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

27 files changed, 185 insertions, 193 deletions

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 37719bc0f95d..3d3cfda365c3 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -66,10 +66,10 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
 
     m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs );
 
-    rtl::OUString sProfile(CUI_RESSTR(STR_PROFILE));
-    rtl::OUString sDirectory(CUI_RESSTR(STR_DIRECTORY));
+    OUString sProfile(CUI_RESSTR(STR_PROFILE));
+    OUString sDirectory(CUI_RESSTR(STR_DIRECTORY));
 
-    rtl::OUStringBuffer sHeader;
+    OUStringBuffer sHeader;
     sHeader.append('\t').append(sProfile).append('\t').append(sDirectory);
     m_aCertPathList.InsertHeaderEntry( sHeader.makeStringAndClear(), HEADERBAR_APPEND, HIB_LEFT );
     m_aCertPathList.SetCheckButtonHdl( LINK( this, CertPathDialog, CheckHdl_Impl ) );
@@ -98,15 +98,15 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
 
         for (sal_Int32 i = 0; i < nProduct; ++i)
         {
-            ::rtl::OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]);
+            OUString profile = xMozillaBootstrap->getDefaultProfile(productTypes[i]);
 
             if (!profile.isEmpty())
             {
-                ::rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile );
-                rtl::OUStringBuffer sEntry;
+                OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile );
+                OUStringBuffer sEntry;
                 sEntry.append('\t').appendAscii(productNames[i]).append(':').append(profile).append('\t').append(sProfilePath);
                 SvTreeListEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear());
-                rtl::OUString* pCertPath = new rtl::OUString(sProfilePath);
+                OUString* pCertPath = new OUString(sProfilePath);
                 pEntry->SetUserData(pCertPath);
             }
         }
@@ -124,8 +124,8 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
 
     try
     {
-        rtl::OUString sUserSetCertPath =
-            officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(rtl::OUString());
+        OUString sUserSetCertPath =
+            officecfg::Office::Common::Security::Scripting::CertDir::get().get_value_or(OUString());
 
         if (!sUserSetCertPath.isEmpty())
             AddCertPath(m_sManual, sUserSetCertPath);
@@ -137,12 +137,12 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
 
     const char* pEnv = getenv("MOZILLA_CERTIFICATE_FOLDER");
     if (pEnv)
-        AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", rtl::OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding()));
+        AddCertPath("$MOZILLA_CERTIFICATE_FOLDER", OUString(pEnv, strlen(pEnv), osl_getThreadTextEncoding()));
 }
 
 IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
 {
-    fprintf(stderr, "dir is %s\n", rtl::OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr());
+    fprintf(stderr, "dir is %s\n", OUStringToOString(getDirectory(), RTL_TEXTENCODING_UTF8).getStr());
 
     try
     {
@@ -162,11 +162,11 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl)
     return 0;
 }
 
-rtl::OUString CertPathDialog::getDirectory() const
+OUString CertPathDialog::getDirectory() const
 {
     SvTreeListEntry* pEntry = m_aCertPathList.FirstSelected();
     void* pCertPath = pEntry ? pEntry->GetUserData() : NULL;
-    return pCertPath ? *static_cast<rtl::OUString*>(pCertPath) : rtl::OUString();
+    return pCertPath ? *static_cast<OUString*>(pCertPath) : OUString();
 }
 
 CertPathDialog::~CertPathDialog()
@@ -174,7 +174,7 @@ CertPathDialog::~CertPathDialog()
     SvTreeListEntry* pEntry = m_aCertPathList.First();
     while (pEntry)
     {
-        rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData());
+        OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData());
         delete pCertPath;
         pEntry = m_aCertPathList.Next( pEntry );
     }
@@ -209,12 +209,12 @@ void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry )
         m_aCertPathList.SetCheckButtonState(_pEntry, SV_BUTTON_CHECKED);
 }
 
-void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath)
+void CertPathDialog::AddCertPath(const OUString &rProfile, const OUString &rPath)
 {
     SvTreeListEntry* pEntry = m_aCertPathList.First();
     while (pEntry)
     {
-        rtl::OUString* pCertPath = static_cast<rtl::OUString*>(pEntry->GetUserData());
+        OUString* pCertPath = static_cast<OUString*>(pEntry->GetUserData());
         //already exists, just select the original one
         if (pCertPath->equals(rPath))
         {
@@ -225,10 +225,10 @@ void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUStr
         pEntry = m_aCertPathList.Next(pEntry);
     }
 
-    rtl::OUStringBuffer sEntry;
+    OUStringBuffer sEntry;
     sEntry.append('\t').append(rProfile).append('\t').append(rPath);
     pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear());
-    rtl::OUString* pCertPath = new rtl::OUString(rPath);
+    OUString* pCertPath = new OUString(rPath);
     pEntry->SetUserData(pCertPath);
     m_aCertPathList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED);
     HandleCheckEntry(pEntry);
@@ -240,7 +240,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
     {
         uno::Reference<ui::dialogs::XFolderPicker2> xFolderPicker = ui::dialogs::FolderPicker::create(comphelper::getProcessComponentContext());
 
-        rtl::OUString sURL;
+        OUString sURL;
         osl::Security().getHomeDir(sURL);
         xFolderPicker->setDisplayDirectory(sURL);
         xFolderPicker->setDescription(m_sAddDialogText);
@@ -248,7 +248,7 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
         if (xFolderPicker->execute() == ui::dialogs::ExecutableDialogResults::OK)
         {
             sURL = xFolderPicker->getDirectory();
-            rtl::OUString aPath;
+            OUString aPath;
             if (osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sURL, aPath))
                 AddCertPath(m_sManual, aPath);
         }
diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx
index 65d9a77e1fdb..e8585e528785 100644
--- a/cui/source/options/certpath.hxx
+++ b/cui/source/options/certpath.hxx
@@ -48,20 +48,20 @@ private:
     OKButton        m_aOKBtn;
     CancelButton    m_aCancelBtn;
     HelpButton      m_aHelpBtn;
-    rtl::OUString   m_sAddDialogText;
-    rtl::OUString    m_sManual;
+    OUString   m_sAddDialogText;
+    OUString    m_sManual;
 
     DECL_LINK(CheckHdl_Impl, SvxSimpleTable *);
     DECL_LINK(AddHdl_Impl, void *);
     DECL_LINK(OKHdl_Impl, void *);
 
     void HandleCheckEntry(SvTreeListEntry* _pEntry);
-    void AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath);
+    void AddCertPath(const OUString &rProfile, const OUString &rPath);
 public:
     CertPathDialog(Window* pParent);
     ~CertPathDialog();
 
-    rtl::OUString getDirectory() const;
+    OUString getDirectory() const;
 };
 
 #endif
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index a9dcd4aad45e..faac1b594979 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -173,11 +173,11 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
 // ====================
 
 SvxChartOptions::SvxChartOptions() :
