mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

5 files changed, 32 insertions, 37 deletions

diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 90ed5146ac6e..b4fb2b0d218c 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -30,7 +30,6 @@
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
-using ::rtl::OUString;
 using ::sd::framework::FrameworkHelper;
 
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 99e7efc991f2..f9154e255431 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -57,7 +57,6 @@
 using ::com::sun::star::presentation::XSlideShowController;
 using ::com::sun::star::container::XIndexAccess;
 using ::sd::framework::FrameworkHelper;
-using ::rtl::OUString;
 using ::com::sun::star::awt::XWindow;
 using namespace ::sd;
 using namespace ::cppu;
@@ -69,7 +68,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::drawing::framework;
 
-extern String getUiNameFromPageApiNameImpl( const ::rtl::OUString& rApiName );
+extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 
 namespace {
@@ -831,7 +830,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
 
                         uno::Reference< frame::XDispatch > xDispatch(
                             xProvider->queryDispatch(
-                                aURL, ::rtl::OUString(), 0));
+                                aURL, OUString(), 0));
                         if( xDispatch.is() )
                         {
                             xDispatch->dispatch(aURL,
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index fd29a7bd9996..7bb32b86995d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -78,8 +78,6 @@
 
 #include <boost/bind.hpp>
 
-using ::rtl::OUString;
-using ::rtl::OString;
 using ::cppu::OInterfaceContainerHelper;
 using ::comphelper::ImplementationReference;
 using ::com::sun::star::animations::XAnimationNode;
@@ -94,7 +92,7 @@ using namespace ::com::sun::star::document;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::beans;
 
-extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const rtl::OUString& rEventName );
+extern void NotifyDocumentEvent( SdDrawDocument* pDocument, const OUString& rEventName );
 extern String getUiNameFromPageApiNameImpl( const OUString& rApiName );
 
 namespace sd
@@ -327,7 +325,7 @@ bool AnimationSlideController::getSlideAPI( sal_Int32 nSlideNumber, Reference< X
         OSL_FAIL(
             OString(OString("sd::AnimationSlideController::getSlideAPI(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
 
@@ -651,7 +649,7 @@ void SAL_CALL SlideshowImpl::disposing()
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::stop(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
 
@@ -879,7 +877,7 @@ bool SlideshowImpl::startPreview(
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::startPreview(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
         bRet = false;
@@ -1106,7 +1104,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::startShow(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
         bRet = false;
@@ -1167,7 +1165,7 @@ bool SlideshowImpl::startShowImpl( const Sequence< beans::PropertyValue >& aProp
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::startShowImpl(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
         return false;
@@ -1205,7 +1203,7 @@ void SlideshowImpl::paint( const Rectangle& /* rRect */ )
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::paint(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1259,7 +1257,7 @@ void SlideshowImpl::removeShapeEvents()
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::removeShapeEvents(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1294,7 +1292,7 @@ void SlideshowImpl::registerShapeEvents(sal_Int32 nSlideNumber)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::registerShapeEvents(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1372,7 +1370,7 @@ void SlideshowImpl::registerShapeEvents( Reference< XShapes >& xShapes ) throw(
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::registerShapeEvents(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1443,7 +1441,7 @@ void SAL_CALL SlideshowImpl::pause() throw (RuntimeException)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::pause(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1479,7 +1477,7 @@ void SAL_CALL SlideshowImpl::resume() throw (RuntimeException)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::resume(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -1663,7 +1661,7 @@ sal_Int32 SlideshowImpl::getSlideNumberForBookmark( const OUString& rStrBookmark
 
 // ---------------------------------------------------------
 
-void SlideshowImpl::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException)
+void SlideshowImpl::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException)
 {
     OUString aBookmark( aHyperLink );
 
@@ -1901,7 +1899,7 @@ sal_Int32 SlideshowImpl::updateSlideShow (void)
     {
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::updateSlideShow(), exception caught: ")
-                + rtl::OUStringToOString(
+                + OUStringToOString(
                     comphelper::anyToString( cppu::getCaughtException() ),
                     RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -2033,7 +2031,7 @@ bool SlideshowImpl::keyInput(const KeyEvent& rKEvt)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::keyInput(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -2422,7 +2420,7 @@ Reference< XSlideShow > SlideshowImpl::createSlideShow() const
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::createSlideShow(), "
                      "exception caught: ") +
-             rtl::OUStringToOString(
+             OUStringToOString(
                  comphelper::anyToString( cppu::getCaughtException() ),
                  RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -2631,7 +2629,7 @@ void SlideshowImpl::resize( const Size& rSize )
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::resize(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -2987,7 +2985,7 @@ void SAL_CALL SlideshowImpl::setUsePen( sal_Bool bMouseAsPen ) throw (RuntimeExc
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::setUsePen(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -3280,7 +3278,7 @@ void SlideshowImpl::gotoPreviousSlide (const bool bSkipAllMainSequenceEffects)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::gotoPreviousSlide(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -3380,7 +3378,7 @@ void SAL_CALL SlideshowImpl::stopSound(  ) throw (RuntimeException)
         OSL_FAIL(
             OString(OString("sd::SlideshowImpl::stopSound(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
@@ -3728,7 +3726,7 @@ void SlideShowListenerProxy::slideEnded(sal_Bool bReverse) throw (RuntimeExcepti
 
 // ---------------------------------------------------------
 
-void SlideShowListenerProxy::hyperLinkClicked( rtl::OUString const& aHyperLink ) throw (RuntimeException)
+void SlideShowListenerProxy::hyperLinkClicked( OUString const& aHyperLink ) throw (RuntimeException)
 {
     {
         ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 7f87ea01ccd5..8be006b320da 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -102,7 +102,7 @@ struct PresentationSettingsEx : public PresentationSettings
 
     void SetArguments( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ) throw (css::lang::IllegalArgumentException);
 
-    void SetPropertyValue( const ::rtl::OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException);
+    void SetPropertyValue( const OUString& rProperty, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException);
 };
 
 // --------------------------------------------------------------------
@@ -111,7 +111,7 @@ struct WrappedShapeEventImpl
 {
     css::presentation::ClickAction meClickAction;
     sal_Int32 mnVerb;
-    ::rtl::OUString maStrBookmark;
+    OUString maStrBookmark;
     WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {};
 };
 
@@ -148,7 +148,7 @@ public:
     virtual void SAL_CALL slideTransitionEnded() throw (css::uno::RuntimeException);
     virtual void SAL_CALL slideAnimationsEnded() throw (css::uno::RuntimeException);
     virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException);
 
     // css::lang::XEventListener:
     virtual void SAL_CALL disposing(const css::lang::EventObject & Source) throw (css::uno::RuntimeException);
@@ -201,7 +201,7 @@ public:
     virtual void SAL_CALL gotoNextSlide(  ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoPreviousSlide(  ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoLastSlide(  ) throw (css::uno::RuntimeException);
-    virtual void SAL_CALL gotoBookmark( const ::rtl::OUString& Bookmark ) throw (css::uno::RuntimeException);
+    virtual void SAL_CALL gotoBookmark( const OUString& Bookmark ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL gotoSlide( const css::uno::Reference< css::drawing::XDrawPage >& Page ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
     virtual void SAL_CALL gotoSlideIndex( ::sal_Int32 Index ) throw (css::uno::RuntimeException);
     virtual void SAL_CALL stopSound(  ) throw (css::uno::RuntimeException);
@@ -227,7 +227,7 @@ public:
 
     // will be called from the SlideShowListenerProxy when this event is fired from the XSlideShow
     void slideEnded(const bool bReverse);
-    void hyperLinkClicked(const ::rtl::OUString & hyperLink) throw (css::uno::RuntimeException);
+    void hyperLinkClicked(const OUString & hyperLink) throw (css::uno::RuntimeException);
     void click(const css::uno::Reference< css::drawing::XShape > & xShape, const css::awt::MouseEvent & aOriginalEvent);
 
     /// ends the presentation async
@@ -311,7 +311,7 @@ private:
     SfxDispatcher* getDispatcher() const;
     SfxBindings* getBindings() const;
 
-    sal_Int32 getSlideNumberForBookmark( const rtl::OUString& rStrBookmark );
+    sal_Int32 getSlideNumberForBookmark( const OUString& rStrBookmark );
 
     void removeShapeEvents();
     void registerShapeEvents( sal_Int32 nSlideNumber );
@@ -388,9 +388,9 @@ private:
     sal_Int32       mnLastSlideNumber;
     WrappedShapeEventImplMap    maShapeEventMap;
 
-    ::rtl::OUString msOnClick;
-    ::rtl::OUString msBookmark;
-    ::rtl::OUString msVerb;
+    OUString msOnClick;
+    OUString msBookmark;
+    OUString msVerb;
 
     css::uno::Reference< css::drawing::XDrawPage > mxPreviewDrawPage;
     css::uno::Reference< css::animations::XAnimationNode > mxPreviewAnimationNode;
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 5fccaed09ca2..032345b5491c 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx
@@ -44,7 +44,6 @@ using ::com::sun::star::presentation::XShapeEventListener;
 using ::com::sun::star::presentation::XSlideShowListener;
 using ::comphelper::ImplementationReference;
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 
 namespace sd