RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals

Conflicts:
	cui/source/options/optgdlg.cxx
	cui/source/options/webconninfo.cxx
	dbaccess/source/ui/app/AppController.cxx

Change-Id: I2abfad91318e8be8c0f77909cbd76825cdca9b85
Reviewed-on: https://gerrit.libreoffice.org/2350
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

4 files changed, 105 insertions, 105 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 78463c94cb51..fb313b74a0f0 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -77,16 +77,16 @@ using namespace com::sun::star;
 
 
 //-----------------------------------------------
-static ::rtl::OUString SERVICE_UICONFIGMGR              (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UIConfigurationManager"              ));
+static OUString SERVICE_UICONFIGMGR              ("com.sun.star.ui.UIConfigurationManager"  );
 
-static ::rtl::OUString MODULEPROP_SHORTNAME             (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryShortName"                                  ));
-static ::rtl::OUString MODULEPROP_UINAME                (RTL_CONSTASCII_USTRINGPARAM("ooSetupFactoryUIName"                                     ));
-static ::rtl::OUString CMDPROP_UINAME                   (RTL_CONSTASCII_USTRINGPARAM("Name"                                                     ));
+static OUString MODULEPROP_SHORTNAME             ("ooSetupFactoryShortName"                 );
+static OUString MODULEPROP_UINAME                ("ooSetupFactoryUIName"                    );
+static OUString CMDPROP_UINAME                   ("Name"                                    );
 
-static ::rtl::OUString FOLDERNAME_UICONFIG              (RTL_CONSTASCII_USTRINGPARAM("Configurations2"                                          ));
+static OUString FOLDERNAME_UICONFIG              ("Configurations2"                         );
 
-static ::rtl::OUString MEDIATYPE_PROPNAME               (RTL_CONSTASCII_USTRINGPARAM("MediaType"                                                ));
-static ::rtl::OUString MEDIATYPE_UICONFIG               (RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.xml.ui.configuration"                 ));
+static OUString MEDIATYPE_PROPNAME               ("MediaType"                               );
+static OUString MEDIATYPE_UICONFIG               ("application/vnd.sun.xml.ui.configuration");
 
 //-----------------------------------------------
 static sal_uInt16 KEYCODE_ARRAY[] =
@@ -848,8 +848,8 @@ void SfxAcceleratorConfigPage::InitAccCfg()
                  css::frame::ModuleManager::create(comphelper::getComponentContext(m_xSMGR)));
         m_sModuleLongName = xModuleManager->identify(m_xFrame);
         ::comphelper::SequenceAsHashMap lModuleProps(xModuleManager->getByName(m_sModuleLongName));
-        m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, ::rtl::OUString());
-        m_sModuleUIName    = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_UINAME   , ::rtl::OUString());
+        m_sModuleShortName = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_SHORTNAME, OUString());
+        m_sModuleUIName    = lModuleProps.getUnpackedValueOrDefault(MODULEPROP_UINAME   , OUString());
 
         // get global accelerator configuration
         m_xGlobal = css::ui::GlobalAcceleratorConfiguration::create(comphelper::getComponentContext(m_xSMGR));