-    ::utl::ConfigItem( rtl::OUString("Office.Chart") ),
+    ::utl::ConfigItem( OUString("Office.Chart") ),
     mbIsInitialized( sal_False )
 {
     maPropertyNames.realloc( 1 );
-    maPropertyNames[ 0 ] = ::rtl::OUString("DefaultColor/Series");
+    maPropertyNames[ 0 ] = OUString("DefaultColor/Series");
 }
 
 SvxChartOptions::~SvxChartOptions()
@@ -201,7 +201,7 @@ sal_Bool SvxChartOptions::RetrieveOptions()
 {
     // get sequence containing all properties
 
-    uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames();
+    uno::Sequence< OUString > aNames = GetPropertyNames();
     uno::Sequence< uno::Any > aProperties( aNames.getLength());
     aProperties = GetProperties( aNames );
 
@@ -244,7 +244,7 @@ sal_Bool SvxChartOptions::RetrieveOptions()
 
 void SvxChartOptions::Commit()
 {
-    uno::Sequence< ::rtl::OUString > aNames = GetPropertyNames();
+    uno::Sequence< OUString > aNames = GetPropertyNames();
     uno::Sequence< uno::Any > aValues( aNames.getLength());
 
     if( aValues.getLength() >= 1 )
@@ -265,7 +265,7 @@ void SvxChartOptions::Commit()
     PutProperties( aNames, aValues );
 }
 
-void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
 }
 
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 1319702a5d46..a8eeed37bd50 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -69,10 +69,10 @@ private:
     SvxChartColorTable          maDefColors;
     sal_Bool                    mbIsInitialized;
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    ::com::sun::star::uno::Sequence< OUString >
                             maPropertyNames;
 
-    inline ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const
+    inline ::com::sun::star::uno::Sequence< OUString > GetPropertyNames() const
         { return maPropertyNames; }
     sal_Bool RetrieveOptions();
 
@@ -84,7 +84,7 @@ public:
     void                        SetDefaultColors( const SvxChartColorTable& aCol );
 
     virtual void                Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
 };
 
 // ====================
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index cb93a9724147..25d34e63161d 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -193,7 +193,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
         DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() );
         if ( pRegistration && !pRegistration->sLocation.isEmpty() )
         {
-            ::rtl::OUString sName( pPathBox->GetEntryText( pEntry, 0 ) );
+            OUString sName( pPathBox->GetEntryText( pEntry, 0 ) );
             OFileNotation aTransformer( pRegistration->sLocation );
             aRegistrations[ sName ] = DatabaseRegistration( aTransformer.get( OFileNotation::N_URL ), pRegistration->bReadOnly );
         }
@@ -389,7 +389,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl)
     return 0;
 }
 // -----------------------------------------------------------------------------
-void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,const ::rtl::OUString& _sLocation, const bool _bReadOnly )
+void DbRegistrationOptionsPage::insertNewEntry( const OUString& _sName,const OUString& _sLocation, const bool _bReadOnly )
 {
     String aStr( _sName );
     aStr += '\t';
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index e3a41a85a2fd..77092ace236e 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -56,12 +56,12 @@ namespace svx
             Reference< XDatabaseContext > xRegistrations(
                 DatabaseContext::create(xContext) );
 
-            Sequence< ::rtl::OUString > aRegistrationNames( xRegistrations->getRegistrationNames() );
-            const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray();
-            const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength();
+            Sequence< OUString > aRegistrationNames( xRegistrations->getRegistrationNames() );
+            const OUString* pRegistrationName = aRegistrationNames.getConstArray();
+            const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength();
             for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName )
             {
-                ::rtl::OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) );
+                OUString sLocation( xRegistrations->getDatabaseLocation( *pRegistrationName ) );
                 aSettings[ *pRegistrationName ] =
                     DatabaseRegistration( sLocation, xRegistrations->isDatabaseRegistrationReadOnly( *pRegistrationName ) );
             }
