mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

8 files changed, 70 insertions, 73 deletions

diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 4ceeb870469e..a0d5acc2bc9d 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -36,7 +36,6 @@ using namespace ::cppu                          ;
 using namespace ::osl                           ;
 using namespace ::std                           ;
 
-using rtl::OUString;
 
 //*****************************************************************************************************************
 //  constructor
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 3b0d7a4e2e64..d6733eadd3c5 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -126,7 +126,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
         return;
 
     // unknown module -> no configuration available!
-    ::rtl::OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame);
+    OUString sModuleName = PersistentWindowState::implst_identifyModule(xContext, xFrame);
     if (sModuleName.isEmpty())
         return;
 
@@ -136,7 +136,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
             {
                 if (bRestoreWindowState)
                 {
-                    ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName);
+                    OUString sWindowState = PersistentWindowState::implst_getWindowStateFromConfig(xContext, sModuleName);
                     PersistentWindowState::implst_setWindowStateOnWindow(xWindow,sWindowState);
                     // SAFE -> ----------------------------------
                     WriteGuard aWriteLock(m_aLock);
@@ -156,7 +156,7 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
 
         case css::frame::FrameAction_COMPONENT_DETACHING :
             {
-                ::rtl::OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow);
+                OUString sWindowState = PersistentWindowState::implst_getWindowStateFromWindow(xWindow);
                 PersistentWindowState::implst_setWindowStateOnConfig(xContext, sModuleName, sWindowState);
             }
             break;
@@ -173,10 +173,10 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
 }
 
 //*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                              const css::uno::Reference< css::frame::XFrame >&              xFrame)
 {
-    ::rtl::OUString sModuleName;
+    OUString sModuleName;
 
     css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
         css::frame::ModuleManager::create( rxContext );
@@ -188,25 +188,25 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
-        { sModuleName = ::rtl::OUString(); }
+        { sModuleName = OUString(); }
 
     return sModuleName;
 }
 
 //*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                                                                       const ::rtl::OUString&                                    sModuleName)
+OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+                                                                       const OUString&                                    sModuleName)
 {
-    ::rtl::OUString sWindowState;
+    OUString sWindowState;
 
-    ::rtl::OUStringBuffer sRelPathBuf(256);
+    OUStringBuffer sRelPathBuf(256);
     sRelPathBuf.appendAscii("Office/Factories/*[\"");
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage("org.openoffice.Setup/");
-    ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
+    OUString sPackage("org.openoffice.Setup/");
+    OUString sRelPath = sRelPathBuf.makeStringAndClear();
+    OUString sKey("ooSetupFactoryWindowAttributes");
 
     try
     {
@@ -219,24 +219,24 @@ void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     catch(const css::uno::RuntimeException&)
         { throw; }
     catch(const css::uno::Exception&)
-        { sWindowState = ::rtl::OUString(); }
+        { sWindowState = OUString(); }
 
     return sWindowState;
 }
 
 //*****************************************************************************************************************
 void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                                                          const ::rtl::OUString&                                    sModuleName ,
-                                                          const ::rtl::OUString&                                    sWindowState)
+                                                          const OUString&                                    sModuleName ,
+                                                          const OUString&                                    sWindowState)
 {
-    ::rtl::OUStringBuffer sRelPathBuf(256);
+    OUStringBuffer sRelPathBuf(256);
     sRelPathBuf.appendAscii("Office/Factories/*[\"");
     sRelPathBuf.append     (sModuleName            );
     sRelPathBuf.appendAscii("\"]"                  );
 
-    ::rtl::OUString sPackage("org.openoffice.Setup/");
-    ::rtl::OUString sRelPath = sRelPathBuf.makeStringAndClear();
-    ::rtl::OUString sKey("ooSetupFactoryWindowAttributes");
+    OUString sPackage("org.openoffice.Setup/");
+    OUString sRelPath = sRelPathBuf.makeStringAndClear();
+    OUString sKey("ooSetupFactoryWindowAttributes");
 
     try
     {
@@ -254,9 +254,9 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
 }
 
 //*****************************************************************************************************************
-::rtl::OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
+OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
-    ::rtl::OUString sWindowState;
+    OUString sWindowState;
 
     if (xWindow.is())
     {
@@ -272,7 +272,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
         {
             sal_uLong nMask  =   WINDOWSTATE_MASK_ALL;
                   nMask &= ~(WINDOWSTATE_MASK_MINIMIZED);
-            sWindowState = rtl::OStringToOUString(
+            sWindowState = OStringToOUString(
                             ((SystemWindow*)pWindow)->GetWindowState(nMask),
                             RTL_TEXTENCODING_UTF8);
         }
@@ -285,7 +285,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
 
 //*********************************************************************************************************
 void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow     ,
-                                                          const ::rtl::OUString&                          sWindowState)
+                                                          const OUString&                          sWindowState)
 {
     if (
         (!xWindow.is()                ) ||
@@ -314,9 +314,9 @@ void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Refere
     if (pWorkWindow->IsMinimized())
         return;
 
-    ::rtl::OUString sOldWindowState = ::rtl::OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US );
+    OUString sOldWindowState = OStringToOUString( pSystemWindow->GetWindowState(), RTL_TEXTENCODING_ASCII_US );
     if ( sOldWindowState != sWindowState )
-        pSystemWindow->SetWindowState(rtl::OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
+        pSystemWindow->SetWindowState(OUStringToOString(sWindowState,RTL_TEXTENCODING_UTF8));
     // <- SOLAR SAFE ------------------------
 }
 
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 970be61f5b3d..02df7c03973c 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -55,7 +55,7 @@ StatusIndicator::~StatusIndicator()
 }
 
 //***********************************************
-void SAL_CALL StatusIndicator::start(const ::rtl::OUString& sText ,
+void SAL_CALL StatusIndicator::start(const OUString& sText ,
                                            sal_Int32        nRange)
     throw(css::uno::RuntimeException)
 {
@@ -104,7 +104,7 @@ void SAL_CALL StatusIndicator::reset()
 }
 
 //***********************************************
-void SAL_CALL StatusIndicator::setText(const ::rtl::OUString& sText)
+void SAL_CALL StatusIndicator::setText(const OUString& sText)
     throw(css::uno::RuntimeException)
 {
     // SAFE ->
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 19347ee43177..6a103ad86a4e 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -165,7 +165,7 @@ void SAL_CALL StatusIndicatorFactory::update()
 
 //-----------------------------------------------
 void StatusIndicatorFactory::start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
-                                   const ::rtl::OUString&                                    sText ,
+                                   const OUString&                                    sText ,
                                          sal_Int32                                           nRange)
 {
     // SAFE -> ----------------------------------
@@ -204,7 +204,7 @@ void StatusIndicatorFactory::reset(const css::uno::Reference< css::task::XStatus
     if (pItem != m_aStack.end())
     {
         pItem->m_nValue = 0;
-        pItem->m_sText  = ::rtl::OUString();
+        pItem->m_sText  = OUString();
     }
 
     css::uno::Reference< css::task::XStatusIndicator > xActive   = m_xActiveChild;
@@ -237,7 +237,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn
 
     // activate next child ... or finish the progress if there is no further one.
     m_xActiveChild.clear();
-    ::rtl::OUString                  sText;
+    OUString                  sText;
     sal_Int32                        nValue = 0;
     IndicatorStack::reverse_iterator pNext  = m_aStack.rbegin();
     if (pNext != m_aStack.rend())
@@ -280,7 +280,7 @@ void StatusIndicatorFactory::end(const css::uno::Reference< css::task::XStatusIn
 
 //-----------------------------------------------
 void StatusIndicatorFactory::setText(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
-                                     const ::rtl::OUString&                                    sText )
+                                     const OUString&                                    sText )
 {
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
@@ -431,9 +431,9 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
         bool bForceFrontAndFocus(false);
         ::comphelper::ConfigurationHelper::readDirectKey(
             comphelper::getComponentContext(xSMGR),
-            ::rtl::OUString("org.openoffice.Office.Common/View"),
-            ::rtl::OUString("NewDocumentHandling"),
-            ::rtl::OUString("ForceFocusAndToFront"),
+            OUString("org.openoffice.Office.Common/View"),
+            OUString("NewDocumentHandling"),
+            OUString("ForceFocusAndToFront"),
             ::comphelper::ConfigurationHelper::E_READONLY) >>= bForceFrontAndFocus;
 
         pWindow->Show(sal_True, bForceFrontAndFocus ? SHOW_FOREGROUNDTASK : 0 );
@@ -473,7 +473,7 @@ void StatusIndicatorFactory::impl_createProgress()
             if (xLayoutManager.is())
             {
                 xLayoutManager->lock();
-                rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
+                OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
                 xLayoutManager->createElement( sPROGRESS_RESOURCE );
                 xLayoutManager->hideElement( sPROGRESS_RESOURCE );
 
@@ -520,7 +520,7 @@ void StatusIndicatorFactory::impl_showProgress()
                 // Be sure that we have always a progress. It can be that our frame
                 // was recycled and therefore the progress was destroyed!
                 // CreateElement does nothing if there is already a valid progress.
-                rtl::OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
+                OUString sPROGRESS_RESOURCE(PROGRESS_RESOURCE);
                 xLayoutManager->createElement( sPROGRESS_RESOURCE );
                 xLayoutManager->showElement( sPROGRESS_RESOURCE );
 
@@ -560,7 +560,7 @@ void StatusIndicatorFactory::impl_hideProgress()
             css::uno::Reference< css::frame::XLayoutManager > xLayoutManager;
             xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager;
             if (xLayoutManager.is())
-                xLayoutManager->hideElement( rtl::OUString(PROGRESS_RESOURCE) );
+                xLayoutManager->hideElement( OUString(PROGRESS_RESOURCE) );
         }
     }
 }
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 4c2060545e2b..e8a5334ec1c0 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -158,7 +158,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
     if ( ! xWindow.is() )
         return;
 
-    ::rtl::OUString sApplicationID;
+    OUString sApplicationID;
     try
     {
         // SYNCHRONIZED ->
@@ -170,33 +170,33 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
         css::uno::Reference< css::frame::XModuleManager2 > xModuleManager =
             css::frame::ModuleManager::create( comphelper::getComponentContext(xSMGR) );
 
-        rtl::OUString aModuleId = xModuleManager->identify(xFrame);
-        rtl::OUString sDesktopName;
+        OUString aModuleId = xModuleManager->identify(xFrame);
+        OUString sDesktopName;
 
         if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument")) ||
              aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument")) ||
              aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument")) ||
              aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument")) )
-            sDesktopName = ::rtl::OUString("writer");
+            sDesktopName = OUString("writer");
         else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
-            sDesktopName = ::rtl::OUString("calc");
+            sDesktopName = OUString("calc");
         else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
-            sDesktopName = ::rtl::OUString("impress");
+            sDesktopName = OUString("impress");
         else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
-            sDesktopName = ::rtl::OUString("draw");
+            sDesktopName = OUString("draw");
         else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
-            sDesktopName = ::rtl::OUString("math");
+            sDesktopName = OUString("math");
         else if ( aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign")) ||
                   aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser")) )
-            sDesktopName = ::rtl::OUString("base");
+            sDesktopName = OUString("base");
         else
-            sDesktopName = ::rtl::OUString("startcenter");
+            sDesktopName = OUString("startcenter");
         sApplicationID = utl::ConfigManager::getProductName().toAsciiLowerCase();
-        sApplicationID += ::rtl::OUString(sal_Unicode('-'));
+        sApplicationID += OUString(sal_Unicode('-'));
         sApplicationID += sDesktopName;
     }
     catch(const css::uno::Exception&)
@@ -240,7 +240,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
         rInfo.sID = xModuleManager->identify(xFrame);
         ::comphelper::SequenceAsHashMap lProps    = xModuleManager->getByName (rInfo.sID);
 
-        rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, ::rtl::OUString());
+        rInfo.sUIName = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_UINAME, OUString());
         rInfo.nIcon   = lProps.getUnpackedValueOrDefault (OFFICEFACTORY_PROPNAME_ICON  , INVALID_ICON_ID  );
 
         // Note: If we could retrieve a module id ... everything is OK.
@@ -344,7 +344,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
         pWorkWindow->SetIcon( (sal_uInt16)nIcon );
 
         css::uno::Reference< css::frame::XModel > xModel = xController->getModel();
-        rtl::OUString aURL;
+        OUString aURL;
         if( xModel.is() )
             aURL = xModel->getURL();
         pWorkWindow->SetRepresentedURL( aURL );
@@ -364,7 +364,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
     if ( ! xTitle.is() )
         return;
 
-    const ::rtl::OUString sTitle = xTitle->getTitle ();
+    const OUString sTitle = xTitle->getTitle ();
 
     // VCL SYNCHRONIZED ->
     SolarMutexGuard aSolarGuard;
diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx
index a819f3f91f13..a70340ad22d8 100644
--- a/framework/source/helper/uiconfigelementwrapperbase.cxx
+++ b/framework/source/helper/uiconfigelementwrapperbase.cxx
@@ -49,7 +49,6 @@ const char UIELEMENT_PROPNAME_RESOURCEURL[] = "ResourceURL";
 const char UIELEMENT_PROPNAME_TYPE[] = "Type";
 const char UIELEMENT_PROPNAME_XMENUBAR[] = "XMenuBar";
 const char UIELEMENT_PROPNAME_NOCLOSE[] = "NoClose";
-using ::rtl::OUString;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
@@ -453,14 +452,14 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIConfigE
 
     const com::sun::star::beans::Property pProperties[] =
     {
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE   , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE        , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT     , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR       , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGLISTENER), UIELEMENT_PROPHANDLE_CONFIGLISTENER , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_CONFIGSOURCE), UIELEMENT_PROPHANDLE_CONFIGSOURCE   , ::getCppuType((const Reference< ::com::sun::star::ui::XUIConfigurationManager >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((const Reference< com::sun::star::frame::XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_NOCLOSE), UIELEMENT_PROPHANDLE_NOCLOSE        , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_PERSISTENT), UIELEMENT_PROPHANDLE_PERSISTENT     , ::getCppuType((const sal_Bool*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT  ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_XMENUBAR), UIELEMENT_PROPHANDLE_XMENUBAR       , ::getCppuType((const Reference< com::sun::star::awt::XMenuBar >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
     const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
@@ -483,7 +482,7 @@ void SAL_CALL UIConfigElementWrapperBase::setSettings( const Reference< XIndexAc
 
         if ( m_xConfigSource.is() && m_bPersistent )
         {
-            ::rtl::OUString aResourceURL( m_aResourceURL );
+            OUString aResourceURL( m_aResourceURL );
             Reference< XUIConfigurationManager > xUICfgMgr( m_xConfigSource );
 
             aLock.unlock();
@@ -524,7 +523,7 @@ Reference< XFrame > SAL_CALL UIConfigElementWrapperBase::getFrame() throw (Runti
     return xFrame;
 }
 
-::rtl::OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
+OUString SAL_CALL UIConfigElementWrapperBase::getResourceURL() throw (RuntimeException)
 {
     ResetableGuard aLock( m_aLock );
     return m_aResourceURL;
diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx
index 860d5765003a..071448d37e7f 100644
--- a/framework/source/helper/uielementwrapperbase.cxx
+++ b/framework/source/helper/uielementwrapperbase.cxx
@@ -40,7 +40,6 @@ const char UIELEMENT_PROPNAME_FRAME[] = "Frame";
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
-using ::rtl::OUString;
 
 namespace framework
 {
@@ -131,7 +130,7 @@ throw ( Exception, RuntimeException )
     return xFrame;
 }
 
-::rtl::OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL UIElementWrapperBase::getResourceURL() throw (::com::sun::star::uno::RuntimeException)
 {
     return m_aResourceURL;
 }
@@ -242,9 +241,9 @@ const com::sun::star::uno::Sequence< com::sun::star::beans::Property > UIElement
 
     const com::sun::star::beans::Property pProperties[] =
     {
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
-        com::sun::star::beans::Property( rtl::OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , ::getCppuType((const ::rtl::OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_FRAME), UIELEMENT_PROPHANDLE_FRAME          , ::getCppuType((Reference< XFrame >*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_RESOURCEURL), UIELEMENT_PROPHANDLE_RESOURCEURL    , ::getCppuType((sal_Int16*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY ),
+        com::sun::star::beans::Property( OUString(UIELEMENT_PROPNAME_TYPE), UIELEMENT_PROPHANDLE_TYPE           , ::getCppuType((const OUString*)NULL), com::sun::star::beans::PropertyAttribute::TRANSIENT | com::sun::star::beans::PropertyAttribute::READONLY )
     };
     // Use it to initialize sequence!
     const com::sun::star::uno::Sequence< com::sun::star::beans::Property > lPropertyDescriptor( pProperties, UIELEMENT_PROPCOUNT );
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 4441ae2a9b3e..b8517a451488 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -47,7 +47,7 @@ VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMu
 {
     if (!m_xParentWindow.is())
         throw css::uno::RuntimeException(
-                ::rtl::OUString("Cant work without a parent window!"),
+                OUString("Cant work without a parent window!"),
                 static_cast< css::task::XStatusIndicator* >(this));
 }
 
@@ -57,7 +57,7 @@ VCLStatusIndicator::~VCLStatusIndicator()
 }
 
 //-----------------------------------------------
-void SAL_CALL VCLStatusIndicator::start(const ::rtl::OUString& sText ,
+void SAL_CALL VCLStatusIndicator::start(const OUString& sText ,
                                               sal_Int32        nRange)
     throw(css::uno::RuntimeException)
 {
@@ -117,7 +117,7 @@ void SAL_CALL VCLStatusIndicator::end()
 {
     // SAFE -> ----------------------------------
     WriteGuard aWriteLock(m_aLock);
-    m_sText  = ::rtl::OUString();
+    m_sText  = OUString();
     m_nRange = 0;
     m_nValue = 0;
     aWriteLock.unlock();
@@ -139,7 +139,7 @@ void SAL_CALL VCLStatusIndicator::end()
 }
 
 //-----------------------------------------------
-void SAL_CALL VCLStatusIndicator::setText(const ::rtl::OUString& sText)
+void SAL_CALL VCLStatusIndicator::setText(const OUString& sText)
     throw(css::uno::RuntimeException)
 {
     // SAFE -> ----------------------------------