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, 125 insertions, 137 deletions

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index b250e8a71eaf..a6533b1898d2 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -56,7 +56,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
 
 
 namespace sd {
@@ -195,7 +194,7 @@ namespace {
         OUString GetPrinterSelection (sal_Int32 nPageCount, sal_Int32 nCurrentPageIndex) const
         {
             sal_Int32 nContent = static_cast<sal_Int32>(mrProperties.getIntValue( "PrintContent", 0 ));
-            OUString sFullRange = ::rtl::OUStringBuffer()
+            OUString sFullRange = OUStringBuffer()
                  .append(static_cast<sal_Int32>(1))
                  .append(static_cast<sal_Unicode>('-'))
                  .append(nPageCount).makeStringAndClear();
@@ -291,8 +290,8 @@ namespace {
 
         const Printer* mpPrinter;
         sal_uLong mnDrawMode;
-        ::rtl::OUString msTimeDate;
-        ::rtl::OUString msPageString;
+        OUString msTimeDate;
+        OUString msPageString;
         Size maPrintSize;
         Size maPageSize;
         Orientation meOrientation;
@@ -343,7 +342,7 @@ namespace {
     */
     void PrintMessage (
         Printer& rPrinter,
-        const ::rtl::OUString& rsPageString,
+        const OUString& rsPageString,
         const Point& rPageStringOffset)
     {
         const Font aOriginalFont (rPrinter.OutputDevice::GetFont());
@@ -397,11 +396,11 @@ namespace {
         {
             // load the writer PrinterOptions into the custom tab
             beans::PropertyValue aOptionsUIFile;
-            aOptionsUIFile.Name = rtl::OUString("OptionsUIFile");
+            aOptionsUIFile.Name = OUString("OptionsUIFile");
             if( mbImpress )
-                aOptionsUIFile.Value <<= rtl::OUString("modules/simpress/ui/printeroptions.ui");
+                aOptionsUIFile.Value <<= OUString("modules/simpress/ui/printeroptions.ui");
             else
-                aOptionsUIFile.Value <<= rtl::OUString("modules/sdraw/ui/printeroptions.ui");
+                aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/printeroptions.ui");
             maProperties.push_back(aOptionsUIFile);
 
             SvtModuleOptions aOpt;
@@ -410,7 +409,7 @@ namespace {
                                            aOpt.GetModuleName( mbImpress ? SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
             AddDialogControl(vcl::PrinterOptionsHelper::setGroupControlOpt("tabcontrol-page2", aAppGroupname, ".HelpID:vcl:PrintDialog:TabPage:AppPage"));
 
-            uno::Sequence< rtl::OUString > aHelpIds, aWidgetIds;
+            uno::Sequence< OUString > aHelpIds, aWidgetIds;
             if( mbImpress )
             {
                 vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
@@ -623,7 +622,7 @@ namespace {
                              );
 
             // create a choice for the content to create
-            rtl::OUString aPrintRangeName( "PrintContent" );
+            OUString aPrintRangeName( "PrintContent" );
             aHelpIds.realloc( 3 );
             aHelpIds[0] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:0" ;
             aHelpIds[1] = ".HelpID:vcl:PrintDialog:PrintContent:RadioButton:1" ;
@@ -656,22 +655,22 @@ namespace {
             maProperties.push_back( aVal );
         }
 
-        Sequence<rtl::OUString> CreateChoice (const sal_uInt16 nResourceId) const
+        Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId) const
         {
             SdResId aResourceId (nResourceId);
             ResStringArray aChoiceStrings (aResourceId);
 
             const sal_uInt32 nCount (aChoiceStrings.Count());
-            Sequence<rtl::OUString> aChoices (nCount);
+            Sequence<OUString> aChoices (nCount);
             for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex)
                 aChoices[nIndex] = aChoiceStrings.GetString(nIndex);
 
             return aChoices;
         }
 
-        Sequence<rtl::OUString> GetSlidesPerPageSequence()
+        Sequence<OUString> GetSlidesPerPageSequence()
         {
-            const Sequence<rtl::OUString> aChoice (
+            const Sequence<OUString> aChoice (
                 CreateChoice(_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
             maSlidesPerPage.clear();
             maSlidesPerPage.push_back(0); // first is using the default
@@ -702,7 +701,7 @@ namespace {
             const PageKind ePageKind,
             const MapMode& rMapMode,
             const bool bPrintMarkedOnly,
-            const ::rtl::OUString& rsPageString,
+            const OUString& rsPageString,
             const Point& rPageStringOffset,
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
@@ -737,7 +736,7 @@ namespace {
         const PageKind mePageKind;
         const MapMode maMap;
         const bool mbPrintMarkedOnly;
-        const ::rtl::OUString msPageString;
+        const OUString msPageString;
         const Point maPageStringOffset;
         const sal_uLong mnDrawMode;
         const Orientation meOrientation;
@@ -758,7 +757,7 @@ namespace {
             const PageKind ePageKind,
             const MapMode& rMapMode,
             const bool bPrintMarkedOnly,
-            const ::rtl::OUString& rsPageString,
+            const OUString& rsPageString,
             const Point& rPageStringOffset,
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
@@ -815,7 +814,7 @@ namespace {
             const PageKind ePageKind,
             const sal_Int32 nGap,
             const bool bPrintMarkedOnly,
-            const ::rtl::OUString& rsPageString,
+            const OUString& rsPageString,
             const Point& rPageStringOffset,
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
@@ -975,7 +974,7 @@ namespace {
             const sal_uInt16 nHandoutPageIndex,
             const ::std::vector<sal_uInt16>& rPageIndices,
             const MapMode& rMapMode,
-            const ::rtl::OUString& rsPageString,
+            const OUString& rsPageString,
             const Point& rPageStringOffset,
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
@@ -999,7 +998,7 @@ namespace {
             SdPage& rHandoutPage (*rDocument.GetSdPage(0, PK_HANDOUT));
 
             Reference< com::sun::star::beans::XPropertySet > xHandoutPage( rHandoutPage.getUnoPage(), UNO_QUERY );
-            const rtl::OUString sPageNumber( "Number" );
+            const OUString sPageNumber( "Number" );
 
             // Collect the page objects of the handout master.
             std::vector<SdrPageObj*> aHandoutPageObjects;
@@ -1120,7 +1119,7 @@ namespace {
         OutlinerPrinterPage (
             OutlinerParaObject* pParaObject,
             const MapMode& rMapMode,
-            const ::rtl::OUString& rsPageString,
+            const OUString& rsPageString,
             const Point& rPageStringOffset,
             const sal_uLong nDrawMode,
             const Orientation eOrientation,
@@ -1499,7 +1498,7 @@ private:
             if (mpOptions->IsDate())
             {
                 aInfo.msTimeDate += GetSdrGlobalData().GetLocaleData()->getDate( Date( Date::SYSTEM ) );
-                aInfo.msTimeDate += ::rtl::OUString((sal_Unicode)' ');
+                aInfo.msTimeDate += OUString((sal_Unicode)' ');
             }
 
             if (mpOptions->IsTime())
@@ -2006,7 +2005,7 @@ private:
             if (mpOptions->IsPrintPageName())
             {
                 rInfo.msPageString = pPage->GetName();
-                rInfo.msPageString += rtl::OUString(sal_Unicode(' '));
+                rInfo.msPageString += OUString(sal_Unicode(' '));
             }
             else
                 rInfo.msPageString = "";
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 466c09b49608..aed500bef3c6 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -84,7 +84,7 @@ GraphicObjectBar::GraphicObjectBar (
     SetUndoManager( pDocShell->GetUndoManager() );
     SetRepeatTarget( mpView );
     SetHelpId( SD_IF_SDDRAWGRAFOBJECTBAR );
-    SetName( rtl::OUString( "Graphic objectbar" ));
+    SetName( OUString( "Graphic objectbar" ));
 }
 
 // -----------------------------------------------------------------------------
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 508a1b63f3a8..ccead8452eb9 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -68,7 +68,6 @@
 #include <svx/svxids.hrc>
 #include <editeng/editerr.hxx>
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -1263,7 +1262,7 @@ void Outliner::SetViewMode (PageKind ePageKind)
         pDrawViewShell->ChangeEditMode(mpImpl->meOriginalEditMode, sal_False);
 
         SetStatusEventHdl(Link());
-        ::rtl::OUString sViewURL;
+        OUString sViewURL;
         switch (ePageKind)
         {
             case PK_STANDARD:
diff --git a/sd/source/ui/view/ToolBarManager.cxx b/sd/source/ui/view/ToolBarManager.cxx
index cc0e64655040..bb427ce30c74 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -67,7 +67,7 @@ private:
 };
 
 
-typedef ::std::vector<rtl::OUString> NameList;
+typedef ::std::vector<OUString> NameList;
 
 /** Store a list of tool bars for each of the tool bar groups.  From
     this the list of requested tool bars is built.
@@ -78,14 +78,14 @@ public:
     ToolBarList (void);
 
     void ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup);
-    void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName);
-    bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const ::rtl::OUString& rsName);
+    void AddToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName);
+    bool RemoveToolBar (sd::ToolBarManager::ToolBarGroup eGroup, const OUString& rsName);
 
     void GetToolBarsToActivate (NameList& rToolBars) const;
     void GetToolBarsToDeactivate (NameList& rToolBars) const;
 
-    void MarkToolBarAsActive (const ::rtl::OUString& rsName);
-    void MarkToolBarAsNotActive (const ::rtl::OUString& rsName);
+    void MarkToolBarAsActive (const OUString& rsName);
+    void MarkToolBarAsNotActive (const OUString& rsName);
     void MarkAllToolBarsAsNotActive (void);
 
 private:
@@ -263,9 +263,9 @@ public:
 
     void ResetToolBars (ToolBarGroup eGroup);
     void ResetAllToolBars (void);
-    void AddToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
+    void AddToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName);
     void AddToolBarShell (ToolBarGroup eGroup, ShellId nToolBarId);
-    void RemoveToolBar (ToolBarGroup eGroup, const ::rtl::OUString& rsToolBarName);
+    void RemoveToolBar (ToolBarGroup eGroup, const OUString& rsToolBarName);
 
     /** Release all tool bar shells and the associated framework tool bars.
         Typically called when the main view shell is being replaced by
@@ -309,7 +309,7 @@ public:
     ToolBarRules& GetToolBarRules (void);
 
 private:
-    const static ::rtl::OUString msToolBarResourcePrefix;
+    const static OUString msToolBarResourcePrefix;
 
     mutable ::osl::Mutex maMutex;
     ViewShellBase& mrBase;
@@ -335,8 +335,8 @@ private:
     sal_uLong mnPendingSetValidCall;
     ToolBarRules maToolBarRules;
 
-    ::rtl::OUString GetToolBarResourceName (const ::rtl::OUString& rsBaseName) const;
-    bool CheckPlugInMode (const ::rtl::OUString& rsName) const;
+    OUString GetToolBarResourceName (const OUString& rsBaseName) const;
+    bool CheckPlugInMode (const OUString& rsName) const;
 
     DECL_LINK(UpdateCallback, void *);
     DECL_LINK(EventMultiplexerCallback, sd::tools::EventMultiplexerEvent*);
@@ -347,21 +347,21 @@ private:
 
 //===== ToolBarManager ========================================================
 
-const ::rtl::OUString ToolBarManager::msToolBar("toolbar");
-const ::rtl::OUString ToolBarManager::msOptionsToolBar("optionsbar");
-const ::rtl::OUString ToolBarManager::msCommonTaskToolBar("commontaskbar");
-const ::rtl::OUString ToolBarManager::msViewerToolBar("viewerbar");
-const ::rtl::OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar");
-const ::rtl::OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar");
-const ::rtl::OUString ToolBarManager::msOutlineToolBar("outlinetoolbar");
-const ::rtl::OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar");
-const ::rtl::OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar");
-const ::rtl::OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar");
-const ::rtl::OUString ToolBarManager::msTextObjectBar("textobjectbar");
-const ::rtl::OUString ToolBarManager::msBezierObjectBar("bezierobjectbar");
-const ::rtl::OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar");
-const ::rtl::OUString ToolBarManager::msMediaObjectBar("mediaobjectbar");
-const ::rtl::OUString ToolBarManager::msTableObjectBar("tableobjectbar");
+const OUString ToolBarManager::msToolBar("toolbar");
+const OUString ToolBarManager::msOptionsToolBar("optionsbar");
+const OUString ToolBarManager::msCommonTaskToolBar("commontaskbar");
+const OUString ToolBarManager::msViewerToolBar("viewerbar");
+const OUString ToolBarManager::msSlideSorterToolBar("slideviewtoolbar");
+const OUString ToolBarManager::msSlideSorterObjectBar("slideviewobjectbar");
+const OUString ToolBarManager::msOutlineToolBar("outlinetoolbar");
+const OUString ToolBarManager::msMasterViewToolBar("masterviewtoolbar");
+const OUString ToolBarManager::msDrawingObjectToolBar("drawingobjectbar");
+const OUString ToolBarManager::msGluePointsToolBar("gluepointsobjectbar");
+const OUString ToolBarManager::msTextObjectBar("textobjectbar");
+const OUString ToolBarManager::msBezierObjectBar("bezierobjectbar");
+const OUString ToolBarManager::msGraphicObjectBar("graphicobjectbar");
+const OUString ToolBarManager::msMediaObjectBar("mediaobjectbar");
+const OUString ToolBarManager::msTableObjectBar("tableobjectbar");
 
 
 ::boost::shared_ptr<ToolBarManager> ToolBarManager::Create (
@@ -428,7 +428,7 @@ void ToolBarManager::ResetAllToolBars (void)
 
 void ToolBarManager::AddToolBar (
     ToolBarGroup eGroup,
-    const ::rtl::OUString& rsToolBarName)
+    const OUString& rsToolBarName)
 {
     if (mpImpl.get() != NULL)
     {
@@ -456,7 +456,7 @@ void ToolBarManager::AddToolBarShell (
 
 void ToolBarManager::RemoveToolBar (
     ToolBarGroup eGroup,
-    const ::rtl::OUString& rsToolBarName)
+    const OUString& rsToolBarName)
 {
     if (mpImpl.get() != NULL)
     {
@@ -470,7 +470,7 @@ void ToolBarManager::RemoveToolBar (
 
 void ToolBarManager::SetToolBar (
     ToolBarGroup eGroup,
-    const ::rtl::OUString& rsToolBarName)
+    const OUString& rsToolBarName)
 {
     if (mpImpl.get() != NULL)
     {
@@ -585,7 +585,7 @@ void ToolBarManager::ToolBarsDestroyed(void)
 
 //===== ToolBarManager::Implementation =======================================
 
-const ::rtl::OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/");
+const OUString ToolBarManager::Implementation::msToolBarResourcePrefix("private:resource/toolbar/");
 
 ToolBarManager::Implementation::Implementation (
     ViewShellBase& rBase,
@@ -705,7 +705,7 @@ void ToolBarManager::Implementation::ResetAllToolBars (void)
 
 void ToolBarManager::Implementation::AddToolBar (
     ToolBarGroup eGroup,
-    const ::rtl::OUString& rsToolBarName)
+    const OUString& rsToolBarName)
 {
     ::osl::MutexGuard aGuard(maMutex);
 
@@ -724,7 +724,7 @@ void ToolBarManager::Implementation::AddToolBar (
 
 void ToolBarManager::Implementation::RemoveToolBar (
     ToolBarGroup eGroup,
-    const ::rtl::OUString& rsToolBarName)
+    const OUString& rsToolBarName)
 {
     ::osl::MutexGuard aGuard(maMutex);
 
@@ -796,9 +796,9 @@ void ToolBarManager::Implementation::PreUpdate (void)
         NameList::const_iterator iToolBar;
         for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
         {
-            ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar));
+            OUString sFullName (GetToolBarResourceName(*iToolBar));
             SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning off tool bar " <<
-                ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+                OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
             mxLayouter->destroyElement(sFullName);
             maToolBarList.MarkToolBarAsNotActive(*iToolBar);
         }
@@ -830,9 +830,9 @@ void ToolBarManager::Implementation::PostUpdate (void)
         NameList::const_iterator iToolBar;
         for (iToolBar=aToolBars.begin(); iToolBar!=aToolBars.end(); ++iToolBar)
         {
-            ::rtl::OUString sFullName (GetToolBarResourceName(*iToolBar));
+            OUString sFullName (GetToolBarResourceName(*iToolBar));
             SAL_INFO("sd.view", OSL_THIS_FUNC << ":    turning on tool bar " <<
-                ::rtl::OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
+                OUStringToOString(sFullName, RTL_TEXTENCODING_UTF8).getStr());
             mxLayouter->requestElement(sFullName);
             maToolBarList.MarkToolBarAsActive(*iToolBar);
         }
@@ -1029,10 +1029,10 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback)
 
 
 
-::rtl::OUString ToolBarManager::Implementation::GetToolBarResourceName (
-    const ::rtl::OUString& rsBaseName) const
+OUString ToolBarManager::Implementation::GetToolBarResourceName (
+    const OUString& rsBaseName) const
 {
-    ::rtl::OUString sToolBarName (msToolBarResourcePrefix);
+    OUString sToolBarName (msToolBarResourcePrefix);
     sToolBarName += rsBaseName;
     return sToolBarName;
 }
@@ -1040,7 +1040,7 @@ IMPL_LINK_NOARG(ToolBarManager::Implementation, SetValidCallback)
 
 
 
-bool ToolBarManager::Implementation::CheckPlugInMode (const ::rtl::OUString& rsName) const
+bool ToolBarManager::Implementation::CheckPlugInMode (const OUString& rsName) const
 {
     bool bValid (false);
 
@@ -1400,7 +1400,7 @@ void ToolBarList::ClearGroup (sd::ToolBarManager::ToolBarGroup eGroup)
 
 void ToolBarList::AddToolBar (
     sd::ToolBarManager::ToolBarGroup eGroup,
-    const ::rtl::OUString& rsName)
+    const OUString& rsName)
 {
     Groups::iterator iGroup (maGroups.find(eGroup));
     if (iGroup == maGroups.end())
@@ -1422,7 +1422,7 @@ void ToolBarList::AddToolBar (
 
 bool ToolBarList::RemoveToolBar (
     sd::ToolBarManager::ToolBarGroup eGroup,
-    const ::rtl::OUString& rsName)
+    const OUString& rsName)
 {
     Groups::iterator iGroup (maGroups.find(eGroup));
     if (iGroup != maGroups.end())
@@ -1496,7 +1496,7 @@ void ToolBarList::GetToolBarsToDeactivate (NameList& rToolBars) const
 
 
 
-void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName)
+void ToolBarList::MarkToolBarAsActive (const OUString& rsName)
 {
     maActiveToolBars.push_back(rsName);
 }
@@ -1504,7 +1504,7 @@ void ToolBarList::MarkToolBarAsActive (const ::rtl::OUString& rsName)
 
 
 
-void ToolBarList::MarkToolBarAsNotActive (const ::rtl::OUString& rsName)
+void ToolBarList::MarkToolBarAsNotActive (const OUString& rsName)
 {
     maActiveToolBars.erase(
         ::std::find(maActiveToolBars.begin(),maActiveToolBars.end(), rsName));
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index 1f3597a3267a..867fa2a8bc68 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -74,7 +74,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable)
     {
         do
         {
-            const std::vector<rtl::OUString> &rBookmarks = rTransferable.GetPageBookmarks();
+            const std::vector<OUString> &rBookmarks = rTransferable.GetPageBookmarks();
 
             if (rBookmarks.empty())
                 break;
@@ -87,7 +87,7 @@ SdPage* ViewClipboard::GetFirstMasterPage (const SdTransferable& rTransferable)
             if (pDocument == NULL)
                 break;
 
-            std::vector<rtl::OUString>::const_iterator pIter;
+            std::vector<OUString>::const_iterator pIter;
             for ( pIter = rBookmarks.begin(); pIter != rBookmarks.end(); ++pIter )
             {
                 String sName (*pIter);
@@ -207,7 +207,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
     sal_Bool bMergeMasterPages = !rTransferable.HasSourceDoc( &rDoc );
 
     // Prepare the insertion.
-    const std::vector<rtl::OUString> *pBookmarkList = NULL;
+    const std::vector<OUString> *pBookmarkList = NULL;
     DrawDocShell* pDataDocSh;
     if (rTransferable.HasPageBookmarks())
     {
@@ -238,7 +238,7 @@ sal_uInt16 ViewClipboard::InsertSlides (
             pWin->LeaveWait();
 
         rDoc.InsertBookmarkAsPage(
-            pBookmarkList ? *pBookmarkList : std::vector<rtl::OUString>(),
+            pBookmarkList ? *pBookmarkList : std::vector<OUString>(),
             NULL,
             sal_False,
             sal_False,
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 0cd5c67b7902..37c39bec67e1 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -87,7 +87,6 @@ using namespace sd;
 #include "sdslots.hxx"
 
 using ::sd::framework::FrameworkHelper;
-using ::rtl::OUString;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::container;
@@ -177,8 +176,8 @@ public:
     */
     void SetPaneVisibility (
         const SfxRequest& rRequest,
-        const ::rtl::OUString& rsPaneURL,
-        const ::rtl::OUString& rsViewURL);
+        const OUString& rsPaneURL,
+        const OUString& rsViewURL);
 
     void GetSlotState (SfxItemSet& rSet);
 
@@ -301,7 +300,7 @@ ViewShellBase::~ViewShellBase (void)
 
 
 
-void ViewShellBase::LateInit (const ::rtl::OUString& rsDefaultView)
+void ViewShellBase::LateInit (const OUString& rsDefaultView)
 {
     StartListening(*GetViewFrame(),sal_True);
     StartListening(*GetDocShell(),sal_True);
@@ -781,7 +780,7 @@ void ViewShellBase::ReadUserDataSequence (
             case ViewShell::ST_NOTES:
             case ViewShell::ST_HANDOUT:
             {
-                ::rtl::OUString sViewURL;
+                OUString sViewURL;
                 switch (PTR_CAST(DrawViewShell, pShell)->GetPageKind())
                 {
                     default:
@@ -1116,9 +1115,9 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
 }
 
 
-::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const ::rtl::OUString& aCmdURL )
+OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL )
 {
-    ::rtl::OUString aLabel;
+    OUString aLabel;
 
     if ( !aCmdURL.isEmpty() ) try
     {
@@ -1128,7 +1127,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
         Reference< XModuleManager2 > xModuleManager( ModuleManager::create(xContext) );
         Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW );
 
-        ::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
+        OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
 
         if( !aModuleIdentifier.isEmpty() )
         {
@@ -1156,7 +1155,7 @@ void ViewShellBase::SetViewTabBar (const ::rtl::Reference<ViewTabBar>& rViewTabB
     return aLabel;
 }
 
-::rtl::OUString ViewShellBase::RetrieveLabelFromCommand( const ::rtl::OUString& aCmdURL ) const
+OUString ViewShellBase::RetrieveLabelFromCommand( const OUString& aCmdURL ) const
 {
     Reference< XFrame > xFrame( GetMainViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), UNO_QUERY );
     return ImplRetrieveLabelFromCommand( xFrame, aCmdURL );
@@ -1295,8 +1294,8 @@ void ViewShellBase::Implementation::ResizePixel (
 
 void ViewShellBase::Implementation::SetPaneVisibility (
     const SfxRequest& rRequest,
-    const ::rtl::OUString& rsPaneURL,
-    const ::rtl::OUString& rsViewURL)
+    const OUString& rsPaneURL,
+    const OUString& rsViewURL)
 {
     try
     {
@@ -1587,7 +1586,7 @@ void CurrentPageSetter::operator() (bool)
             // Switch to the page last edited by setting the CurrentPage
             // property.
             Reference<beans::XPropertySet> xSet (mrBase.GetController(), UNO_QUERY_THROW);
-            xSet->setPropertyValue (rtl::OUString("CurrentPage"), aPage);
+            xSet->setPropertyValue (OUString("CurrentPage"), aPage);
         }
         catch (const RuntimeException&)
         {
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index 2df51ea80499..109da58163c0 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -1304,7 +1304,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
         if (*iEntry != NULL)
             SAL_INFO("sd.view", OSL_THIS_FUNC << ":    " <<
                 *iEntry << " : " <<
-                ::rtl::OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr());
+                OUStringToOString((*iEntry)->GetName(),RTL_TEXTENCODING_UTF8).getStr());
         else
             SAL_INFO("sd.view", OSL_THIS_FUNC << "     null");
 }
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 167f2f752122..ae0891d90b4c 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
 using ::sd::framework::FrameworkHelper;
 using ::sd::tools::EventMultiplexerEvent;
-using ::rtl::OUString;
 
 namespace sd {
 
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index bd12b3c987be..25eb71a565df 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -117,7 +117,7 @@ TextObjectBar::TextObjectBar (
         }
     }
 
-    SetName( rtl::OUString( "TextObjectBar" ));
+    SetName( OUString( "TextObjectBar" ));
 
     // SetHelpId( SD_IF_SDDRAWTEXTOBJECTBAR );
 }
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index e74f82c81413..c69c2efae8a2 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -232,9 +232,9 @@ void DrawViewShell::SelectionHasChanged (void)
     catch( ::com::sun::star::uno::Exception& )
     {
         OSL_FAIL(
-            OString(rtl::OString("sd::DrawViewShell::SelectionHasChanged(), "
+            OString(OString("sd::DrawViewShell::SelectionHasChanged(), "
                     "exception caught: ") +
-            rtl::OUStringToOString(
+            OUStringToOString(
                 comphelper::anyToString( cppu::getCaughtException() ),
                 RTL_TEXTENCODING_UTF8 )).getStr() );
     }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 77a1c2acdcf2..d9cee3c2af1f 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -401,7 +401,7 @@ void  DrawViewShell::ExecCtrl(SfxRequest& rReq)
 
                 if (pBookmark)
                 {
-                    rtl::OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET));
+                    OUString sBookmark(INetURLObject::decode(pBookmark->GetValue(), '%', INetURLObject::DECODE_WITH_CHARSET));
 
                     rtl::Reference< sd::SlideShow > xSlideshow( SlideShow::GetSlideShow( GetViewShellBase() ) );
                     if(xSlideshow.is() && xSlideshow->isRunning())
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 64100504a41f..d3651b09568e 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -80,7 +80,6 @@
 #include "fubullet.hxx"
 #include "fuformatpaintbrush.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index b75289e456d3..840979562272 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -352,7 +352,7 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind)
 
     mbIsRulerDrag = sal_False;
 
-    rtl::OUString aName( "DrawViewShell" );
+    OUString aName( "DrawViewShell" );
     SetName (aName);
 
     mnLockCount = 0UL;
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 969ac97cf826..02d9cbecc531 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -94,7 +94,6 @@
 #include "Window.hxx"
 #include "fuformatpaintbrush.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::presentation;
diff --git a/sd/source/ui/view/drviewsf.cxx b/sd/source/ui/view/drviewsf.cxx
index aa5ced7823f0..3e1a3af3dad1 100644
--- a/sd/source/ui/view/drviewsf.cxx
+++ b/sd/source/ui/view/drviewsf.cxx
@@ -58,7 +58,6 @@
 #include "cfgids.hxx"
 #include "anminfo.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 
 namespace sd {
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index cc563af5f3f7..5e7a88b59a3a 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::std;
-using ::rtl::OUString;
 
 namespace sd {
 
@@ -94,7 +93,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
                 {
                     nSdViewShellCount++;
 
-                    ::rtl::OUString sViewURL;
+                    OUString sViewURL;
                     Reference<drawing::framework::XView> xView (
                         framework::FrameworkHelper::Instance(*pBase)->GetView(
                             drawing::framework::ResourceId::create(
@@ -390,7 +389,7 @@ EditMode FrameView::GetViewShEditModeOnLoad (void) const
 
 static OUString createHelpLinesString( const SdrHelpLineList& rHelpLines )
 {
-    ::rtl::OUStringBuffer aLines;
+    OUStringBuffer aLines;
 
     const sal_uInt16 nCount = rHelpLines.GetCount();
     for( sal_uInt16 nHlpLine = 0; nHlpLine < nCount; nHlpLine++ )
@@ -510,11 +509,11 @@ void FrameView::WriteUserDataSequence ( ::com::sun::star::uno::Sequence < ::com:
 }
 #undef addValue
 
-static void createHelpLinesFromString( const rtl::OUString& rLines, SdrHelpLineList& rHelpLines )
+static void createHelpLinesFromString( const OUString& rLines, SdrHelpLineList& rHelpLines )
 {
     const sal_Unicode * pStr = rLines.getStr();
     SdrHelpLine aNewHelpLine;
-    rtl::OUStringBuffer sBuffer;
+    OUStringBuffer sBuffer;
 
     while( *pStr )
     {
@@ -583,7 +582,7 @@ void FrameView::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence < :
         sal_Bool bBool = sal_False;
         sal_Int32 nInt32 = 0;
         sal_Int16 nInt16 = 0;
-        rtl::OUString aString;
+        OUString aString;
 
         sal_Int32 aSnapGridWidthXNum = GetSnapGridWidthX().GetNumerator();
         sal_Int32 aSnapGridWidthXDom = GetSnapGridWidthX().GetDenominator();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 1da13815f082..595886d3b07d 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -84,7 +84,6 @@
 #include "DrawController.hxx"
 #include "framework/FrameworkHelper.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 9758fc94f57e..25c6ff0d8a1e 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -70,7 +70,6 @@
 #include "undo/undomanager.hxx"
 #include "stlsheet.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 2bc148a4c1c9..a2a467cc4622 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -56,7 +56,6 @@
 using namespace sd;
 #include "sdslots.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::beans;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 3d804aed035f..eece2095344e 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -757,7 +757,7 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar
                         if( PickObj( aPos, getHitTolLog(), pPickObj, pPageView ) )
                         {
                             // insert as clip action => jump
-                            rtl::OUString       aBookmark( aINetBookmark.GetURL() );
+                            OUString       aBookmark( aINetBookmark.GetURL() );
                             SdAnimationInfo*    pInfo = mrDoc.GetAnimationInfo( pPickObj );
                             sal_Bool                bCreated = sal_False;
 
@@ -841,20 +841,20 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
     if( pPageObjsTransferable && aDataHelper.GetINetBookmark( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, aINetBookmark ) )
     {
         Point   aPos;
-        rtl::OUString  aBookmark;
+        OUString  aBookmark;
         SdPage* pPage = (SdPage*) GetSdrPageView()->GetPage();
         sal_uInt16  nPgPos = 0xFFFF;
 
         if( pSdNavigatorDropEvent->mpTargetWindow )
             aPos = pSdNavigatorDropEvent->mpTargetWindow->PixelToLogic( pSdNavigatorDropEvent->maPosPixel );
 
-        const rtl::OUString aURL( aINetBookmark.GetURL() );
+        const OUString aURL( aINetBookmark.GetURL() );
         sal_Int32 nIndex = aURL.indexOf( (sal_Unicode)'#' );
         if( nIndex != -1 )
             aBookmark = aURL.copy( nIndex+1 );
 
-        std::vector<rtl::OUString> aExchangeList;
-        std::vector<rtl::OUString> aBookmarkList(1,aBookmark);
+        std::vector<OUString> aExchangeList;
+        std::vector<OUString> aBookmarkList(1,aBookmark);
 
         if( !pPage->IsMasterPage() )
         {
@@ -889,8 +889,8 @@ IMPL_LINK( View, ExecuteNavigatorDrop, SdNavigatorDropEvent*, pSdNavigatorDropEv
     return 0;
 }
 
-bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
-                            std::vector<rtl::OUString> &rBookmarkList,
+bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
+                            std::vector<OUString> &rBookmarkList,
                             const sal_uInt16 nType)
 {
     assert(rExchangeList.empty());
@@ -898,7 +898,7 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
     bool bListIdentical = true; ///< Bookmark list and exchange list are identical
     bool bNameOK = true;        ///< name is unique
 
-    std::vector<rtl::OUString>::const_iterator pIter;
+    std::vector<OUString>::const_iterator pIter;
     for ( pIter = rBookmarkList.begin(); bNameOK && pIter != rBookmarkList.end(); ++pIter )
     {
         String aNewName = *pIter;
@@ -910,8 +910,8 @@ bool View::GetExchangeList (std::vector<rtl::OUString> &rExchangeList,
         {
             if( mrDoc.GetObj( aNewName ) )
             {
-                rtl::OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP));
-                rtl::OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
+                OUString aTitle(SD_RESSTR(STR_TITLE_NAMEGROUP));
+                OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 AbstractSvxNameDialog* pDlg = 0;
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 7d6bf5e696c9..cc201163496d 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -328,7 +328,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
             {
                 xStm->Seek( 0 );
 
-                rtl::OString aLine;
+                OString aLine;
                 while (xStm->ReadLine(aLine))
                 {
                     sal_Int32 x = aLine.indexOf( "\\trowd" );
@@ -785,7 +785,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
     }
     else if( CHECK_FORMAT_TRANS( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE ) )
     {
-        ::rtl::OUString aOUString;
+        OUString aOUString;
 
         if( aDataHelper.GetString( SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE, aOUString ) )
         {
@@ -867,7 +867,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
             }
             else
             {
-                ::rtl::OUString aName;
+                OUString aName;
                 uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer().InsertEmbeddedObject( xStm, aName );
                 if ( xObj.is() )
                 {
@@ -995,7 +995,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
             if ( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR_OLE, aObjDesc ) )
             {
                 uno::Reference < embed::XEmbeddedObject > xObj;
-                ::rtl::OUString aName;
+                OUString aName;
 
                 if ( aDataHelper.GetInputStream( nFormat ? nFormat : SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, xStm ) ||
                     aDataHelper.GetInputStream( SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, xStm ) )
@@ -1402,7 +1402,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper,
               !aDataHelper.HasFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK ) &&
               !aDataHelper.HasFormat( SOT_FORMATSTR_ID_FILENAME ) ) )
         {
-            ::rtl::OUString aOUString;
+            OUString aOUString;
 
             if( aDataHelper.GetString( FORMAT_STRING, aOUString ) )
             {
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index a58b387b141d..075cf79074be 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -261,11 +261,11 @@ SdrGrafObj* View::InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction,
 
 // -----------------------------------------------------------------------------
 
-SdrMediaObj* View::InsertMediaURL( const rtl::OUString& rMediaURL, sal_Int8& rAction,
+SdrMediaObj* View::InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction,
                                    const Point& rPos, const Size& rSize,
                                    bool const bLink )
 {
-    ::rtl::OUString realURL;
+    OUString realURL;
     if (bLink)
     {
         realURL = rMediaURL;
@@ -368,7 +368,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
 
         if( aURL.GetProtocol() == INET_PROT_NOT_VALID )
         {
-            rtl::OUString aURLStr;
+            OUString aURLStr;
             ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aCurrentDropFile, aURLStr );
             aURL = INetURLObject( aURLStr );
         }
@@ -404,7 +404,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
 
                 if( pFoundFilter && !nErr )
                 {
-                    ::std::vector< ::rtl::OUString > aFilterVector;
+                    ::std::vector< OUString > aFilterVector;
                     const String            aFilterName( pFoundFilter->GetFilterName() );
                     String                  aLowerAsciiFileName( aCurrentDropFile );
                     aLowerAsciiFileName.ToLowerAscii();
@@ -466,10 +466,10 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
                     try
                     {
                         //TODO/MBA: testing
-                        ::rtl::OUString aName;
+                        OUString aName;
                         uno::Sequence < beans::PropertyValue > aMedium(1);
                         aMedium[0].Name = "URL" ;
-                        aMedium[0].Value <<=  ::rtl::OUString(aCurrentDropFile) ;
+                        aMedium[0].Value <<=  OUString(aCurrentDropFile) ;
 
                         uno::Reference < embed::XEmbeddedObject > xObj = mpDocSh->GetEmbeddedObjectContainer().
                                 InsertEmbeddedObject( aMedium, aName );
diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 4967cfea64de..d02f9c1703bd 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -1040,16 +1040,16 @@ void Window::DropScroll(const Point& rMousePos)
     }
 }
 
-rtl::OUString Window::GetSurroundingText() const
+OUString Window::GetSurroundingText() const
 {
     if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
-        return rtl::OUString();
+        return OUString();
     else if ( mpViewShell->GetView()->IsTextEdit() )
     {
         OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
         return pOLV->GetEditView().GetSurroundingText();
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 Selection Window::GetSurroundingTextSelection() const
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index 08a97b4dd490..068c28483277 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -169,7 +169,7 @@ ModifyPageUndoAction::~ModifyPageUndoAction()
 }
 
 
-rtl::OUString ModifyPageUndoAction::GetComment() const
+OUString ModifyPageUndoAction::GetComment() const
 {
     return maComment;
 }
@@ -205,7 +205,7 @@ void RenameLayoutTemplateUndoAction::Redo()
     mpDoc->RenameLayoutTemplate( aLayoutName, maNewName );
 }
 
-rtl::OUString RenameLayoutTemplateUndoAction::GetComment() const
+OUString RenameLayoutTemplateUndoAction::GetComment() const
 {
     return  maComment;
 }
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 0a9c9de0011a..e834999a5350 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -56,7 +56,6 @@
 #include "drawdoc.hxx"
 #include "smarttag.hxx"
 
-using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
@@ -190,7 +189,7 @@ void ImageButtonHdl::HideTip()
 
 // --------------------------------------------------------------------
 
-extern ::rtl::OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
+extern OUString ImplRetrieveLabelFromCommand( const Reference< XFrame >& xFrame, const OUString& aCmdURL );
 
 void ImageButtonHdl::onMouseEnter(const MouseEvent& rMEvt)
 {
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 69cc2be872a2..6f88cf1b73d6 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -741,14 +741,14 @@ sal_Bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
     SfxViewShell* pViewShell = GetViewShell();
     OSL_ASSERT (pViewShell!=NULL);
     bool bChangeDefaultsForChart = false;
-    rtl::OUString aName;
+    OUString aName;
 
     uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef();
     if ( !xObj.is() )
     {
         // provide OLE object to empty OLE object
         aName = pObj->GetProgName();
-        ::rtl::OUString aObjName;
+        OUString aObjName;
         SvGlobalName aClass;
 
         if( aName == "StarChart"  || aName == "StarOrg" )
@@ -995,8 +995,8 @@ void ViewShell::WriteUserDataSequence ( ::com::sun::star::uno::Sequence <
     sal_uInt16 nViewID (IMPRESS_FACTORY_ID);
     if (GetViewShellBase().GetMainViewShell().get() != NULL)
         nViewID = GetViewShellBase().GetMainViewShell()->mpImpl->GetViewId();
-    rSequence[nIndex].Name = rtl::OUString( sUNO_View_ViewId );
-    rtl::OUStringBuffer sBuffer( "view" );
+    rSequence[nIndex].Name = OUString( sUNO_View_ViewId );
+    OUStringBuffer sBuffer( "view" );
     sBuffer.append( static_cast<sal_Int32>(nViewID));
     rSequence[nIndex].Value <<= sBuffer.makeStringAndClear();
 
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 224e7e52acce..2b1060998376 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -208,7 +208,7 @@ void ViewShell::construct(void)
         mpScrollBarBox.reset(new ScrollBarBox(GetParentWindow(), WB_SIZEABLE));
     }
 
-    rtl::OUString aName( "ViewShell" );
+    OUString aName( "ViewShell" );
     SetName (aName);
 
     GetDoc()->StartOnlineSpelling(sal_False);