@@ -94,8 +94,8 @@ namespace svx
                     ++reg
                 )
             {
-                const ::rtl::OUString sName = reg->first;
-                const ::rtl::OUString sLocation = reg->second.sLocation;
+                const OUString sName = reg->first;
+                const OUString sLocation = reg->second.sLocation;
 
                 if ( xRegistrations->hasRegisteredDatabase( sName ) )
                 {
@@ -112,9 +112,9 @@ namespace svx
             }
 
             // delete unused entries
-            Sequence< ::rtl::OUString > aRegistrationNames = xRegistrations->getRegistrationNames();
-            const ::rtl::OUString* pRegistrationName = aRegistrationNames.getConstArray();
-            const ::rtl::OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength();
+            Sequence< OUString > aRegistrationNames = xRegistrations->getRegistrationNames();
+            const OUString* pRegistrationName = aRegistrationNames.getConstArray();
+            const OUString* pRegistrationNamesEnd = pRegistrationName + aRegistrationNames.getLength();
             for ( ; pRegistrationName != pRegistrationNamesEnd; ++pRegistrationName )
             {
                 if ( rNewRegistrations.find( *pRegistrationName ) == rNewRegistrations.end() )
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 22411085f19f..692d75f5e378 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -30,7 +30,7 @@ namespace svx
 
     struct DatabaseRegistration
     {
-        ::rtl::OUString sLocation;
+        OUString sLocation;
         bool            bReadOnly;
 
         DatabaseRegistration()
@@ -39,7 +39,7 @@ namespace svx
         {
         }
 
-        DatabaseRegistration( const ::rtl::OUString& _rLocation, const sal_Bool _bReadOnly )
+        DatabaseRegistration( const OUString& _rLocation, const sal_Bool _bReadOnly )
             :sLocation( _rLocation )
             ,bReadOnly( _bReadOnly )
         {
@@ -58,7 +58,7 @@ namespace svx
         }
     };
 
-    typedef ::std::map< ::rtl::OUString, DatabaseRegistration, ::comphelper::UStringLess >   DatabaseRegistrations;
+    typedef ::std::map< OUString, DatabaseRegistration, ::comphelper::UStringLess >   DatabaseRegistrations;
 
     //====================================================================
     //= DatabaseMapItem
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index d38b872ab27d..8302799b480a 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -62,7 +62,7 @@ namespace svx
 
         FreeResource();
 
-        rtl::OUString sTemp("*.odb");
+        OUString sTemp("*.odb");
         m_aURL.SetFilter(sTemp);
 
         m_aName.SetModifyHdl( LINK(this, ODocumentLinkDialog, OnTextModified) );
@@ -103,7 +103,7 @@ namespace svx
     IMPL_LINK_NOARG(ODocumentLinkDialog, OnOk)
     {
         // get the current URL
-        ::rtl::OUString sURL = m_aURL.GetText();
+        OUString sURL = m_aURL.GetText();
         OFileNotation aTransformer(sURL);
         sURL = aTransformer.get(OFileNotation::N_URL);
 
@@ -162,7 +162,7 @@ namespace svx
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
-        const SfxFilter* pFilter = SfxFilter::GetFilterByName(rtl::OUString("StarOffice XML (Base)"));
+        const SfxFilter* pFilter = SfxFilter::GetFilterByName(OUString("StarOffice XML (Base)"));
         if ( pFilter )
         {
             aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 0702c99cfe43..ef193e379065 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -182,11 +182,11 @@ sal_Bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
             NonProportionalFontsOnly::set(
                 m_pNonPropFontsOnlyCB->IsChecked(), batch);
     //font name changes cannot be detected by saved values
-    rtl::OUString sFontName;
+    OUString sFontName;
     if(m_pFontNameLB->GetSelectEntryPos())
         sFontName = m_pFontNameLB->GetSelectEntry();
     officecfg::Office::Common::Font::SourceViewFont::FontName::set(
-        boost::optional< rtl::OUString >(sFontName), batch);
+        boost::optional< OUString >(sFontName), batch);
     batch->commit();
 
     return sal_False;
@@ -224,9 +224,9 @@ void  SvxFontSubstTabPage::Reset( const SfxItemSet& )
         officecfg::Office::Common::Font::SourceViewFont::
         NonProportionalFontsOnly::get());
     NonPropFontsHdl(m_pNonPropFontsOnlyCB);
-    rtl::OUString sFontName(
+    OUString sFontName(
         officecfg::Office::Common::Font::SourceViewFont::FontName::get().
-        get_value_or(rtl::OUString()));
+        get_value_or(OUString()));
     if(!sFontName.isEmpty())
         m_pFontNameLB->SelectEntry(sFontName);
     else
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 66984ca99375..d035daf373f2 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
-using rtl::OUString;
 
 const sal_Char cIsKernAsianPunctuation[] = "IsKernAsianPunctuation";
 const sal_Char cCharacterCompressionType[] = "CharacterCompressionType";
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index b0b284068fbe..e359353ece84 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -190,7 +190,7 @@ private:
         FixedText *m_pText;
     public:
         Chapter(FixedText *pText, bool bShow);
-        Chapter(Window *pGrid, unsigned nYPos, const rtl::OUString& sDisplayName);
+        Chapter(Window *pGrid, unsigned nYPos, const OUString& sDisplayName);
         ~Chapter();
     public:
         void SetBackground(const Wallpaper& W) { m_pText->SetBackground(W); }
@@ -569,7 +569,7 @@ void ColorConfigWindow_Impl::CreateEntries()
         size_t nLineNum = vChapters.size() + vEntries.size() + 1;
         for (unsigned j = 0; j != nExtGroupCount; ++j)
         {
-            rtl::OUString const sComponentName = aExtConfig.GetComponentName(j);
+            OUString const sComponentName = aExtConfig.GetComponentName(j);
             vChapters.push_back(boost::shared_ptr<Chapter>(new Chapter(
                 m_pGrid, nLineNum,
                 aExtConfig.GetComponentDisplayName(sComponentName)
@@ -698,7 +698,7 @@ void ColorConfigWindow_Impl::Update (
     unsigned const nExtCount = pExtConfig->GetComponentCount();
     for (unsigned j = 0; j != nExtCount; ++j)
     {
-        rtl::OUString sComponentName = pExtConfig->GetComponentName(j);
+        OUString sComponentName = pExtConfig->GetComponentName(j);
         unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName);
         for (unsigned k = 0; i != vEntries.size() && k != nColorCount; ++i, ++k)
             vEntries[i]->Update(
@@ -757,7 +757,7 @@ void ColorConfigWindow_Impl::ColorHdl (
     unsigned const nExtCount = pExtConfig->GetComponentCount();
     for (unsigned j = 0; j != nExtCount; ++j)
     {
-        rtl::OUString sComponentName = pExtConfig->GetComponentName(j);
+        OUString sComponentName = pExtConfig->GetComponentName(j);
         unsigned const nColorCount = pExtConfig->GetComponentColorCount(sComponentName);
         unsigned const nCount = vEntries.size();
         for (unsigned k = 0; i != nCount && k != nColorCount; ++i, ++k)
@@ -1056,7 +1056,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
     //changes need to be undone
     if(!bFillItemSetCalled && m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos())
     {
-        rtl::OUString sOldScheme =  m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue());
+        OUString sOldScheme =  m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue());
         if(!sOldScheme.isEmpty())
         {
             pColorConfig->SetCurrentSchemeName(sOldScheme);
@@ -1115,8 +1115,8 @@ void SvxColorOptionsTabPage::Reset( const SfxItemSet& )
     //has to be called always to speed up accessibility tools
     m_pColorConfigCT->SetScrollPosition(sUser.ToInt32());
     m_pColorSchemeLB->Clear();
-    uno::Sequence< ::rtl::OUString >  aSchemes = pColorConfig->GetSchemeNames();
-    const rtl::OUString* pSchemes = aSchemes.getConstArray();
+    uno::Sequence< OUString >  aSchemes = pColorConfig->GetSchemeNames();
+    const OUString* pSchemes = aSchemes.getConstArray();
     for(sal_Int32 i = 0; i < aSchemes.getLength(); i++)
         m_pColorSchemeLB->InsertEntry(pSchemes[i]);
     m_pColorSchemeLB->SelectEntry(pColorConfig->GetCurrentSchemeName());
@@ -1179,7 +1179,7 @@ IMPL_LINK(SvxColorOptionsTabPage, SaveDeleteHdl_Impl, PushButton*, pButton )
         aQuery.SetText(String(CUI_RES(RID_SVXSTR_COLOR_CONFIG_DELETE)));
         if(RET_YES == aQuery.Execute())
         {
-            rtl::OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry());
+            OUString sDeleteScheme(m_pColorSchemeLB->GetSelectEntry());
             m_pColorSchemeLB->RemoveEntry(m_pColorSchemeLB->GetSelectEntryPos());
             m_pColorSchemeLB->SelectEntryPos(0);
             m_pColorSchemeLB->GetSelectHdl().Call(m_pColorSchemeLB);
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 86b180f0e887..218b67aec1be 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -54,9 +54,9 @@ static long nStaticTabs[]=
 
 // static function -------------------------------------------------------
 
-static String getNormDicEntry_Impl(const rtl::OUString &rText)
+static String getNormDicEntry_Impl(const OUString &rText)
 {
-    rtl::OUString aTmp(comphelper::string::stripEnd(rText, '.'));
+    OUString aTmp(comphelper::string::stripEnd(rText, '.'));
     return comphelper::string::remove(aTmp, '=');
 }
 
@@ -606,7 +606,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
                 //! ...IsVisible should reflect whether the dictionary is a negativ
                 //! or not (hopefully...)
                 sal_Bool bIsNegEntry = aReplaceFT.IsVisible();
-                ::rtl::OUString aRplcText;
+                OUString aRplcText;
                 if(bIsNegEntry)
                     aRplcText = aReplaceStr;
 
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d495a243231d..e1ab16c88171 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -97,8 +97,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::util;
 using namespace ::utl;
-using ::rtl::OString;
-using ::rtl::OUString;
 
 // class OfaMiscTabPage --------------------------------------------------
 
@@ -362,7 +360,7 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd )
 IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd )
 {
     sal_Int64 nNum = m_pYearValueField->GetValue();
-    rtl::OUString aOutput(rtl::OUString::number(nNum));
+    OUString aOutput(OUString::number(nNum));
     m_pYearValueField->SetText(aOutput);
     m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) );
     TwoFigureHdl( pEd );
@@ -623,7 +621,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
     // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)'
     if( m_pIconStyleLB->GetEntryCount() > 1 )
     {
-        ::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
+        OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
 
         aAutoStr += " (";
 
@@ -636,7 +634,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
             aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] );
 
         m_pIconStyleLB->RemoveEntry( 0 );
-        m_pIconStyleLB->InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 );
+        m_pIconStyleLB->InsertEntry( aAutoStr += OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 );
         // separate auto and other icon themes
         m_pIconStyleLB->SetSeparatorPos( 0 );
     }
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index cc4e667f7e0b..e1a2436f3fcb 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -174,7 +174,7 @@ class OfaLanguagesTabPage : public SfxTabPage
     sal_Bool        m_bOldCtl;
     LanguageConfig_Impl*    pLangConfig;
 
-    rtl::OUString m_sUserLocaleValue;
+    OUString m_sUserLocaleValue;
 
     DECL_LINK(  SupportHdl, CheckBox* ) ;
     DECL_LINK(  LocaleSettingHdl, SvxLanguageBox* ) ;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 934f0c841b20..a3f25e0f7986 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -371,11 +371,11 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, pEdit )
     // updating the initial
     if (nField < nInits && rShortName.pEdit->IsEnabled())
     {
-        rtl::OUString sShortName = rShortName.pEdit->GetText();
+        OUString sShortName = rShortName.pEdit->GetText();
         while ((unsigned)sShortName.getLength() < nInits)
-            sShortName += rtl::OUString(' ');
-        rtl::OUString sName = pEdit->GetText();
-        rtl::OUString sLetter = rtl::OUString(sName.getLength() ? sName.toChar() : ' ');
+            sShortName += OUString(' ');
+        OUString sName = pEdit->GetText();
+        OUString sLetter = OUString(sName.getLength() ? sName.toChar() : ' ');
         rShortName.pEdit->SetText(sShortName.replaceAt(nField, 1, sLetter).trim());
     }
     return 0;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index c8bd32a87c2a..668d35490d83 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -93,7 +93,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::sfx2;
-using ::rtl::OUString;
 
 // static ----------------------------------------------------------------
 
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 42b120686dd4..1325c796883a 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -90,14 +90,14 @@ private:
 
     String          sFromBrowser;
 
-    const rtl::OUString aProxyModePN;
-    const rtl::OUString aHttpProxyPN;
-    const rtl::OUString aHttpPortPN;
-    const rtl::OUString aHttpsProxyPN;
-    const rtl::OUString aHttpsPortPN;
-    const rtl::OUString aFtpProxyPN;
-    const rtl::OUString aFtpPortPN;
-    const rtl::OUString aNoProxyDescPN;
+    const OUString aProxyModePN;
+    const OUString aHttpProxyPN;
+    const OUString aHttpPortPN;
+    const OUString aHttpsProxyPN;
+    const OUString aHttpsPortPN;
+    const OUString aFtpProxyPN;
+    const OUString aFtpPortPN;
+    const OUString aNoProxyDescPN;
 
     uno::Reference< uno::XInterface > m_xConfigurationUpdateAccess;
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 23e37a9fd86c..8f7adca0dd97 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -58,7 +58,7 @@ using namespace ::com::sun::star::uno;
 
 // -----------------------------------------------------------------------
 
-bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< ::rtl::OUString >& rListB )
+bool areListsEqual( const Sequence< OUString >& rListA, const Sequence< OUString >& rListB )
 {
     bool bRet = true;
     const sal_Int32 nLen = rListA.getLength();
@@ -67,8 +67,8 @@ bool areListsEqual( const Sequence< ::rtl::OUString >& rListA, const Sequence< :
         bRet = false;
     else
     {
-        const ::rtl::OUString* pStringA = rListA.getConstArray();
-        const ::rtl::OUString* pStringB = rListB.getConstArray();
+        const OUString* pStringA = rListA.getConstArray();
+        const OUString* pStringB = rListB.getConstArray();
 
         for ( sal_Int32 i = 0; i < nLen; ++i )
         {
@@ -268,7 +268,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, AddHdl_Impl)
 
 IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
 {
-    Sequence< ::rtl::OUString > aParameterList;
+    Sequence< OUString > aParameterList;
     if ( !m_pParamDlg )
     {
         m_pParamDlg = new SvxJavaParameterDlg( this );
@@ -277,11 +277,11 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ParameterHdl_Impl)
         {
             rtl_uString** pParamArr = m_parParameters;
             aParameterList.realloc( m_nParamSize );
-            ::rtl::OUString* pParams = aParameterList.getArray();
+            OUString* pParams = aParameterList.getArray();
             for ( sal_Int32 i = 0; i < m_nParamSize; ++i )
             {
                 rtl_uString* pParam = *pParamArr++;
-                pParams[i] = ::rtl::OUString( pParam );
+                pParams[i] = OUString( pParam );
             }
             m_pParamDlg->SetParameters( aParameterList );
         }
@@ -324,7 +324,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, ClassPathHdl_Impl)
         javaFrameworkError eErr = jfw_getUserClassPath( &m_pClassPath );
         if ( JFW_E_NONE == eErr && m_pClassPath )
         {
-            sClassPath = String( ::rtl::OUString( m_pClassPath ) );
+            sClassPath = String( OUString( m_pClassPath ) );
             m_pPathDlg->SetClassPath( sClassPath );
         }
     }
@@ -478,7 +478,7 @@ void SvxJavaOptionsPage::LoadJREs()
 
 void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
 {
-    rtl::OUStringBuffer sEntry;
+    OUStringBuffer sEntry;
     sEntry.append('\t');
     sEntry.append(_pInfo->sVendor);
     sEntry.append('\t');
@@ -487,7 +487,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo )
     if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE )
         sEntry.append(m_sAccessibilityText);
     SvTreeListEntry* pEntry = m_pJavaList->InsertEntry(sEntry.makeStringAndClear());
-    INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) );
+    INetURLObject aLocObj( OUString( _pInfo->sLocation ) );
     String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
     pEntry->SetUserData( pLocation );
 }
