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

22 files changed, 64 insertions, 77 deletions

diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index b7ff37ad9171..59e3d126ea2a 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -48,7 +48,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans::PropertyAttribute;
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 048f38d4e579..7067a4f33726 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -39,7 +39,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 
 namespace
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index db85d75bf644..e64a1ea40e13 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0f15ee72ac11..e2157c4f2daa 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -66,7 +66,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 using namespace ::com::sun::star;
@@ -203,12 +202,12 @@ void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
 // private methods
 //-----------------------------------------------------------------
 
-::rtl::OUString ChartModel::impl_g_getLocation()
+OUString ChartModel::impl_g_getLocation()
 {
 
     LifeTimeGuard aGuard(m_aLifeTimeManager);
     if(!aGuard.startApiCall())
-        return ::rtl::OUString(); //behave passive if already disposed or closed or throw exception @todo?
+        return OUString(); //behave passive if already disposed or closed or throw exception @todo?
     //mutex is acquired
     return m_aResource;
 }
@@ -310,9 +309,9 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
 
 APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME)
 
-uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static()
 {
-    uno::Sequence< rtl::OUString > aSNS( 3 );
+    uno::Sequence< OUString > aSNS( 3 );
     aSNS[0] = CHART_MODEL_SERVICE_NAME;
     aSNS[1] = "com.sun.star.document.OfficeDocument";
     aSNS[2] = "com.sun.star.chart.ChartDocument";
@@ -324,7 +323,7 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static()
 // frame::XModel (required interface)
 //-----------------------------------------------------------------
 
-sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL
+sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
         , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
         throw(uno::RuntimeException)
 {
@@ -350,7 +349,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL
     return sal_True;
 }
 
-::rtl::OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException)
+OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException)
 {
     return impl_g_getLocation();
 }
@@ -508,7 +507,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
         if ( xSelectionSupl.is() )
         {
             uno::Any aSel = xSelectionSupl->getSelection();
-            rtl::OUString aObjectCID;
+            OUString aObjectCID;
             if( aSel >>= aObjectCID )
                 xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this)));
         }
@@ -1181,8 +1180,8 @@ enum eServiceType
     SERVICE_NAMESPACE_MAP
 };
 
-typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap;
+typedef ::std::map< OUString, enum eServiceType > tServiceNameMap;
+typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap;
 
 tServiceNameMap & lcl_getStaticServiceNameMap()
 {
@@ -1257,7 +1256,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments(
 Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames()
             throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > aResult;
+    uno::Sequence< OUString > aResult;
 
     if( m_xOldModelAgg.is())
     {
@@ -1347,7 +1346,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM
 }
 
 //XDumper
-rtl::OUString SAL_CALL ChartModel::dump()
+OUString SAL_CALL ChartModel::dump()
     throw (uno::RuntimeException)
 {
     uno::Reference< qa::XDumper > xDumper(
@@ -1355,7 +1354,7 @@ rtl::OUString SAL_CALL ChartModel::dump()
     if (xDumper.is())
         return xDumper->dump();
 
-    return rtl::OUString();
+    return OUString();
 }
 
 }  // namespace chart
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 1af220bce72b..f7d81b8dff92 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -122,7 +122,7 @@ private:
     sal_Int32               m_nInLoad;
     sal_Bool volatile       m_bUpdateNotificationsPending;
 
-    ::rtl::OUString                                                             m_aResource;
+    OUString                                                             m_aResource;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >   m_aMediaDescriptor;
     ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties;
     ::rtl::Reference< UndoManager >                                             m_pUndoManager;
@@ -174,7 +174,7 @@ private:
 private:
     //private methods
 
-    ::rtl::OUString impl_g_getLocation();
+    OUString impl_g_getLocation();
 
     sal_Bool
         impl_isControllerConnected( const com::sun::star::uno::Reference<
@@ -248,12 +248,12 @@ public:
     //-----------------------------------------------------------------
 
     virtual sal_Bool SAL_CALL
-        attachResource( const ::rtl::OUString& rURL
+        attachResource( const OUString& rURL
                             , const ::com::sun::star::uno::Sequence<
                             ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
                             throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
         getURL()            throw (::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
@@ -346,7 +346,7 @@ public:
     virtual sal_Bool SAL_CALL
         hasLocation()       throw (::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
         getLocation()       throw (::com::sun::star::uno::RuntimeException);
 
     virtual sal_Bool SAL_CALL
@@ -357,14 +357,14 @@ public:
                             , ::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL
-        storeAsURL( const ::rtl::OUString& rURL
+        storeAsURL( const OUString& rURL
                             , const ::com::sun::star::uno::Sequence<
                             ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
                             throw (::com::sun::star::io::IOException
                             , ::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL
-        storeToURL( const ::rtl::OUString& rURL
+        storeToURL( const OUString& rURL
                             , const ::com::sun::star::uno::Sequence<
                             ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
                             throw (::com::sun::star::io::IOException
@@ -468,7 +468,7 @@ public:
         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUsedRangeRepresentations()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData()
         throw (::com::sun::star::uno::RuntimeException);
@@ -534,13 +534,13 @@ public:
 
     // ____ XMultiServiceFactory ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        createInstance( const ::rtl::OUString& aServiceSpecifier )
+        createInstance( const OUString& aServiceSpecifier )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-        createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier
+        createInstanceWithArguments( const OUString& ServiceSpecifier
                                    , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
             throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XStorageBasedDocument ____
@@ -602,7 +602,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // XDumper
-    virtual rtl::OUString SAL_CALL dump()
+    virtual OUString SAL_CALL dump()
         throw (com::sun::star::uno::RuntimeException);
 };
 
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 2bc5cde61bf1..2984fdb8c944 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -58,7 +58,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 namespace
@@ -223,7 +222,7 @@ sal_Bool SAL_CALL ChartModel::hasLocation()
     return !m_aResource.isEmpty();
 }
 
-::rtl::OUString SAL_CALL ChartModel::getLocation()
+OUString SAL_CALL ChartModel::getLocation()
     throw(uno::RuntimeException)
 {
     return impl_g_getLocation();
@@ -244,7 +243,7 @@ void SAL_CALL ChartModel::store()
     if(!aGuard.startApiCall(sal_True)) //start LongLastingCall
         return; //behave passive if already disposed or closed or throw exception @todo?
 
-    ::rtl::OUString aLocation = m_aResource;
+    OUString aLocation = m_aResource;
 
     if( aLocation.isEmpty() )
         throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this));
@@ -259,7 +258,7 @@ void SAL_CALL ChartModel::store()
 }
 
 void SAL_CALL ChartModel::storeAsURL(
-    const ::rtl::OUString& rURL,
+    const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
     throw(io::IOException, uno::RuntimeException)
 {
@@ -285,7 +284,7 @@ void SAL_CALL ChartModel::storeAsURL(
 }
 
 void SAL_CALL ChartModel::storeToURL(
-    const ::rtl::OUString& rURL,
+    const OUString& rURL,
     const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
     throw(io::IOException,
           uno::RuntimeException)
@@ -618,7 +617,7 @@ void ChartModel::impl_loadGraphics(
 
         if( xGraphicsStorage.is() )
         {
-            const uno::Sequence< ::rtl::OUString > aElementNames(
+            const uno::Sequence< OUString > aElementNames(
                 xGraphicsStorage->getElementNames() );
 
             for( int i = 0; i < aElementNames.getLength(); ++i )
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 2537dba9f869..bcd7c4b02b75 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -37,7 +37,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 // ____________________________________________________________
 
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index fb11ece86a93..de4f0b6e62f4 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -77,7 +77,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "TransparencyGradientName",
                   PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
@@ -85,7 +85,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "GradientName",
                   PROP_DATAPOINT_GRADIENT_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
@@ -101,7 +101,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "HatchName",
                   PROP_DATAPOINT_HATCH_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
@@ -109,7 +109,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "FillBitmapName",
                   PROP_DATAPOINT_FILL_BITMAP_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID  ));
@@ -144,7 +144,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "BorderDashName",
                   PROP_DATAPOINT_BORDER_DASH_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
     rOutProperties.push_back(
@@ -177,7 +177,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "LineDashName",
                   LineProperties::PROP_LINE_DASH_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID ));
 
@@ -277,7 +277,7 @@ void DataPointProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "LabelSeparator",
                   PROP_DATAPOINT_LABEL_SEPARATOR,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
@@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap(
             sal_False  // ShowLegendSymbol
             ));
 
-    PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " );
+    PropertyHelper::setPropertyValueDefault< OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " );
 
     //@todo maybe choose a different one here -> should be dynamically that of the attached axis
     PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >());
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index c292e1822a5f..e6632ec7e235 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -38,7 +38,6 @@ using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 // ----------------------------------------
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 74ca6183f34c..5a270fcbddac 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -29,7 +29,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Reference;
 
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 1d0295a6c8a6..ec1637ba1f51 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -47,7 +47,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans::PropertyAttribute;
 
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index e21beed575df..9505b33d8d0e 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -27,7 +27,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -127,14 +126,14 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
 }
 
 // ____ XFormattedString ____
-::rtl::OUString SAL_CALL FormattedString::getString()
+OUString SAL_CALL FormattedString::getString()
     throw (uno::RuntimeException)
 {
     MutexGuard aGuard( GetMutex());
     return m_aString;
 }
 
-void SAL_CALL FormattedString::setString( const ::rtl::OUString& String )
+void SAL_CALL FormattedString::setString( const OUString& String )
     throw (uno::RuntimeException)
 {
     {
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 4f88a7af8996..c88fff0b21f1 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -68,9 +68,9 @@ protected:
     explicit FormattedString( const FormattedString & rOther );
 
     // ____ XFormattedString ____
-    virtual ::rtl::OUString SAL_CALL getString()
+    virtual OUString SAL_CALL getString()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setString( const ::rtl::OUString& String )
+    virtual void SAL_CALL setString( const OUString& String )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ OPropertySet ____
@@ -114,7 +114,7 @@ protected:
     void fireModifyEvent();
 
 private:
-    ::rtl::OUString m_aString;
+    OUString m_aString;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
 };
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index b810fe19febe..fd713a9aa5f2 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -35,7 +35,6 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 // ____________________________________________________________
 
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 5edead84c863..2173f933c7be 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -39,7 +39,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans::PropertyAttribute;
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 050bbc05590b..5728f9c26fef 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -220,9 +220,9 @@ void PageBackground::fireModifyEvent()
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = "com.sun.star.chart2.PageBackground";
     aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index df77dd7a8e8a..f50c7b31cd7f 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
@@ -58,13 +57,13 @@ PolarCoordinateSystem::~PolarCoordinateSystem()
 {}
 
 // ____ XCoordinateSystem ____
-::rtl::OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType()
+OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType()
     throw (RuntimeException)
 {
     return CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
 }
 
-::rtl::OUString SAL_CALL PolarCoordinateSystem::getViewServiceName()
+OUString SAL_CALL PolarCoordinateSystem::getViewServiceName()
     throw (RuntimeException)
 {
     return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME;
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index ce97bd7db4b7..02d63f9bc7ef 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -232,9 +232,9 @@ void StockBar::fireModifyEvent()
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static()
+uno::Sequence< OUString > StockBar::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = "com.sun.star.chart2.StockBar";
     aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index c9ed149d4d9f..bd127e899ed9 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -373,9 +373,9 @@ void Title::fireModifyEvent()
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static()
+uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 4 );
+    uno::Sequence< OUString > aServices( 4 );
     aServices[ 0 ] = "com.sun.star.chart2.Title";
     aServices[ 1 ] = "com.sun.star.style.ParagraphProperties";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 82aae3668aea..4809510fbd45 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -143,7 +143,7 @@ namespace chart
         void UndoManager_Impl::checkDisposed_lck()
         {
             if ( m_bDisposed )
-                throw DisposedException( ::rtl::OUString(), getThis() );
+                throw DisposedException( OUString(), getThis() );
         }
 
         //==============================================================================================================
@@ -240,7 +240,7 @@ namespace chart
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException)
+    void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException)
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard );
@@ -300,28 +300,28 @@ namespace chart
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    OUString SAL_CALL UndoManager::getCurrentUndoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getCurrentUndoActionTitle();
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
+    OUString SAL_CALL UndoManager::getCurrentRedoActionTitle(  ) throw (EmptyUndoStackException, RuntimeException)
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getCurrentRedoActionTitle();
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles(  ) throw (RuntimeException)
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getAllUndoActionTitles();
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles(  ) throw (RuntimeException)
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         return m_pImpl->getUndoHelper().getAllRedoActionTitles();
@@ -395,7 +395,7 @@ namespace chart
     {
         UndoManagerMethodGuard aGuard( *m_pImpl );
         (void)i_parent;
-        throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() );
+        throw NoSupportException( OUString(), m_pImpl->getThis() );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index c261b6c85024..2a1cf3035182 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -58,7 +58,7 @@ namespace chart
         void disposing();
 
         // XUndoManager
-        virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL enterHiddenUndoContext(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL leaveUndoContext(  ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -66,10 +66,10 @@ namespace chart
         virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
         virtual ::sal_Bool SAL_CALL isUndoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::sal_Bool SAL_CALL isRedoPossible(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getCurrentUndoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getCurrentRedoActionTitle(  ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL clear(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL clearRedo(  ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL reset(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index ab4570be985d..cc80cf6351a0 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -223,9 +223,9 @@ void Wall::fireModifyEvent()
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static()
+uno::Sequence< OUString > Wall::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = "com.sun.star.chart2.Wall";
     aServices[ 1 ] = "com.sun.star.beans.PropertySet";
     return aServices;