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

8 files changed, 48 insertions, 50 deletions

diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx
index d9f64a30b17b..35a4800ce890 100644
--- a/extensions/source/scanner/sane.cxx
+++ b/extensions/source/scanner/sane.cxx
@@ -137,7 +137,7 @@ SANE_Status Sane::ControlOption( int nOption, SANE_Action nAction,
                 pAction = "SANE_ACTION_SET_AUTO";break;
         }
         dbg_msg( "Option: \"%s\" action: %s\n",
-                 rtl::OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(),
+                 OUStringToOString(GetOptionName(nOption), osl_getThreadTextEncoding()).getStr(),
                  pAction );
     }
 #endif
@@ -168,17 +168,17 @@ Sane::~Sane()
 
 void Sane::Init()
 {
-    ::rtl::OUString sSaneLibName( "libsane" SAL_DLLEXTENSION  );
+    OUString sSaneLibName( "libsane" SAL_DLLEXTENSION  );
     pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     if( ! pSaneLib )
     {
-        sSaneLibName = ::rtl::OUString("libsane" SAL_DLLEXTENSION ".1" );
+        sSaneLibName = OUString("libsane" SAL_DLLEXTENSION ".1" );
         pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     }
     // try reasonable places that might not be in the library search path
     if( ! pSaneLib )
     {
-        ::rtl::OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION  );
+        OUString sSaneLibSystemPath( "/usr/local/lib/libsane" SAL_DLLEXTENSION  );
         osl_getFileURLFromSystemPath( sSaneLibSystemPath.pData, &sSaneLibName.pData );
         pSaneLib = osl_loadModule( sSaneLibName.pData, SAL_LOADMODULE_LAZY );
     }
