remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

8 files changed, 21 insertions, 22 deletions

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index fae113555f12..3376b022de84 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -1144,10 +1144,10 @@ void SdDrawDocument::InitLayoutVector()
         ::comphelper::getProcessComponentContext() );
 
     // get file list from configuration
-    Sequence< rtl::OUString > aFiles(
+    Sequence< OUString > aFiles(
         officecfg::Office::Impress::Misc::LayoutListFiles::get(xContext) );
 
-    rtl::OUString sFilename;
+    OUString sFilename;
     for( sal_Int32 i=0; i < aFiles.getLength(); ++i )
     {
         sFilename = comphelper::getExpandedUri(xContext, aFiles[i]);
@@ -1183,10 +1183,10 @@ void SdDrawDocument::InitObjectVector()
         ::comphelper::getProcessComponentContext() );
 
     // get file list from configuration
-    Sequence< rtl::OUString > aFiles(
+    Sequence< OUString > aFiles(
        officecfg::Office::Impress::Misc::PresObjListFiles::get(xContext) );
 
-    rtl::OUString sFilename;
+    OUString sFilename;
     for( sal_Int32 i=0; i < aFiles.getLength(); ++i )
     {
         sFilename = comphelper::getExpandedUri(xContext, aFiles[i]);
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7646a6063d8d..2415061add75 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -910,7 +910,7 @@ void getPresObjProp( const SdPage& rPage, const char* sObjKind, const char* sPag
             Reference<XNode> objectNode = *aIter;      //get i'th object element
             Reference<XNamedNodeMap> objectattrlist = objectNode->getAttributes();
             Reference<XNode> objectattr = objectattrlist->getNamedItem("type");
-            rtl::OUString sObjType = objectattr->getNodeValue();
+            OUString sObjType = objectattr->getNodeValue();
 
             if (sObjType.equalsAscii(sObjKind))
             {
@@ -920,19 +920,19 @@ void getPresObjProp( const SdPage& rPage, const char* sObjKind, const char* sPag
                 for( int j=0; j< objSize; j++)
                 {
                     Reference<XNode> obj = objectChildren->item(j);
-                    rtl::OUString nodename = obj->getNodeName();
+                    OUString nodename = obj->getNodeName();
 
                     //check whether children is blank 'text-node' or 'object-prop' node
                     if(nodename == "object-prop")
                     {
                         Reference<XNamedNodeMap> ObjAttributes = obj->getAttributes();
                         Reference<XNode> ObjPageKind = ObjAttributes->getNamedItem("pagekind");
-                        rtl::OUString sObjPageKind = ObjPageKind->getNodeValue();
+                        OUString sObjPageKind = ObjPageKind->getNodeValue();
 
                         if (sObjPageKind.equalsAscii(sPageKind))
                         {
                             Reference<XNode> ObjSizeHeight = ObjAttributes->getNamedItem("relative-height");
-                            rtl::OUString sValue = ObjSizeHeight->getNodeValue();
+                            OUString sValue = ObjSizeHeight->getNodeValue();
                             presObjPropValue[0] = sValue.toDouble();
 
                             Reference<XNode> ObjSizeWidth = ObjAttributes->getNamedItem("relative-width");
@@ -1273,9 +1273,9 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
     return aLayouts[ eLayout - AUTOLAYOUT_START ];
 }
 
-static rtl::OUString enumtoString(AutoLayout aut)
+static OUString enumtoString(AutoLayout aut)
 {
-    rtl::OUString retstr;
+    OUString retstr;
     switch (aut)
     {
         case AUTOLAYOUT_TITLE_CONTENT:
@@ -1331,7 +1331,7 @@ static rtl::OUString enumtoString(AutoLayout aut)
     return retstr;
 }
 
-static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* rRectangle ,const rtl::OUString& sLayoutType )
+static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* rRectangle ,const OUString& sLayoutType )
 {
     ::tools::Rectangle aTitleRect;
     ::tools::Rectangle aLayoutRect;
@@ -1373,7 +1373,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
         Reference<XNamedNodeMap> layoutAttrList =layoutNode->getAttributes();
 
         // get the attribute value of layout (i.e it's type)
-        rtl::OUString sLayoutAttName =
+        OUString sLayoutAttName =
             layoutAttrList->getNamedItem("type")->getNodeValue();
         if(sLayoutAttName == sLayoutType)
         {
@@ -1382,7 +1382,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
             const int presobjsize = layoutChildren->getLength();
             for( int j=0; j< presobjsize ; j++)
             {
-                rtl::OUString nodename;
+                OUString nodename;
                 Reference<XNode> presobj = layoutChildren->item(j);
                 nodename=presobj->getNodeName();
 
@@ -1395,7 +1395,7 @@ static void CalcAutoLayoutRectangles( SdPage const & rPage,::tools::Rectangle* r
                     Reference<XNamedNodeMap> presObjAttributes = presobj->getAttributes();
 
                     Reference<XNode> presObjSizeHeight = presObjAttributes->getNamedItem("relative-height");
-                    rtl::OUString sValue = presObjSizeHeight->getNodeValue();
+                    OUString sValue = presObjSizeHeight->getNodeValue();
                     propvalue[0] = sValue.toDouble();
 
                     Reference<XNode> presObjSizeWidth = presObjAttributes->getNamedItem("relative-width");
@@ -1618,7 +1618,7 @@ void SdPage::SetAutoLayout(AutoLayout eLayout, bool bInit, bool bCreate )
 
     ::tools::Rectangle aRectangle[MAX_PRESOBJS];
     const LayoutDescriptor& aDescriptor = GetLayoutDescriptor( meAutoLayout );
-    rtl::OUString sLayoutName( enumtoString(meAutoLayout) );
+    OUString sLayoutName( enumtoString(meAutoLayout) );
     CalcAutoLayoutRectangles( *this, aRectangle, sLayoutName);
 
     std::set< SdrObject* > aUsedPresentationObjects;
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 61f7c3414711..ff2a55a22f80 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -639,7 +639,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
         SfxStyleSheetBase* pSheet = rSourcePool.GetStyleSheetByPositionInIndex( *it );
         if( !pSheet )
             continue;
-        rtl::OUString aName( pSheet->GetName() );
+        OUString aName( pSheet->GetName() );
 
         // now check whether we already have a sheet with the same name
         std::vector<unsigned> aSheetsWithName = GetIndexedStyleSheets().FindPositionsByName(aName);
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 9b002537a849..1e71a03cc8ae 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -138,7 +138,7 @@ OUString SAL_CALL
     if ( pSdView )
     {
         SdDrawDocument& rDoc = pSdView->GetDoc();
-        rtl::OUString sFileName = rDoc.getDocAccTitle();
+        OUString sFileName = rDoc.getDocAccTitle();
         if (sFileName.isEmpty())
         {
             ::sd::DrawDocShell* pDocSh = pSdView->GetDocSh();
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 1c6843de8241..7d34fd8cf1ef 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -165,7 +165,7 @@ OUString SdStartPresentationDlg::GetDisplayName( sal_Int32   nDisplay,
 }
 
 /// Store display index together with name in user data
-sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const rtl::OUString &aName,
+sal_Int32 SdStartPresentationDlg::InsertDisplayEntry(const OUString &aName,
                                                      sal_Int32            nDisplay)
 {
     m_xLBMonitor->append(OUString::number(nDisplay), aName);
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 990431646b7c..fc84f0e8cbb1 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -73,7 +73,7 @@ private:
         MONITOR_NORMAL,
         MONITOR_IS_EXTERNAL,
     };
-    sal_Int32           InsertDisplayEntry(const rtl::OUString &aName,
+    sal_Int32           InsertDisplayEntry(const OUString &aName,
                                            sal_Int32            nDisplay);
     OUString            GetDisplayName( sal_Int32 nDisplay,
                                         DisplayType eType );
diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx
index 67cc62b1392e..4750ee9494d2 100644
--- a/sd/source/ui/sidebar/PanelFactory.cxx
+++ b/sd/source/ui/sidebar/PanelFactory.cxx
@@ -41,7 +41,6 @@
 using namespace css;
 using namespace css::uno;
 using namespace ::sd::framework;
-using ::rtl::OUString;
 
 namespace sd { namespace sidebar {
 
@@ -65,7 +64,7 @@ void SAL_CALL PanelFactory::disposing()
 // XUIElementFactory
 
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
-    const ::rtl::OUString& rsUIElementResourceURL,
+    const OUString& rsUIElementResourceURL,
     const css::uno::Sequence<css::beans::PropertyValue>& rArguments)
 {
     // Process arguments.
diff --git a/sd/source/ui/sidebar/PanelFactory.hxx b/sd/source/ui/sidebar/PanelFactory.hxx
index ad34f1ba4a58..0eee16f580c9 100644
--- a/sd/source/ui/sidebar/PanelFactory.hxx
+++ b/sd/source/ui/sidebar/PanelFactory.hxx
@@ -56,7 +56,7 @@ public:
     // XUIElementFactory
 
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
-        const ::rtl::OUString& rsResourceURL,
+        const OUString& rsResourceURL,
         const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 };