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>

4 files changed, 6 insertions, 6 deletions

diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index b37b6659a443..8b99b8523d77 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -49,7 +49,7 @@ enum PredefinedClrSchemeId {
     Count
 };
 
-static std::map<PredefinedClrSchemeId, rtl::OUString> PredefinedClrNames =
+static std::map<PredefinedClrSchemeId, OUString> PredefinedClrNames =
 {
     //{ dk1,  "dk1" },
     //{ lt1, "lt1" },
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 3d67e49b23c3..b53988e2f908 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -598,8 +598,8 @@ public:
     sal_uInt32   mnTabStyle;
     sal_uInt32   mnTabData;
     sal_uInt32   mnVariousPropertyBits;
-    std::vector< ::rtl::OUString > maItems; // captions for each tab
-    std::vector< ::rtl::OUString > maTabNames; // names for each tab
+    std::vector< OUString > maItems; // captions for each tab
+    std::vector< OUString > maTabNames; // names for each tab
 };
 
 
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index f8fde406d06a..58199fc463f6 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -198,7 +198,7 @@ private:
     OUString            maPrjName;          ///< Name of the VBA project.
     css::uno::Reference< css::container::XNameContainer >
                         mxOleOverridesSink;
-    typedef RefMap< rtl::OUString, VbaModule > VbaModuleMap;
+    typedef RefMap< OUString, VbaModule > VbaModuleMap;
     VbaModuleMap        maModules;
     VbaModuleMap        maModulesByStrm;
 };
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 55e7afedcb50..2bab907e884f 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -101,8 +101,8 @@ struct OOX_DLLPUBLIC ShapeTypeModel
     OptValue< OUString > moGraphicTitle; ///< Title of the graphic.
     OptValue< OUString > moWrapAnchorX;  ///< The base object from which our horizontal positioning should be calculated.
     OptValue< OUString > moWrapAnchorY;  ///< The base object from which our vertical positioning should be calculated.
-    OptValue< ::rtl::OUString > moWrapType;     ///< How to wrap the text around the object
-    OptValue< ::rtl::OUString > moWrapSide;     ///< On which side to wrap the text around the object
+    OptValue< OUString > moWrapType;     ///< How to wrap the text around the object
+    OptValue< OUString > moWrapSide;     ///< On which side to wrap the text around the object
     OUString maVTextAnchor; ///< How the text inside the shape is anchored vertically.
     OUString maWrapDistanceLeft;         ///< Distance from the left side of the shape to the text that wraps around it.
     OUString maWrapDistanceRight;        ///< Distance from the right side of the shape to the text that wraps around it.