@@ -929,7 +929,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
     for (i2=0; i2<c2; ++i2)
     {
         const css::awt::KeyEvent& aAWTKey  = lKeys[i2];
-              ::rtl::OUString     sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
+              OUString     sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
               String              sLabel   = GetLabel4Command(sCommand);
               KeyCode             aKeyCode = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(aAWTKey);
               sal_uInt16              nPos     = MapKeyCodeToPos(aKeyCode);
@@ -980,7 +980,7 @@ void SfxAcceleratorConfigPage::Apply(const css::uno::Reference< css::ui::XAccele
     while (pEntry)
     {
         TAccInfo*          pUserData = (TAccInfo*)pEntry->GetUserData();
-        ::rtl::OUString    sCommand  ;
+        OUString    sCommand  ;
         css::awt::KeyEvent aAWTKey   ;
 
         if (pUserData)
@@ -1071,7 +1071,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
     // remove function name from selected entry
     sal_uInt16 nCol = aEntriesBox.TabCount() - 1;
     aEntriesBox.SetEntryText( String(), nPos, nCol );
-    pEntry->m_sCommand = ::rtl::OUString();
+    pEntry->m_sCommand = OUString();
 
     ((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
     return 0;
@@ -1086,7 +1086,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
     {
         sal_uInt16          nPos                = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
         TAccInfo*       pEntry              = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
-        ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
+        OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
 
         aRemoveButton.Enable( sal_False );
         aChangeButton.Enable( sal_False );
@@ -1115,7 +1115,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
         {
             sal_uInt16          nPos                = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
             TAccInfo*       pEntry              = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
-            ::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
+            OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
 
             if (pEntry->m_bIsConfigurable)
             {
@@ -1205,7 +1205,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, LoadHdl)
 {
     DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
 
-    ::rtl::OUString sCfgName;
+    OUString sCfgName;
     if ( ERRCODE_NONE == m_pFileDlg->GetError() )
         sCfgName = m_pFileDlg->GetPath();
 
@@ -1289,7 +1289,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
 {
     DBG_ASSERT( m_pFileDlg, "SfxInternetPage::DialogClosedHdl(): no file dialog" );
 
-    ::rtl::OUString sCfgName;
+    OUString sCfgName;
     if ( ERRCODE_NONE == m_pFileDlg->GetError() )
         sCfgName = m_pFileDlg->GetPath();
 
@@ -1332,7 +1332,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, SaveHdl)
                                 css::uno::UNO_QUERY_THROW);
 
             // set the correct media type if the storage was new created
-            ::rtl::OUString sMediaType;
+            OUString sMediaType;
             xUIConfigProps->getPropertyValue(MEDIATYPE_PROPNAME) >>= sMediaType;
             if (sMediaType.isEmpty())
                 xUIConfigProps->setPropertyValue(MEDIATYPE_PROPNAME, css::uno::makeAny(MEDIATYPE_UICONFIG));
@@ -1497,7 +1497,7 @@ String SfxAcceleratorConfigPage::GetLabel4Command(const String& sCommand)
         if (xModuleConf.is())
         {
             ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
-            String sLabel = String(lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, ::rtl::OUString()));
+            String sLabel = String(lProps.getUnpackedValueOrDefault(CMDPROP_UINAME, OUString()));
             if (sLabel.Len())
                 return sLabel;
         }
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 6603538c4b3a..ee6387ea3e25 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -67,7 +67,7 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::document;
 namespace css = ::com::sun::star;
 
-static ::rtl::OUString SERVICE_UICATEGORYDESCRIPTION (RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.UICategoryDescription") );
+static OUString SERVICE_UICATEGORYDESCRIPTION ("com.sun.star.ui.UICategoryDescription");
 
 SfxStylesInfo_Impl::SfxStylesInfo_Impl()
 {}
@@ -77,18 +77,18 @@ void SfxStylesInfo_Impl::setModel(const ::com::sun::star::uno::Reference< ::com:
     m_xDoc = xModel;
 }
 
-static ::rtl::OUString CMDURL_SPART  (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?Style:string=") );
-static ::rtl::OUString CMDURL_FPART2 (RTL_CONSTASCII_USTRINGPARAM("&FamilyName:string=") );
+static OUString CMDURL_SPART  (".uno:StyleApply?Style:string=");
+static OUString CMDURL_FPART2 ("&FamilyName:string=");
 
-static ::rtl::OUString CMDURL_STYLEPROT_ONLY (RTL_CONSTASCII_USTRINGPARAM(".uno:StyleApply?") );
-static ::rtl::OUString CMDURL_SPART_ONLY     (RTL_CONSTASCII_USTRINGPARAM("Style:string=") );
-static ::rtl::OUString CMDURL_FPART_ONLY     (RTL_CONSTASCII_USTRINGPARAM("FamilyName:string=") );
+static OUString CMDURL_STYLEPROT_ONLY (".uno:StyleApply?");
+static OUString CMDURL_SPART_ONLY     ("Style:string=");
+static OUString CMDURL_FPART_ONLY     ("FamilyName:string=");
 
-static ::rtl::OUString STYLEPROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
+static OUString STYLEPROP_UINAME ("DisplayName");
 
-::rtl::OUString SfxStylesInfo_Impl::generateCommand(const ::rtl::OUString& sFamily, const ::rtl::OUString& sStyle)
+OUString SfxStylesInfo_Impl::generateCommand(const OUString& sFamily, const OUString& sStyle)
 {
-    ::rtl::OUStringBuffer sCommand(1024);
+    OUStringBuffer sCommand(1024);
     sCommand.append(CMDURL_SPART );
     sCommand.append(sStyle       );
     sCommand.append(CMDURL_FPART2);
@@ -105,16 +105,16 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
     if (aStyle.sCommand.indexOf(CMDURL_STYLEPROT_ONLY, 0) != 0)
         return sal_False;
 
-    aStyle.sFamily = ::rtl::OUString();
-    aStyle.sStyle  = ::rtl::OUString();
+    aStyle.sFamily = OUString();
+    aStyle.sStyle  = OUString();
 
     sal_Int32       nCmdLen  = aStyle.sCommand.getLength();
-    ::rtl::OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
+    OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
     sal_Int32       i        = sCmdArgs.indexOf('&');
     if (i<0)
         return sal_False;
 
-    ::rtl::OUString sArg = sCmdArgs.copy(0, i);
+    OUString sArg = sCmdArgs.copy(0, i);
     if (sArg.indexOf(CMDURL_SPART_ONLY) == 0)
         aStyle.sStyle = sArg.copy(LEN_SPART, sArg.getLength()-LEN_SPART);
     else if (sArg.indexOf(CMDURL_FPART_ONLY) == 0)
@@ -150,14 +150,14 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
         if (xStyleSet.is())
             xStyleSet->getByName(aStyle.sStyle) >>= xStyle;
 
-        aStyle.sLabel = ::rtl::OUString();
+        aStyle.sLabel = OUString();
         if (xStyle.is())
             xStyle->getPropertyValue(STYLEPROP_UINAME) >>= aStyle.sLabel;
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
-        { aStyle.sLabel = ::rtl::OUString(); }
+        { aStyle.sLabel = OUString(); }
 
     if (aStyle.sLabel.isEmpty())
     {
@@ -173,7 +173,7 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
         return ::std::vector< SfxStyleInfo_Impl >();
 
     css::uno::Reference< css::container::XNameAccess > xCont = xModel->getStyleFamilies();
-    css::uno::Sequence< ::rtl::OUString > lFamilyNames = xCont->getElementNames();
+    css::uno::Sequence< OUString > lFamilyNames = xCont->getElementNames();
     ::std::vector< SfxStyleInfo_Impl > lFamilies;
     sal_Int32 c = lFamilyNames.getLength();
     sal_Int32 i = 0;
@@ -205,11 +205,11 @@ void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
     return lFamilies;
 }
 
-::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const ::rtl::OUString& sFamily)
+::std::vector< SfxStyleInfo_Impl > SfxStylesInfo_Impl::getStyles(const OUString& sFamily)
 {
-    static ::rtl::OUString PROP_UINAME (RTL_CONSTASCII_USTRINGPARAM("DisplayName") );
+    static OUString PROP_UINAME ("DisplayName");
 
-    css::uno::Sequence< ::rtl::OUString > lStyleNames;
+    css::uno::Sequence< OUString > lStyleNames;
     css::uno::Reference< css::style::XStyleFamiliesSupplier > xModel(m_xDoc, css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNameAccess > xFamilies = xModel->getStyleFamilies();
     css::uno::Reference< css::container::XNameAccess > xStyleSet;
@@ -371,8 +371,8 @@ struct SvxConfigGroupBoxResource_Impl : public Resource
     Image m_libImage;
     Image m_macImage;
     Image m_docImage;
-    ::rtl::OUString m_sMyMacros;
-    ::rtl::OUString m_sProdMacros;
+    OUString m_sMyMacros;
+    OUString m_sProdMacros;
     String m_sMacros;
     String m_sDlgMacros;
     String m_aHumanAppName;
@@ -454,8 +454,8 @@ void SfxConfigGroupListBox_Impl::InitModule()
         for (i1=0; i1<c1; ++i1)
         {
             sal_Int16&      rGroupID   = lGroups[i1];
-            ::rtl::OUString sGroupID   = ::rtl::OUString::valueOf((sal_Int32)rGroupID);
-            ::rtl::OUString sGroupName ;
+            OUString sGroupID   = OUString::valueOf((sal_Int32)rGroupID);
+            OUString sGroupName ;
 
             try
             {
@@ -543,7 +543,7 @@ namespace
 //-----------------------------------------------
 void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR          ,
                                       const css::uno::Reference< css::frame::XFrame >&              xFrame         ,
-                                      const ::rtl::OUString&                                        sModuleLongName)
+                                      const OUString&                                        sModuleLongName)
 {
     SetUpdateMode(sal_False);
     ClearAll(); // Remove all old entries from treelist box
@@ -572,13 +572,13 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
     try
     {
         Reference< browse::XBrowseNodeFactory > xFac( xCtx->getValueByName(
-           ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ) ), UNO_QUERY_THROW );
+           OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
         rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
     }
     catch( Exception& e )
     {
         OSL_TRACE(" Caught some exception whilst retrieving browse nodes from factory... Exception: %s",
-            ::rtl::OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+            OUStringToOString( e.Message , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
         // TODO exception handling
     }
 
@@ -612,8 +612,8 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                         rootNode->getChildNodes();
                     sal_Bool bIsRootNode = sal_False;
 
-                    ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
-                    ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
+                    OUString user("user");
+                    OUString share("share");
                     if ( rootNode->getName() == "Root" )
                     {
                         bIsRootNode = sal_True;
@@ -625,7 +625,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                     //set the bDisplay flag to FALSE if the current
                     //node is a first level child of the Root and is NOT
                     //either the current document, user or share
-                    ::rtl::OUString currentDocTitle;
+                    OUString currentDocTitle;
                     Reference< XModel > xDocument( lcl_getScriptableDocument_nothrow( m_xFrame ) );
                     if ( xDocument.is() )
                     {
@@ -636,7 +636,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
                     {
                         Reference< browse::XBrowseNode >& theChild = children[n];
                         sal_Bool bDisplay = sal_True;
-                        ::rtl::OUString uiName = theChild->getName();
+                        OUString uiName = theChild->getName();
                         if ( bIsRootNode )
                         {
                             if (  ! ((theChild->getName().equals( user )  || theChild->getName().equals( share ) ||
@@ -722,28 +722,28 @@ Image SfxConfigGroupListBox_Impl::GetImage(
     Image aImage;
     if ( bIsRootNode )
     {
-        ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
-        ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share") );
+        OUString user("user");
+        OUString share("share");
         if (node->getName().equals( user ) || node->getName().equals(share ) )
         {
             aImage = pImp->m_hdImage;
         }
         else
         {
-            ::rtl::OUString factoryURL;
-            ::rtl::OUString nodeName = node->getName();
+            OUString factoryURL;
+            OUString nodeName = node->getName();
             Reference<XInterface> xDocumentModel = getDocumentModel(xCtx, nodeName );
             if ( xDocumentModel.is() )
             {
                 Reference< frame::XModuleManager2 > xModuleManager( frame::ModuleManager::create(xCtx) );
                 // get the long name of the document:
-                ::rtl::OUString appModule( xModuleManager->identify(
+                OUString appModule( xModuleManager->identify(
                                     xDocumentModel ) );
                 Sequence<beans::PropertyValue> moduleDescr;
                 Any aAny = xModuleManager->getByName(appModule);
                 if( sal_True != ( aAny >>= moduleDescr ) )
                 {
-                    throw RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue") ), Reference< XInterface >());
+                    throw RuntimeException(OUString("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
                 }
                 beans::PropertyValue const * pmoduleDescr =
                     moduleDescr.getConstArray();
@@ -753,7 +753,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
                     {
                         pmoduleDescr[ pos ].Value >>= factoryURL;
                         OSL_TRACE("factory url for doc images is %s",
-                        ::rtl::OUStringToOString( factoryURL , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
+                        OUStringToOString( factoryURL , RTL_TEXTENCODING_ASCII_US ).pData->buffer );
                         break;
                     }
                 }
@@ -779,7 +779,7 @@ Image SfxConfigGroupListBox_Impl::GetImage(
 }
 
 Reference< XInterface  >
-SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xCtx, ::rtl::OUString& docName )
+SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xCtx, OUString& docName )
 {
     Reference< XInterface > xModel;
     Reference< frame::XDesktop2 > desktop = frame::Desktop::create( xCtx );
@@ -794,7 +794,7 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
             components->nextElement(), UNO_QUERY );
         if ( model.is() )
         {
-            ::rtl::OUString sTdocUrl =
+            OUString sTdocUrl =
                 ::comphelper::DocumentInfo::getDocumentTitle( model );
             if( sTdocUrl.equals( docName ) )
             {
@@ -807,9 +807,9 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
 }
 
 //-----------------------------------------------
-::rtl::OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const ::rtl::OUString& sCommand)
+OUString SfxConfigGroupListBox_Impl::MapCommand2UIName(const OUString& sCommand)
 {
-    ::rtl::OUString sUIName;
+    OUString sUIName;
     try
     {
         css::uno::Reference< css::container::XNameAccess > xModuleConf;
@@ -817,13 +817,13 @@ SfxConfigGroupListBox_Impl::getDocumentModel( Reference< XComponentContext >& xC
         if (xModuleConf.is())
         {
             ::comphelper::SequenceAsHashMap lProps(xModuleConf->getByName(sCommand));
-            sUIName = lProps.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name") ), ::rtl::OUString());
+            sUIName = lProps.getUnpackedValueOrDefault(OUString("Name"), OUString());
         }
     }
     catch(const css::uno::RuntimeException&)
         { throw; }
     catch(css::uno::Exception&)
-        { sUIName = ::rtl::OUString(); }
+        { sUIName = OUString(); }
 
     // fallback for missing UINames !?
     if (sUIName.isEmpty())
@@ -866,7 +866,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
             for (i=0; i<c; ++i)
             {
                 const css::frame::DispatchInformation& rInfo      = lCommands[i];
-                ::rtl::OUString                        sUIName    = MapCommand2UIName(rInfo.Command);
+                OUString                        sUIName    = MapCommand2UIName(rInfo.Command);
                 SvTreeListEntry*                           pFuncEntry = pFunctionListBox->InsertEntry(sUIName, NULL);
                 SfxGroupInfo_Impl*                     pGrpInfo   = new SfxGroupInfo_Impl(SFX_CFGFUNCTION_SLOT, 0);
                 pGrpInfo->sCommand = rInfo.Command;
@@ -894,7 +894,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
                         {
                             if (children[n]->getType() == browse::BrowseNodeTypes::SCRIPT)
                             {
-                                ::rtl::OUString uri;
+                                OUString uri;
 
                                 Reference < beans::XPropertySet >xPropSet( children[n], UNO_QUERY );
                                 if (!xPropSet.is())
@@ -1019,8 +1019,8 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
                             rootNode->getChildNodes();
                         sal_Bool bIsRootNode = sal_False;
 
-                        ::rtl::OUString user( RTL_CONSTASCII_USTRINGPARAM("user") );
-                        ::rtl::OUString share( RTL_CONSTASCII_USTRINGPARAM("share" ));
+                        OUString user("user");
+                        OUString share("share" );
                         if ( rootNode->getName() == "Root" )
                         {
                             bIsRootNode = sal_True;
@@ -1032,7 +1032,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
                         set the bDisplay flag to sal_False if the current
                         node is a first level child of the Root and is NOT
                         either the current document, user or share */
-                        ::rtl::OUString currentDocTitle;
+                        OUString currentDocTitle;
                         Reference< XModel > xDocument( lcl_getScriptableDocument_nothrow( m_xFrame ) );
                         if ( xDocument.is() )
                         {
@@ -1043,7 +1043,7 @@ void SfxConfigGroupListBox_Impl::RequestingChildren( SvTreeListEntry *pEntry )
                         for ( sal_Int32 n = 0; n < nLen; ++n )
                         {
                             Reference< browse::XBrowseNode >& theChild = children[n];
-                            ::rtl::OUString aName( theChild->getName() );
+                            OUString aName( theChild->getName() );
                             sal_Bool bDisplay = sal_True;
                             if ( bIsRootNode )
                             {
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 53703752566d..b5b7566eb162 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -48,8 +48,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-static ::rtl::OUString aVndSunStarUNO( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.UNO:") );
-static ::rtl::OUString aVndSunStarScript( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:") );
+static OUString aVndSunStarUNO( "vnd.sun.star.UNO:" );
+static OUString aVndSunStarScript( "vnd.sun.star.script:" );
 
 _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
     pAssignFT( NULL ),
@@ -226,7 +226,7 @@ _SvxMacroTabPage::~_SvxMacroTabPage()
     SvTreeListEntry* pE = rListBox.GetEntry( 0 );
     while( pE )
     {
-        ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
+        OUString* pEventName = (OUString*)pE->GetUserData();
         delete pEventName;
         pE->SetUserData((void*)0);
         pE = rListBox.NextSibling( pE );
@@ -322,7 +322,7 @@ sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
 {
     try
     {
-        ::rtl::OUString eventName;
+        OUString eventName;
         if( m_xAppEvents.is() )
         {
             EventsHash::iterator h_itEnd =  m_appEventsHash.end();
@@ -384,7 +384,7 @@ void _SvxMacroTabPage::Reset()
 
     try
     {
-            ::rtl::OUString sEmpty;
+            OUString sEmpty;
             if( m_xAppEvents.is() )
             {
                 EventsHash::iterator h_itEnd =  m_appEventsHash.end();
@@ -458,14 +458,14 @@ void IconLBoxString::Paint(
     String aTxt( GetText() );
     if( aTxt.Len() )
     {
-        ::rtl::OUString aURL( aTxt );
+        OUString aURL( aTxt );
         sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO );
         bool bUNO = nIndex == 0;
 
         const Image* pImg = bUNO ? m_pComponentImg : m_pMacroImg;
         aDevice.DrawImage( aPos, *pImg );
 
-        ::rtl::OUString aPureMethod;
+        OUString aPureMethod;
         if( bUNO )
         {
             sal_Int32 nBegin = aVndSunStarUNO.getLength();
@@ -513,12 +513,12 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
         return;
     }
 
-    Sequence< ::rtl::OUString > eventNames = nameReplace->getElementNames();
-    ::std::set< ::rtl::OUString > aEventNamesCache;
+    Sequence< OUString > eventNames = nameReplace->getElementNames();
+    ::std::set< OUString > aEventNamesCache;
     ::std::copy(
         eventNames.getConstArray(),
         eventNames.getConstArray() + eventNames.getLength(),
-        ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aEventNamesCache, aEventNamesCache.end() )
+        ::std::insert_iterator< ::std::set< OUString > >( aEventNamesCache, aEventNamesCache.end() )
     );
 
     for (   EventDisplayNames::const_iterator displayableEvent = aDisplayNames.begin();
@@ -526,7 +526,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
             ++displayableEvent
         )
     {
-        ::rtl::OUString sEventName( ::rtl::OUString::createFromAscii( displayableEvent->pAsciiEventName ) );
+        OUString sEventName( OUString::createFromAscii( displayableEvent->pAsciiEventName ) );
         if ( !nameReplace->hasByName( sEventName ) )
             continue;
 
@@ -537,12 +537,12 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
             continue;
         }
 
-        ::rtl::OUString eventURL = h_it->second.second;
+        OUString eventURL = h_it->second.second;
         String displayName( CUI_RES( displayableEvent->nEventResourceID ) );
 
         displayName += '\t';
         SvTreeListEntry*    _pE = rListBox.InsertEntry( displayName );
-        ::rtl::OUString* pEventName = new ::rtl::OUString( sEventName );
+        OUString* pEventName = new OUString( sEventName );
         _pE->SetUserData( (void*)pEventName );
         String sNew( eventURL );
         _pE->ReplaceItem( new IconLBoxString( _pE, 0, sNew,
@@ -608,10 +608,10 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
 
     const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
 
-    ::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
+    OUString* pEventName = (OUString*)pE->GetUserData();
 
-    ::rtl::OUString sEventURL;
-    ::rtl::OUString sEventType;
+    OUString sEventURL;
+    OUString sEventType;
     if(pThis->bAppEvents)
     {
         EventsHash::iterator h_it = pThis->m_appEventsHash.find( *pEventName );
@@ -636,8 +636,8 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
     if( pBtn == pImpl->pDeletePB )
     {
         // delete pressed
-        sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script") );
-        sEventURL = ::rtl::OUString();
+        sEventType = OUString( "Script" );
+        sEventURL = OUString();
         if(!pThis->bAppEvents)
             pThis->bDocModified = true;
     }
@@ -654,7 +654,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
         short ret = pAssignDlg->Execute();
         if( ret )
         {
-            sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO"));
+            sEventType = OUString("UNO");
             sEventURL = pAssignDlg->getURL();
             if(!pThis->bAppEvents)
                 pThis->bDocModified = true;
@@ -670,7 +670,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
             short ret = pDlg->Execute();
             if ( ret )
             {
-                sEventType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Script"));
+                sEventType = OUString("Script");
                 sEventURL = pDlg->GetScriptURL();
                 if(!pThis->bAppEvents)
                     pThis->bDocModified = true;
@@ -746,7 +746,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
     {
         return;
     }
-    Sequence< ::rtl::OUString > eventNames = m_xAppEvents->getElementNames();
+    Sequence< OUString > eventNames = m_xAppEvents->getElementNames();
     sal_Int32 nEventCount = eventNames.getLength();
     for(sal_Int32 nEvent = 0; nEvent < nEventCount; ++nEvent )
     {
@@ -777,9 +777,9 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
 }
 
 // returns the two props EventType & Script for a given event name
-Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHash& eventsHash )
+Any _SvxMacroTabPage::GetPropsByName( const OUString& eventName, EventsHash& eventsHash )
 {
-    const ::std::pair< ::rtl::OUString, ::rtl::OUString >& rAssignedEvent( eventsHash[ eventName ] );
+    const ::std::pair< OUString, OUString >& rAssignedEvent( eventsHash[ eventName ] );
 
     Any aReturn;
     ::comphelper::NamedValueCollection aProps;
@@ -795,10 +795,10 @@ Any _SvxMacroTabPage::GetPropsByName( const ::rtl::OUString& eventName, EventsHa
 
 // converts the Any returned by GetByName into a pair which can be stored in
 // the EventHash
-::std::pair< ::rtl::OUString, ::rtl::OUString  > _SvxMacroTabPage::GetPairFromAny( Any aAny )
+::std::pair< OUString, OUString  > _SvxMacroTabPage::GetPairFromAny( Any aAny )
 {
     Sequence< beans::PropertyValue > props;
-    ::rtl::OUString type, url;
+    OUString type, url;
     if( sal_True == ( aAny >>= props ) )
     {
         ::comphelper::NamedValueCollection aProps( props );
@@ -872,8 +872,8 @@ SvxMacroAssignDlg::~SvxMacroAssignDlg()
 
 IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
 {
-    ::rtl::OUString aMethodName = maMethodEdit.GetText();
-    maURL = ::rtl::OUString();
+    OUString aMethodName = maMethodEdit.GetText();
+    maURL = OUString();
     if( !aMethodName.isEmpty() )
     {
         maURL = aVndSunStarUNO;
@@ -883,7 +883,7 @@ IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler)
     return 0;
 }
 
-AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUString& rURL )
+AssignComponentDialog::AssignComponentDialog( Window * pParent, const OUString& rURL )
     : ModalDialog( pParent, CUI_RES( RID_SVXDLG_ASSIGNCOMPONENT ) )
     , maMethodLabel( this, CUI_RES( FT_METHOD ) )
     , maMethodEdit( this, CUI_RES( EDIT_METHOD ) )
@@ -895,7 +895,7 @@ AssignComponentDialog::AssignComponentDialog( Window * pParent, const ::rtl::OUS
     FreeResource();
     maOKButton.SetClickHdl(LINK(this, AssignComponentDialog, ButtonHandler));
 
-    ::rtl::OUString aMethodName;
+    OUString aMethodName;
     if( !maURL.isEmpty() )
     {
         sal_Int32 nIndex = maURL.indexOf( aVndSunStarUNO );
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 65bfde5a69b6..49e02e527475 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -308,7 +308,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode
                 //#139111# some crash reports show that it might be unset
                 if ( !theChild.is() )
                     continue;
-                ::rtl::OUString sUIName = theChild->getName();
+                OUString sUIName = theChild->getName();
                 sal_Bool bDisplay = sal_True;
 
                 if  (   bIsRootNode
@@ -409,7 +409,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
         try{
             aModuleId = xModuleManager->identify( m_xFrame );
         }catch(const uno::Exception&)
-            { aModuleId = ::rtl::OUString(); }
+            { aModuleId = OUString(); }
 
         Reference< container::XNameAccess > const xNameAccess(
                 frame::UICommandDescription::create(xContext) );
@@ -417,8 +417,8 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
 
         Reference< container::XNameAccess > xAllCategories(
             xMCF->createInstanceWithContext(
-                OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "com.sun.star.ui.UICategoryDescription" )),
+                OUString(
+                    "com.sun.star.ui.UICategoryDescription" ),
                 xContext ),
             UNO_QUERY );
 
@@ -494,7 +494,7 @@ void SvxConfigGroupListBox::Init(bool bShowSlots, const Reference< frame::XFrame
     try
     {
         Reference< browse::XBrowseNodeFactory > xFac( xContext->getValueByName(
-                                                          OUString(RTL_CONSTASCII_USTRINGPARAM( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory")) ), UNO_QUERY_THROW );
+                                                          OUString( "/singletons/com.sun.star.script.browse.theBrowseNodeFactory") ), UNO_QUERY_THROW );
         rootNode.set( xFac->createView( browse::BrowseNodeFactoryViewTypes::MACROSELECTOR ) );
     }
     catch( const Exception& )
@@ -553,7 +553,7 @@ Image SvxConfigGroupListBox::GetImage(
                 Any aAny = xModuleManager->getByName(appModule);
                 if( sal_True != ( aAny >>= moduleDescr ) )
                 {
-                    throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("SFTreeListBox::Init: failed to get PropertyValue")), Reference< XInterface >());
+                    throw RuntimeException(OUString("SFTreeListBox::Init: failed to get PropertyValue"), Reference< XInterface >());
                 }
                 beans::PropertyValue const * pmoduleDescr =
                     moduleDescr.getConstArray();
@@ -706,7 +706,7 @@ void SvxConfigGroupListBox::GroupSelected()
                     }
 
                     SvxGroupInfo_Impl *_pGroupInfo = new SvxGroupInfo_Impl(
-                        SVX_CFGFUNCTION_SLOT, 123, aCmdURL, ::rtl::OUString() );
+                        SVX_CFGFUNCTION_SLOT, 123, aCmdURL, OUString() );
 
                     pFunctionListBox->aArr.push_back( _pGroupInfo );
 
@@ -742,13 +742,13 @@ void SvxConfigGroupListBox::GroupSelected()
                             }
 
                             Any value = xPropSet->getPropertyValue(
-                                rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URI")));
+                                OUString("URI"));
                             value >>= uri;
 
                             try
                             {
                                 value = xPropSet->getPropertyValue(
-                                    rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Description")));
+                                    OUString("Description"));
                                 value >>= description;
                             }
                             catch (Exception &) {