String cleanup in oox

Change-Id: Ica69f655f3777fe37a51e313218ae12aa7d012a2
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1977
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

20 files changed, 47 insertions, 67 deletions

diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index 3751e4dc0083..9236f93a8541 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -43,7 +43,7 @@ namespace oox { namespace ppt {
 class ExtDrawingFragmentHandler : public ::oox::core::FragmentHandler
 {
 public:
-    ExtDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const ::rtl::OUString& rFragmentPath,
+    ExtDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath,
         const oox::ppt::SlidePersistPtr pSlidePersistPtr,
         const oox::ppt::ShapeLocation eShapeLocation,
         oox::drawingml::ShapePtr pMasterShapePtr,
diff --git a/oox/source/ppt/pptfilterhelpers.hxx b/oox/source/ppt/pptfilterhelpers.hxx
index 3924b2dc4fc4..67efbbf51020 100644
--- a/oox/source/ppt/pptfilterhelpers.hxx
+++ b/oox/source/ppt/pptfilterhelpers.hxx
@@ -86,7 +86,7 @@ namespace oox { namespace ppt {
 
 
     // BEGIN CUT&PASTE from sd pptinanimation.cxx
-    bool convertMeasure( ::rtl::OUString& rString );
+    bool convertMeasure( OUString& rString );
     // END CUT&PASTE from sd pptinanimation.cxx
 
 
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index 11bab219184c..6b62396a8feb 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -31,15 +31,15 @@ using namespace ::com::sun::star;
 using namespace core;
 using namespace drawingml;
 
-::rtl::OUString SAL_CALL ShapeContextHandler_getImplementationName()
+OUString SAL_CALL ShapeContextHandler_getImplementationName()
 {
     return OUString( "com.sun.star.comp.oox.ShapeContextHandler" );
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
 ShapeContextHandler_getSupportedServiceNames()
 {
-    uno::Sequence< ::rtl::OUString > s(1);
+    uno::Sequence< OUString > s(1);
     s[0] = "com.sun.star.xml.sax.FastShapeContextHandler";
     return s;
 }
@@ -154,8 +154,8 @@ void SAL_CALL ShapeContextHandler::startFastElement
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
-    static const ::rtl::OUString sInputStream
-        (RTL_CONSTASCII_USTRINGPARAM ("InputStream"));
+    static const OUString sInputStream
+        ("InputStream");
 
     uno::Sequence<beans::PropertyValue> aSeq(1);
     aSeq[0].Name = sInputStream;
@@ -170,7 +170,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
         if (!msRelationFragmentPath.isEmpty())
         {
             FragmentHandlerRef rFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath));
-            rtl::OUString aThemeFragmentPath = rFragmentHandler->getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "theme" ) );
+            OUString aThemeFragmentPath = rFragmentHandler->getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "theme" ) );
             uno::Reference<xml::sax::XFastSAXSerializable> xDoc(mxFilterBase->importFragment(aThemeFragmentPath), uno::UNO_QUERY_THROW);
             mxFilterBase->importFragment(new ThemeFragmentHandler(*mxFilterBase, aThemeFragmentPath, *mpThemePtr ), xDoc);
             ShapeFilterBase* pShapeFilterBase(dynamic_cast<ShapeFilterBase*>(mxFilterBase.get()));
@@ -193,7 +193,7 @@ void SAL_CALL ShapeContextHandler::startFastElement
 }
 
 void SAL_CALL ShapeContextHandler::startUnknownElement
