Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1558
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/1558/1
remove some ::rtl:: prefixes
Change-Id: Ia31f1b5ae3c940861d72598aff54be85e2ad33dd
---
M accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
M accessibility/source/extended/textwindowaccessibility.cxx
M avmedia/source/quicktime/framegrabber.mm
M avmedia/source/quicktime/manager.mm
M avmedia/source/quicktime/player.mm
M avmedia/source/quicktime/quicktimeuno.mm
M avmedia/source/quicktime/window.mm
M avmedia/source/viewer/mediawindowbase_impl.cxx
M basctl/source/basicide/unomodel.cxx
M basctl/source/basicide/unomodel.hxx
M basegfx/test/basegfx2d.cxx
M bridges/source/jni_uno/jni_base.h
M bridges/source/jni_uno/jni_info.h
M bridges/test/testcomp.cxx
M bridges/test/testcomp.h
M canvas/source/cairo/cairo_canvashelper.cxx
M canvas/source/directx/dx_9rm.cxx
17 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
index 6d8db68..02c5571 100644
--- a/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
+++ b/accessibility/inc/accessibility/extended/textwindowaccessibility.hxx
@@ -141,7 +141,7 @@
public ParagraphBase, private ::comphelper::OCommonAccessibleText
{
public:
- ParagraphImpl(::rtl::Reference< Document > const & rDocument,
+ ParagraphImpl(Reference< Document > const & rDocument,
Paragraphs::size_type nNumber, ::osl::Mutex & rMutex);
// Not thread-safe.
@@ -372,7 +372,7 @@
// Throws ::css::lang::DisposedException:
void checkDisposed();
- ::rtl::Reference< Document > m_xDocument;
+ Reference< Document > m_xDocument;
Paragraphs::size_type m_nNumber;
// ::cppu::OInterfaceContainerHelper m_aListeners;
@@ -404,21 +404,21 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const *" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::sal_Int32 retrieveParagraphIndex(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const *" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::sal_Int64 retrieveParagraphState(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::css::awt::Rectangle
retrieveParagraphBounds(ParagraphImpl const * pParagraph, bool bAbsolute);
@@ -426,14 +426,14 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
OUString retrieveParagraphText(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
void retrieveParagraphSelection(ParagraphImpl const * pParagraph,
::sal_Int32 * pBegin, ::sal_Int32 * pEnd);
@@ -441,14 +441,14 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const *" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::sal_Int32 retrieveParagraphCaretPosition(ParagraphImpl const * pParagraph);
// Must be called only after init has been called.
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
::css::awt::Rectangle
retrieveCharacterBounds(ParagraphImpl const * pParagraph,
@@ -458,7 +458,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::sal_Int32 retrieveCharacterIndex(ParagraphImpl const * pParagraph,
::css::awt::Point const & rPoint);
@@ -466,7 +466,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveCharacterAttributes(
ParagraphImpl const * pParagraph, ::sal_Int32 nIndex,
@@ -476,7 +476,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveDefaultAttributes(
ParagraphImpl const * pParagraph,
const ::css::uno::Sequence< OUString >& RequestedAttributes);
@@ -485,7 +485,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
::css::uno::Sequence< ::css::beans::PropertyValue > retrieveRunAttributes(
ParagraphImpl const * pParagraph, ::sal_Int32 Index,
@@ -495,7 +495,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
void changeParagraphText(ParagraphImpl * pParagraph,
OUString const & rText);
@@ -503,7 +503,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
void changeParagraphText(ParagraphImpl * pParagraph, ::sal_Int32 nBegin,
::sal_Int32 nEnd, bool bCut, bool bPaste,
@@ -513,7 +513,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
void copyParagraphText(ParagraphImpl const * pParagraph,
::sal_Int32 nBegin, ::sal_Int32 nEnd);
@@ -522,7 +522,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
void changeParagraphAttributes(
ParagraphImpl * pParagraph, ::sal_Int32 nBegin, ::sal_Int32 nEnd,
@@ -533,7 +533,7 @@
// To make it possible for this method to be (indirectly) called from
// within Paragraph's constructor (i.e., when the Paragraph's ref count is
// still zero), pass a "ParagraphImpl const &" instead of a
- // "::rtl::Reference< ParagraphImpl > const &".
+ // "Reference< ParagraphImpl > const &".
// Throws ::css::lang::IndexOutOfBoundsException.
void changeParagraphSelection(ParagraphImpl * pParagraph,
::sal_Int32 nBegin, ::sal_Int32 nEnd);
@@ -590,7 +590,7 @@
// Must be called with both the external (Solar) and internal mutex
// locked, and after init has been called:
- ::rtl::Reference< ParagraphImpl >
+ Reference< ParagraphImpl >
getParagraph(Paragraphs::iterator const & rIt);
// Must be called with both the external (Solar) and internal mutex
diff --git a/accessibility/source/extended/textwindowaccessibility.cxx
b/accessibility/source/extended/textwindowaccessibility.cxx
index 6691856..902cded 100644
--- a/accessibility/source/extended/textwindowaccessibility.cxx
+++ b/accessibility/source/extended/textwindowaccessibility.cxx
@@ -32,12 +32,12 @@
{
// Both ::osl::Mutex and ParagraphBase implement acquire and release, and thus
-// ::rtl::Reference< Paragraph > does not work. So ParagraphImpl was factored
-// out and ::rtl::Reference< ParagraphImpl > is used instead.
+// Reference< Paragraph > does not work. So ParagraphImpl was factored
+// out and Reference< ParagraphImpl > is used instead.
class Paragraph: private ::osl::Mutex, public ParagraphImpl
{
public:
- inline Paragraph(::rtl::Reference< Document > const & rDocument,
+ inline Paragraph(Reference< Document > const & rDocument,
Paragraphs::size_type nNumber):
ParagraphImpl(rDocument, nNumber, *this) {}
};
@@ -74,7 +74,7 @@
}
}
-ParagraphImpl::ParagraphImpl(::rtl::Reference< Document > const & rDocument,
+ParagraphImpl::ParagraphImpl(Reference< Document > const & rDocument,
Paragraphs::size_type nNumber,
::osl::Mutex & rMutex):
ParagraphBase(rMutex),
@@ -1591,7 +1591,7 @@
if (m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
{
- ::rtl::Reference< ParagraphImpl > xParagraph(
+ Reference< ParagraphImpl > xParagraph(
getParagraph(m_aFocused));
if (xParagraph.is())
xParagraph->notifyEvent(
@@ -1612,7 +1612,7 @@
if (m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
{
- ::rtl::Reference< ParagraphImpl > xParagraph(
+ Reference< ParagraphImpl > xParagraph(
getParagraph(m_aFocused));
if (xParagraph.is())
xParagraph->notifyEvent(
@@ -1661,7 +1661,7 @@
}
}
-::rtl::Reference< ParagraphImpl >
+Reference< ParagraphImpl >
Document::getParagraph(Paragraphs::iterator const & rIt)
{
return static_cast< ParagraphImpl * >(
@@ -1813,7 +1813,7 @@
++aIt;
if (aIt == m_xParagraphs->end())
break;
- ::rtl::Reference< ParagraphImpl > xParagraph(
+ Reference< ParagraphImpl > xParagraph(
getParagraph(aIt));
if (xParagraph.is())
xParagraph->numberChanged(true);
@@ -1914,7 +1914,7 @@
for (; aIt != m_xParagraphs->end(); ++aIt)
{
- ::rtl::Reference< ParagraphImpl > xParagraph(
+ Reference< ParagraphImpl > xParagraph(
getParagraph(aIt));
if (xParagraph.is())
xParagraph->numberChanged(false);
@@ -1958,7 +1958,7 @@
if (n < m_xParagraphs->size())
{
Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
- ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+ Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
if (xParagraph.is())
xParagraph->textChanged();
}
@@ -1998,7 +1998,7 @@
if (m_aFocused != m_xParagraphs->end() && m_aFocused != aIt
&& m_aFocused >= m_aVisibleBegin && m_aFocused < m_aVisibleEnd)
{
- ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(m_aFocused));
+ Reference< ParagraphImpl > xParagraph(getParagraph(m_aFocused));
if (xParagraph.is())
xParagraph->notifyEvent(
::css::accessibility::AccessibleEventId::
@@ -2014,7 +2014,7 @@
|| nNewLastPara != m_nSelectionLastPara
|| nNewLastPos != m_nSelectionLastPos))
{
- ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+ Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
if (xParagraph.is())
{
if (aIt != m_aFocused)
@@ -2133,7 +2133,7 @@
{
for ( Paragraphs::iterator i = iFirst; i != iLast; ++i )
{
- ::rtl::Reference< ParagraphImpl > xParagraph( getParagraph( i ) );
+ Reference< ParagraphImpl > xParagraph( getParagraph( i ) );
if ( xParagraph.is() )
{
xParagraph->notifyEvent(
diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm
index 3e262f1..406cecb 100644
--- a/avmedia/source/quicktime/framegrabber.mm
+++ b/avmedia/source/quicktime/framegrabber.mm
@@ -70,7 +70,7 @@
// ------------------------------------------------------------------------------
-bool FrameGrabber::create( const ::rtl::OUString& rURL )
+bool FrameGrabber::create( const OUString& rURL )
{
bool bRet = false;
maURL = rURL;
@@ -115,15 +115,15 @@
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( )
+OUString SAL_CALL FrameGrabber::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
@@ -131,11 +131,11 @@
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME );
return aRet;
}
diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm
index fb9c41a..1cbd0fa 100644
--- a/avmedia/source/quicktime/manager.mm
+++ b/avmedia/source/quicktime/manager.mm
@@ -42,7 +42,7 @@
// ------------------------------------------------------------------------------
-uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL )
throw (uno::RuntimeException)
{
Player* pPlayer( new Player( mxMgr ) );
@@ -59,15 +59,15 @@
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Manager::getImplementationName( )
+OUString SAL_CALL Manager::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
@@ -75,11 +75,11 @@
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME );
return aRet;
}
diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm
index 4755ad8..0dd5886 100644
--- a/avmedia/source/quicktime/player.mm
+++ b/avmedia/source/quicktime/player.mm
@@ -78,7 +78,7 @@
// ------------------------------------------------------------------------------
-bool Player::create( const ::rtl::OUString& rURL )
+bool Player::create( const OUString& rURL )
{
bool bRet = false;
// create the Movie
@@ -391,15 +391,15 @@
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Player::getImplementationName( )
+OUString SAL_CALL Player::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
@@ -407,11 +407,11 @@
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString( AVMEDIA_QUICKTIME_PLAYER_SERVICENAME );
return aRet;
}
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm
index 7baacb4..70d4a746 100644
--- a/avmedia/source/quicktime/quicktimeuno.mm
+++ b/avmedia/source/quicktime/quicktimeuno.mm
@@ -38,11 +38,11 @@
if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(AVMEDIA_QUICKTIME_MANAGER_SERVICENAME
) );
+ const OUString aServiceName( OUString(AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
+ OUString(AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
create_MediaPlayer, uno::Sequence< OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm
index bdb4e08..2d145df 100644
--- a/avmedia/source/quicktime/window.mm
+++ b/avmedia/source/quicktime/window.mm
@@ -314,15 +314,15 @@
// XServiceInfo
// ------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL Window::getImplementationName( )
+OUString SAL_CALL Window::getImplementationName( )
throw (uno::RuntimeException)
{
- return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
+ return OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME );
}
// ------------------------------------------------------------------------------
-sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName )
throw (uno::RuntimeException)
{
return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
@@ -330,11 +330,11 @@
// ------------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( )
+uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( )
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet(1);
- aRet[0] = ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
+ uno::Sequence< OUString > aRet(1);
+ aRet[0] = OUString( AVMEDIA_QUICKTIME_WINDOW_SERVICENAME );
return aRet;
}
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx
b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 74dc1d3..60ea780 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -51,7 +51,7 @@
// -------------------------------------------------------------------------
-uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUString& rURL )
{
uno::Reference< media::XPlayer > xPlayer;
uno::Reference< lang::XMultiServiceFactory > xFactory(
::comphelper::getProcessServiceFactory() );
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 1b6122c..465ee4e 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -123,13 +123,13 @@
notImplemented();
}
-void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString&, const uno::Sequence< PROPERTYVALUE >&
)
+void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< PROPERTYVALUE >& )
throw (io::IOException, uno::RuntimeException)
{
notImplemented();
}
-void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString&,
+void SAL_CALL SIDEModel::storeToURL( const OUString&,
const uno::Sequence< PROPERTYVALUE >& )
throw (io::IOException, uno::RuntimeException)
{
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 4d6fd0c..4e92040 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -55,10 +55,10 @@
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { notImplemented(); }
// XStorable
virtual void SAL_CALL store() throw (::com::sun::star::io::IOException,
::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL,
+ virtual void SAL_CALL storeAsURL( const OUString& sURL,
const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL,
+ virtual void SAL_CALL storeToURL( const OUString& sURL,
const ::com::sun::star::uno::Sequence< PROPERTYVALUE >& seqArguments )
throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index aea6c35..c62c2b8 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -55,27 +55,27 @@
class b2dsvgdimpex : public CppUnit::TestFixture
{
private:
- ::rtl::OUString aPath0;
- ::rtl::OUString aPath1;
- ::rtl::OUString aPath2;
- ::rtl::OUString aPath3;
+ OUString aPath0;
+ OUString aPath1;
+ OUString aPath2;
+ OUString aPath3;
public:
// initialise your test code values here.
void setUp()
{
// simple rectangle
- aPath0 = ::rtl::OUString(
+ aPath0 = OUString(
"M 10 10-10 10-10-10 10-10Z" );
// simple bezier polygon
- aPath1 = ::rtl::OUString(
+ aPath1 = OUString(
"m11430 0c-8890 3810 5715 6985 5715 6985 "
"0 0-17145-1905-17145-1905 0 0 22860-10160 "
"16510 6350-6350 16510-3810-11430-3810-11430z" );
// '@' as a bezier polygon
- aPath2 = ::rtl::OUString(
+ aPath2 = OUString(
"m1917 1114c-89-189-233-284-430-284-167 "
"0-306 91-419 273-113 182-170 370-170 564 "
"0 145 33 259 98 342 65 84 150 126 257 126 "
@@ -101,7 +101,7 @@
"600-77 211-52 378-110 503-174 27 70 54 140 81 210z" );
// first part of 'Hello World' as a line polygon
- aPath3 = ::rtl::OUString(
+ aPath3 = OUString(
"m1598 125h306v2334h-306v-1105h-1293v1105h-305v"
"-2334h305v973h1293zm2159 1015 78-44 85 235-91 "
"47-91 40-90 34-90 29-89 21-88 16-88 10-88 3-102"
@@ -143,7 +143,7 @@
void impex()
{
B2DPolyPolygon aPoly;
- ::rtl::OUString aExport;
+ OUString aExport;
CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D",
tools::importFromSvgD( aPoly,
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index ad0fd8d..3f5a6ba 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -41,7 +41,7 @@
#include "uno/environment.h"
#include "typelib/typedescription.h"
-#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
+#define OUSTR(x) OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
namespace jni_uno
@@ -52,9 +52,9 @@
//==============================================================================
struct BridgeRuntimeError
{
- ::rtl::OUString m_message;
+ OUString m_message;
- inline BridgeRuntimeError( ::rtl::OUString const & message )
+ inline BridgeRuntimeError( OUString const & message )
: m_message( message )
{}
};
@@ -100,7 +100,7 @@
inline void ensure_no_exception() const; // throws BridgeRuntimeError
inline bool assert_no_exception() const; // asserts and clears exception
- ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const;
+ OUString get_stack_trace( jobject jo_exc = 0 ) const;
};
//______________________________________________________________________________
@@ -275,7 +275,7 @@
{
throw BridgeRuntimeError(
OUSTR("cannot get comprehensive type description for ") +
- ::rtl::OUString::unacquired( &td_ref->pTypeName ) );
+ OUString::unacquired( &td_ref->pTypeName ) );
}
}
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index b02bb88..a627480 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -46,10 +46,10 @@
{
if (type1 == type2)
return true;
- ::rtl::OUString const & name1 =
- ::rtl::OUString::unacquired( &type1->pTypeName );
- ::rtl::OUString const & name2 =
- ::rtl::OUString::unacquired( &type2->pTypeName );
+ OUString const & name1 =
+ OUString::unacquired( &type1->pTypeName );
+ OUString const & name2 =
+ OUString::unacquired( &type2->pTypeName );
return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 ));
}
@@ -57,7 +57,7 @@
inline bool is_XInterface( typelib_TypeDescriptionReference * type )
{
return ((typelib_TypeClass_INTERFACE == type->eTypeClass) &&
- ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
+ OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
}
//==============================================================================
@@ -112,7 +112,7 @@
};
typedef ::boost::unordered_map<
- ::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type;
+ OUString, JNI_type_info_holder, OUStringHash > t_str2type;
//==============================================================================
class JNI_info
@@ -211,10 +211,10 @@
typelib_TypeDescriptionReference * type ) const;
JNI_type_info const * get_type_info(
JNI_context const & jni,
- ::rtl::OUString const & uno_name ) const;
+ OUString const & uno_name ) const;
//
inline static void append_sig(
- ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
+ OStringBuffer * buf, typelib_TypeDescriptionReference * type,
bool use_Object_for_type_XInterface = true, bool use_slashes = true );
// get this
@@ -242,7 +242,7 @@
//______________________________________________________________________________
inline void JNI_info::append_sig(
- ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
+ OStringBuffer * buf, typelib_TypeDescriptionReference * type,
bool use_Object_for_type_XInterface, bool use_slashes )
{
switch (type->eTypeClass)
@@ -304,20 +304,20 @@
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
{
- ::rtl::OUString const & uno_name =
- ::rtl::OUString::unacquired( &type->pTypeName );
+ OUString const & uno_name =
+ OUString::unacquired( &type->pTypeName );
buf->append( 'L' );
// Erase type arguments of instantiated polymorphic struct types:
sal_Int32 i = uno_name.indexOf( '<' );
if ( i < 0 ) {
buf->append(
- ::rtl::OUStringToOString(
+ OUStringToOString(
use_slashes ? uno_name.replace( '.', '/' ) : uno_name,
RTL_TEXTENCODING_JAVA_UTF8 ) );
} else {
rtl::OUString s( uno_name.copy( 0, i ) );
buf->append(
- ::rtl::OUStringToOString(
+ OUStringToOString(
use_slashes ? s.replace( '.', '/' ) : s,
RTL_TEXTENCODING_JAVA_UTF8 ) );
}
@@ -344,11 +344,11 @@
}
else
{
- ::rtl::OUString const & uno_name =
- ::rtl::OUString::unacquired( &type->pTypeName );
+ OUString const & uno_name =
+ OUString::unacquired( &type->pTypeName );
buf->append( 'L' );
buf->append(
- ::rtl::OUStringToOString(
+ OUStringToOString(
use_slashes ? uno_name.replace( '.', '/' ) : uno_name,
RTL_TEXTENCODING_JAVA_UTF8 ) );
buf->append( ';' );
@@ -357,7 +357,7 @@
default:
throw BridgeRuntimeError(
OUSTR("unsupported type: ") +
- ::rtl::OUString::unacquired( &type->pTypeName ) );
+ OUString::unacquired( &type->pTypeName ) );
}
}
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 588546e..53b7fd0 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -51,7 +51,7 @@
void parseCommandLine( char *argv[] ,
- ::rtl::OUString *pConnection , ::rtl::OUString *pProtocol ,
+ OUString *pConnection , OUString *pProtocol ,
sal_Bool *pbLatency , sal_Bool *pbReverse)
{
sal_Int32 nArgIndex = 1;
@@ -92,7 +92,7 @@
}
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
- OInstanceProvider::getInstance( const ::rtl::OUString& sObjectName )
+ OInstanceProvider::getInstance( const OUString& sObjectName )
throw(::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException)
{
@@ -176,7 +176,7 @@
{}
virtual OUString SAL_CALL getString_attr() throw(::com::sun::star::uno::RuntimeException)
{ return _aDummyString; }
- virtual void SAL_CALL setString_attr( const ::rtl::OUString& /* _attributestring */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setString_attr( const OUString& /* _attributestring */)
throw(::com::sun::star::uno::RuntimeException)
{}
virtual Reference< XInterface > SAL_CALL getInterface_attr()
throw(::com::sun::star::uno::RuntimeException)
{ return Reference< XInterface >(); }
@@ -214,7 +214,7 @@
{}
virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException)
{ return _aDummyString; }
- virtual void SAL_CALL setString( const ::rtl::OUString& /* _string */)
throw(::com::sun::star::uno::RuntimeException)
+ virtual void SAL_CALL setString( const OUString& /* _string */)
throw(::com::sun::star::uno::RuntimeException)
{}
virtual Reference< XInterface > SAL_CALL getInterface()
throw(::com::sun::star::uno::RuntimeException)
{ return Reference< XInterface >(); }
@@ -293,7 +293,7 @@
return OWeakObject::queryInterface( aType );
}
-void OCallMe::call( const ::rtl::OUString& s, sal_Int32 nToDo )
+void OCallMe::call( const OUString& s, sal_Int32 nToDo )
throw( RuntimeException, ::test::TestBridgeException)
{
if( nToDo < 0 )
@@ -318,7 +318,7 @@
// do nothings
}
-void OCallMe::callOneway( const ::rtl::OUString& /* s */, sal_Int32 nToDo )
+void OCallMe::callOneway( const OUString& /* s */, sal_Int32 nToDo )
throw(RuntimeException)
{
OUString sDummy;
@@ -343,11 +343,11 @@
return types;
}
-::rtl::OUString OCallMe::getsAttribute() throw(RuntimeException)
+OUString OCallMe::getsAttribute() throw(RuntimeException)
{
return m_sAttribute;
}
-void OCallMe::setsAttribute( const ::rtl::OUString& _sattribute )
+void OCallMe::setsAttribute( const OUString& _sattribute )
throw(RuntimeException)
{
m_sAttribute = _sattribute;
@@ -469,7 +469,7 @@
// public:
// virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-// getInstance( const ::rtl::OUString& sObjectName )
+// getInstance( const OUString& sObjectName )
// throw( ::com::sun::star::container::NoSuchElementException,
// ::com::sun::star::uno::RuntimeException);
// };
@@ -749,8 +749,8 @@
-Reference <XInterface > createComponent( const ::rtl::OUString &sService ,
- const ::rtl::OUString &sDllName,
+Reference <XInterface > createComponent( const OUString &sService ,
+ const OUString &sDllName,
const Reference < XMultiServiceFactory > &rSMgr )
{
Reference< XInterface > rInterface;
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index 67b796d..75bd05e 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -24,13 +24,13 @@
void parseCommandLine( char *argv[] ,
- ::rtl::OUString *pProtocol , ::rtl::OUString *pConnection ,
+ OUString *pProtocol , OUString *pConnection ,
sal_Bool *pbLatency , sal_Bool *pbReverse);
Reference< XInterface > createComponent(
- const ::rtl::OUString &sServiceName,
- const ::rtl::OUString &sDllName,
+ const OUString &sServiceName,
+ const OUString &sDllName,
const Reference < XMultiServiceFactory > & rSMgr );
class OInterfaceTest :
@@ -75,16 +75,16 @@
void SAL_CALL release()throw() { OWeakObject::release(); }
public:
// XCallMe
- virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo )
+ virtual void SAL_CALL call( const OUString& s, sal_Int32 nToDo )
throw(::com::sun::star::uno::RuntimeException,
::test::TestBridgeException);
- virtual void SAL_CALL callOneway( const ::rtl::OUString& s, sal_Int32 nToDo )
+ virtual void SAL_CALL callOneway( const OUString& s, sal_Int32 nToDo )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL drawLine( sal_Int32 x1, sal_Int32 y1 , sal_Int32 x2 , sal_Int32 y2 )
throw(::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getsAttribute()
throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setsAttribute( const ::rtl::OUString& _sattribute )
throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setsAttribute( const OUString& _sattribute )
throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL callAgain( const ::com::sun::star::uno::Reference< ::test::XCallMe >&
callAgain,
sal_Int32 nToCall )
throw(::com::sun::star::uno::RuntimeException);
@@ -92,7 +92,7 @@
throw(::com::sun::star::uno::RuntimeException);
::osl::Mutex m_mutex;
- ::rtl::OUString m_sAttribute;
+ OUString m_sAttribute;
sal_Int32 m_nLastToDos;
};
@@ -136,7 +136,7 @@
public:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- getInstance( const ::rtl::OUString& sObjectName )
+ getInstance( const OUString& sObjectName )
throw( ::com::sun::star::container::NoSuchElementException,
::com::sun::star::uno::RuntimeException);
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index cbda60a..e04f083 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1369,10 +1369,10 @@
Matrix aMatrix;
cairo_get_matrix( mpCairo.get(), &aMatrix );
- if( ! ::rtl::math::approxEqual( aMatrix.xx, 1 ) &&
- ! ::rtl::math::approxEqual( aMatrix.yy, 1 ) &&
- ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
- ::rtl::math::approxEqual( aMatrix.y0, 0 ) &&
+ if( ! math::approxEqual( aMatrix.xx, 1 ) &&
+ ! math::approxEqual( aMatrix.yy, 1 ) &&
+ math::approxEqual( aMatrix.x0, 0 ) &&
+ math::approxEqual( aMatrix.y0, 0 ) &&
basegfx::fround( rSize.Width * aMatrix.xx ) > 8 &&
basegfx::fround( rSize.Height* aMatrix.yy ) > 8 )
{
@@ -1440,10 +1440,10 @@
cairo_set_source_surface( mpCairo.get(), pSurface->getCairoSurface().get(), 0, 0 );
if( !bHasAlpha &&
- ::rtl::math::approxEqual( aMatrix.xx, 1 ) &&
- ::rtl::math::approxEqual( aMatrix.yy, 1 ) &&
- ::rtl::math::approxEqual( aMatrix.x0, 0 ) &&
- ::rtl::math::approxEqual( aMatrix.y0, 0 ) )
+ math::approxEqual( aMatrix.xx, 1 ) &&
+ math::approxEqual( aMatrix.yy, 1 ) &&
+ math::approxEqual( aMatrix.x0, 0 ) &&
+ math::approxEqual( aMatrix.y0, 0 ) )
cairo_set_operator( mpCairo.get(), CAIRO_OPERATOR_SOURCE );
#if CAIRO_VERSION >= 10200
cairo_pattern_set_extend( cairo_get_source(mpCairo.get()), CAIRO_EXTEND_PAD );
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index b30b0a4..05a31c0 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -586,7 +586,7 @@
if(!(create(rWindow)))
{
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not create DirectX device!") ),NULL);
}
@@ -606,7 +606,7 @@
(aPageSize.getY() < MIN_TEXTURE_SIZE))
{
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not create DirectX device - "
"insufficient texture space!") ),NULL);
}
@@ -623,7 +623,7 @@
NULL)) )
{
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not create DirectX device - out of
memory!")),NULL);
}
@@ -905,7 +905,7 @@
NULL)) )
{
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not create offscreen surface - out of mem!")
),NULL);
}
@@ -960,7 +960,7 @@
NULL)) )
{
throw lang::NoSupportException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString( RTL_CONSTASCII_USTRINGPARAM(
"Could not create DirectX device - out of
memory!")),NULL);
}
mpVertexBuffer=COMReference<IDirect3DVertexBuffer9>(pVB);
--
To view, visit https://gerrit.libreoffice.org/1558
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia31f1b5ae3c940861d72598aff54be85e2ad33dd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Context
- [PATCH] remove some ::rtl:: prefixes · Joren De Cuyper (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.