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, 10 insertions, 13 deletions

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index c4c6897ce8a6..e3fe236b591d 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -80,7 +80,6 @@
 #include "textapi.hxx"
 #include "optsitem.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
@@ -463,16 +462,16 @@ void AnnotationManagerImpl::ExecuteReplyToAnnotation( SfxRequest& rReq )
 
         aStr.SearchAndReplaceAscii("%1", sAuthor);
 
-        aStr.Append( rtl::OUString(" (") );
-        aStr.Append( rtl::OUString( getAnnotationDateTimeString( xAnnotation ) ) );
-        aStr.Append( rtl::OUString("): \"") );
+        aStr.Append( OUString(" (") );
+        aStr.Append( OUString( getAnnotationDateTimeString( xAnnotation ) ) );
+        aStr.Append( OUString("): \"") );
 
         String sQuote( pTextApi->GetText() );
 
         if( sQuote.Len() == 0 )
-            sQuote = rtl::OUString( "..." );
+            sQuote = OUString( "..." );
         aStr.Append( sQuote );
-        aStr.Append( rtl::OUString("\"\n") );
+        aStr.Append( OUString("\"\n") );
 
         sal_uInt16 nParaCount = comphelper::string::getTokenCount(aStr, '\n');
         for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
@@ -524,7 +523,7 @@ void AnnotationManagerImpl::DeleteAnnotation( Reference< XAnnotation > xAnnotati
     }
 }
 
-void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor )
+void AnnotationManagerImpl::DeleteAnnotationsByAuthor( const OUString& sAuthor )
 {
     if( mpDoc->IsUndoEnabled() )
         mpDoc->BegUndo( String( SdResId( STR_ANNOTATION_UNDO_DELETE ) ) );
diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx
index c0d83fdafe1f..9e7a3e5e202c 100644
--- a/sd/source/ui/annotations/annotationmanagerimpl.hxx
+++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx
@@ -75,7 +75,7 @@ public:
 
     void InsertAnnotation();
     void DeleteAnnotation( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation );
-    void DeleteAnnotationsByAuthor( const rtl::OUString& sAuthor );
+    void DeleteAnnotationsByAuthor( const OUString& sAuthor );
     void DeleteAllAnnotations();
 
     void ExecuteAnnotationContextMenu( ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotation > xAnnotation, ::Window* pParent, const Rectangle& rContextRect, bool bButtonMenu = false );
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx
index a10b5ba00960..53b6f7de2d53 100644
--- a/sd/source/ui/annotations/annotationtag.cxx
+++ b/sd/source/ui/annotations/annotationtag.cxx
@@ -46,7 +46,6 @@
 #include "Window.hxx"
 #include "drawdoc.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::drawing;
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index d03548ad85fa..f539d1f4800a 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -84,7 +84,6 @@
 #include "textapi.hxx"
 #include "sdresid.hxx"
 
-using rtl::OUString;
 using namespace ::sd;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -233,7 +232,7 @@ void AnnotationTextWindow::LoseFocus()
     Window::LoseFocus();
 }
 
-rtl::OUString AnnotationTextWindow::GetSurroundingText() const
+OUString AnnotationTextWindow::GetSurroundingText() const
 {
     if( mpOutlinerView )
     {
@@ -246,7 +245,7 @@ rtl::OUString AnnotationTextWindow::GetSurroundingText() const
             return aEditEngine->GetText(aSelection.nStartPara);
         }
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 Selection AnnotationTextWindow::GetSurroundingTextSelection() const
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 116a9cd15f6e..ef4d3763f6a2 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -66,7 +66,7 @@ public:
 
     void SetOutlinerView( OutlinerView* pOutlinerView ) { mpOutlinerView = pOutlinerView; }
 
-    virtual rtl::OUString GetSurroundingText() const;
+    virtual OUString GetSurroundingText() const;
     virtual Selection GetSurroundingTextSelection() const;
 
     virtual void    GetFocus();