@@ -292,7 +292,7 @@ sal_Bool Sane::Open( const char* name )
 
     if( mnDevice == -1 )
     {
-        rtl::OString aDevice( name );
+        OString aDevice( name );
         for( int i = 0; i < nDevices; i++ )
         {
             if( aDevice.equals( ppDevices[i]->name ) )
@@ -331,7 +331,7 @@ void Sane::Close()
 int Sane::GetOptionByName( const char* rName )
 {
     int i;
-    rtl::OString aOption( rName );
+    OString aOption( rName );
     for( i = 0; i < mnOptions; i++ )
     {
         if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) )
@@ -353,7 +353,7 @@ sal_Bool Sane::GetOptionValue( int n, sal_Bool& rRet )
     return sal_True;
 }
 
-sal_Bool Sane::GetOptionValue( int n, rtl::OString& rRet )
+sal_Bool Sane::GetOptionValue( int n, OString& rRet )
 {
     sal_Bool bSuccess = sal_False;
     if( ! maHandle  ||  mppOptions[n]->type != SANE_TYPE_STRING )
@@ -430,7 +430,7 @@ sal_Bool Sane::SetOptionValue( int n, const String& rSet )
 {
     if( ! maHandle  ||  mppOptions[n]->type != SANE_TYPE_STRING )
         return sal_False;
-    rtl::OString aSet(rtl::OUStringToOString(rSet, osl_getThreadTextEncoding()));
+    OString aSet(OUStringToOString(rSet, osl_getThreadTextEncoding()));
     SANE_Status nStatus = ControlOption( n, SANE_ACTION_SET_VALUE, (void*)aSet.getStr() );
     if( nStatus != SANE_STATUS_GOOD )
         return sal_False;
@@ -986,7 +986,7 @@ String Sane::GetOptionUnitName( int n )
     SANE_Unit nUnit = mppOptions[n]->unit;
     size_t nUnitAsSize = (size_t)nUnit;
     if (nUnitAsSize >= SAL_N_ELEMENTS( ppUnits ))
-        aText = rtl::OUString("[unknown units]");
+        aText = OUString("[unknown units]");
     else
         aText = String( ppUnits[ nUnit ], osl_getThreadTextEncoding() );
     return aText;
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 914248433526..06a7dc8f0e4c 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -147,7 +147,7 @@ public:
     inline int      GetOptionElements( int n );
     int             GetOptionByName( const char* );
     sal_Bool            GetOptionValue( int, sal_Bool& );
-    sal_Bool            GetOptionValue( int, rtl::OString& );
+    sal_Bool            GetOptionValue( int, OString& );
     sal_Bool            GetOptionValue( int, double&, int nElement = 0 );
     sal_Bool            GetOptionValue( int, double* );
 
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index 36feba647bf9..2ccd4d94d432 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -280,7 +280,7 @@ void SaneDlg::InitFields()
                 else // SANE_UNIT_PIXEL
                 {
                     pField->SetValue( (int)fValue, FUNIT_CUSTOM );
-                    pField->SetCustomUnitText(rtl::OUString("Pixel"));
+                    pField->SetCustomUnitText(OUString("Pixel"));
                 }
                 switch( i ) {
                     case 0: maTopLeft.X() = (int)fValue;break;
@@ -503,7 +503,7 @@ IMPL_LINK( SaneDlg, SelectHdl, ListBox*, pListBox )
     {
         if( pListBox == &maQuantumRangeBox )
         {
-            rtl::OString aValue(rtl::OUStringToOString(maQuantumRangeBox.GetSelectEntry(),
+            OString aValue(OUStringToOString(maQuantumRangeBox.GetSelectEntry(),
                 osl_getThreadTextEncoding()));
             double fValue = atof(aValue.getStr());
             mrSane.SetOptionValue( mnCurrentOption, fValue, mnCurrentElement );
@@ -522,7 +522,7 @@ IMPL_LINK( SaneDlg, OptionsBoxSelectHdl, SvTreeListBox*, pBox )
     {
         String aOption =
             maOptionBox.GetEntryText( maOptionBox.FirstSelected() );
-        int nOption = mrSane.GetOptionByName(rtl::OUStringToOString(aOption,
+        int nOption = mrSane.GetOptionByName(OUStringToOString(aOption,
             osl_getThreadTextEncoding()).getStr());
         if( nOption != -1 && nOption != mnCurrentOption )
         {
@@ -626,7 +626,7 @@ IMPL_LINK( SaneDlg, ModifyHdl, Edit*, pEdit )
         else if( pEdit == &maNumericEdit )
         {
             double fValue;
-            rtl::OString aContents(rtl::OUStringToOString(maNumericEdit.GetText(),
+            OString aContents(OUStringToOString(maNumericEdit.GetText(),
                 osl_getThreadTextEncoding()));
             fValue = atof(aContents.getStr());
             if( mfMin != mfMax && ( fValue < mfMin || fValue > mfMax ) )
@@ -817,14 +817,14 @@ void SaneDlg::EstablishBoolOption()
 void SaneDlg::EstablishStringOption()
 {
     sal_Bool bSuccess;
-    rtl::OString aValue;
+    OString aValue;
 
     bSuccess = mrSane.GetOptionValue( mnCurrentOption, aValue );
     if( bSuccess )
     {
         maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
         maOptionDescTxt.Show( sal_True );
-        maStringEdit.SetText(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()));
+        maStringEdit.SetText(OStringToOUString(aValue, osl_getThreadTextEncoding()));
         maStringEdit.Show( sal_True );
     }
 }
@@ -835,9 +835,9 @@ void SaneDlg::EstablishStringRange()
     maStringRangeBox.Clear();
     for( int i = 0; ppStrings[i] != 0; i++ )
         maStringRangeBox.InsertEntry( String( ppStrings[i], osl_getThreadTextEncoding() ) );
-    rtl::OString aValue;
+    OString aValue;
     mrSane.GetOptionValue( mnCurrentOption, aValue );
-    maStringRangeBox.SelectEntry(rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()));
+    maStringRangeBox.SelectEntry(OStringToOUString(aValue, osl_getThreadTextEncoding()));
     maStringRangeBox.Show( sal_True );
     maOptionDescTxt.SetText( mrSane.GetOptionName( mnCurrentOption ) );
     maOptionDescTxt.Show( sal_True );
@@ -1181,8 +1181,8 @@ sal_Bool SaneDlg::LoadState()
         return sal_False;
 
     aConfig.SetGroup( "SANE" );
-    rtl::OString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
-    for( i = 0; i < Sane::CountDevices() && !aString.equals(rtl::OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ;
+    OString aString = aConfig.ReadKey( "SO_LastSaneDevice" );
+    for( i = 0; i < Sane::CountDevices() && !aString.equals(OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ;
     if( i == Sane::CountDevices() )
         return sal_False;
 
@@ -1198,7 +1198,7 @@ sal_Bool SaneDlg::LoadState()
         for (i = 0; i < iMax; ++i)
         {
             aString = aConfig.GetKeyName( i );
-            rtl::OString aValue = aConfig.ReadKey( i );
+            OString aValue = aConfig.ReadKey( i );
             int nOption = mrSane.GetOptionByName( aString.getStr() );
             if( nOption == -1 )
                 continue;
@@ -1212,7 +1212,7 @@ sal_Bool SaneDlg::LoadState()
             else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("STRING=")))
             {
                 aValue = aValue.copy(RTL_CONSTASCII_LENGTH("STRING="));
-                mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()) );
+                mrSane.SetOptionValue(nOption,OStringToOUString(aValue, osl_getThreadTextEncoding()) );
             }
             else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("NUMERIC=")))
             {
@@ -1222,7 +1222,7 @@ sal_Bool SaneDlg::LoadState()
                 int n = 0;
                 do
                 {
-                    rtl::OString aSub = aValue.getToken(0, ':', nIndex);
+                    OString aSub = aValue.getToken(0, ':', nIndex);
                     double fValue=0.0;
                     sscanf(aSub.getStr(), "%lg", &fValue);
                     SetAdjustedNumericalValue(aString.getStr(), fValue, n++);
@@ -1251,7 +1251,7 @@ void SaneDlg::SaveState()
     aConfig.DeleteGroup( "SANE" );
     aConfig.SetGroup( "SANE" );
     aConfig.WriteKey( "SO_LastSANEDevice",
-        rtl::OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) );
+        OUStringToOString(maDeviceBox.GetSelectEntry(), RTL_TEXTENCODING_UTF8) );
 
     static char const* pSaveOptions[] = {
         "resolution",
@@ -1262,7 +1262,7 @@ void SaneDlg::SaveState()
     };
     for( size_t i = 0; i < SAL_N_ELEMENTS(pSaveOptions); ++i )
     {
-        rtl::OString aOption = pSaveOptions[i];
+        OString aOption = pSaveOptions[i];
         int nOption = mrSane.GetOptionByName( pSaveOptions[i] );
         if( nOption > -1 )
         {
@@ -1274,7 +1274,7 @@ void SaneDlg::SaveState()
                     sal_Bool bValue;
                     if( mrSane.GetOptionValue( nOption, bValue ) )
                     {
-                        rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
+                        OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
                             "BOOL="));
                         aString.append(static_cast<sal_Int32>(bValue));
                         aConfig.WriteKey(aOption, aString.makeStringAndClear());
@@ -1283,10 +1283,10 @@ void SaneDlg::SaveState()
                 break;
                 case SANE_TYPE_STRING:
                 {
-                    rtl::OString aValue;
+                    OString aValue;
                     if( mrSane.GetOptionValue( nOption, aValue ) )
                     {
-                        rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING="));
+                        OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING="));
                         aString.append(aValue);
                         aConfig.WriteKey( aOption, aString.makeStringAndClear() );
                     }
@@ -1295,7 +1295,7 @@ void SaneDlg::SaveState()
                 case SANE_TYPE_FIXED:
                 case SANE_TYPE_INT:
                 {
-                    rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC="));
+                    OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC="));
                     double fValue;
                     char buf[256];
                     int n;
diff --git a/extensions/source/scanner/scanner.cxx b/extensions/source/scanner/scanner.cxx
index d415116dce17..ec2f088594ec 100644
--- a/extensions/source/scanner/scanner.cxx
+++ b/extensions/source/scanner/scanner.cxx
@@ -79,7 +79,7 @@ Sequence< sal_Int8 > SAL_CALL ScannerManager::getMaskDIB() throw()
 
 OUString ScannerManager::getImplementationName_Static() throw()
 {
-    return ::rtl::OUString( "com.sun.star.scanner.ScannerManager" );
+    return OUString( "com.sun.star.scanner.ScannerManager" );
 }
 
 // -----------------------------------------------------------------------------
@@ -88,7 +88,7 @@ Sequence< OUString > ScannerManager::getSupportedServiceNames_Static() throw ()
 {
     Sequence< OUString > aSNS( 1 );
 
-    aSNS.getArray()[0] = ::rtl::OUString( "com.sun.star.scanner.ScannerManager" );
+    aSNS.getArray()[0] = OUString( "com.sun.star.scanner.ScannerManager" );
 
     return aSNS;
 }
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index bfbbc99e2289..85f116339591 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -37,8 +37,6 @@ using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::scanner;
 
-using ::rtl::OUString;
-
 class ScannerManager : public OWeakObject, XScannerManager2, css::awt::XBitmap
 {
 protected:
diff --git a/extensions/source/scanner/scanunx.cxx b/extensions/source/scanner/scanunx.cxx
index aace9cb1511e..d6d7615d93cc 100644
--- a/extensions/source/scanner/scanunx.cxx
+++ b/extensions/source/scanner/scanunx.cxx
@@ -256,7 +256,7 @@ Sequence< ScannerContext > ScannerManager::getAvailableScanners() throw()
     if( Sane::IsSane() )
     {
         Sequence< ScannerContext > aRet(1);
-        aRet.getArray()[0].ScannerName      = ::rtl::OUString("SANE");
+        aRet.getArray()[0].ScannerName      = OUString("SANE");
         aRet.getArray()[0].InternalData     = 0;
         return aRet;
     }
@@ -281,7 +281,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
 
         if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
             throw ScannerException(
-                ::rtl::OUString("Scanner does not exist"),
+                OUString("Scanner does not exist"),
                 Reference< XScannerManager >( this ),
                 ScanError_InvalidContext
             );
@@ -289,7 +289,7 @@ sal_Bool ScannerManager::configureScannerAndScan( ScannerContext& scanner_contex
         boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
         if( pHolder->m_bBusy )
             throw ScannerException(
-                ::rtl::OUString("Scanner is busy"),
+                OUString("Scanner is busy"),
                 Reference< XScannerManager >( this ),
                 ScanError_ScanInProgress
             );
@@ -320,14 +320,14 @@ void ScannerManager::startScan( const ScannerContext& scanner_context,
 
     if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString("Scanner does not exist"),
+            OUString("Scanner does not exist"),
             Reference< XScannerManager >( this ),
             ScanError_InvalidContext
             );
     boost::shared_ptr<SaneHolder> pHolder = rSanes[scanner_context.InternalData];
     if( pHolder->m_bBusy )
         throw ScannerException(
-            ::rtl::OUString("Scanner is busy"),
+            OUString("Scanner is busy"),
             Reference< XScannerManager >( this ),
             ScanError_ScanInProgress
             );
@@ -346,7 +346,7 @@ ScanError ScannerManager::getError( const ScannerContext& scanner_context ) thro
 
     if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString("Scanner does not exist"),
+            OUString("Scanner does not exist"),
             Reference< XScannerManager >( this ),
             ScanError_InvalidContext
             );
@@ -365,7 +365,7 @@ Reference< css::awt::XBitmap > ScannerManager::getBitmap( const ScannerContext&
 
     if( scanner_context.InternalData < 0 || (sal_uLong)scanner_context.InternalData >= rSanes.size() )
         throw ScannerException(
-            ::rtl::OUString("Scanner does not exist"),
+            OUString("Scanner does not exist"),
             Reference< XScannerManager >( this ),
             ScanError_InvalidContext
             );
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 60e1d588a862..fbeeff9f3d98 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -253,9 +253,9 @@ void ImpTwain::ImplOpenSourceManager()
 {
     if( 1 == nCurState )
     {
-        pMod = new ::osl::Module( ::rtl::OUString() );
+        pMod = new ::osl::Module( OUString() );
 
-        if( pMod->load( ::rtl::OUString( TWAIN_LIBNAME  ) ) )
+        if( pMod->load( OUString( TWAIN_LIBNAME  ) ) )
         {
             nCurState = 2;
 
@@ -869,7 +869,7 @@ uno::Sequence< ScannerContext > SAL_CALL ScannerManager::getAvailableScanners()
     osl::MutexGuard aGuard( maProtector );
     uno::Sequence< ScannerContext >   aRet( 1 );
 
-    aRet.getArray()[0].ScannerName = ::rtl::OUString( "TWAIN"  );
+    aRet.getArray()[0].ScannerName = OUString( "TWAIN"  );
     aRet.getArray()[0].InternalData = 0;
 
     return aRet;
@@ -881,8 +881,8 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( ScannerContext& rCont
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
-    if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN"  ) )
-        throw ScannerException( ::rtl::OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
+    if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN"  ) )
+        throw ScannerException( OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
 
     ReleaseData();
 
@@ -895,8 +895,8 @@ void SAL_CALL ScannerManager::startScan( const ScannerContext& rContext, const u
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
-    if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN"  ) )
-        throw ScannerException( ::rtl::OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
+    if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN"  ) )
+        throw ScannerException( OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
 
     ReleaseData();
     aTwain.PerformTransfer( *this, rxListener );
@@ -908,8 +908,8 @@ ScanError SAL_CALL ScannerManager::getError( const ScannerContext& rContext )
     osl::MutexGuard aGuard( maProtector );
     uno::Reference< XScannerManager >   xThis( this );
 
-    if( rContext.InternalData != 0 || rContext.ScannerName != ::rtl::OUString( "TWAIN"  ) )
-        throw ScannerException( ::rtl::OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
+    if( rContext.InternalData != 0 || rContext.ScannerName != OUString( "TWAIN"  ) )
+        throw ScannerException( OUString( "Scanner does not exist"  ), xThis, ScanError_InvalidContext );
 
     return( ( aTwain.GetState() == TWAIN_STATE_CANCELED ) ? ScanError_ScanCanceled : ScanError_ScanErrorNone );
 }
diff --git a/extensions/source/scanner/scnserv.cxx b/extensions/source/scanner/scnserv.cxx
index daf2a07fb805..e9a187bd42cd 100644
--- a/extensions/source/scanner/scnserv.cxx
+++ b/extensions/source/scanner/scnserv.cxx
@@ -32,7 +32,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL scn_component_getFactory( const s
     Reference< ::com::sun::star::lang::XSingleServiceFactory > xFactory;
     void*                                                pRet = 0;
 
-    if( ::rtl::OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() )
+    if( OUString::createFromAscii( pImplName ) == ScannerManager::getImplementationName_Static() )
     {
         xFactory = Reference< ::com::sun::star::lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
                         static_cast< ::com::sun::star::lang::XMultiServiceFactory* >( pServiceManager ),