-(const ::rtl::OUString & Namespace, const ::rtl::OUString & Name,
+(const OUString & Namespace, const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
@@ -216,8 +216,8 @@ void SAL_CALL ShapeContextHandler::endFastElement(::sal_Int32 Element)
 }
 
 void SAL_CALL ShapeContextHandler::endUnknownElement
-(const ::rtl::OUString & Namespace,
- const ::rtl::OUString & Name)
+(const OUString & Namespace,
+ const OUString & Name)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -244,8 +244,8 @@ ShapeContextHandler::createFastChildContext
 
 uno::Reference< xml::sax::XFastContextHandler > SAL_CALL
 ShapeContextHandler::createUnknownChildContext
-(const ::rtl::OUString & Namespace,
- const ::rtl::OUString & Name,
+(const OUString & Namespace,
+ const OUString & Name,
  const uno::Reference< xml::sax::XFastAttributeList > & Attribs)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
@@ -258,7 +258,7 @@ ShapeContextHandler::createUnknownChildContext
     return uno::Reference< xml::sax::XFastContextHandler >();
 }
 
-void SAL_CALL ShapeContextHandler::characters(const ::rtl::OUString & aChars)
+void SAL_CALL ShapeContextHandler::characters(const OUString & aChars)
     throw (uno::RuntimeException, xml::sax::SAXException)
 {
     uno::Reference<XFastContextHandler> xContextHandler(getContextHandler());
@@ -296,10 +296,10 @@ ShapeContextHandler::getShape() throw (uno::RuntimeException)
             else
             {
                 // Prerendered diagram output is available, then use that, and throw away the original result.
-                for (std::vector<rtl::OUString>::const_iterator aIt = mpShape->getExtDrawings().begin(); aIt != mpShape->getExtDrawings().end(); ++aIt)
+                for (std::vector<OUString>::const_iterator aIt = mpShape->getExtDrawings().begin(); aIt != mpShape->getExtDrawings().end(); ++aIt)
                 {
                     DiagramGraphicDataContext* pDiagramGraphicDataContext = dynamic_cast<DiagramGraphicDataContext*>(mxDiagramShapeContext.get());
-                    rtl::OUString aFragmentPath(pDiagramGraphicDataContext->getFragmentPathFromRelId(*aIt));
+                    OUString aFragmentPath(pDiagramGraphicDataContext->getFragmentPathFromRelId(*aIt));
                     oox::drawingml::ShapePtr pShapePtr( new Shape( "com.sun.star.drawing.GroupShape" ) );
                     mxFilterBase->importFragment(new ShapeDrawingFragmentHandler(*mxFilterBase, aFragmentPath, pShapePtr));
                     pShapePtr->addShape( *mxFilterBase, mpThemePtr.get(), xShapes, aMatrix );
@@ -365,14 +365,14 @@ void SAL_CALL ShapeContextHandler::setInputStream
     mxInputStream = the_value;
 }
 
-::rtl::OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
+OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath()
     throw (uno::RuntimeException)
 {
     return msRelationFragmentPath;
 }
 
 void SAL_CALL ShapeContextHandler::setRelationFragmentPath
-(const ::rtl::OUString & the_value)
+(const OUString & the_value)
     throw (uno::RuntimeException)
 {
     msRelationFragmentPath = the_value;
@@ -390,22 +390,22 @@ void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) thro
 
 }
 
-::rtl::OUString ShapeContextHandler::getImplementationName()
+OUString ShapeContextHandler::getImplementationName()
     throw (css::uno::RuntimeException)
 {
     return ShapeContextHandler_getImplementationName();
 }
 
-uno::Sequence< ::rtl::OUString > ShapeContextHandler::getSupportedServiceNames()
+uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
     throw (css::uno::RuntimeException)
 {
     return ShapeContextHandler_getSupportedServiceNames();
 }
 
 ::sal_Bool SAL_CALL ShapeContextHandler::supportsService
-(const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException)
+(const OUString & ServiceName) throw (css::uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aSeq = getSupportedServiceNames();
+    uno::Sequence< OUString > aSeq = getSupportedServiceNames();
 
     if (aSeq[0].equals(ServiceName))
         return sal_True;
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 6128bc534bf3..f8cdcb77bfc0 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -38,7 +38,7 @@ public:
     typedef boost::shared_ptr<ShapeFragmentHandler> Pointer_t;
 
     explicit ShapeFragmentHandler(core::XmlFilterBase& rFilter,
-                                  const ::rtl::OUString& rFragmentPath )
+                                  const OUString& rFragmentPath )
     : FragmentHandler(rFilter, rFragmentPath)
     {
     }
@@ -55,13 +55,13 @@ public:
     virtual ~ShapeContextHandler();
 
     // ::com::sun::star::lang::XServiceInfo:
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException);
 
     virtual ::sal_Bool SAL_CALL supportsService
-    (const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException);
+    (const OUString & ServiceName) throw (css::uno::RuntimeException);
 
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames() throw (css::uno::RuntimeException);
 
     // ::com::sun::star::xml::sax::XFastContextHandler:
@@ -71,8 +71,8 @@ public:
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
     virtual void SAL_CALL startUnknownElement
-    (const ::rtl::OUString & Namespace,
-     const ::rtl::OUString & Name,
+    (const OUString & Namespace,
+     const OUString & Name,
      const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
@@ -80,8 +80,8 @@ public:
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
     virtual void SAL_CALL endUnknownElement
-    (const ::rtl::OUString & Namespace,
-     const ::rtl::OUString & Name)
+    (const OUString & Namespace,
+     const OUString & Name)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
@@ -92,12 +92,12 @@ public:
 
     virtual css::uno::Reference< css::xml::sax::XFastContextHandler > SAL_CALL
     createUnknownChildContext
-    (const ::rtl::OUString & Namespace,
-     const ::rtl::OUString & Name,
+    (const OUString & Namespace,
+     const OUString & Name,
      const css::uno::Reference< css::xml::sax::XFastAttributeList > & Attribs)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
-    virtual void SAL_CALL characters(const ::rtl::OUString & aChars)
+    virtual void SAL_CALL characters(const OUString & aChars)
         throw (css::uno::RuntimeException, css::xml::sax::SAXException);
 
     // ::com::sun::star::xml::sax::XFastShapeContextHandler:
@@ -125,10 +125,10 @@ public:
     (const css::uno::Reference< css::io::XInputStream > & the_value)
         throw (css::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getRelationFragmentPath()
+    virtual OUString SAL_CALL getRelationFragmentPath()
         throw (css::uno::RuntimeException);
     virtual void SAL_CALL setRelationFragmentPath
-    (const ::rtl::OUString & the_value)
+    (const OUString & the_value)
         throw (css::uno::RuntimeException);
 
     virtual ::sal_Int32 SAL_CALL getStartToken() throw (::com::sun::star::uno::RuntimeException);
@@ -154,7 +154,7 @@ private:
     drawingml::ThemePtr mpThemePtr;
     css::uno::Reference<css::drawing::XDrawPage> mxDrawPage;
     css::uno::Reference<css::io::XInputStream> mxInputStream;
-    ::rtl::OUString msRelationFragmentPath;
+    OUString msRelationFragmentPath;
 
     css::uno::Reference<XFastContextHandler> getGraphicShapeContext(::sal_Int32 Element);
     css::uno::Reference<XFastContextHandler> getDrawingShapeContext();
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 6e2381c24af4..c3f58573dd7c 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -29,7 +29,6 @@
 #include "ShapeDrawingFragmentHandler.hxx"
 
 using namespace com::sun::star;
-using rtl::OUString;
 
 namespace oox { namespace shape {
 
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index e7a8fdd6b976..b43d859ec7e9 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -38,7 +38,7 @@ namespace oox { namespace shape {
 class ShapeDrawingFragmentHandler : public oox::core::FragmentHandler
 {
 public:
-    ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const rtl::OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw();
+    ShapeDrawingFragmentHandler( oox::core::XmlFilterBase& rFilter, const OUString& rFragmentPath, oox::drawingml::ShapePtr pGroupShapePtr ) throw();
     virtual ~ShapeDrawingFragmentHandler() throw();
     virtual void SAL_CALL endDocument() throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
     virtual com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastContextHandler> SAL_CALL createFastChildContext(sal_Int32 Element, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList>& Attribs ) throw (com::sun::star::xml::sax::SAXException, com::sun::star::uno::RuntimeException);
diff --git a/oox/source/shape/ShapeFilterBase.cxx b/oox/source/shape/ShapeFilterBase.cxx
index c1cebda87950..a0694208109d 100644
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -67,9 +67,9 @@ const ::oox::drawingml::table::TableStyleListPtr ShapeFilterBase::getTableStyles
     return new ::oox::ole::VbaProject( getComponentContext(), getModel(), "Writer" );
 }
 
-::rtl::OUString ShapeFilterBase::implGetImplementationName() const
+OUString ShapeFilterBase::implGetImplementationName() const
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
 /// Graphic helper for shapes, that can manage color schemes.
diff --git a/oox/source/shape/ShapeFilterBase.hxx b/oox/source/shape/ShapeFilterBase.hxx
index 13a89eb2c3e5..abdece1c4600 100644
--- a/oox/source/shape/ShapeFilterBase.hxx
+++ b/oox/source/shape/ShapeFilterBase.hxx
@@ -63,7 +63,7 @@ public:
 
 private:
     virtual ::oox::ole::VbaProject* implCreateVbaProject() const;
-    virtual rtl::OUString implGetImplementationName() const;
+    virtual OUString implGetImplementationName() const;
     virtual GraphicHelper* implCreateGraphicHelper() const;
 
     ::boost::shared_ptr< ::oox::drawingml::chart::ChartConverter > mxChartConv;
diff --git a/oox/source/token/namespacemap.cxx b/oox/source/token/namespacemap.cxx
index f5a177248a22..faa9f6b840df 100644
--- a/oox/source/token/namespacemap.cxx
+++ b/oox/source/token/namespacemap.cxx
@@ -33,7 +33,7 @@ NamespaceMap::NamespaceMap()
     };
 
     for( const NamespaceUrl* pNamespaceUrl = spNamespaceUrls; pNamespaceUrl->mnId != -1; ++pNamespaceUrl )
-        operator[]( pNamespaceUrl->mnId ) = ::rtl::OUString::createFromAscii( pNamespaceUrl->mpcUrl );
+        operator[]( pNamespaceUrl->mnId ) = OUString::createFromAscii( pNamespaceUrl->mpcUrl );
 }
 
 }
diff --git a/oox/source/token/propertynames.cxx b/oox/source/token/propertynames.cxx
index 5d7fa452eb8e..2e07636e5083 100644
--- a/oox/source/token/propertynames.cxx
+++ b/oox/source/token/propertynames.cxx
@@ -35,7 +35,7 @@ PropertyNameVector::PropertyNameVector()
     size_t nArraySize = SAL_N_ELEMENTS(sppcPropertyNames) - 1;
     reserve( nArraySize );
     for( size_t nIndex = 0; nIndex < nArraySize; ++nIndex )
-        push_back( ::rtl::OUString::createFromAscii( sppcPropertyNames[ nIndex ] ) );
+        push_back( OUString::createFromAscii( sppcPropertyNames[ nIndex ] ) );
 }
 
 // ============================================================================
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index f32e7396b5f5..bd2657ce007b 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -28,9 +28,6 @@ namespace oox {
 // ============================================================================
 
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OString;
-using ::rtl::OUString;
-
 // ============================================================================
 
 namespace {
@@ -67,7 +64,7 @@ TokenMap::TokenMap() :
         OString aUtf8Name = OUStringToOString( maTokenNames[ nToken ].maUniName, RTL_TEXTENCODING_UTF8 );
         struct xmltoken* pToken = Perfect_Hash::in_word_set( aUtf8Name.getStr(), aUtf8Name.getLength() );
         bOk = pToken && (pToken->nToken == nToken);
-        OSL_ENSURE( bOk, ::rtl::OStringBuffer( "TokenMap::TokenMap - token list broken, #" ).
+        OSL_ENSURE( bOk, OStringBuffer( "TokenMap::TokenMap - token list broken, #" ).
             append( nToken ).append( ", '" ).append( aUtf8Name ).append( '\'' ).getStr() );
     }
 #endif
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index c68f89619ac4..5293e1ec1e31 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
-using ::rtl::OUString;
 
 // ============================================================================
 
diff --git a/oox/source/vml/vmldrawingfragment.cxx b/oox/source/vml/vmldrawingfragment.cxx
index 6b035a4307a7..7bbf4da22fc3 100644
--- a/oox/source/vml/vmldrawingfragment.cxx
+++ b/oox/source/vml/vmldrawingfragment.cxx
@@ -33,8 +33,6 @@ using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 using namespace ::oox::core;
 
-using ::rtl::OUString;
-
 // ============================================================================
 
 DrawingFragment::DrawingFragment( XmlFilterBase& rFilter, const OUString& rFragmentPath, Drawing& rDrawing ) :
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 1af17a3886f7..05940f941281 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -41,8 +41,6 @@ using ::oox::drawingml::FillProperties;
 using ::oox::drawingml::LineArrowProperties;
 using ::oox::drawingml::LineProperties;
 using ::oox::drawingml::ShapePropertyMap;
-using ::rtl::OStringBuffer;
-using ::rtl::OUString;
 using ::com::sun::star::awt::Point;
 using ::com::sun::star::drawing::PolygonFlags;
 using ::com::sun::star::drawing::PolygonFlags_NORMAL;
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 58f01247865d..340d5b22effa 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -34,9 +34,6 @@ namespace vml {
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
-
 // ============================================================================
 
 namespace {
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index b7b1c5ce8ad0..3239151aa0f0 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -72,8 +72,6 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
 using ::oox::core::XmlFilterBase;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 // ============================================================================
 
@@ -584,7 +582,7 @@ Reference<XShape> RectangleShape::implConvertAndInsert(const Reference<XShapes>&
 
     // default: try to create a rectangle shape
     Reference<XShape> xShape = SimpleShape::implConvertAndInsert(rxShapes, rShapeRect);
-    rtl::OUString sArcsize = maTypeModel.maArcsize;
+    OUString sArcsize = maTypeModel.maArcsize;
     if ( !sArcsize.isEmpty( ) )
     {
         sal_Unicode cLastChar = sArcsize[sArcsize.getLength() - 1];
diff --git a/oox/source/vml/vmlshapecontainer.cxx b/oox/source/vml/vmlshapecontainer.cxx
index 4355b115bfcc..5a4c362845ee 100644
--- a/oox/source/vml/vmlshapecontainer.cxx
+++ b/oox/source/vml/vmlshapecontainer.cxx
@@ -31,8 +31,6 @@ using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OUString;
-
 // ============================================================================
 
 namespace {
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx
index 39ac32595a6d..79dac8e963da 100644
--- a/oox/source/vml/vmlshapecontext.cxx
+++ b/oox/source/vml/vmlshapecontext.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
-using ::rtl::OUString;
 
 // ============================================================================
 
@@ -283,7 +282,7 @@ ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& r
     mrTypeModel.maFillModel.moColor = rAttribs.getString( XML_fillcolor );
 
     // For roundrect we may have a arcsize attribute to read
-    mrTypeModel.maArcsize = rAttribs.getString( XML_arcsize,rtl::OUString( ) );
+    mrTypeModel.maArcsize = rAttribs.getString( XML_arcsize,OUString( ) );
 }
 
 ContextHandlerRef ShapeTypeContext::onCreateContext( sal_Int32 nElement, const AttributeList& rAttribs )
@@ -381,8 +380,8 @@ void ShapeTypeContext::setStyle( const OUString& rStyle )
             else if( aName == "mso-fit-shape-to-text" )           mrTypeModel.mbAutoHeight = sal_True;
             else if( aName == "rotation" )       mrTypeModel.maRotation = aValue;
             else if( aName == "flip" )       mrTypeModel.maFlip = aValue;
-            else if( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "visibility" ) ) )
-                mrTypeModel.mbVisible = !aValue.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("hidden") );
+            else if( aName.equalsAscii( "visibility" ) )
+                mrTypeModel.mbVisible = !aValue.equalsAscii( "hidden" );
             else if( aName == "mso-wrap-style" ) mrTypeModel.maWrapStyle = aValue;
         }
     }
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index 4af0a9d67cc0..f3c4102f3def 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -26,8 +26,6 @@
 namespace oox {
 namespace vml {
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using namespace com::sun::star;
 
 TextFontModel::TextFontModel()
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 3755cc7efd5b..9d1c4eee1508 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -30,7 +30,6 @@ namespace vml {
 using ::oox::core::ContextHandler2;
 using ::oox::core::ContextHandler2Helper;
 using ::oox::core::ContextHandlerRef;
-using ::rtl::OUString;
 
 // ============================================================================