@@ -516,7 +516,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry )
 
 // -----------------------------------------------------------------------
 
-void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder )
+void SvxJavaOptionsPage::AddFolder( const OUString& _rFolder )
 {
     bool bStartAgain = true;
     JavaInfo* pInfo = NULL;
@@ -600,11 +600,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
     javaFrameworkError eErr = JFW_E_NONE;
     if ( m_pParamDlg )
     {
-        Sequence< ::rtl::OUString > aParamList = m_pParamDlg->GetParameters();
+        Sequence< OUString > aParamList = m_pParamDlg->GetParameters();
         sal_Int32 i, nSize = aParamList.getLength();
         rtl_uString** pParamArr = (rtl_uString**)rtl_allocateMemory( sizeof(rtl_uString*) * nSize );
         rtl_uString** pParamArrIter = pParamArr;
-        const ::rtl::OUString* pList = aParamList.getConstArray();
+        const OUString* pList = aParamList.getConstArray();
         for ( i = 0; i < nSize; ++i )
             pParamArr[i] = pList[i].pData;
         eErr = jfw_setVMParameters( pParamArrIter, nSize );
@@ -633,7 +633,7 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
 
     if ( m_pPathDlg )
     {
-        ::rtl::OUString sPath( m_pPathDlg->GetClassPath() );
+        OUString sPath( m_pPathDlg->GetClassPath() );
         if ( m_pPathDlg->GetOldPath() != String( sPath ) )
         {
             eErr = jfw_setUserClassPath( sPath.pData );
@@ -771,7 +771,7 @@ SvxJavaParameterDlg::~SvxJavaParameterDlg()
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
 {
-    rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' ');
+    OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' ');
     m_aAssignBtn.Enable(!sParam.isEmpty());
 
     return 0;
@@ -781,7 +781,7 @@ IMPL_LINK_NOARG(SvxJavaParameterDlg, ModifyHdl_Impl)
 
 IMPL_LINK_NOARG(SvxJavaParameterDlg, AssignHdl_Impl)
 {
-    rtl::OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' ');
+    OUString sParam = comphelper::string::strip(m_aParameterEdit.GetText(), ' ');
     if (!sParam.isEmpty())
     {
         sal_uInt16 nPos = m_aAssignedList.GetEntryPos( sParam );
@@ -846,23 +846,23 @@ short SvxJavaParameterDlg::Execute()
 
 // -----------------------------------------------------------------------
 
-Sequence< ::rtl::OUString > SvxJavaParameterDlg::GetParameters() const
+Sequence< OUString > SvxJavaParameterDlg::GetParameters() const
 {
     sal_uInt16 nCount = m_aAssignedList.GetEntryCount();
-    Sequence< ::rtl::OUString > aParamList( nCount );
-    ::rtl::OUString* pArray = aParamList.getArray();
+    Sequence< OUString > aParamList( nCount );
+    OUString* pArray = aParamList.getArray();
      for ( sal_uInt16 i = 0; i < nCount; ++i )
-         pArray[i] = ::rtl::OUString( m_aAssignedList.GetEntry(i) );
+         pArray[i] = OUString( m_aAssignedList.GetEntry(i) );
     return aParamList;
 }
 
 // -----------------------------------------------------------------------
 
-void SvxJavaParameterDlg::SetParameters( Sequence< ::rtl::OUString >& rParams )
+void SvxJavaParameterDlg::SetParameters( Sequence< OUString >& rParams )
 {
     m_aAssignedList.Clear();
     sal_uLong i, nCount = rParams.getLength();
-    const ::rtl::OUString* pArray = rParams.getConstArray();
+    const OUString* pArray = rParams.getConstArray();
     for ( i = 0; i < nCount; ++i )
     {
         String sParam = String( *pArray++ );
@@ -937,7 +937,7 @@ IMPL_LINK_NOARG(SvxJavaClassPathDlg, AddArchiveHdl_Impl)
 {
     sfx2::FileDialogHelper aDlg( TemplateDescription::FILEOPEN_SIMPLE, 0 );
     aDlg.SetTitle( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ) );
-    aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), rtl::OUString("*.jar;*.zip") );
+    aDlg.AddFilter( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ), OUString("*.jar;*.zip") );
     String sFolder;
     if ( m_aPathList.GetSelectEntryCount() > 0 )
     {
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index cdd96b7fdb3c..07fa6be1bfeb 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -89,7 +89,7 @@ private:
     void                    LoadJREs();
     void                    AddJRE( JavaInfo* _pInfo );
     void                    HandleCheckEntry( SvTreeListEntry* _pEntry );
-    void                    AddFolder( const ::rtl::OUString& _rFolder );
+    void                    AddFolder( const OUString& _rFolder );
 
 public:
     SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet );
@@ -139,8 +139,8 @@ public:
 
     virtual short           Execute();
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > GetParameters() const;
-    void SetParameters( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rParams );
+    ::com::sun::star::uno::Sequence< OUString > GetParameters() const;
+    void SetParameters( ::com::sun::star::uno::Sequence< OUString >& rParams );
 };
 
 // class SvxJavaClassPathDlg ---------------------------------------------
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 2ca777b5b3d7..93f3c666e9f1 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -817,7 +817,7 @@ void SvxPathTabPage::SetPathList(
             pImpl->m_xPathSettings->setPropertyValue( sProp, aValue );
 
             // then the writable path
-            aValue = makeAny( ::rtl::OUString( _rWritablePath ) );
+            aValue = makeAny( OUString( _rWritablePath ) );
             sProp = sCfgName;
             sProp += POSTFIX_WRITABLE;
             pImpl->m_xPathSettings->setPropertyValue( sProp, aValue );
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index a221e4d176df..9318ba24dd2e 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -458,8 +458,8 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
         {
             (void) e;
             OSL_FAIL(
-                rtl::OUStringToOString(
-                    (rtl::OUString(
+                OUStringToOString(
+                    (OUString(
                             "exception in FilterFactory access: ") +
                      e.Message),
                     RTL_TEXTENCODING_UTF8).
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 375a8d383d95..7cae029e184b 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -91,9 +91,9 @@ SvxOnlineUpdateTabPage::~SvxOnlineUpdateTabPage()
 // -----------------------------------------------------------------------
 void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
 {
-    rtl::OUString aDateStr;
-    rtl::OUString aTimeStr;
-    rtl::OUString aText;
+    OUString aDateStr;
+    OUString aTimeStr;
+    OUString aText;
     sal_Int64 lastChecked = 0;
 
     m_xUpdateAccess->getByName("LastCheck") >>= lastChecked;
@@ -204,7 +204,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
         bModified = sal_True;
     }
 
-    rtl::OUString sValue, aURL;
+    OUString sValue, aURL;
     m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
 
     if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) &&
@@ -254,7 +254,7 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& )
     m_pDestPath->Enable(sal_True);
     m_pChangePathButton->Enable(sal_True);
 
-    rtl::OUString sValue, aPath;
+    OUString sValue, aPath;
     m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
 
     if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sValue, aPath) )
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
     uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     uno::Reference < ui::dialogs::XFolderPicker2 >  xFolderPicker = ui::dialogs::FolderPicker::create(xContext);
 
-    rtl::OUString aURL;
+    OUString aURL;
     if( osl::FileBase::E_None != osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) )
         osl::Security().getHomeDir(aURL);
 
@@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
 
     if ( ui::dialogs::ExecutableDialogResults::OK == nRet )
     {
-        rtl::OUString aFolder;
+        OUString aFolder;
         if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder))
             m_pDestPath->SetText( aFolder );
     }
@@ -341,7 +341,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
         uno::Reference< frame::XDispatchProvider > xDispatchProvider(
             xDesktop->getCurrentFrame(), uno::UNO_QUERY );
 
-        uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0);
+        uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0);
 
         if( xDispatch.is() )
         {
@@ -352,7 +352,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
     catch( const uno::Exception& e )
     {
          OSL_TRACE( "Caught exception: %s\n thread terminated.\n",
-            rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     return 0;
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 3323f08bc6fb..bdfb8f7a8e74 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -39,8 +39,8 @@ private:
     FixedText*          m_pDestPath;
     PushButton*         m_pChangePathButton;
     FixedText*          m_pLastChecked;
-    rtl::OUString       m_aNeverChecked;
-    rtl::OUString       m_aLastCheckedTemplate;
+    OUString       m_aNeverChecked;
+    OUString       m_aLastCheckedTemplate;
 
     DECL_LINK(FileDialogHdl_Impl, void *) ;
     DECL_LINK(CheckNowHdl_Impl, void *) ;
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index e210df625df0..939985e6bb1c 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -40,12 +40,12 @@ namespace offapp
     class ODriverEnumerationImpl
     {
     protected:
-        ::std::vector< ::rtl::OUString >    m_aImplNames;
+        ::std::vector< OUString >    m_aImplNames;
 
     public:
         ODriverEnumerationImpl();
 
-        const ::std::vector< ::rtl::OUString >& getDriverImplNames() const { return m_aImplNames; }
+        const ::std::vector< OUString >& getDriverImplNames() const { return m_aImplNames; }
     };
 
     //--------------------------------------------------------------------
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index e0f61dddccf5..b329a858b780 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -22,14 +22,10 @@
 
 
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 
 #include <vector>
 
-namespace rtl
-{
-    class OUString;
-}
-
 //........................................................................
 namespace offapp
 {
@@ -52,7 +48,7 @@ namespace offapp
     public:
         ODriverEnumeration() throw();
         ~ODriverEnumeration() throw();
-        typedef ::std::vector< ::rtl::OUString >::const_iterator const_iterator;
+        typedef ::std::vector< OUString >::const_iterator const_iterator;
 
         const_iterator  begin() const throw();
         const_iterator  end() const throw();
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b7bc0b868476..8f5c20f3d5d4 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -114,19 +114,19 @@ LastPageSaver* OfaTreeOptionsDialog::pLastPageSaver = NULL;
 
 // some stuff for easier changes for SvtViewOptions
 static const sal_Char*      pViewOptDataName = "page data";
-#define VIEWOPT_DATANAME    rtl::OUString::createFromAscii( pViewOptDataName )
+#define VIEWOPT_DATANAME    OUString::createFromAscii( pViewOptDataName )
 
 static XOutdevItemPool* mpStaticXOutdevItemPool = 0L;
 
 static inline void SetViewOptUserItem( SvtViewOptions& rOpt, const String& rData )
 {
-    rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( rtl::OUString( rData ) ) );
+    rOpt.SetUserItem( VIEWOPT_DATANAME, makeAny( OUString( rData ) ) );
 }
 
 static inline String GetViewOptUserItem( const SvtViewOptions& rOpt )
 {
     Any aAny( rOpt.GetUserItem( VIEWOPT_DATANAME ) );
-    rtl::OUString aUserData;
+    OUString aUserData;
     aAny >>= aUserData;
 
     return String( aUserData );
@@ -159,13 +159,13 @@ static ModuleToGroupNameMap_Impl ModuleMap[] =
     { NULL, String::EmptyString(), 0xFFFF }
 };
 
-static void setGroupName( const rtl::OUString& rModule, const String& rGroupName )
+static void setGroupName( const OUString& rModule, const String& rGroupName )
 {
     sal_uInt16 nIndex = 0;
     while ( ModuleMap[ nIndex ].m_pModule )
     {
-        rtl::OUString sTemp =
-            rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
+        OUString sTemp =
+            OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
         if ( sTemp == rModule )
         {
             ModuleMap[ nIndex ].m_sGroupName = rGroupName;
@@ -175,14 +175,14 @@ static void setGroupName( const rtl::OUString& rModule, const String& rGroupName
     }
 }
 
-static String getGroupName( const rtl::OUString& rModule, bool bForced )
+static String getGroupName( const OUString& rModule, bool bForced )
 {
     String sGroupName;
     sal_uInt16 nIndex = 0;
     while ( ModuleMap[ nIndex ].m_pModule )
     {
-        rtl::OUString sTemp =
-            rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
+        OUString sTemp =
+            OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
         if ( sTemp == rModule )
         {
             sGroupName = ModuleMap[ nIndex ].m_sGroupName;
@@ -221,13 +221,13 @@ static void deleteGroupNames()
         ModuleMap[ nIndex++ ].m_sGroupName = String::EmptyString();
 }
 
-static sal_uInt16 getGroupNodeId( const rtl::OUString& rModule )
+static sal_uInt16 getGroupNodeId( const OUString& rModule )
 {
     sal_uInt16 nNodeId = 0xFFFF, nIndex = 0;
     while ( ModuleMap[ nIndex ].m_pModule )
     {
-        rtl::OUString sTemp =
-            rtl::OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
+        OUString sTemp =
+            OUString::createFromAscii( ModuleMap[ nIndex ].m_pModule );
         if ( sTemp == rModule )
         {
             nNodeId = ModuleMap[ nIndex ].m_nNodeId;
@@ -250,7 +250,7 @@ public:
     virtual ~MailMergeCfg_Impl();
 
     virtual void    Commit();
-    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+    virtual void Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames);
 
     sal_Bool IsEmailSupported() const {return bIsEmailSupported;}
 
@@ -260,7 +260,7 @@ MailMergeCfg_Impl::MailMergeCfg_Impl() :
     utl::ConfigItem("Office.Writer/MailMergeWizard"),
     bIsEmailSupported(sal_False)
 {
-    Sequence<rtl::OUString> aNames(1);
+    Sequence<OUString> aNames(1);
     aNames.getArray()[0] = "EMailSupported";
     const Sequence< Any > aValues = GetProperties(aNames);
     const Any* pValues = aValues.getConstArray();
@@ -276,7 +276,7 @@ void MailMergeCfg_Impl::Commit()
 {
 }
 
-void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+void MailMergeCfg_Impl::Notify( const com::sun::star::uno::Sequence< OUString >& )
 {
 }
 
@@ -455,8 +455,8 @@ struct OptionsPageInfo
 {
     SfxTabPage*         m_pPage;
     sal_uInt16          m_nPageId;
-    rtl::OUString       m_sPageURL;
-    rtl::OUString       m_sEventHdl;
+    OUString       m_sPageURL;
+    OUString       m_sEventHdl;
     ExtensionsTabPage*  m_pExtPage;
 
     OptionsPageInfo( sal_uInt16 nId ) : m_pPage( NULL ), m_nPageId( nId ), m_pExtPage( NULL ) {}
@@ -470,13 +470,13 @@ struct OptionsGroupInfo
     SfxModule*          m_pModule;      // used to create the ItemSet
     sal_uInt16          m_nDialogId;    // Id of the former dialog
     sal_Bool            m_bLoadError;   // load fails?
-    rtl::OUString       m_sPageURL;
+    OUString       m_sPageURL;
     ExtensionsTabPage*  m_pExtPage;
 
     OptionsGroupInfo( SfxShell* pSh, SfxModule* pMod, sal_uInt16 nId ) :
         m_pInItemSet( NULL ), m_pOutItemSet( NULL ), m_pShell( pSh ),
         m_pModule( pMod ), m_nDialogId( nId ), m_bLoadError( sal_False ),
-        m_sPageURL( rtl::OUString() ), m_pExtPage( NULL ) {}
+        m_sPageURL( OUString() ), m_pExtPage( NULL ) {}
     ~OptionsGroupInfo() { delete m_pInItemSet; delete m_pOutItemSet; }
 };
 
@@ -512,7 +512,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
 
     InitTreeAndHandler();
     Initialize( _xFrame );
-    LoadExtensionOptions( rtl::OUString() );
+    LoadExtensionOptions( OUString() );
     ResizeTreeLB();
     if (bActivateLastSelection)
         ActivateLastSelection();
@@ -522,7 +522,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
 
 // Ctor() with ExtensionId -----------------------------------------------
 
-OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId ) :
+OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const OUString& rExtensionId ) :
 
     SfxModalDialog( pParent, CUI_RES( RID_OFADLG_OPTIONS_TREE ) ),
     INI_LIST()
@@ -846,7 +846,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection()
                     && sExpand.Match( sPageURL ) == STRING_MATCH )
                 {
                     // cut protocol
-                    ::rtl::OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) );
+                    OUString sTemp( sPageURL.Copy( sizeof( EXPAND_PROTOCOL ) -1 ) );
                     // decode uri class chars
                     sTemp = ::rtl::Uri::decode(
                         sTemp, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
@@ -1146,7 +1146,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     }
 
     {
-        ::rtl::OUStringBuffer sTitleBuf(sTitle);
+        OUStringBuffer sTitleBuf(sTitle);
         sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
         sTitleBuf.append(aTreeLB.GetEntryText(pParent));
         sTitleBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(" - "));
@@ -1265,9 +1265,9 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                         nMinTrail = 2;
             if (xProp.is())
             {
-                xProp->getPropertyValue( rtl::OUString(
+                xProp->getPropertyValue( OUString(
                         UPN_HYPH_MIN_LEADING) ) >>= nMinLead;
-                xProp->getPropertyValue( rtl::OUString(
+                xProp->getPropertyValue( OUString(
                         UPN_HYPH_MIN_TRAILING) ) >>= nMinTrail;
             }
             aHyphen.GetMinLead()  = (sal_uInt8)nMinLead;
@@ -1298,7 +1298,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( sal_uInt16 nId )
                         sal_Bool bVal = sal_False;
                         if (xProp.is())
                         {
-                            xProp->getPropertyValue( rtl::OUString( UPN_IS_SPELL_AUTO) ) >>= bVal;
+                            xProp->getPropertyValue( OUString( UPN_IS_SPELL_AUTO) ) >>= bVal;
                         }
 
                         pRet->Put(SfxBoolItem(SID_AUTOSPELL_CHECK, bVal));
@@ -1438,7 +1438,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
     }
     Reference< XMultiServiceFactory >  xMgr( ::comphelper::getProcessServiceFactory() );
     Reference< XPropertySet >  xProp(
-            xMgr->createInstance( ::rtl::OUString( "com.sun.star.linguistic2.LinguProperties" ) ),
+            xMgr->createInstance( OUString( "com.sun.star.linguistic2.LinguProperties" ) ),
             UNO_QUERY );
     if ( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_HYPHENREGION, sal_False, &pItem ) )
     {
@@ -1447,10 +1447,10 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
         if (xProp.is())
         {
             xProp->setPropertyValue(
-                    rtl::OUString(UPN_HYPH_MIN_LEADING),
+                    OUString(UPN_HYPH_MIN_LEADING),
                     makeAny((sal_Int16) pHyphenItem->GetMinLead()) );
             xProp->setPropertyValue(
-                    rtl::OUString(UPN_HYPH_MIN_TRAILING),
+                    OUString(UPN_HYPH_MIN_TRAILING),
                     makeAny((sal_Int16) pHyphenItem->GetMinTrail()) );
         }
         bSaveSpellCheck = sal_True;
@@ -1486,7 +1486,7 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
             if (xProp.is())
             {
                 xProp->setPropertyValue(
-                        rtl::OUString(UPN_IS_SPELL_AUTO),
+                        OUString(UPN_IS_SPELL_AUTO),
                         makeAny(bOnlineSpelling) );
             }
         }
@@ -1510,9 +1510,9 @@ void OfaTreeOptionsDialog::ApplyLanguageOptions(const SfxItemSet& rSet)
     }
 }
 
-rtl::OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
+OUString getCurrentFactory_Impl( const Reference< XFrame >& _xFrame )
 {
-    rtl::OUString sIdentifier;
+    OUString sIdentifier;
     Reference < XFrame > xCurrentFrame( _xFrame );
     Reference < XModuleManager2 > xModuleManager = ModuleManager::create(::comphelper::getProcessComponentContext());
     if ( !xCurrentFrame.is() )
@@ -1566,7 +1566,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
             // Disable Online Update page if service not installed
             if( RID_SVXPAGE_ONLINEUPDATE == nPageId )
             {
-                const ::rtl::OUString sService = "com.sun.star.setup.UpdateCheck";
+                const OUString sService = "com.sun.star.setup.UpdateCheck";
 
                 try
                 {
@@ -1619,8 +1619,8 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
     }
 
 
-    rtl::OUString aFactory = getCurrentFactory_Impl( _xFrame );
-    rtl::OUString sTemp = GetModuleIdentifier( _xFrame );
+    OUString aFactory = getCurrentFactory_Impl( _xFrame );
+    OUString sTemp = GetModuleIdentifier( _xFrame );
     DBG_ASSERT( sTemp == aFactory, "S H I T!!!" );
 
     // Writer and Writer/Web options
@@ -1652,7 +1652,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                         AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
                 }
 #ifdef DBG_UTIL
-                AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup );
+                AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup );
 #endif
             }
 
@@ -1668,7 +1668,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference< XFrame >& _xFrame )
                         AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
                 }
 #ifdef DBG_UTIL
-                AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString("Internal Test"), nGroup );
+                AddTabPage( RID_SW_TP_OPTTEST_PAGE, OUString("Internal Test"), nGroup );
 #endif
             }
         }
