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

12 files changed, 24 insertions, 30 deletions

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index a874a6ad819c..c87f1b82fb10 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -290,7 +290,7 @@ OSXBluetoothWrapper::OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel ) :
     SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::OSXBluetoothWrapper(): mnMTU=" << mnMTU );
 }
 
-sal_Int32 OSXBluetoothWrapper::readLine( rtl::OString& aLine )
+sal_Int32 OSXBluetoothWrapper::readLine( OString& aLine )
 {
     SAL_INFO( "sdremote.bluetooth", "OSXBluetoothWrapper::readLine()" );
 
diff --git a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
index 0359807d549f..cef365ac7e4e 100644
--- a/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
+++ b/sd/source/ui/remotecontrol/IBluetoothSocket.hxx
@@ -26,7 +26,7 @@ namespace sd
             @return whatever the last call of recv returned, i.e. 0 or less
                     if there was a problem in communications.
          */
-        virtual sal_Int32 readLine(rtl::OString& aLine) = 0;
+        virtual sal_Int32 readLine(OString& aLine) = 0;
 
         /** Write a number of bytes
 
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index e9f9c22d9099..14d62d78e976 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -221,9 +221,9 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
         return "";
 
 
-    static const ::rtl::OUString sNotesShapeName (
+    static const OUString sNotesShapeName (
         "com.sun.star.presentation.NotesShape" );
-    static const ::rtl::OUString sTextShapeName (
+    static const OUString sTextShapeName (
         "com.sun.star.drawing.TextShape" );
 
     uno::Reference<container::XIndexAccess> xIndexAccess ( aNotesPage, UNO_QUERY);
@@ -253,7 +253,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
                     xIndexAccess->getByIndex(nIndex), UNO_QUERY);
                 if (xShapeDescriptor.is())
                 {
-                    ::rtl::OUString sType (xShapeDescriptor->getShapeType());
+                    OUString sType (xShapeDescriptor->getShapeType());
                     if (sType.equals(sNotesShapeName) || sType.equals(sTextShapeName))
                     {
                         uno::Reference<text::XTextRange> xText (
@@ -283,7 +283,7 @@ OString ImagePreparer::prepareNotes( sal_uInt32 aSlideNumber )
 
 sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl )
 {
-    ::rtl::OUString aFilterName( "XHTML Draw File" );
+    OUString aFilterName( "XHTML Draw File" );
     uno::Reference< document::XExporter > xExporter;
 
     {
@@ -298,7 +298,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl
         else
             fprintf( stderr, "Couldn't find by name.\n" );
 
-        ::rtl::OUString aFilterImplName;
+        OUString aFilterImplName;
         sal_Int32 nFilterProps = aProps.getLength();
         for ( sal_Int32 nFilterProp = 0; nFilterProp<nFilterProps; nFilterProp++ )
         {
@@ -384,7 +384,7 @@ sal_Bool ExportTo( uno::Reference< drawing::XDrawPage>& aNotesPage, String aUrl
         if ( !bHasBaseURL )
         {
             aArgs.realloc ( ++nEnd );
-            aArgs[nEnd-1].Name = ::rtl::OUString( "DocumentBaseURL" );
+            aArgs[nEnd-1].Name = OUString( "DocumentBaseURL" );
             aArgs[nEnd-1].Value <<= rMedium.GetBaseURL( sal_True );
         }
 
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index 66b30aeeee4c..750d2535e139 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -38,7 +38,7 @@ private:
                 sal_uInt32 aWidth, sal_uInt32 aHeight, sal_uInt64 &rSize );
 
     void sendNotes( sal_uInt32 aSlideNumber );
-    rtl::OString prepareNotes( sal_uInt32 aSlideNumber );
+    OString prepareNotes( sal_uInt32 aSlideNumber );
 };
 
 }
diff --git a/sd/source/ui/remotecontrol/Listener.cxx b/sd/source/ui/remotecontrol/Listener.cxx
index 2052fbf4d065..67259d70a963 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -20,8 +20,6 @@
 using namespace sd;
 using namespace ::com::sun::star::presentation;
 using namespace ::com::sun::star::frame;
-using rtl::OString;
-using rtl::OStringBuffer;
 
 
 Listener::Listener( const ::rtl::Reference<Communicator>& rCommunicator,
@@ -105,7 +103,7 @@ void SAL_CALL Listener::slideEnded (sal_Bool bReverse)
     (void) bReverse;
 }
 
-void SAL_CALL Listener::hyperLinkClicked (const rtl::OUString &)
+void SAL_CALL Listener::hyperLinkClicked (const OUString &)
     throw (css::uno::RuntimeException)
 {
 }
diff --git a/sd/source/ui/remotecontrol/Listener.hxx b/sd/source/ui/remotecontrol/Listener.hxx
index e3385eb359fc..111076b47595 100644
--- a/sd/source/ui/remotecontrol/Listener.hxx
+++ b/sd/source/ui/remotecontrol/Listener.hxx
@@ -51,7 +51,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 )
+    virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink )
         throw (css::uno::RuntimeException);
 
     // XEventListener
diff --git a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx
index cecaa7a8b1e5..d744a60cff81 100644
--- a/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx
+++ b/sd/source/ui/remotecontrol/OSXBluetoothWrapper.hxx
@@ -29,7 +29,7 @@ namespace sd
 
     public:
         OSXBluetoothWrapper( IOBluetoothRFCOMMChannel* channel );
-        virtual sal_Int32 readLine( rtl::OString& aLine );
+        virtual sal_Int32 readLine( OString& aLine );
         virtual sal_Int32 write( const void* pBuffer, sal_uInt32 len );
         void appendData(void* pBuffer, size_t len );
         void channelClosed();
diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx
index 3ec14de911a8..c3fe6fcb80dd 100644
--- a/sd/source/ui/remotecontrol/Receiver.cxx
+++ b/sd/source/ui/remotecontrol/Receiver.cxx
@@ -23,8 +23,6 @@
 
 using namespace sd;
 using namespace ::com::sun::star;
-using rtl::OUString;
-using rtl::OString;
 using namespace ::osl;
 using namespace std;
 
@@ -50,7 +48,7 @@ void Receiver::Timeout()
 {
     if( maExecQueue.size() )
     {
-        std::vector< rtl::OString > aCommands( maExecQueue.front() );
+        std::vector< OString > aCommands( maExecQueue.front() );
         maExecQueue.pop_front();
         if( !aCommands.empty() )
             executeCommand( aCommands );
diff --git a/sd/source/ui/remotecontrol/Receiver.hxx b/sd/source/ui/remotecontrol/Receiver.hxx
index a4a915c4b3a9..261a72cc06ce 100644
--- a/sd/source/ui/remotecontrol/Receiver.hxx
+++ b/sd/source/ui/remotecontrol/Receiver.hxx
@@ -29,13 +29,13 @@ namespace sd
 // Timer is protected by the solar mutex => so are we.
 class Receiver : Timer
 {
-    std::deque< std::vector< rtl::OString > > maExecQueue;
+    std::deque< std::vector< OString > > maExecQueue;
 public:
     Receiver( Transmitter *aTransmitter );
     ~Receiver();
     virtual void Timeout();
-    void pushCommand( const std::vector<rtl::OString> &rCommand );
-    void executeCommand( const std::vector<rtl::OString> &aCommand );
+    void pushCommand( const std::vector<OString> &rCommand );
+    void executeCommand( const std::vector<OString> &aCommand );
 
 private:
     Transmitter *pTransmitter;
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 5b53b87d4494..846ea9eae3db 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
-using rtl::OString;
 using namespace ::osl;
 using namespace ::comphelper;
 
@@ -51,11 +50,11 @@ namespace sd {
         ClientInfo
     {
         BufferedStreamSocket *mpStreamSocket;
-        rtl::OUString mPin;
+        OUString mPin;
 
-        ClientInfoInternal( const rtl::OUString rName,
-                            const rtl::OUString rAddress,
-                            BufferedStreamSocket *pSocket, rtl::OUString rPin ):
+        ClientInfoInternal( const OUString rName,
+                            const OUString rAddress,
+                            BufferedStreamSocket *pSocket, OUString rPin ):
                 ClientInfo( rName, rAddress ),
                 mpStreamSocket( pSocket ),
                 mPin( rPin ) {}
@@ -249,7 +248,7 @@ std::vector<ClientInfo*> RemoteServer::getClients()
     return aClients;
 }
 
-sal_Bool RemoteServer::connectClient( ClientInfo* pClient, rtl::OUString aPin )
+sal_Bool RemoteServer::connectClient( ClientInfo* pClient, OUString aPin )
 {
     SAL_INFO( "sdremote", "RemoteServer::connectClient called" );
     if ( !spServer )
diff --git a/sd/source/ui/remotecontrol/Transmitter.cxx b/sd/source/ui/remotecontrol/Transmitter.cxx
index a7c211b20ad1..f5861e4286f2 100644
--- a/sd/source/ui/remotecontrol/Transmitter.cxx
+++ b/sd/source/ui/remotecontrol/Transmitter.cxx
@@ -8,7 +8,6 @@
  */
 #include "Transmitter.hxx"
 
-using rtl::OString;
 using namespace std;
 using namespace osl; // Sockets etc.
 using namespace sd;
diff --git a/sd/source/ui/remotecontrol/Transmitter.hxx b/sd/source/ui/remotecontrol/Transmitter.hxx
index 783e1d5dbc3c..9412ccc2faa4 100644
--- a/sd/source/ui/remotecontrol/Transmitter.hxx
+++ b/sd/source/ui/remotecontrol/Transmitter.hxx
@@ -28,7 +28,7 @@ public:
     enum Priority { PRIORITY_LOW = 1, PRIORITY_HIGH };
     Transmitter( ::sd::IBluetoothSocket* aSocket );
     ~Transmitter();
-    void addMessage( const rtl::OString& aMessage, const Priority aPriority );
+    void addMessage( const OString& aMessage, const Priority aPriority );
     void notifyFinished();
 
 private:
@@ -41,8 +41,8 @@ private:
 
     ::osl::Mutex mQueueMutex;
 
-    std::queue<rtl::OString> mLowPriority;
-    std::queue<rtl::OString> mHighPriority;
+    std::queue<OString> mLowPriority;
+    std::queue<OString> mHighPriority;
 };
 
 }