@@ -1941,7 +1941,7 @@ bool isNodeActive( OptionsNode* pNode, Module* pModule )
     return false;
 }
 
-void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtensionId )
+void OfaTreeOptionsDialog::LoadExtensionOptions( const OUString& rExtensionId )
 {
     Module* pModule = NULL;
 
@@ -1957,9 +1957,9 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const rtl::OUString& rExtension
     delete pModule;
 }
 
-rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame )
+OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame >& rFrame )
 {
-    rtl::OUString sModule;
+    OUString sModule;
     Reference < XFrame > xCurrentFrame( rFrame );
     Reference< XComponentContext > xContext = comphelper::getProcessComponentContext();
     Reference < XModuleManager2 > xModuleManager = ModuleManager::create(xContext);
@@ -1989,16 +1989,16 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier( const Reference< XFrame
 }
 
 Module* OfaTreeOptionsDialog::LoadModule(
-    const rtl::OUString& rModuleIdentifier )
+    const OUString& rModuleIdentifier )
 {
     Module* pModule = NULL;
     Reference< XNameAccess > xSet(
         officecfg::Office::OptionsDialog::Modules::get());
 
-    Sequence< rtl::OUString > seqNames = xSet->getElementNames();
+    Sequence< OUString > seqNames = xSet->getElementNames();
     for ( int i = 0; i < seqNames.getLength(); ++i )
     {
-        rtl::OUString sModule( seqNames[i] );
+        OUString sModule( seqNames[i] );
         if ( rModuleIdentifier == sModule )
         {
             // current active module found
@@ -2014,7 +2014,7 @@ Module* OfaTreeOptionsDialog::LoadModule(
                 xModAccess->getByName( "Nodes" ) >>= xNodeAccess;
                 if ( xNodeAccess.is() )
                 {
-                    Sequence< rtl::OUString > xTemp = xNodeAccess->getElementNames();
+                    Sequence< OUString > xTemp = xNodeAccess->getElementNames();
                     Reference< XNameAccess > xAccess;
                     sal_Int32 nIndex = -1;
                     for ( int x = 0; x < xTemp.getLength(); ++x )
@@ -2052,14 +2052,14 @@ Module* OfaTreeOptionsDialog::LoadModule(
 }
 
 VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
-    Module* pModule, const rtl::OUString& rExtensionId)
+    Module* pModule, const OUString& rExtensionId)
 {
     VectorOfNodes aOutNodeList;
 
     Reference< XNameAccess > xSet(
         officecfg::Office::OptionsDialog::Nodes::get());
     VectorOfNodes aNodeList;
-    Sequence< rtl::OUString > seqNames = xSet->getElementNames();
+    Sequence< OUString > seqNames = xSet->getElementNames();
 
     for ( int i = 0; i < seqNames.getLength(); ++i )
     {
@@ -2069,7 +2069,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
 
         if ( xNodeAccess.is() )
         {
-            rtl::OUString sNodeId, sLabel, sPageURL, sGroupId;
+            OUString sNodeId, sLabel, sPageURL, sGroupId;
             bool bAllModules = false;
             sal_Int32 nGroupIndex = 0;
 
@@ -2098,7 +2098,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
             xNodeAccess->getByName( "Leaves" ) >>= xLeavesSet;
             if ( xLeavesSet.is() )
             {
-                Sequence< rtl::OUString > seqLeaves = xLeavesSet->getElementNames();
+                Sequence< OUString > seqLeaves = xLeavesSet->getElementNames();
                 for ( int j = 0; j < seqLeaves.getLength(); ++j )
                 {
                     Reference< XNameAccess > xLeaveAccess;
@@ -2106,7 +2106,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
 
                     if ( xLeaveAccess.is() )
                     {
-                        rtl::OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId;
+                        OUString sId, sLeafLabel, sEventHdl, sLeafURL, sLeafGrpId;
                         sal_Int32 nLeafGrpIdx = 0;
 
                         xLeaveAccess->getByName( "Id" ) >>= sId;
@@ -2174,7 +2174,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
         sal_uInt32 i = 0, j = 0;
         for ( ; i < pModule->m_aNodeList.size(); ++i )
         {
-            rtl::OUString sNodeId = pModule->m_aNodeList[i]->m_sId;
+            OUString sNodeId = pModule->m_aNodeList[i]->m_sId;
             for ( j = 0; j < aNodeList.size(); ++j )
             {
                 OptionsNode* pNode = aNodeList[j];
@@ -2193,7 +2193,7 @@ VectorOfNodes OfaTreeOptionsDialog::LoadNodes(
     return aOutNodeList;
 }
 
-static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeListBox& rTreeLB )
+static sal_uInt16 lcl_getGroupId( const OUString& rGroupName, const SvTreeListBox& rTreeLB )
 {
     String sGroupName( rGroupName );
     sal_uInt16 nRet = 0;
@@ -2290,8 +2290,8 @@ short OfaTreeOptionsDialog::Execute()
 // class ExtensionsTabPage -----------------------------------------------
 
 ExtensionsTabPage::ExtensionsTabPage(
-    Window* pParent, WinBits nStyle, const rtl::OUString& rPageURL,
-    const rtl::OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
+    Window* pParent, WinBits nStyle, const OUString& rPageURL,
+    const OUString& rEvtHdl, const Reference< awt::XContainerWindowProvider >& rProvider ) :
 
     TabPage( pParent, nStyle ),
 
@@ -2331,7 +2331,7 @@ void ExtensionsTabPage::CreateDialogWithHandler()
             Reference< awt::XWindowPeer > xParent( VCLUnoHelper::GetInterface( this ), UNO_QUERY );
             m_xPage = Reference < awt::XWindow >(
                 m_xWinProvider->createContainerWindow(
-                    m_sPageURL, rtl::OUString(), xParent, m_xEventHdl ), UNO_QUERY );
+                    m_sPageURL, OUString(), xParent, m_xEventHdl ), UNO_QUERY );
 
             Reference< awt::XControl > xPageControl( m_xPage, UNO_QUERY );
             if ( xPageControl.is() )
@@ -2358,7 +2358,7 @@ void ExtensionsTabPage::CreateDialogWithHandler()
 
 // -----------------------------------------------------------------------
 
-sal_Bool ExtensionsTabPage::DispatchAction( const rtl::OUString& rAction )
+sal_Bool ExtensionsTabPage::DispatchAction( const OUString& rAction )
 {
     sal_Bool bRet = sal_False;
     if ( m_xEventHdl.is() )
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 49a0354bdf86..56ca925ccbfa 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -188,9 +188,9 @@ void WebConnectionInfoDialog::FillPasswordList()
 
             for ( sal_Int32 nURLIdx = 0; nURLIdx < aUrls.getLength(); nURLIdx++ )
             {
-                ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] );
-                aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' );
-                aUIEntry += ::rtl::OUString( "*" );
+                OUString aUIEntry( aUrls[ nURLIdx ] );
+                aUIEntry += OUString::valueOf( (sal_Unicode)'\t' );
+                aUIEntry += OUString( "*" );
                 SvTreeListEntry* pEntry = m_pPasswordsLB->InsertEntry( aUIEntry );
                 pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) );
             }
@@ -208,8 +208,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
         SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
         if ( pEntry )
         {
-            ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
-            ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
+            OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
+            OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
 
             uno::Reference< task::XPasswordContainer2 > xPasswdContainer(
                 task::PasswordContainer::create(comphelper::getProcessComponentContext()));
@@ -264,8 +264,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
         SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
         if ( pEntry )
         {
-            ::rtl::OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
-            ::rtl::OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
+            OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
+            OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
 
             ::comphelper::SimplePasswordRequest* pPasswordRequest
                   = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE );