8696 files changed, 81125 insertions, 83402 deletions

diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx
index 90b388dcb0c1..36a73658a457 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -65,7 +65,7 @@ FrameGrabber::FrameGrabber( const OUString &rURL ) :
         "uridecodebin uri=%s ! videoconvert ! videoscale ! appsink "
         "name=sink caps=\"video/x-raw,format=RGB,pixel-aspect-ratio=1/1\"",
 #endif
-        rtl::OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
+        OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() );
 
     GError *pError = NULL;
     mpPipeline = gst_parse_launch( pPipelineStr, &pError );
diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx
index 6d23f2004fb2..14fecf3b5253 100644
--- a/avmedia/source/gstreamer/gstplayer.cxx
+++ b/avmedia/source/gstreamer/gstplayer.cxx
@@ -351,7 +351,7 @@ void Player::preparePlaybin( const OUString& rURL, GstElement *pSink )
         else
             mbFakeVideo = false;
 
-        rtl::OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 );
+        OString ascURL = OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 );
         g_object_set( G_OBJECT( mpPlaybin ), "uri", ascURL.getStr() , NULL );
 
         pBus = gst_element_get_bus( mpPlaybin );
diff --git a/avmedia/source/viewer/mediawindowbase_impl.cxx b/avmedia/source/viewer/mediawindowbase_impl.cxx
index 325e6d4fa676..71e57792c64f 100644
--- a/avmedia/source/viewer/mediawindowbase_impl.cxx
+++ b/avmedia/source/viewer/mediawindowbase_impl.cxx
@@ -50,7 +50,7 @@ MediaWindowBaseImpl::~MediaWindowBaseImpl()
 
 // -------------------------------------------------------------------------
 
-uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl::OUString& rURL )
+uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const OUString& rURL )
 {
     uno::Reference< media::XPlayer > xPlayer;
     uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -66,7 +66,7 @@ uno::Reference< media::XPlayer > MediaWindowBaseImpl::createPlayer( const ::rtl:
 
     for( sal_uInt32 i = 0; !xPlayer.is() && i < SAL_N_ELEMENTS( aServiceManagers ); ++i )
     {
-        const rtl::OUString aServiceName( aServiceManagers[ i ],
+        const OUString aServiceName( aServiceManagers[ i ],
                                           strlen( aServiceManagers[ i ] ),
                                           RTL_TEXTENCODING_ASCII_US );
 
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index 3add351089f2..48413feb9a4c 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -123,13 +123,13 @@ void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException)
     notImplemented();
 }
 
-void SAL_CALL SIDEModel::storeAsURL( const ::rtl::OUString&, const uno::Sequence< beans::PropertyValue >& )
+void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& )
         throw (io::IOException, uno::RuntimeException)
 {
     notImplemented();
 }
 
-void SAL_CALL SIDEModel::storeToURL( const ::rtl::OUString&,
+void SAL_CALL SIDEModel::storeToURL( const OUString&,
         const uno::Sequence< beans::PropertyValue >& )
         throw (io::IOException, uno::RuntimeException)
 {
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index cf9eb35d887b..ba1d2193c95d 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -55,10 +55,10 @@ public:
         throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) { notImplemented(); }
     //  XStorable
     virtual void SAL_CALL store() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL storeAsURL(   const   ::rtl::OUString& sURL,
+    virtual void SAL_CALL storeAsURL(   const   OUString& sURL,
         const   ::com::sun::star::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL storeToURL(   const   ::rtl::OUString& sURL,
+    virtual void SAL_CALL storeToURL(   const   OUString& sURL,
         const   ::com::sun::star::uno::Sequence< css::beans::PropertyValue >&   seqArguments    )
         throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
diff --git a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index 67fa17f0c433..e397a5cae89f 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
@@ -117,7 +117,7 @@ namespace basegfx
             @return true, if the string was successfully parsed
          */
         BASEGFX_DLLPUBLIC bool importFromSvgD( B2DPolyPolygon&        o_rPolyPoly,
-                             const ::rtl::OUString& rSvgDAttribute, bool bWrongPositionAfterZ = false );
+                             const OUString& rSvgDAttribute, bool bWrongPositionAfterZ = false );
 
         /** Read poly-polygon from SVG.
 
@@ -134,7 +134,7 @@ namespace basegfx
             @return true, if the string was successfully parsed
          */
         BASEGFX_DLLPUBLIC bool importFromSvgPoints( B2DPolygon&            o_rPoly,
-                                  const ::rtl::OUString& rSvgPointsAttribute );
+                                  const OUString& rSvgPointsAttribute );
 
 
         // grow for polyPolygon. Move all geometry in each point in the direction of the normal in that point
@@ -211,7 +211,7 @@ namespace basegfx
             @return the generated SVG-D statement (the XML d attribute
             value alone, without any "<path ...>" or "d="...")
          */
-        BASEGFX_DLLPUBLIC ::rtl::OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly,
+        BASEGFX_DLLPUBLIC OUString exportToSvgD( const B2DPolyPolygon& rPolyPoly,
                                       bool                  bUseRelativeCoordinates=true,
                                       bool                  bDetectQuadraticBeziers=true );
 
diff --git a/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index 71ddc64323a5..72ed9418663a 100644
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
@@ -70,9 +70,9 @@ namespace unotools
         virtual void SAL_CALL setBezierSegment( const ::com::sun::star::geometry::RealBezierSegment2D& point, ::sal_Int32 nPolygonIndex, ::sal_Int32 nPointIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         B2DPolyPolygon getPolyPolygon() const;
 
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 4abcf6c00468..67ecb3e32d0b 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.cxx
@@ -55,10 +55,10 @@ namespace basegfx2d
 class b2dsvgdimpex : public CppUnit::TestFixture
 {
 private:
-    ::rtl::OUString aPath0;
-    ::rtl::OUString aPath1;
-    ::rtl::OUString aPath2;
-    ::rtl::OUString aPath3;
+    OUString aPath0;
+    OUString aPath1;
+    OUString aPath2;
+    OUString aPath3;
 
 public:
     // initialise your test code values here.
@@ -139,7 +139,7 @@ public:
     void impex()
     {
         B2DPolyPolygon  aPoly;
-        ::rtl::OUString aExport;
+        OUString aExport;
 
         CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D",
                                tools::importFromSvgD( aPoly,
diff --git a/basegfx/test/boxclipper.cxx b/basegfx/test/boxclipper.cxx
index fb084e85a03c..a296871d7fe9 100644
--- a/basegfx/test/boxclipper.cxx
+++ b/basegfx/test/boxclipper.cxx
@@ -165,7 +165,7 @@ public:
         B2DPolyPolygon randomPoly;
         tools::importFromSvgD(
             randomPoly,
-            rtl::OUString::createFromAscii(randomSvg));
+            OUString::createFromAscii(randomSvg));
         std::for_each(randomPoly.begin(),
                       randomPoly.end(),
                       boost::bind(
@@ -241,9 +241,9 @@ public:
         CPPUNIT_ASSERT_MESSAGE(sName,
                                tools::importFromSvgD(
                                    aTmp1,
-                                   rtl::OUString::createFromAscii(sSvg)));
+                                   OUString::createFromAscii(sSvg)));
 
-        const rtl::OUString aSvg=
+        const OUString aSvg=
             tools::exportToSvgD(toTest.solveCrossovers());
         B2DPolyPolygon aTmp2;
         CPPUNIT_ASSERT_MESSAGE(sName,
@@ -320,7 +320,7 @@ public:
         (void)pName; (void)rPoly;
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     basegfx::tools::exportToSvgD(rPoly),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
@@ -363,32 +363,32 @@ public:
 
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s input      - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         genericClip),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         const B2DPolyPolygon boxClipResult=rRange.solveCrossovers();
-        const rtl::OUString boxClipSvg(
+        const OUString boxClipSvg(
             basegfx::tools::exportToSvgD(
                 normalizePoly(
                     boxClipResult)));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s boxclipper - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     boxClipSvg,
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
         genericClip = tools::solveCrossovers(genericClip);
-        const rtl::OUString genericClipSvg(
+        const OUString genericClipSvg(
             basegfx::tools::exportToSvgD(
                 normalizePoly(
                     genericClip)));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s genclipper - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     genericClipSvg,
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
diff --git a/basegfx/test/clipstate.cxx b/basegfx/test/clipstate.cxx
index 54346835c1b5..f2b0ef0e94b7 100644
--- a/basegfx/test/clipstate.cxx
+++ b/basegfx/test/clipstate.cxx
@@ -94,7 +94,7 @@ public:
     {
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
-                sName, rtl::OUStringToOString(
+                sName, OUStringToOString(
                     basegfx::tools::exportToSvgD(toTest.getClipPoly()),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
@@ -103,9 +103,9 @@ public:
         CPPUNIT_ASSERT_MESSAGE(sName,
                                tools::importFromSvgD(
                                    aTmp1,
-                                   rtl::OUString::createFromAscii(sSvg)));
+                                   OUString::createFromAscii(sSvg)));
 
-        const rtl::OUString aSvg=
+        const OUString aSvg=
             tools::exportToSvgD(toTest.getClipPoly());
         B2DPolyPolygon aTmp2;
         CPPUNIT_ASSERT_MESSAGE(sName,
@@ -143,7 +143,7 @@ public:
         B2DPolyPolygon aTmp1;
         tools::importFromSvgD(
             aTmp1,
-            rtl::OUString::createFromAscii(unionSvg));
+            OUString::createFromAscii(unionSvg));
 
         aMixedClip.intersectPolyPolygon(aTmp1);
         aMixedClip.subtractRange(B2DRange(-20,-150,20,0));
diff --git a/basegfx/test/genericclipper.cxx b/basegfx/test/genericclipper.cxx
index 6b62ff5d94de..c1af17d369c5 100644
--- a/basegfx/test/genericclipper.cxx
+++ b/basegfx/test/genericclipper.cxx
@@ -77,12 +77,12 @@ public:
             tools::prepareForPolygonOperation(aShiftedRectangle));
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s input LHS - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         aSelfIntersect),
                     RTL_TEXTENCODING_UTF8).getStr() );
         fprintf(stderr, "%s input RHS - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     basegfx::tools::exportToSvgD(
                         aRect),
                     RTL_TEXTENCODING_UTF8).getStr() );
@@ -93,12 +93,12 @@ public:
 
 #if OSL_DEBUG_LEVEL > 2
         fprintf(stderr, "%s - svg:d=\"%s\"\n",
-                pName, rtl::OUStringToOString(
+                pName, OUStringToOString(
                     basegfx::tools::exportToSvgD(aRes),
                     RTL_TEXTENCODING_UTF8).getStr() );
 #endif
 
-        rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD);
+        OUString aValid=OUString::createFromAscii(pValidSvgD);
 
         CPPUNIT_ASSERT_MESSAGE(pName,
                                basegfx::tools::exportToSvgD(aRes) == aValid);
@@ -132,8 +132,8 @@ public:
                            const char* pInputSvgD,
                            const char* pValidSvgD)
     {
-        rtl::OUString aInput=rtl::OUString::createFromAscii(pInputSvgD);
-        rtl::OUString aValid=rtl::OUString::createFromAscii(pValidSvgD);
+        OUString aInput=OUString::createFromAscii(pInputSvgD);
+        OUString aValid=OUString::createFromAscii(pValidSvgD);
         B2DPolyPolygon aInputPoly, aValidPoly;
 
         tools::importFromSvgD(aInputPoly, aInput);
diff --git a/basic/inc/basic/basmgr.hxx b/basic/inc/basic/basmgr.hxx
index 9c731369d1be..12bca4779565 100644
--- a/basic/inc/basic/basmgr.hxx
+++ b/basic/inc/basic/basmgr.hxx
@@ -205,7 +205,7 @@ public:
         @param _out_rModuleNames
             takes the names of modules whose size exceeds the legacy limit
     */
-    bool            LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< rtl::OUString >& _out_rModuleNames );
+    bool            LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& _out_rModuleNames );
     bool HasExeCode( const OUString& );
     /// determines whether the Basic Manager has a given macro, given by fully qualified name
     bool            HasMacro( OUString const& i_fullyQualifiedName ) const;
diff --git a/basic/inc/basic/sbxcore.hxx b/basic/inc/basic/sbxcore.hxx
index 5d45d4bbc9c5..4c71d1a5b977 100644
--- a/basic/inc/basic/sbxcore.hxx
+++ b/basic/inc/basic/sbxcore.hxx
@@ -103,7 +103,7 @@ public:
     static void RemoveFactory( SbxFactory* );
 
     static SbxBase* Create( sal_uInt16, sal_uInt32=SBXCR_SBX );
-    static SbxObject* CreateObject( const rtl::OUString& );
+    static SbxObject* CreateObject( const OUString& );
 };
 
 SV_DECL_REF(SbxBase)
diff --git a/basic/inc/basic/sbxfac.hxx b/basic/inc/basic/sbxfac.hxx
index ce368dccf3b8..33035cf45c9b 100644
--- a/basic/inc/basic/sbxfac.hxx
+++ b/basic/inc/basic/sbxfac.hxx
@@ -35,7 +35,7 @@ public:
     SbxFactory( bool bLast=false )  { bHandleLast = bLast; }
     bool IsHandleLast( void )       { return bHandleLast; }
     virtual SbxBase* Create( sal_uInt16 nSbxId, sal_uInt32 = SBXCR_SBX );
-    virtual SbxObject* CreateObject( const rtl::OUString& );
+    virtual SbxObject* CreateObject( const OUString& );
 };
 
 #endif
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 56b9ab6a8412..073653b061ae 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -77,7 +77,7 @@ void Coverage::test_failed()
 void Coverage::test_success()
 {
     m_nb_tests_ok += 1;
-    fprintf(stderr,"%s,PASS\n", rtl::OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() );
+    fprintf(stderr,"%s,PASS\n", OUStringToOString( m_sCurrentTest, RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 
 void Coverage::run_test(OUString sFileURL)
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index c828f25fb42b..25ed568ce49f 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -152,7 +152,7 @@ IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/)
 {
     fprintf(stderr,"(%d:%d)\n",
             StarBASIC::GetLine(), StarBASIC::GetCol1());
-    fprintf(stderr,"Basic error: %s\n", rtl::OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+    fprintf(stderr,"Basic error: %s\n", OUStringToOString( StarBASIC::GetErrorText(), RTL_TEXTENCODING_UTF8 ).getStr() );
     mbError = true;
     return 0;
 }
diff --git a/basic/qa/cppunit/test_append.cxx b/basic/qa/cppunit/test_append.cxx
index e3d9f6b6704f..ff6a56080bdc 100644
--- a/basic/qa/cppunit/test_append.cxx
+++ b/basic/qa/cppunit/test_append.cxx
@@ -32,7 +32,7 @@ namespace
         CPPUNIT_TEST_SUITE_END();
     };
 
-rtl::OUString sTestEnableRuntime(
+OUString sTestEnableRuntime(
     "Function doUnitTest as Integer\n"
     "Dim Enable as Integer\n"
     "Enable = 1\n"
@@ -41,7 +41,7 @@ rtl::OUString sTestEnableRuntime(
     "End Function\n"
 );
 
-rtl::OUString sTestDimEnable(
+OUString sTestDimEnable(
     "Sub doUnitTest\n"
     "Dim Enable as String\n"
     "End Sub\n"
diff --git a/basic/qa/cppunit/test_nested_struct.cxx b/basic/qa/cppunit/test_nested_struct.cxx
index 8c7fabcdec85..47bd726bd22c 100644
--- a/basic/qa/cppunit/test_nested_struct.cxx
+++ b/basic/qa/cppunit/test_nested_struct.cxx
@@ -53,7 +53,7 @@ namespace
 
 // tests the new behaviour, we should be able to
 // directly modify the value of the nested 'HorizontalLine' struct
-rtl::OUString sTestSource1(
+OUString sTestSource1(
     "Function doUnitTest() as Integer\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\"\n"
     "b0.HorizontalLine.OuterLineWidth = 9\n"
@@ -61,7 +61,7 @@ rtl::OUString sTestSource1(
     "End Function\n"
 );
 
-rtl::OUString sTestSource1Alt(
+OUString sTestSource1Alt(
     "Function doUnitTest() as Object\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\"\n"
     "b0.HorizontalLine.OuterLineWidth = 9\n"
@@ -75,7 +75,7 @@ rtl::OUString sTestSource1Alt(
 // b) cloning the new instance with the value of b0.HorizontalLine
 // c) modifying the new instance
 // d) setting b0.HorizontalLine with the value of the new instance
-rtl::OUString sTestSource2(
+OUString sTestSource2(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n"
     "l = b0.HorizontalLine\n"
@@ -85,7 +85,7 @@ rtl::OUString sTestSource2(
 "End Function\n"
 );
 
-rtl::OUString sTestSource2Alt(
+OUString sTestSource2Alt(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n"
     "l = b0.HorizontalLine\n"
@@ -99,7 +99,7 @@ rtl::OUString sTestSource2Alt(
 // a reference copy of b0.HorizontalLine, each one should have an
 // OuterLineWidth of 4 & 9 respectively and we should be returning
 // 13 the sum of the two ( hopefully unique values if we haven't copied by reference )
-rtl::OUString sTestSource3(
+OUString sTestSource3(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\"\n"
     "l = b0.HorizontalLine\n"
@@ -110,7 +110,7 @@ rtl::OUString sTestSource3(
 "End Function\n"
 );
 
-rtl::OUString sTestSource3Alt(
+OUString sTestSource3Alt(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\"\n"
     "l = b0.HorizontalLine\n"
@@ -126,7 +126,7 @@ rtl::OUString sTestSource3Alt(
 
 // nearly the same as above but this time for a fixed type
 // variable
-rtl::OUString sTestSource4(
+OUString sTestSource4(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n"
     "l = b0.HorizontalLine\n"
@@ -137,7 +137,7 @@ rtl::OUString sTestSource4(
 "End Function\n"
 );
 
-rtl::OUString sTestSource4Alt(
+OUString sTestSource4Alt(
     "Function doUnitTest()\n"
     "Dim b0 as new \"com.sun.star.table.TableBorder\", l as new \"com.sun.star.table.BorderLine\"\n"
     "l = b0.HorizontalLine\n"
@@ -156,7 +156,7 @@ rtl::OUString sTestSource4Alt(
 // in the debugger shows the expected values )
 // We need to additionally check the actual uno struct to see if the
 // changes made are *really* reflected in the object
-rtl::OUString sTestSource5(
+OUString sTestSource5(
     "Function doUnitTest() as Object\n"
     "Dim aWinDesc as new \"com.sun.star.awt.WindowDescriptor\"\n"
     "Dim aRect as new \"com.sun.star.awt.Rectangle\"\n"
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index 6ff0b9203b78..8a4412d1b5c5 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -351,7 +351,7 @@ bool SbiImage::Save( SvStream& r, sal_uInt32 nVer )
         for( i = 0; i < nStrings; i++ )
         {
             sal_uInt16 nOff = (sal_uInt16) pStringOff[ i ];
-            rtl::OString aStr(rtl::OUStringToOString(rtl::OUString(pStrings + nOff), eCharSet));
+            OString aStr(OUStringToOString(OUString(pStrings + nOff), eCharSet));
             memcpy( pByteStrings + nOff, aStr.getStr(), (aStr.getLength() + 1) * sizeof( char ) );
         }
         r << (sal_uInt32) nStringSize;
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index abf94b05621e..63347374e08b 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1058,7 +1058,7 @@ SbModule* StarBASIC::MakeModule32( const OUString& rName, const OUString& rSrc )
 SbModule* StarBASIC::MakeModule32( const OUString& rName, const ModuleInfo& mInfo, const OUString& rSrc )
 {
 
-    OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
+    OSL_TRACE("create module %s type mInfo %d", OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
     SbModule* p = NULL;
     switch ( mInfo.ModuleType )
     {
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index b10d00c63d8f..f16fc449c88c 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -296,7 +296,7 @@ SbUnoObject* createOLEObject_Impl( const OUString& aType )
             Any aAny;
             aAny <<= xOLEObject;
             pUnoObj = new SbUnoObject( aType, aAny );
-            ::rtl::OUString sDfltPropName;
+            OUString sDfltPropName;
 
             if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
                 pUnoObj->SetDfltProperty( sDfltPropName );
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 7592943d77a5..a48bffca4ba9 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -2668,7 +2668,7 @@ void SbUserFormModule::InitObject()
             aArgs[ 0 ] = uno::Any();
             aArgs[ 1 ] <<= m_xDialog;
             aArgs[ 2 ] <<= m_xModel;
-            aArgs[ 3 ] <<= rtl::OUString( GetParent()->GetName() );
+            aArgs[ 3 ] <<= OUString( GetParent()->GetName() );
             pDocObject = new SbUnoObject( GetName(), uno::makeAny( xVBAFactory->createInstanceWithArguments( "ooo.vba.msforms.UserForm", aArgs  ) ) );
 
             uno::Reference< lang::XComponent > xComponent( m_xDialog, uno::UNO_QUERY_THROW );
diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx
index 23d814409de7..529be3fb287e 100644
--- a/basic/source/comp/basiccharclass.cxx
+++ b/basic/source/comp/basiccharclass.cxx
@@ -102,7 +102,7 @@ bool BasicCharClass::isLetterUnicode( sal_Unicode c )
   if( pCharClass == NULL )
     pCharClass = new CharClass( Application::GetSettings().GetLanguageTag() );
   // can we get pCharClass to accept a sal_Unicode instead of this waste?
-  return pCharClass->isLetter( rtl::OUString(c), 0 );
+  return pCharClass->isLetter( OUString(c), 0 );
 }
 
 bool BasicCharClass::isAlpha( sal_Unicode c, bool bCompatible )
diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx
index e3312c91e9c4..b08d352eb318 100644
--- a/basic/source/comp/buffer.cxx
+++ b/basic/source/comp/buffer.cxx
@@ -238,7 +238,7 @@ bool SbiBuffer::operator +=( const OUString& n )
     sal_uInt32 len = n.getLength() + 1;
     if( Check( len ) )
     {
-        rtl::OString aByteStr(rtl::OUStringToOString(n, osl_getThreadTextEncoding()));
+        OString aByteStr(OUStringToOString(n, osl_getThreadTextEncoding()));
         memcpy( pCur, aByteStr.getStr(), len );
         pCur += len;
         nOff += len;
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index c17ecbb6648b..32b1d84a9e79 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -243,7 +243,7 @@ void SbiCodeGen::Save()
                         aPropName = aPropName.copy( aIfaceName.getLength() + 1 );
                     }
                     OSL_TRACE("*** getProcedureProperty for thing %s",
-                              rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
+                              OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
                     rMod.GetProcedureProperty( aPropName, ePropType );
                 }
                 if( nPass == 1 )
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 3f79a2874092..81f6effee2bf 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -129,7 +129,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, bool bAsNewAlreadyParsed )
                     // #52709 DIM AS NEW for Uno with full-qualified name
                     if( Peek() == DOT )
                     {
-                        rtl::OUString aDotStr( '.' );
+                        OUString aDotStr( '.' );
                         while( Peek() == DOT )
                         {
                             aCompleteName += aDotStr;
@@ -663,8 +663,8 @@ void SbiParser::DefType( bool bPrivate )
         }
     }
 
-    pType->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
-    pType->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
+    pType->Remove( OUString("Name"), SbxCLASS_DONTCARE );
+    pType->Remove( OUString("Parent"), SbxCLASS_DONTCARE );
 
     rTypeArray->Insert (pType,rTypeArray->Count());
 }
@@ -800,8 +800,8 @@ void SbiParser::DefEnum( bool bPrivate )
         }
     }
 
-    pEnum->Remove( rtl::OUString("Name"), SbxCLASS_DONTCARE );
-    pEnum->Remove( rtl::OUString("Parent"), SbxCLASS_DONTCARE );
+    pEnum->Remove( OUString("Name"), SbxCLASS_DONTCARE );
+    pEnum->Remove( OUString("Parent"), SbxCLASS_DONTCARE );
 
     rEnumArray->Insert( pEnum, rEnumArray->Count() );
 }
diff --git a/basic/source/comp/sbcomp.cxx b/basic/source/comp/sbcomp.cxx
index 85d91aeac257..20d5262aafb1 100644
--- a/basic/source/comp/sbcomp.cxx
+++ b/basic/source/comp/sbcomp.cxx
@@ -223,8 +223,8 @@ static void lcl_ReadIniFile( const char* pIniFileName )
 
 struct TraceTextData
 {
-    rtl::OString m_aTraceStr_STMNT;
-    rtl::OString m_aTraceStr_PCode;
+    OString m_aTraceStr_STMNT;
+    OString m_aTraceStr_PCode;
 };
 typedef std::hash_map< sal_Int32, TraceTextData > PCToTextDataMap;
 typedef std::hash_map< OUString, PCToTextDataMap*, OUStringHash, ::std::equal_to< OUString > > ModuleTraceMap;
@@ -257,11 +257,11 @@ const char* lcl_getSpaces( int nSpaceCount )
     return pSpacesEnd - nSpaceCount;
 }
 
-static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
+static OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
 {
     static sal_Char Buffer[1000];
 
-    rtl::OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US );
+    OString aOStr = OUStringToOString( OUString( aStr ), RTL_TEXTENCODING_ASCII_US );
     const sal_Char* pStr = aOStr.getStr();
 
     // Skip whitespace
@@ -276,7 +276,7 @@ static rtl::OString lcl_toOStringSkipLeadingWhites( const OUString& aStr )
     strncpy( Buffer, pStr, nLen );
     Buffer[nLen] = 0;
 
-    rtl::OString aORetStr( Buffer );
+    OString aORetStr( Buffer );
     return aORetStr;
 }
 
@@ -591,7 +591,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
     int nIndent = nCallLvl * GnIndentPerCallLevel;
 
     const TraceTextData& rTraceTextData = itInner->second;
-    const rtl::OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
+    const OString& rStr_STMNT = rTraceTextData.m_aTraceStr_STMNT;
     bool bSTMT = false;
     if( rStr_STMNT.getLength() )
     {
@@ -626,7 +626,7 @@ void dbg_traceStep( SbModule* pModule, sal_uInt32 nPC, sal_Int32 nCallLvl )
     }
 
     nIndent += GnIndentForPCode;
-    const rtl::OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
+    const OString& rStr_PCode = rTraceTextData.m_aTraceStr_PCode;
     if( rStr_PCode.getLength() )
     {
         lcl_lineOut( rStr_PCode.getStr(), lcl_getSpaces( nIndent ),
@@ -837,7 +837,7 @@ void dbg_traceNotifyError( SbError nTraceErr, const OUString& aTraceErrMsg,
 #endif
     GnLastCallLvl = nCallLvl;
 
-    rtl::OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US );
+    OString aOTraceErrMsg = OUStringToOString( OUString( aTraceErrMsg ), RTL_TEXTENCODING_ASCII_US );
 
     char Buffer[200];
     const char* pHandledStr = bTraceErrHandled ? " / HANDLED" : "";
@@ -864,10 +864,10 @@ void dbg_RegisterTraceTextForPC( SbModule* pModule, sal_uInt32 nPC,
 
     TraceTextData aData;
 
-    rtl::OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT );
+    OString aOTraceStr_STMNT = lcl_toOStringSkipLeadingWhites( aTraceStr_STMNT );
     aData.m_aTraceStr_STMNT = aOTraceStr_STMNT;
 
-    rtl::OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode );
+    OString aOTraceStr_PCode = lcl_toOStringSkipLeadingWhites( aTraceStr_PCode );
     aData.m_aTraceStr_PCode = aOTraceStr_PCode;
 
     (*pInnerMap)[nPC] = aData;
diff --git a/basic/source/comp/symtbl.cxx b/basic/source/comp/symtbl.cxx
index 005ae381ebcc..0a5e3a22c04c 100644
--- a/basic/source/comp/symtbl.cxx
+++ b/basic/source/comp/symtbl.cxx
@@ -43,7 +43,7 @@ SbiStringPool::SbiStringPool( SbiParser* p )
 SbiStringPool::~SbiStringPool()
 {}
 
-const rtl::OUString& SbiStringPool::Find( sal_uInt32 n ) const
+const OUString& SbiStringPool::Find( sal_uInt32 n ) const
 {
     if( n == 0 || n > aData.size() )
         return aEmpty; //hack, returning a reference to a simulation of null
@@ -77,7 +77,7 @@ short SbiStringPool::Add( double n, SbxDataType t )
         case SbxDOUBLE:  snprintf( buf, sizeof(buf), "%.16g", n ); break;
         default: break;
     }
-    return Add( rtl::OUString::createFromAscii( buf ) );
+    return Add( OUString::createFromAscii( buf ) );
 }
 
 /***************************************************************************
diff --git a/basic/source/inc/iosys.hxx b/basic/source/inc/iosys.hxx
index 2f35789d33e0..d6d6c6aab6bf 100644
--- a/basic/source/inc/iosys.hxx
+++ b/basic/source/inc/iosys.hxx
@@ -40,7 +40,7 @@ class SbiStream
 {
     SvStream* pStrm;
     sal_uIntPtr  nExpandOnWriteTo;  // during writing access expand the stream to this size
-    rtl::OString aLine;
+    OString aLine;
     sal_uIntPtr  nLine;
     short  nLen;                    // buffer length
     short  nMode;
@@ -51,11 +51,11 @@ class SbiStream
 public:
     SbiStream();
    ~SbiStream();
-    SbError Open( short, const rtl::OString&, short, short, short );
+    SbError Open( short, const OString&, short, short, short );
     SbError Close();
-    SbError Read(rtl::OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
+    SbError Read(OString&, sal_uInt16 = 0, bool bForceReadingPerByte=false);
     SbError Read( char& );
-    SbError Write( const rtl::OString&, sal_uInt16 = 0 );
+    SbError Write( const OString&, sal_uInt16 = 0 );
 
     bool IsText() const     { return (nMode & SBSTRM_BINARY) == 0; }
     bool IsRandom() const   { return (nMode & SBSTRM_RANDOM) != 0; }
@@ -73,27 +73,27 @@ public:
 class SbiIoSystem
 {
     SbiStream* pChan[ CHANNELS ];
-    rtl::OString aPrompt;
-    rtl::OString aIn;
-    rtl::OString aOut;
+    OString aPrompt;
+    OString aIn;
+    OString aOut;
     short     nChan;
     SbError   nError;
-    void      ReadCon(rtl::OString&);
-    void      WriteCon(const rtl::OString&);
+    void      ReadCon(OString&);
+    void      WriteCon(const OString&);
 public:
     SbiIoSystem();
    ~SbiIoSystem();
     SbError GetError();
     void  Shutdown();
-    void  SetPrompt(const rtl::OString& r) { aPrompt = r; }
+    void  SetPrompt(const OString& r) { aPrompt = r; }
     void  SetChannel( short n  )       { nChan = n;   }
     short GetChannel() const           { return nChan;}
     void  ResetChannel()               { nChan = 0;   }
-    void  Open( short, const rtl::OString&, short, short, short );
+    void  Open( short, const OString&, short, short, short );
     void  Close();
-    void  Read(rtl::OString&, short = 0);
+    void  Read(OString&, short = 0);
     char  Read();
-    void  Write(const rtl::OString&, short = 0);
+    void  Write(const OString&, short = 0);
     // 0 == bad channel or no SvStream (nChannel=0..CHANNELS-1)
     SbiStream* GetStream( short nChannel ) const;
     void  CloseAll(); // JSM
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index fd942b0d3815..1eda66c0cfbe 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
 
 IMPL_LINK_INLINE( SbiDdeControl,Data , DdeData*, pData,
 {
-    aData = rtl::OUString::createFromAscii( (const char*)(const void*)*pData );
+    aData = OUString::createFromAscii( (const char*)(const void*)*pData );
     return 1;
 }
 )
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index 79b985d28d28..95c02b71cb65 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -43,13 +43,13 @@
 struct SbiDllMgr::Impl {};
 
 SbError SbiDllMgr::Call(
-    rtl::OUString const &, rtl::OUString const &, SbxArray *, SbxVariable &,
+    OUString const &, OUString const &, SbxArray *, SbxVariable &,
     bool)
 {
     return ERRCODE_BASIC_NOT_IMPLEMENTED;
 }
 
-void SbiDllMgr::FreeDll(rtl::OUString const &) {}
+void SbiDllMgr::FreeDll(OUString const &) {}
 
 SbiDllMgr::SbiDllMgr(): impl_(new Impl) {}
 
diff --git a/basic/source/runtime/dllmgr.hxx b/basic/source/runtime/dllmgr.hxx
index 5a8803487995..51cb7cc3fa38 100644
--- a/basic/source/runtime/dllmgr.hxx
+++ b/basic/source/runtime/dllmgr.hxx
@@ -38,10 +38,10 @@ public:
     ~SbiDllMgr();
 
     SbError Call(
-        rtl::OUString const & function, rtl::OUString const &  library,
+        OUString const & function, OUString const &  library,
         SbxArray * arguments, SbxVariable & result, bool cdeclConvention);
 
-    void FreeDll(rtl::OUString const & library);
+    void FreeDll(OUString const & library);
 
 private:
     struct Impl;
diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index de08aaacccea..c4a6d649c011 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -554,7 +554,7 @@ void    UCBStream::SetSize( sal_uIntPtr nSize )
 
 
 SbError SbiStream::Open
-( short nCh, const rtl::OString& rName, short nStrmMode, short nFlags, short nL )
+( short nCh, const OString& rName, short nStrmMode, short nFlags, short nL )
 {
     nMode   = nFlags;
     nLen    = nL;
@@ -565,7 +565,7 @@ SbError SbiStream::Open
     {
         nStrmMode |= STREAM_NOCREATE;
     }
-    OUString aStr(rtl::OStringToOUString(rName, osl_getThreadTextEncoding()));
+    OUString aStr(OStringToOUString(rName, osl_getThreadTextEncoding()));
     OUString aNameStr = getFullPath( aStr );
 
     if( hasUno() )
@@ -632,7 +632,7 @@ SbError SbiStream::Close()
     return nError;
 }
 
-SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
+SbError SbiStream::Read(OString& rBuf, sal_uInt16 n, bool bForceReadingPerByte)
 {
     nExpandOnWriteTo = 0;
     if( !bForceReadingPerByte && IsText() )
@@ -650,7 +650,7 @@ SbError SbiStream::Read(rtl::OString& rBuf, sal_uInt16 n, bool bForceReadingPerB
         {
             return nError = SbERR_BAD_RECORD_LENGTH;
         }
-        rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n));
+        OStringBuffer aBuffer(read_uInt8s_ToOString(*pStrm, n));
         //Pad it out with ' ' to the requested length on short read
         sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(n);
         comphelper::string::padToLength(aBuffer, nRequested, ' ');
@@ -670,7 +670,7 @@ SbError SbiStream::Read( char& ch )
     if (aLine.isEmpty())
     {
         Read( aLine, 0 );
-        aLine = aLine + rtl::OString('\n');
+        aLine = aLine + OString('\n');
     }
     ch = aLine[0];
     aLine = aLine.copy(1);
@@ -701,15 +701,15 @@ void SbiStream::ExpandFile()
 
 namespace
 {
-    void WriteLines(SvStream &rStream, const rtl::OString& rStr)
+    void WriteLines(SvStream &rStream, const OString& rStr)
     {
-        rtl::OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) );
+        OString aStr(convertLineEnd(rStr, rStream.GetLineDelimiter()) );
         write_uInt8s_FromOString(rStream, aStr);
         endl( rStream );
     }
 }
 
-SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n )
+SbError SbiStream::Write( const OString& rBuf, sal_uInt16 n )
 {
     ExpandFile();
     if( IsAppend() )
@@ -730,7 +730,7 @@ SbError SbiStream::Write( const rtl::OString& rBuf, sal_uInt16 n )
                 aLine = aLine.copy(0, nLineLen);
             }
             WriteLines(*pStrm, aLine);
-            aLine = rtl::OString();
+            aLine = OString();
         }
     }
     else
@@ -779,7 +779,7 @@ SbError SbiIoSystem::GetError()
     return n;
 }
 
-void SbiIoSystem::Open(short nCh, const rtl::OString& rName, short nMode, short nFlags, short nLen)
+void SbiIoSystem::Open(short nCh, const OString& rName, short nMode, short nFlags, short nLen)
 {
     nError = 0;
     if( nCh >= CHANNELS || !nCh )
@@ -842,7 +842,7 @@ void SbiIoSystem::Shutdown()
     // anything left to PRINT?
     if( !aOut.isEmpty() )
     {
-        OUString aOutStr(rtl::OStringToOUString(aOut, osl_getThreadTextEncoding()));
+        OUString aOutStr(OStringToOUString(aOut, osl_getThreadTextEncoding()));
 #if defined __GNUC__
         Window* pParent = Application::GetDefDialogParent();
         MessBox( pParent, WinBits( WB_OK ), OUString(), aOutStr ).Execute();
@@ -850,11 +850,11 @@ void SbiIoSystem::Shutdown()
         MessBox( GetpApp()->GetDefDialogParent(), WinBits( WB_OK ), OUString(), aOutStr ).Execute();
 #endif
     }
-    aOut = rtl::OString();
+    aOut = OString();
 }
 
 
-void SbiIoSystem::Read(rtl::OString& rBuf, short n)
+void SbiIoSystem::Read(OString& rBuf, short n)
 {
     if( !nChan )
     {
@@ -878,7 +878,7 @@ char SbiIoSystem::Read()
         if( aIn.isEmpty() )
         {
             ReadCon( aIn );
-            aIn = aIn + rtl::OString('\n');
+            aIn = aIn + OString('\n');
         }
         ch = aIn[0];
         aIn = aIn.copy(1);
@@ -894,7 +894,7 @@ char SbiIoSystem::Read()
     return ch;
 }
 
-void SbiIoSystem::Write(const rtl::OString& rBuf, short n)
+void SbiIoSystem::Write(const OString& rBuf, short n)
 {
     if( !nChan )
     {
@@ -946,9 +946,9 @@ void SbiIoSystem::CloseAll(void)
 ***************************************************************************/
 
 
-void SbiIoSystem::ReadCon(rtl::OString& rIn)
+void SbiIoSystem::ReadCon(OString& rIn)
 {
-    OUString aPromptStr(rtl::OStringToOUString(aPrompt, osl_getThreadTextEncoding()));
+    OUString aPromptStr(OStringToOUString(aPrompt, osl_getThreadTextEncoding()));
     SbiInputDialog aDlg( NULL, aPromptStr );
     if( aDlg.Execute() )
     {
@@ -958,12 +958,12 @@ void SbiIoSystem::ReadCon(rtl::OString& rIn)
     {
         nError = SbERR_USER_ABORT;
     }
-    aPrompt = rtl::OString();
+    aPrompt = OString();
 }
 
 // output of a MessageBox, if theres a CR in the console-buffer
 
-void SbiIoSystem::WriteCon(const rtl::OString& rText)
+void SbiIoSystem::WriteCon(const OString& rText)
 {
     aOut += rText;
     sal_Int32 n1 = aOut.indexOf('\n');
@@ -988,7 +988,7 @@ void SbiIoSystem::WriteCon(const rtl::OString& rText)
         {
             aOut = aOut.copy(1);
         }
-        OUString aStr(rtl::OStringToOUString(s, osl_getThreadTextEncoding()));
+        OUString aStr(OStringToOUString(s, osl_getThreadTextEncoding()));
         {
             SolarMutexGuard aSolarGuard;
             if( !MessBox( GetpApp()->GetDefDialogParent(),
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index dc9456692af6..f9872b43616b 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -1063,7 +1063,7 @@ static sal_Bool lcl_WriteSbxVariable( const SbxVariable& rVar, SvStream* pStrm,
             {
                 // without any length information! without end-identifier!
                 // What does that mean for Unicode?! Choosing conversion to ByteString...
-                rtl::OString aByteStr(rtl::OUStringToOString(rStr, osl_getThreadTextEncoding()));
+                OString aByteStr(OUStringToOString(rStr, osl_getThreadTextEncoding()));
                 *pStrm << (const char*)aByteStr.getStr();
             }
         }
@@ -1322,7 +1322,7 @@ RTLFUNC(Environ)
     }
     OUString aResult;
     // should be ANSI but that's not possible under Win16 in the DLL
-    rtl::OString aByteStr(rtl::OUStringToOString(rPar.Get(1)->GetOUString(),
+    OString aByteStr(OUStringToOString(rPar.Get(1)->GetOUString(),
                                                  osl_getThreadTextEncoding()));
     const char* pEnvStr = getenv(aByteStr.getStr());
     if ( pEnvStr )
@@ -2661,7 +2661,7 @@ RTLFUNC(Round)
     rPar.Get(0)->PutDouble( dRes );
 }
 
-void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const rtl::OUString& sFuncName, SbxVariable* pRet )
+void CallFunctionAccessFunction( const Sequence< Any >& aArgs, const OUString& sFuncName, SbxVariable* pRet )
 {
     static Reference< XFunctionAccess > xFunc;
     Any aRes;
@@ -3268,7 +3268,7 @@ RTLFUNC(Input)
         return;
     }
 
-    rtl::OString aByteBuffer;
+    OString aByteBuffer;
     SbError err = pSbStrm->Read( aByteBuffer, nByteCount, true );
     if( !err )
         err = pIosys->GetError();
@@ -3278,7 +3278,7 @@ RTLFUNC(Input)
         StarBASIC::Error( err );
         return;
     }
-    rPar.Get(0)->PutString(rtl::OStringToOUString(aByteBuffer, osl_getThreadTextEncoding()));
+    rPar.Get(0)->PutString(OStringToOUString(aByteBuffer, osl_getThreadTextEncoding()));
 }
 
 RTLFUNC(Me)
diff --git a/basic/source/runtime/sbdiagnose.cxx b/basic/source/runtime/sbdiagnose.cxx
index 2168c04956f2..3fab4909c758 100644
--- a/basic/source/runtime/sbdiagnose.cxx
+++ b/basic/source/runtime/sbdiagnose.cxx
@@ -63,7 +63,7 @@ void DbgReportAssertion( const sal_Char* i_assertionMessage )
 
     SbxArrayRef const xArguments( new SbxArray( SbxVARIANT ) );
     SbxVariableRef const xMessageText = new SbxVariable( SbxSTRING );
-    xMessageText->PutString( rtl::OUString::createFromAscii(i_assertionMessage) );
+    xMessageText->PutString( OUString::createFromAscii(i_assertionMessage) );
     xArguments->Put( xMessageText, 1 );
 
     ErrCode const nError = xAssertionChannelBasic->Call( sCaptureFunctionName, xArguments );
diff --git a/basic/source/runtime/stdobj.cxx b/basic/source/runtime/stdobj.cxx
index 752e6cd5b854..08158045689e 100644
--- a/basic/source/runtime/stdobj.cxx
+++ b/basic/source/runtime/stdobj.cxx
@@ -715,7 +715,7 @@ SbiStdObject::SbiStdObject( const OUString& r, StarBASIC* pb ) : SbxObject( r )
     if( !p->nHash )
       while( p->nArgs != -1 )
     {
-        OUString aName_ = rtl::OUString::createFromAscii( p->pName );
+        OUString aName_ = OUString::createFromAscii( p->pName );
         p->nHash = SbxVariable::MakeHashCode( aName_ );
         p += ( p->nArgs & _ARGSMASK ) + 1;
     }
@@ -791,7 +791,7 @@ SbxVariable* SbiStdObject::Find( const OUString& rName, SbxClassType t )
             short nType   = ( p->nArgs & _TYPEMASK );
             if( p->nArgs & _CONST )
                 nAccess |= SBX_CONST;
-            OUString aName_ = rtl::OUString::createFromAscii( p->pName );
+            OUString aName_ = OUString::createFromAscii( p->pName );
             SbxClassType eCT = SbxCLASS_OBJECT;
             if( nType & _PROPERTY )
             {
@@ -866,7 +866,7 @@ SbxInfo* SbiStdObject::GetInfo( short nIdx )
     for( short i = 0; i < nPar; i++ )
     {
         p++;
-        OUString aName_ = rtl::OUString::createFromAscii( p->pName );
+        OUString aName_ = OUString::createFromAscii( p->pName );
         sal_uInt16 nFlags_ = ( p->nArgs >> 8 ) & 0x03;
         if( p->nArgs & _OPT )
         {
diff --git a/basic/source/runtime/step0.cxx b/basic/source/runtime/step0.cxx
index 413548308c81..37e21162c353 100644
--- a/basic/source/runtime/step0.cxx
+++ b/basic/source/runtime/step0.cxx
@@ -1307,7 +1307,7 @@ void SbiRuntime::StepLINPUT()
     pIosys->Read( aInput );
     Error( pIosys->GetError() );
     SbxVariableRef p = PopVar();
-    p->PutString(rtl::OStringToOUString(aInput, osl_getThreadTextEncoding()));
+    p->PutString(OStringToOUString(aInput, osl_getThreadTextEncoding()));
 }
 
 // end of program
@@ -1425,7 +1425,7 @@ void SbiRuntime::StepPRINT()        // print TOS
         s = " ";    // one blank before
     }
     s += s1;
-    OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding()));
+    OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding()));
     pIosys->Write( aByteStr );
     Error( pIosys->GetError() );
 }
@@ -1469,7 +1469,7 @@ void SbiRuntime::StepWRITE()        // write TOS
     {
         s += OUString(ch);
     }
-    OString aByteStr(rtl::OUStringToOString(s, osl_getThreadTextEncoding()));
+    OString aByteStr(OUStringToOString(s, osl_getThreadTextEncoding()));
     pIosys->Write( aByteStr );
     Error( pIosys->GetError() );
 }
@@ -1496,7 +1496,7 @@ void SbiRuntime::StepRENAME()       // Rename Tos+1 to Tos
 void SbiRuntime::StepPROMPT()
 {
     SbxVariableRef p = PopVar();
-    rtl::OString aStr(rtl::OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding()));
+    OString aStr(OUStringToOString(p->GetOUString(), osl_getThreadTextEncoding()));
     pIosys->SetPrompt( aStr );
 }
 
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index f6b39b4952a7..07b94b398ec0 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -170,7 +170,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
     if( nSbxId == 0x65 )    // Dialog Id
         return new SbxVariable;
 
-    rtl::OUString aEmptyStr;
+    OUString aEmptyStr;
     if( nCreator == SBXCR_SBX )
       switch( nSbxId )
     {
@@ -198,7 +198,7 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32 nCreator )
     return pNew;
 }
 
-SbxObject* SbxBase::CreateObject( const rtl::OUString& rClass )
+SbxObject* SbxBase::CreateObject( const OUString& rClass )
 {
     SbxAppData& r = GetSbxData_Impl();
     SbxObject* pNew = NULL;
@@ -341,7 +341,7 @@ SbxBase* SbxFactory::Create( sal_uInt16, sal_uInt32 )
     return NULL;
 }
 
-SbxObject* SbxFactory::CreateObject( const rtl::OUString& )
+SbxObject* SbxFactory::CreateObject( const OUString& )
 {
     return NULL;
 }
@@ -351,7 +351,7 @@ SbxObject* SbxFactory::CreateObject( const rtl::OUString& )
 SbxInfo::~SbxInfo()
 {}
 
-void SbxInfo::AddParam(const rtl::OUString& rName, SbxDataType eType, sal_uInt16 nFlags)
+void SbxInfo::AddParam(const OUString& rName, SbxDataType eType, sal_uInt16 nFlags)
 {
     aParams.push_back(new SbxParamInfo(rName, eType, nFlags));
 }
@@ -377,7 +377,7 @@ sal_Bool SbxInfo::LoadData( SvStream& rStrm, sal_uInt16 nVer )
     {
         sal_uInt16 nType, nFlags;
         sal_uInt32 nUserData = 0;
-        rtl::OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
+        OUString aName = read_lenPrefixed_uInt8s_ToOUString<sal_uInt16>(rStrm,
             RTL_TEXTENCODING_ASCII_US);
         rStrm >> nType >> nFlags;
         if( nVer > 1 )
diff --git a/basic/source/sbx/sbxcoll.cxx b/basic/source/sbx/sbxcoll.cxx
index 40b4a9fb2fd7..581d98d2a976 100644
--- a/basic/source/sbx/sbxcoll.cxx
+++ b/basic/source/sbx/sbxcoll.cxx
@@ -37,10 +37,10 @@ SbxCollection::SbxCollection( const OUString& rClass )
 {
     if( !nCountHash )
     {
-        pCount  = rtl::OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP ));
-        pAdd    = rtl::OUString::createFromAscii(GetSbxRes( STRING_ADDMETH ));
-        pItem   = rtl::OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH ));
-        pRemove = rtl::OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH ));
+        pCount  = OUString::createFromAscii(GetSbxRes( STRING_COUNTPROP ));
+        pAdd    = OUString::createFromAscii(GetSbxRes( STRING_ADDMETH ));
+        pItem   = OUString::createFromAscii(GetSbxRes( STRING_ITEMMETH ));
+        pRemove = OUString::createFromAscii(GetSbxRes( STRING_REMOVEMETH ));
         nCountHash  = MakeHashCode( pCount );
         nAddHash    = MakeHashCode( pAdd );
         nItemHash   = MakeHashCode( pItem );
@@ -101,7 +101,7 @@ SbxVariable* SbxCollection::FindUserData( sal_uInt32 nData )
     }
 }
 
-SbxVariable* SbxCollection::Find( const rtl::OUString& rName, SbxClassType t )
+SbxVariable* SbxCollection::Find( const OUString& rName, SbxClassType t )
 {
     if( GetParameters() )
     {
diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx
index 7b4bde230f2e..328bbcf72a9c 100644
--- a/basic/source/sbx/sbxcurr.cxx
+++ b/basic/source/sbx/sbxcurr.cxx
@@ -26,7 +26,7 @@
 #include "sbxconv.hxx"
 
 
-static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal )
+static OUString ImpCurrencyToString( const sal_Int64 &rVal )
 {
     bool isNeg = ( rVal < 0 );
     sal_Int64 absVal = isNeg ? -rVal : rVal;
@@ -37,8 +37,8 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal )
     ImpGetIntntlSep( cDecimalSep, cThousandSep );
 #endif
 
-    rtl::OUString aAbsStr = rtl::OUString::valueOf( absVal );
-    rtl::OUStringBuffer aBuf;
+    OUString aAbsStr = OUString::valueOf( absVal );
+    OUStringBuffer aBuf;
 
     sal_Int32 initialLen = aAbsStr.getLength();
 
@@ -102,7 +102,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal )
 }
 
 
-static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr )
+static sal_Int64 ImpStringToCurrency( const OUString &rStr )
 {
 
     sal_Int32   nFractDigit = 4;
@@ -155,11 +155,11 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr )
     // we should share some existing ( possibly from calc is there a currency
     // conversion there ? #TODO check )
 
-    rtl::OUString sTmp( rStr.trim() );
+    OUString sTmp( rStr.trim() );
     const sal_Unicode* p =  sTmp.getStr();
 
     // normalise string number by removeing thousands & decimal point seperators
-    rtl::OUStringBuffer sNormalisedNumString( sTmp.getLength() +  nFractDigit );
+    OUStringBuffer sNormalisedNumString( sTmp.getLength() +  nFractDigit );
 
     if ( *p == '-'  || *p == '+' )
         sNormalisedNumString.append( *p );
@@ -430,7 +430,7 @@ start:
         case SbxSTRING:
         case SbxLPSTR:
             if( !p->pOUString )
-                p->pOUString = new rtl::OUString;
+                p->pOUString = new OUString;
 
             *p->pOUString = ImpCurrencyToString( r );
             break;
diff --git a/basic/source/sbx/sbxform.cxx b/basic/source/sbx/sbxform.cxx
index de96b62ecd53..3a3d5bfe73db 100644
--- a/basic/source/sbx/sbxform.cxx
+++ b/basic/source/sbx/sbxform.cxx
@@ -246,7 +246,7 @@ void SbxBasicFormater::InitScan( double _dNum )
     InitExp( get_number_of_digits( dNum ) );
     // maximum of 15 positions behind the decimal point, example: -1.234000000000000E-001
     /*int nCount =*/ sprintf( sBuffer,"%+22.15lE",dNum );
-    sSciNumStrg = rtl::OUString::createFromAscii( sBuffer );
+    sSciNumStrg = OUString::createFromAscii( sBuffer );
 }
 
 
@@ -255,7 +255,7 @@ void SbxBasicFormater::InitExp( double _dNewExp )
     char sBuffer[ MAX_DOUBLE_BUFFER_LENGTH ];
     nNumExp = (short)_dNewExp;
     /*int nCount =*/ sprintf( sBuffer,"%+i",nNumExp );
-    sNumExpStrg = rtl::OUString::createFromAscii( sBuffer );
+    sNumExpStrg = OUString::createFromAscii( sBuffer );
     nExpExp = (short)get_number_of_digits( (double)nNumExp );
 }
 
@@ -386,7 +386,7 @@ OUString SbxBasicFormater::GetPosFormatString( const OUString& sFormatStrg, sal_
     }
 
     OUString aRetStr;
-    aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING );
+    aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING );
     return aRetStr;
 }
 
@@ -413,7 +413,7 @@ OUString SbxBasicFormater::GetNegFormatString( const OUString& sFormatStrg, sal_
         }
     }
     OUString aRetStr;
-    aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING );
+    aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING );
     return aRetStr;
 }
 
@@ -446,7 +446,7 @@ OUString SbxBasicFormater::Get0FormatString( const OUString& sFormatStrg, sal_Bo
     }
 
     OUString aRetStr;
-    aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING );
+    aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING );
     return aRetStr;
 }
 
@@ -475,7 +475,7 @@ OUString SbxBasicFormater::GetNullFormatString( const OUString& sFormatStrg, sal
     }
 
     OUString aRetStr;
-    aRetStr = rtl::OUString::createFromAscii( EMPTYFORMATSTRING );
+    aRetStr = OUString::createFromAscii( EMPTYFORMATSTRING );
     return aRetStr;
 }
 
@@ -961,7 +961,7 @@ OUString SbxBasicFormater::BasicFormatNull( OUString sFormatStrg )
         return sNullFormatStrg;
     }
     OUString aRetStr;
-    aRetStr = rtl::OUString::createFromAscii( "null" );
+    aRetStr = OUString::createFromAscii( "null" );
     return aRetStr;
 }
 
@@ -972,7 +972,7 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg )
     // analyse format-string concerning predefined formats:
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_GENERALNUMBER ) )
     {
-        sFormatStrg = rtl::OUString::createFromAscii( GENERALNUMBER_FORMAT );
+        sFormatStrg = OUString::createFromAscii( GENERALNUMBER_FORMAT );
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_CURRENCY ) )
     {
@@ -980,19 +980,19 @@ OUString SbxBasicFormater::BasicFormat( double dNumber, OUString sFormatStrg )
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_FIXED ) )
     {
-        sFormatStrg = rtl::OUString::createFromAscii( FIXED_FORMAT );
+        sFormatStrg = OUString::createFromAscii( FIXED_FORMAT );
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_STANDARD ) )
     {
-        sFormatStrg = rtl::OUString::createFromAscii( STANDARD_FORMAT );
+        sFormatStrg = OUString::createFromAscii( STANDARD_FORMAT );
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_PERCENT ) )
     {
-        sFormatStrg = rtl::OUString::createFromAscii( PERCENT_FORMAT );
+        sFormatStrg = OUString::createFromAscii( PERCENT_FORMAT );
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_SCIENTIFIC ) )
     {
-        sFormatStrg = rtl::OUString::createFromAscii( SCIENTIFIC_FORMAT );
+        sFormatStrg = OUString::createFromAscii( SCIENTIFIC_FORMAT );
     }
     if( sFormatStrg.equalsIgnoreAsciiCase( BASICFORMAT_YESNO ) )
     {
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx
index 6cbef74a6876..625917eb2fab 100644
--- a/basic/source/sbx/sbxobj.cxx
+++ b/basic/source/sbx/sbxobj.cxx
@@ -214,8 +214,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
 #ifdef DBG_UTIL
     static sal_uInt16 nLvl = 0;
     static const char* pCls[] = { "DontCare","Array","Value","Variable","Method","Property","Object" };
-    rtl::OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
-    rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+    OString aNameStr1(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
+    OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
     DbgOutf( "SBX: Search %.*s %s %s in %s",
              nLvl++, "                              ",
              ( t >= SbxCLASS_DONTCARE && t <= SbxCLASS_OBJECT )
@@ -283,8 +283,8 @@ SbxVariable* SbxObject::Find( const OUString& rName, SbxClassType t )
     nLvl--;
     if( pRes )
     {
-        rtl::OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
-        rtl::OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr3(OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr4(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
         DbgOutf( "SBX: Found %.*s %s in %s",
             nLvl, "                              ", aNameStr3.getStr(), aNameStr4.getStr() );
     }
@@ -499,8 +499,8 @@ void SbxObject::Insert( SbxVariable* pVar )
         {
             aVarName = PTR_CAST(SbxObject,pVar)->GetClassName();
         }
-        rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
-        rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
         DbgOutf( "SBX: Insert %s %s in %s",
                  ( pVar->GetClass() >= SbxCLASS_DONTCARE &&
                    pVar->GetClass() <= SbxCLASS_OBJECT )
@@ -542,8 +542,8 @@ void SbxObject::QuickInsert( SbxVariable* pVar )
         {
             aVarName = PTR_CAST(SbxObject,pVar)->GetClassName();
         }
-        rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
-        rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
         DbgOutf( "SBX: Insert %s %s in %s",
                  ( pVar->GetClass() >= SbxCLASS_DONTCARE &&
                    pVar->GetClass() <= SbxCLASS_OBJECT )
@@ -569,8 +569,8 @@ void SbxObject::Remove( SbxVariable* pVar )
         {
             aVarName = PTR_CAST(SbxObject,pVar)->GetClassName();
         }
-        rtl::OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
-        rtl::OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr1(OUStringToOString(aVarName, RTL_TEXTENCODING_ASCII_US));
+        OString aNameStr2(OUStringToOString(SbxVariable::GetName(), RTL_TEXTENCODING_ASCII_US));
         DbgOutf( "SBX: Remove %s in %s",
             aNameStr1.getStr(), aNameStr2.getStr() );
 #endif
@@ -825,10 +825,10 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
         GetAll( SbxCLASS_DONTCARE );
     }
     // Output the data of the object itself
-    rtl::OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
-    rtl::OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US));
+    OString aNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
+    OString aClassNameStr(OUStringToOString(aClassName, RTL_TEXTENCODING_ASCII_US));
     rStrm << "Object( "
-          << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
+          << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr()<< "=='"
           << ( aNameStr.isEmpty() ?  "<unnamed>" : aNameStr.getStr() ) << "', "
           << "of class '" << aClassNameStr.getStr() << "', "
           << "counts "
@@ -836,9 +836,9 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
           << " refs, ";
     if ( GetParent() )
     {
-        rtl::OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
+        OString aParentNameStr(OUStringToOString(GetName(), RTL_TEXTENCODING_ASCII_US));
         rStrm << "in parent "
-              << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr()
+              << OString::valueOf(reinterpret_cast<sal_Int64>(GetParent())).getStr()
               << "=='" << ( aParentNameStr.isEmpty() ? "<unnamed>" : aParentNameStr.getStr()  ) << "'";
     }
     else
@@ -846,14 +846,14 @@ void SbxObject::Dump( SvStream& rStrm, sal_Bool bFill )
         rStrm << "no parent ";
     }
     rStrm << " )" << endl;
-    rtl::OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US));
+    OString aIndentNameStr(OUStringToOString(aIndent, RTL_TEXTENCODING_ASCII_US));
     rStrm << aIndentNameStr.getStr() << "{" << endl;
 
     // Flags
     OUString aAttrs;
     if( CollectAttrs( this, aAttrs ) )
     {
-        rtl::OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US));
+        OString aAttrStr(OUStringToOString(aAttrs, RTL_TEXTENCODING_ASCII_US));
         rStrm << aIndentNameStr.getStr() << "- Flags: " << aAttrStr.getStr() << endl;
     }
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index e7b02c4043dd..b6927200fb03 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -132,7 +132,7 @@ void removeDimAsNewRecoverItem( SbxVariable* pVar );
 SbxVariable::~SbxVariable()
 {
 #ifdef DBG_UTIL
-    OString aBStr(rtl::OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US));
+    OString aBStr(OUStringToOString(maName, RTL_TEXTENCODING_ASCII_US));
     DbgOutf( "SbxVariable::Dtor %lx (%s)", (void*)this, aBStr.getStr() );
     if ( maName.equalsAscii( "Cells"))
     {
@@ -451,7 +451,7 @@ void SbxVariable::SetParent( SbxObject* p )
             aMsg += "].SetParent([";
             aMsg += p->GetName();
             aMsg += "])";
-            rtl::OString aBStr(rtl::OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US));
+            OString aBStr(OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US));
             DbgOut( aBStr.getStr(), DBG_OUT_WARNING, __FILE__, __LINE__);
         }
     }
@@ -735,11 +735,11 @@ void SbxAlias::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
 
 void SbxVariable::Dump( SvStream& rStrm, sal_Bool bFill )
 {
-    rtl::OString aBNameStr(rtl::OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US));
+    OString aBNameStr(OUStringToOString(GetName( SbxNAME_SHORT_TYPES ), RTL_TEXTENCODING_ASCII_US));
     rStrm << "Variable( "
-          << rtl::OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
+          << OString::valueOf(reinterpret_cast<sal_Int64>(this)).getStr() << "=="
           << aBNameStr.getStr();
-    rtl::OString aBParentNameStr(rtl::OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US));
+    OString aBParentNameStr(OUStringToOString(GetParent()->GetName(), RTL_TEXTENCODING_ASCII_US));
     if ( GetParent() )
     {
         rStrm << " in parent '" << aBParentNameStr.getStr() << "'";
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 8f663de41228..f983ba71c41e 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1029,8 +1029,8 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
         INetURLObject aPrevUserBasicInetObj_1( aUserBasicInetObj );
         aPrevUserBasicInetObj_1.removeSegment();
         INetURLObject aPrevUserBasicInetObj_2 = aPrevUserBasicInetObj_1;
-        aPrevUserBasicInetObj_1.Append( rtl::OString( strPrevFolderName_1 ));
-        aPrevUserBasicInetObj_2.Append( rtl::OString( strPrevFolderName_2 ));
+        aPrevUserBasicInetObj_1.Append( OString( strPrevFolderName_1 ));
+        aPrevUserBasicInetObj_2.Append( OString( strPrevFolderName_2 ));
 
         // #i93163
         bool bCleanUp = false;
@@ -1095,7 +1095,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
                 OUString aFolderUserBasic = aUserBasicInetObj.GetMainURL( INetURLObject::NO_DECODE );
                 INetURLObject aUserBasicTmpInetObj( aUserBasicInetObj );
                 aUserBasicTmpInetObj.removeSegment();
-                aUserBasicTmpInetObj.Append( rtl::OString( "__basic_tmp" ));
+                aUserBasicTmpInetObj.Append( OString( "__basic_tmp" ));
                 OUString aFolderTmp = aUserBasicTmpInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
                 mxSFI->move( aFolderUserBasic, aFolderTmp );
@@ -1225,7 +1225,7 @@ void SfxLibraryContainer::init_Impl( const OUString& rInitialDocumentURL,
             static const char strErrorSavFolderName[] = "__basic_80_err";
             INetURLObject aPrevUserBasicInetObj_Err( aUserBasicInetObj );
             aPrevUserBasicInetObj_Err.removeSegment();
-            aPrevUserBasicInetObj_Err.Append( rtl::OString( strErrorSavFolderName ));
+            aPrevUserBasicInetObj_Err.Append( OString( strErrorSavFolderName ));
             OUString aPrevFolder_Err = aPrevUserBasicInetObj_Err.GetMainURL( INetURLObject::NO_DECODE );
 
             bool bSaved = false;
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
index be610bbd2a4d..ca05bb0ae1b4 100644
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/cpp2uno.cxx
@@ -385,7 +385,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pCppI );
     }
 
@@ -479,7 +479,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pCppI );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
index 635c7e74c53b..8017045bcb7d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/cpp2uno.cxx
@@ -361,7 +361,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -462,7 +462,7 @@ static typelib_TypeClass cpp_mediate(
 #endif
 
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
index 0bf81064a588..665415290bcb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx
@@ -242,7 +242,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -331,7 +331,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
index 335e05fad1fc..970431fce11b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/cpp2uno.cxx
@@ -425,7 +425,7 @@ namespace
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
       throw RuntimeException(
-          rtl::OUString( "illegal vtable index!" ),
+          OUString( "illegal vtable index!" ),
           (XInterface *)pThis );
     }
 
@@ -538,7 +538,7 @@ namespace
     fprintf(stderr,"cpp_mediate6\n");
 #endif
           throw RuntimeException(
-              rtl::OUString( "no member description found!" ),
+              OUString( "no member description found!" ),
               (XInterface *)pThis );
         }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
index 6d57c134f63a..fa96ed3c3704 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/cpp2uno.cxx
@@ -384,7 +384,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -477,7 +477,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 9404471a1474..a06269a4477c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -381,7 +381,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -482,7 +482,7 @@ static typelib_TypeClass cpp_mediate(
 #endif
 
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
index ba384f74472d..5e97cdd35249 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/cpp2uno.cxx
@@ -349,7 +349,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pCppI );
     }
 
@@ -443,7 +443,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pCppI );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
index e571bd2a555c..c2bfe5ef912c 100644
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/cpp2uno.cxx
@@ -370,7 +370,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pCppI );
     }
 
@@ -464,7 +464,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pCppI );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
index ea0d05a50c92..689e54f092b2 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_intel/cpp2uno.cxx
@@ -250,7 +250,7 @@ static typelib_TypeClass cpp_mediate(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -343,7 +343,7 @@ static typelib_TypeClass cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
index 95acfac20aa5..af5c4a245ee4 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/cpp2uno.cxx
@@ -245,7 +245,7 @@ static typelib_TypeClass cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString( "illegal vtable index!" ), (XInterface *)pCppI );
+        throw RuntimeException( OUString( "illegal vtable index!" ), (XInterface *)pCppI );
     }
 
     // determine called method
@@ -340,7 +340,7 @@ static typelib_TypeClass cpp_mediate(
     }
     default:
     {
-        throw RuntimeException(rtl::OUString( "no member description found!" ), (XInterface *)pCppI );
+        throw RuntimeException(OUString( "no member description found!" ), (XInterface *)pCppI );
     }
     }
     return eRet;
diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
index 4129785d39be..a85d756a823f 100644
--- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx
@@ -32,9 +32,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 namespace
 {
diff --git a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
index b29e3a7dce26..e87512a571fc 100644
--- a/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/mingw_intel/cpp2uno.cxx
@@ -250,7 +250,7 @@ extern "C" void cpp_vtable_call(
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
         throw RuntimeException(
-            rtl::OUString( "illegal vtable index!" ),
+            OUString( "illegal vtable index!" ),
             (XInterface *)pThis );
     }
 
@@ -339,7 +339,7 @@ extern "C" void cpp_vtable_call(
     default:
     {
         throw RuntimeException(
-            rtl::OUString( "no member description found!" ),
+            OUString( "no member description found!" ),
             (XInterface *)pThis );
     }
     }
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
index 7859fb505092..f9d220931000 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/cpp2uno.cxx
@@ -246,7 +246,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
                  "### illegal vtable index!" );
     if (nFunctionIndex >= pTypeDescr->nMapFunctionIndexToMemberIndex)
     {
-        throw RuntimeException( rtl::OUString("illegal vtable index!"),
+        throw RuntimeException( OUString("illegal vtable index!"),
                                 (XInterface *)pThis );
     }
 
@@ -340,7 +340,7 @@ static typelib_TypeClass __cdecl cpp_mediate(
     default:
     {
         throw RuntimeException(
-            rtl::OUString("no member description found!"),
+            OUString("no member description found!"),
             (XInterface *)pThis );
     }
     }
@@ -446,7 +446,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
         Rtti():
             n0(0), n1(0), n2(0),
             rtti(CPPU_CURRENT_NAMESPACE::msci_getRTTI(
-                     rtl::OUString(
+                     OUString(
                                        "com.sun.star.uno.XInterface")))
         {}
     };
diff --git a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
index 73cb40fd3c99..64fd8e71e6bf 100644
--- a/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_intel/msci.hxx
@@ -35,7 +35,7 @@ const DWORD MSVC_ExceptionCode = 0xe06d7363;
 const long MSVC_magic_number = 0x19930520L;
 
 //==============================================================================
-type_info * msci_getRTTI( ::rtl::OUString const & rUNOname );
+type_info * msci_getRTTI( OUString const & rUNOname );
 
 //==============================================================================
 int msci_filterCppException(
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index 32c0109757a0..dadae1f64499 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -242,7 +242,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
     OSL_ENSURE( nFunctionIndex < pTD->nMapFunctionIndexToMemberIndex, "### illegal vtable index!\n" );
     if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
-        throw RuntimeException( rtl::OUString("Illegal vtable index!"),
+        throw RuntimeException( OUString("Illegal vtable index!"),
                                 reinterpret_cast<XInterface *>( pCppI ) );
 
     // Determine called method
@@ -345,7 +345,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
         }
         default:
         {
-            throw RuntimeException( rtl::OUString("No member description found!"),
+            throw RuntimeException( OUString("No member description found!"),
                                     reinterpret_cast<XInterface *>( pCppI ) );
         }
     }
@@ -456,7 +456,7 @@ bridges::cpp_uno::shared::VtableFactory::initializeBlock(
         Rtti():
             n0(0), n1(0), n2(0),
             rtti(CPPU_CURRENT_NAMESPACE::mscx_getRTTI(
-                     rtl::OUString(
+                     OUString(
                                        "com.sun.star.uno.XInterface")))
         {}
     };
diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
index df3fb70110ec..715514ffc7ce 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/mscx.hxx
@@ -38,7 +38,7 @@ typedef enum { REGPARAM_INT, REGPARAM_FLT } RegParamKind;
 
 
 //==============================================================================
-type_info * mscx_getRTTI( ::rtl::OUString const & rUNOname );
+type_info * mscx_getRTTI( OUString const & rUNOname );
 
 //==============================================================================
 int mscx_filterCppException(
diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx
index 53b40f23447c..a293d9937ca0 100644
--- a/bridges/source/cpp_uno/shared/vtablefactory.cxx
+++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx
@@ -245,7 +245,7 @@ bool VtableFactory::createBlock(Block &block, sal_Int32 slotCount) const
             strDirectory = "/tmp";
 
         strDirectory += "/.execoooXXXXXX";
-        rtl::OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding());
+        OString aTmpName = OUStringToOString(strDirectory, osl_getThreadTextEncoding());
         char *tmpfname = new char[aTmpName.getLength()+1];
         strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
         if ((block.fd = mkstemp(tmpfname)) == -1)
diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h
index 7b668c17270d..61fc28479585 100644
--- a/bridges/source/jni_uno/jni_base.h
+++ b/bridges/source/jni_uno/jni_base.h
@@ -50,9 +50,9 @@ class JNI_info;
 //==============================================================================
 struct BridgeRuntimeError
 {
-    ::rtl::OUString m_message;
+    OUString m_message;
 
-    inline BridgeRuntimeError( ::rtl::OUString const & message )
+    inline BridgeRuntimeError( OUString const & message )
         : m_message( message )
         {}
 };
@@ -98,7 +98,7 @@ public:
     inline void ensure_no_exception() const; // throws BridgeRuntimeError
     inline bool assert_no_exception() const; // asserts and clears exception
 
-    ::rtl::OUString get_stack_trace( jobject jo_exc = 0 ) const;
+    OUString get_stack_trace( jobject jo_exc = 0 ) const;
 };
 
 //______________________________________________________________________________
@@ -273,7 +273,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
     {
         throw BridgeRuntimeError(
             "cannot get comprehensive type description for " +
-            ::rtl::OUString::unacquired( &td_ref->pTypeName ) );
+            OUString::unacquired( &td_ref->pTypeName ) );
     }
 }
 
diff --git a/bridges/source/jni_uno/jni_data.cxx b/bridges/source/jni_uno/jni_data.cxx
index b73866cbc76c..2a24f58d73db 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1797,7 +1797,7 @@ void Bridge::map_to_java(
             {
                 // Do not lose information about type arguments of instantiated
                 // polymorphic struct types:
-                rtl::OUString const & name = rtl::OUString::unacquired(
+                OUString const & name = OUString::unacquired(
                     &pAny->pType->pTypeName);
                 OSL_ASSERT(!name.isEmpty());
                 if (name[name.getLength() - 1] == '>')
diff --git a/bridges/source/jni_uno/jni_helper.h b/bridges/source/jni_uno/jni_helper.h
index 2251ad8de057..2d8514592947 100644
--- a/bridges/source/jni_uno/jni_helper.h
+++ b/bridges/source/jni_uno/jni_helper.h
@@ -57,12 +57,12 @@ inline void jstring_to_ustring(
 }
 
 //------------------------------------------------------------------------------
-inline ::rtl::OUString jstring_to_oustring(
+inline OUString jstring_to_oustring(
     JNI_context const & jni, jstring jstr )
 {
     rtl_uString * ustr = 0;
     jstring_to_ustring( jni, &ustr, jstr );
-    return ::rtl::OUString( ustr, SAL_NO_ACQUIRE );
+    return OUString( ustr, SAL_NO_ACQUIRE );
 }
 
 //------------------------------------------------------------------------------
diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h
index ecc1cc2d74e8..63ce45dcfd24 100644
--- a/bridges/source/jni_uno/jni_info.h
+++ b/bridges/source/jni_uno/jni_info.h
@@ -46,10 +46,10 @@ inline bool type_equals(
 {
     if (type1 == type2)
         return true;
-    ::rtl::OUString const & name1 =
-          ::rtl::OUString::unacquired( &type1->pTypeName );
-    ::rtl::OUString const & name2 =
-          ::rtl::OUString::unacquired( &type2->pTypeName );
+    OUString const & name1 =
+          OUString::unacquired( &type1->pTypeName );
+    OUString const & name2 =
+          OUString::unacquired( &type2->pTypeName );
     return ((type1->eTypeClass == type2->eTypeClass) && name1.equals( name2 ));
 }
 
@@ -57,7 +57,7 @@ inline bool type_equals(
 inline bool is_XInterface( typelib_TypeDescriptionReference * type )
 {
     return ((typelib_TypeClass_INTERFACE == type->eTypeClass) &&
-            ::rtl::OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
+            OUString::unacquired( &type->pTypeName ) == "com.sun.star.uno.XInterface");
 }
 
 //==============================================================================
@@ -112,7 +112,7 @@ struct JNI_type_info_holder
 };
 
 typedef ::boost::unordered_map<
-    ::rtl::OUString, JNI_type_info_holder, ::rtl::OUStringHash > t_str2type;
+    OUString, JNI_type_info_holder, OUStringHash > t_str2type;
 
 //==============================================================================
 class JNI_info
@@ -211,10 +211,10 @@ public:
         typelib_TypeDescriptionReference * type ) const;
     JNI_type_info const * get_type_info(
         JNI_context const & jni,
-        ::rtl::OUString const & uno_name ) const;
+        OUString const & uno_name ) const;
     //
     inline static void append_sig(
-        ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
+        OStringBuffer * buf, typelib_TypeDescriptionReference * type,
         bool use_Object_for_type_XInterface = true, bool use_slashes = true );
 
     // get this
@@ -242,7 +242,7 @@ inline void JNI_info::destroy( JNIEnv * jni_env )
 
 //______________________________________________________________________________
 inline void JNI_info::append_sig(
-    ::rtl::OStringBuffer * buf, typelib_TypeDescriptionReference * type,
+    OStringBuffer * buf, typelib_TypeDescriptionReference * type,
     bool use_Object_for_type_XInterface, bool use_slashes )
 {
     switch (type->eTypeClass)
@@ -302,20 +302,20 @@ inline void JNI_info::append_sig(
     case typelib_TypeClass_STRUCT:
     case typelib_TypeClass_EXCEPTION:
     {
-        ::rtl::OUString const & uno_name =
-              ::rtl::OUString::unacquired( &type->pTypeName );
+        OUString const & uno_name =
+              OUString::unacquired( &type->pTypeName );
         buf->append( 'L' );
         // Erase type arguments of instantiated polymorphic struct types:
         sal_Int32 i = uno_name.indexOf( '<' );
         if ( i < 0 ) {
             buf->append(
-                ::rtl::OUStringToOString(
+                OUStringToOString(
                     use_slashes ? uno_name.replace( '.', '/' ) : uno_name,
                     RTL_TEXTENCODING_JAVA_UTF8 ) );
         } else {
-            rtl::OUString s( uno_name.copy( 0, i ) );
+            OUString s( uno_name.copy( 0, i ) );
             buf->append(
-                ::rtl::OUStringToOString(
+                OUStringToOString(
                     use_slashes ? s.replace( '.', '/' ) : s,
                     RTL_TEXTENCODING_JAVA_UTF8 ) );
         }
@@ -342,11 +342,11 @@ inline void JNI_info::append_sig(
         }
         else
         {
-            ::rtl::OUString const & uno_name =
-                  ::rtl::OUString::unacquired( &type->pTypeName );
+            OUString const & uno_name =
+                  OUString::unacquired( &type->pTypeName );
             buf->append( 'L' );
             buf->append(
-                ::rtl::OUStringToOString(
+                OUStringToOString(
                     use_slashes ? uno_name.replace( '.', '/' ) : uno_name,
                     RTL_TEXTENCODING_JAVA_UTF8 ) );
             buf->append( ';' );
@@ -355,7 +355,7 @@ inline void JNI_info::append_sig(
     default:
         throw BridgeRuntimeError(
             "unsupported type: " +
-            ::rtl::OUString::unacquired( &type->pTypeName ) );
+            OUString::unacquired( &type->pTypeName ) );
     }
 }
 
diff --git a/bridges/test/java_uno/acquire/testacquire.cxx b/bridges/test/java_uno/acquire/testacquire.cxx
index a0f5ef65cd91..e88be55b3e01 100644
--- a/bridges/test/java_uno/acquire/testacquire.cxx
+++ b/bridges/test/java_uno/acquire/testacquire.cxx
@@ -180,19 +180,19 @@ class Service: public cppu::WeakImplHelper3<
     css::lang::XServiceInfo, css::lang::XMain, test::javauno::acquire::XTest >
 {
 public:
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException)
     { return getImplementationName_static(); }
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const & serviceName)
+    virtual sal_Bool SAL_CALL supportsService(OUString const & 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)
     { return getSupportedServiceNames_static(); }
 
     virtual sal_Int32 SAL_CALL
-    run(css::uno::Sequence< rtl::OUString > const & arguments)
+    run(css::uno::Sequence< OUString > const & arguments)
         throw (css::uno::RuntimeException);
 
     virtual void SAL_CALL setInterfaceToInterface(
@@ -294,9 +294,9 @@ public:
         throw (css::uno::RuntimeException)
     { return obj; }
 
-    static rtl::OUString getImplementationName_static();
+    static OUString getImplementationName_static();
 
-    static css::uno::Sequence< rtl::OUString >
+    static css::uno::Sequence< OUString >
     getSupportedServiceNames_static();
 
     static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
@@ -316,10 +316,10 @@ private:
 
 }
 
-sal_Bool Service::supportsService(rtl::OUString const & serviceName)
+sal_Bool Service::supportsService(OUString const & serviceName)
     throw (css::uno::RuntimeException)
 {
-    css::uno::Sequence< rtl::OUString > names(
+    css::uno::Sequence< OUString > names(
         getSupportedServiceNames_static());
     for (sal_Int32 i = 0; i< names.getLength(); ++i) {
         if (names[i] == serviceName) {
@@ -341,7 +341,7 @@ template< typename T > void assertNotNull(css::uno::Reference< T > const & ref)
 
 }
 
-sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
+sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments)
     throw (css::uno::RuntimeException)
 {
     // - arguments[0] must be the UNO URL to connect to:
@@ -477,13 +477,13 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
     return 0;
 }
 
-rtl::OUString Service::getImplementationName_static() {
-    return rtl::OUString( "com.sun.star.test.bridges.testacquire.impl" );
+OUString Service::getImplementationName_static() {
+    return OUString( "com.sun.star.test.bridges.testacquire.impl" );
 }
 
-css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static() {
-    css::uno::Sequence< rtl::OUString > names(1);
-    names[0] = rtl::OUString( "com.sun.star.test.bridges.testacquire" );
+css::uno::Sequence< OUString > Service::getSupportedServiceNames_static() {
+    css::uno::Sequence< OUString > names(1);
+    names[0] = OUString( "com.sun.star.test.bridges.testacquire" );
     return names;
 }
 
@@ -515,11 +515,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const
 
 namespace {
 
-bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
-               css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName( "/" );
+bool writeInfo(void * registryKey, OUString const & implementationName,
+               css::uno::Sequence< OUString > const & serviceNames) {
+    OUString keyName( "/" );
     keyName += implementationName;
-    keyName += rtl::OUString( "/UNO/SERVICES" );
+    keyName += OUString( "/UNO/SERVICES" );
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/bridges/test/java_uno/any/transport.cxx b/bridges/test/java_uno/any/transport.cxx
index fda624987eca..2200e322871a 100644
--- a/bridges/test/java_uno/any/transport.cxx
+++ b/bridges/test/java_uno/any/transport.cxx
@@ -32,7 +32,6 @@
 
 using namespace ::com::sun::star::uno;
 using ::test::java_uno::anytest::XTransport;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/bridges/test/java_uno/equals/testequals.cxx b/bridges/test/java_uno/equals/testequals.cxx
index 5c274934465c..a56e5b928a39 100644
--- a/bridges/test/java_uno/equals/testequals.cxx
+++ b/bridges/test/java_uno/equals/testequals.cxx
@@ -52,28 +52,28 @@ class Service: public cppu::WeakImplHelper2<
     css::lang::XServiceInfo, test::java_uno::equals::XTestInterface >
 {
 public:
-    virtual inline rtl::OUString SAL_CALL getImplementationName()
+    virtual inline OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException)
-    { return rtl::OUString::createFromAscii(getImplementationName_static()); }
+    { return OUString::createFromAscii(getImplementationName_static()); }
 
     virtual sal_Bool SAL_CALL supportsService(
-        rtl::OUString const & rServiceName) throw (css::uno::RuntimeException);
+        OUString const & rServiceName) throw (css::uno::RuntimeException);
 
-    virtual inline css::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual inline css::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()  throw (css::uno::RuntimeException)
     { return getSupportedServiceNames_static(); }
 
-    virtual void SAL_CALL connect(rtl::OUString const & rConnection,
-                                  rtl::OUString const & rProtocol)
+    virtual void SAL_CALL connect(OUString const & rConnection,
+                                  OUString const & rProtocol)
         throw (css::uno::Exception);
 
     virtual css::uno::Reference< css::uno::XInterface > SAL_CALL get(
-        rtl::OUString const & rName) throw (css::uno::RuntimeException);
+        OUString const & rName) throw (css::uno::RuntimeException);
 
     static inline sal_Char const * getImplementationName_static()
     { return "com.sun.star.test.bridges.testequals.impl"; }
 
-    static css::uno::Sequence< rtl::OUString >
+    static css::uno::Sequence< OUString >
     getSupportedServiceNames_static();
 
     static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
@@ -91,10 +91,10 @@ private:
 
 }
 
-sal_Bool Service::supportsService(rtl::OUString const & rServiceName)
+sal_Bool Service::supportsService(OUString const & rServiceName)
     throw (css::uno::RuntimeException)
 {
-    css::uno::Sequence< rtl::OUString > aNames(
+    css::uno::Sequence< OUString > aNames(
         getSupportedServiceNames_static());
     for (sal_Int32 i = 0; i< aNames.getLength(); ++i)
         if (aNames[i] == rServiceName)
@@ -102,31 +102,31 @@ sal_Bool Service::supportsService(rtl::OUString const & rServiceName)
     return false;
 }
 
-void Service::connect(rtl::OUString const & rConnection,
-                      rtl::OUString const & rProtocol)
+void Service::connect(OUString const & rConnection,
+                      OUString const & rProtocol)
     throw (css::uno::Exception)
 {
     css::uno::Reference< css::connection::XConnection > xConnection(
         css::connection::Connector::create(m_xContext)->connect(rConnection));
     css::uno::Reference< css::bridge::XBridgeFactory > xBridgeFactory(
         m_xContext->getServiceManager()->createInstanceWithContext(
-            rtl::OUString( "com.sun.star.bridge.BridgeFactory" ),
+            OUString( "com.sun.star.bridge.BridgeFactory" ),
             m_xContext),
         css::uno::UNO_QUERY);
-    m_xBridge = xBridgeFactory->createBridge(rtl::OUString(), rProtocol,
+    m_xBridge = xBridgeFactory->createBridge(OUString(), rProtocol,
                                              xConnection, 0);
 }
 
 css::uno::Reference< css::uno::XInterface >
-Service::get(rtl::OUString const & rName) throw (css::uno::RuntimeException)
+Service::get(OUString const & rName) throw (css::uno::RuntimeException)
 {
     return m_xBridge->getInstance(rName);
 }
 
-css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames_static()
+css::uno::Sequence< OUString > Service::getSupportedServiceNames_static()
 {
-    css::uno::Sequence< rtl::OUString > aNames(1);
-    aNames[0] = rtl::OUString( "com.sun.star.test.bridges.testequals" );
+    css::uno::Sequence< OUString > aNames(1);
+    aNames[0] = OUString( "com.sun.star.test.bridges.testequals" );
     return aNames;
 }
 
@@ -160,7 +160,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co
             css::uno::Reference< css::lang::XSingleComponentFactory >
                 xFactory(cppu::createSingleComponentFactory(
                              &Service::createInstance,
-                             rtl::OUString::createFromAscii(
+                             OUString::createFromAscii(
                                  Service::getImplementationName_static()),
                              Service::getSupportedServiceNames_static()));
             if (xFactory.is())
@@ -175,11 +175,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(sal_Char co
 namespace {
 
 bool writeInfo(void * pRegistryKey, sal_Char const * pImplementationName,
-               css::uno::Sequence< rtl::OUString > const & rServiceNames)
+               css::uno::Sequence< OUString > const & rServiceNames)
 {
-    rtl::OUString aKeyName( "/" );
-    aKeyName += rtl::OUString::createFromAscii(pImplementationName);
-    aKeyName += rtl::OUString( "/UNO/SERVICES" );
+    OUString aKeyName( "/" );
+    aKeyName += OUString::createFromAscii(pImplementationName);
+    aKeyName += OUString( "/UNO/SERVICES" );
     css::uno::Reference< css::registry::XRegistryKey > xKey;
     try
     {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
index 907b4b41f2bd..d5a66169a634 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx
@@ -59,7 +59,7 @@ public:
 private:
     virtual ~Client() {}
 
-    virtual sal_Int32 SAL_CALL run(css::uno::Sequence< rtl::OUString > const &)
+    virtual sal_Int32 SAL_CALL run(css::uno::Sequence< OUString > const &)
         throw (css::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException);
@@ -68,34 +68,34 @@ private:
     osl::ThreadData data;
 };
 
-sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
+sal_Int32 Client::run(css::uno::Sequence< OUString > const &)
     throw (css::uno::RuntimeException)
 {
     css::uno::Reference< css::lang::XMultiComponentFactory > factory(
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( "no component context service manager" ),
+            OUString( "no component context service manager" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XRelay > relay;
     try {
         relay = css::uno::Reference< test::javauno::nativethreadpool::XRelay >(
             factory->createInstanceWithContext(
-                rtl::OUString( "test.javauno.nativethreadpool.Relay" ),
+                OUString( "test.javauno.nativethreadpool.Relay" ),
                 context),
             css::uno::UNO_QUERY_THROW);
     } catch (css::uno::RuntimeException &) {
         throw;
     } catch (css::uno::Exception & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "creating test.javauno.nativethreadpool.Relay service" ),
+            OUString( "creating test.javauno.nativethreadpool.Relay service" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     relay->start(this);
     if (!data.setData(reinterpret_cast< void * >(12345))) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( "osl::ThreadData::setData failed" ),
+            OUString( "osl::ThreadData::setData failed" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -103,19 +103,19 @@ sal_Int32 Client::run(css::uno::Sequence< rtl::OUString > const &)
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString( "uno:socket,host=localhost,port=3830;urp;test" )),
+                    OUString( "uno:socket,host=localhost,port=3830;urp;test" )),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     bool success = source->get() == 12345;
@@ -134,12 +134,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     return static_cast< cppu::OWeakObject * >(new Client(context));
 }
 
-rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString( "test.javauno.nativethreadpool.client" );
+OUString SAL_CALL getImplementationName() {
+    return OUString( "test.javauno.nativethreadpool.client" );
 }
 
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
-    return css::uno::Sequence< rtl::OUString >();
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() {
+    return css::uno::Sequence< OUString >();
 }
 
 cppu::ImplementationEntry entries[] = {
diff --git a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
index 6b7490b7732a..d81876f91895 100644
--- a/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
+++ b/bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx
@@ -64,7 +64,7 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         context->getServiceManager());
     if (!factory.is()) {
         throw new css::uno::RuntimeException(
-            rtl::OUString( "no component context service manager" ),
+            OUString( "no component context service manager" ),
             static_cast< cppu::OWeakObject * >(this));
     }
     css::uno::Reference< test::javauno::nativethreadpool::XSource > source;
@@ -73,19 +73,19 @@ sal_Int32 Server::get() throw (css::uno::RuntimeException) {
         source
             = css::uno::Reference< test::javauno::nativethreadpool::XSource >(
                 css::bridge::UnoUrlResolver::create(context)->resolve(
-                    rtl::OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )),
+                    OUString( "uno:socket,host=127.0.0.1,port=3831;urp;test" )),
                 css::uno::UNO_QUERY_THROW);
     } catch (css::connection::NoConnectException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::connection::ConnectionSetupException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     } catch (css::lang::IllegalArgumentException & e) {
         throw css::lang::WrappedTargetRuntimeException(
-            rtl::OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
+            OUString( "com.sun.star.uno.UnoUrlResolver.resolve" ),
             static_cast< cppu::OWeakObject * >(this), css::uno::makeAny(e));
     }
     return source->get();
@@ -98,12 +98,12 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     return static_cast< cppu::OWeakObject * >(new Server(context));
 }
 
-rtl::OUString SAL_CALL getImplementationName() {
-    return rtl::OUString( "test.javauno.nativethreadpool.server" );
+OUString SAL_CALL getImplementationName() {
+    return OUString( "test.javauno.nativethreadpool.server" );
 }
 
-css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() {
-    return css::uno::Sequence< rtl::OUString >();
+css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() {
+    return css::uno::Sequence< OUString >();
 }
 
 cppu::ImplementationEntry entries[] = {
diff --git a/bridges/test/testcomp.cxx b/bridges/test/testcomp.cxx
index 08248b0952fe..2ccda76c5c26 100644
--- a/bridges/test/testcomp.cxx
+++ b/bridges/test/testcomp.cxx
@@ -44,8 +44,6 @@ using namespace ::com::sun::star::bridge;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::test::performance;
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
 
 #include "testcomp.h"
 
diff --git a/bridges/test/testcomp.h b/bridges/test/testcomp.h
index 67b796d720a4..75bd05e81e4f 100644
--- a/bridges/test/testcomp.h
+++ b/bridges/test/testcomp.h
@@ -24,13 +24,13 @@
 
 
 void parseCommandLine( char *argv[] ,
-                       ::rtl::OUString *pProtocol , ::rtl::OUString *pConnection ,
+                       OUString *pProtocol , OUString *pConnection ,
                        sal_Bool *pbLatency , sal_Bool *pbReverse);
 
 
 Reference< XInterface > createComponent(
-    const ::rtl::OUString &sServiceName,
-    const ::rtl::OUString &sDllName,
+    const OUString &sServiceName,
+    const OUString &sDllName,
     const Reference < XMultiServiceFactory > & rSMgr );
 
 class OInterfaceTest :
@@ -75,16 +75,16 @@ public:
     void        SAL_CALL release()throw()                        { OWeakObject::release(); }
 public:
     // XCallMe
-    virtual void SAL_CALL call( const ::rtl::OUString& s, sal_Int32 nToDo )
+    virtual void SAL_CALL call( const OUString& s, sal_Int32 nToDo )
         throw(::com::sun::star::uno::RuntimeException,
               ::test::TestBridgeException);
-    virtual void SAL_CALL callOneway( const ::rtl::OUString& s, sal_Int32 nToDo )
+    virtual void SAL_CALL callOneway( const OUString& s, sal_Int32 nToDo )
         throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL drawLine( sal_Int32 x1, sal_Int32 y1 , sal_Int32 x2 , sal_Int32 y2 )
         throw(::com::sun::star::uno::RuntimeException);
 
-    virtual ::rtl::OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setsAttribute( const ::rtl::OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getsAttribute() throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setsAttribute( const OUString& _sattribute ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL callAgain( const ::com::sun::star::uno::Reference< ::test::XCallMe >& callAgain,
                                      sal_Int32 nToCall ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -92,7 +92,7 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     ::osl::Mutex m_mutex;
-    ::rtl::OUString m_sAttribute;
+    OUString m_sAttribute;
     sal_Int32 m_nLastToDos;
 };
 
@@ -136,7 +136,7 @@ public:
 
 public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
-           getInstance( const ::rtl::OUString& sObjectName )
+           getInstance( const OUString& sObjectName )
                  throw( ::com::sun::star::container::NoSuchElementException,
                         ::com::sun::star::uno::RuntimeException);
 
diff --git a/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index c9de485bb4d0..fd6dadd0a791 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.hxx
@@ -484,7 +484,7 @@ namespace canvas
 #ifdef DBG_UTIL
                 // Ensure that map entries are sorted (and all lowercase, if this
                 // map is case insensitive)
-                const ::rtl::OString aStr( pMap->maKey );
+                const OString aStr( pMap->maKey );
                 if( !mbCaseSensitive &&
                     aStr != aStr.toAsciiLowerCase() )
                 {
@@ -506,7 +506,7 @@ namespace canvas
                             OSL_FAIL( "ValueMap::ValueMap(): Map is not sorted" );
                         }
 
-                        const ::rtl::OString aStr2( pMap[1].maKey );
+                        const OString aStr2( pMap[1].maKey );
                         if( !mbCaseSensitive &&
                             aStr2 != aStr2.toAsciiLowerCase() )
                         {
diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index 0892ad009a3e..ef0c722efe95 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.hxx
@@ -93,7 +93,7 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >                maArguments;
@@ -150,7 +150,7 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // BitmapProvider
         virtual IBitmapSharedPtr getBitmap() const;
diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 4bf1056a2ac5..0db10b88f9be 100644
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.hxx
@@ -74,9 +74,9 @@ namespace dxcanvas
         virtual void disposeThis();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // BitmapProvider
         virtual IBitmapSharedPtr getBitmap() const { return mpBitmap; }
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 8cf291f3b7ef..1b0d57a5362b 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -112,9 +112,9 @@ namespace dxcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         // Sprite
         virtual void redraw() const;
diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index ccff49553a47..c1a0f3371a4a 100644
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.hxx
@@ -72,9 +72,9 @@ namespace dxcanvas
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         double              getCellAscent() const;
         double              getEmHeight() const;
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 117d625f0ff0..7ecfe52b5c8e 100644
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -81,7 +81,7 @@ namespace dxcanvas
         }
         catch( const uno::Exception& )
         {
-            OSL_FAIL( rtl::OUStringToOString(
+            OSL_FAIL( OUStringToOString(
                             comphelper::anyToString( cppu::getCaughtException() ),
                             RTL_TEXTENCODING_UTF8 ).getStr() );
         }
@@ -122,13 +122,13 @@ namespace dxcanvas
         }
         catch( const uno::Exception& )
         {
-            OSL_FAIL( rtl::OUStringToOString(
+            OSL_FAIL( OUStringToOString(
                             comphelper::anyToString( cppu::getCaughtException() ),
                             RTL_TEXTENCODING_UTF8 ).getStr() );
         }
     }
 
-    void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) {}
+    void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<OUString>& ) {}
     void DXCanvasItem::Commit() {}
 
     bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 6a9056c3c1c6..73b09f1191f6 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -66,7 +66,7 @@ namespace dxcanvas
         bool isBlacklistCurrentDevice() const;
         void blacklistDevice( const DeviceInfo& rDeviceInfo );
         void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
-            virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+            virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
             virtual void            Commit();
 
     private:
diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index dcb786a91419..97ff8b749acb 100644
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.hxx
@@ -125,7 +125,7 @@ namespace dxcanvas
         virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         /// Retrieve rendermodule object for this Canvas
         const IDXRenderModuleSharedPtr& getRenderModule() const;
diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index 7af73749321a..795280c2aade 100644
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.hxx
@@ -76,9 +76,9 @@ namespace dxcanvas
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         bool draw( const GraphicsSharedPtr&                              rGraphics,
                    const ::com::sun::star::rendering::ViewState&         rViewState,
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 62a124bd9878..791603022ed6 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -201,7 +201,7 @@ namespace dxcanvas
             const Point aEmptyPoint(0, 0);
 
             // create the String
-            const rtl::OUString aText(rText.Text);
+            const OUString aText(rText.Text);
 
             if( rLogicalAdvancements.getLength() )
             {
diff --git a/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx
index cd2627e5857d..22ca05daf8da 100644
--- a/canvas/source/null/null_canvasbitmap.hxx
+++ b/canvas/source/null/null_canvasbitmap.hxx
@@ -70,9 +70,9 @@ namespace nullcanvas
         virtual void disposeThis();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
         /** MUST hold here, too, since CanvasHelper only contains a
diff --git a/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx
index d7069d002930..38b2985b4688 100644
--- a/canvas/source/null/null_canvascustomsprite.hxx
+++ b/canvas/source/null/null_canvascustomsprite.hxx
@@ -110,9 +110,9 @@ namespace nullcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         // Sprite
         virtual void redraw() const;
diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx
index 95de15a01289..271713b29972 100644
--- a/canvas/source/null/null_canvasfont.hxx
+++ b/canvas/source/null/null_canvasfont.hxx
@@ -69,9 +69,9 @@ namespace nullcanvas
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
     private:
         ::com::sun::star::rendering::FontRequest    maFontRequest;
diff --git a/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx
index 333c4a94d097..7e7815922599 100644
--- a/canvas/source/null/null_spritecanvas.hxx
+++ b/canvas/source/null/null_spritecanvas.hxx
@@ -123,7 +123,7 @@ namespace nullcanvas
         virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
      private:
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > maArguments;
diff --git a/canvas/source/null/null_textlayout.hxx b/canvas/source/null/null_textlayout.hxx
index 08b01ff9bad6..8e2a375dd2e6 100644
--- a/canvas/source/null/null_textlayout.hxx
+++ b/canvas/source/null/null_textlayout.hxx
@@ -75,9 +75,9 @@ namespace nullcanvas
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         bool draw( const ::com::sun::star::rendering::ViewState&         rViewState,
                    const ::com::sun::star::rendering::RenderState&       rRenderState,
diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index c1375e74d0cf..c1f857a93f64 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.cxx
@@ -149,10 +149,10 @@ namespace canvas
         // dump polygons
         OSL_TRACE( "Original clip polygon: %s\n"
                    "Triangulated polygon: %s\n",
-                   rtl::OUStringToOString(
+                   OUStringToOString(
                        basegfx::tools::exportToSvgD( rClipPoly ),
                        RTL_TEXTENCODING_ASCII_US).getStr(),
-                   rtl::OUStringToOString(
+                   OUStringToOString(
                        basegfx::tools::exportToSvgD(
                            basegfx::B2DPolyPolygon(rTriangulatedPolygon) ),
                        RTL_TEXTENCODING_ASCII_US).getStr() );
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 5b89e96a05eb..10bee3b48783 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -98,7 +98,7 @@ namespace vclcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas,   GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // RepaintTarget
         virtual bool repaint( const GraphicObjectSharedPtr&                 rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index d0d884aef88f..176d4faea3bf 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.hxx
@@ -79,9 +79,9 @@ namespace vclcanvas
                       const OutDevProviderSharedPtr&               rOutDevProvider );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // RepaintTarget interface
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index c16a9e73cf85..0014c3f91392 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.hxx
@@ -99,9 +99,9 @@ namespace vclcanvas
         DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase );
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         // Sprite
         virtual void redraw( OutputDevice& rOutDev,
diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index e7a6fcfbb812..c22a193f1c5c 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.hxx
@@ -74,9 +74,9 @@ namespace vclcanvas
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getExtraFontProperties(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         ::Font getVCLFont() const;
 
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index c9f7139487e7..053326feb466 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.cxx
@@ -213,9 +213,9 @@ namespace vclcanvas
 
         if( mpOutDev )
         {
-            rtl::OUString aFilename("dbg_frontbuffer");
-            aFilename += rtl::OUString::valueOf(nFilePostfixCount);
-            aFilename += rtl::OUString(".bmp");
+            OUString aFilename("dbg_frontbuffer");
+            aFilename += OUString::valueOf(nFilePostfixCount);
+            aFilename += OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
 
diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index b4827a1d540e..5ca1f77d25f0 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.hxx
@@ -132,7 +132,7 @@ namespace vclcanvas
         virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getServiceName(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // RepaintTarget
         virtual bool repaint( const GraphicObjectSharedPtr&                   rGrf,
diff --git a/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index e943524b83c3..beaf3545f82a 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.cxx
@@ -130,9 +130,9 @@ namespace vclcanvas
 
         if( mpBackBuffer )
         {
-            rtl::OUString aFilename("dbg_backbuffer");
-            aFilename += rtl::OUString::valueOf(nFilePostfixCount);
-            aFilename += rtl::OUString(".bmp");
+            OUString aFilename("dbg_backbuffer");
+            aFilename += OUString::valueOf(nFilePostfixCount);
+            aFilename += OUString(".bmp");
 
             SvFileStream aStream( aFilename, STREAM_STD_READWRITE );
 
diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index f417622e46b6..f48054826d93 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.hxx
@@ -78,9 +78,9 @@ namespace vclcanvas
         virtual ::com::sun::star::rendering::StringContext SAL_CALL getText(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
         bool draw( OutputDevice&                                   rOutDev,
                    const Point&                                    rOutpos,
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index 8dae44486eae..e738c75ab10a 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -34,10 +34,10 @@ public:
     virtual ~AccStatisticsObject();
 
     // ________ XAccessibleContext ________
-    virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XServiceInfo ________
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
 };
 
 }  // accessibility
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 4d58186cde4f..21d22b3fae05 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -85,17 +85,17 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleContext ________
-    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+    virtual OUString SAL_CALL getAccessibleName()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+    virtual OUString SAL_CALL getAccessibleDescription()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleExtendedComponent ________
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTitledBorderText()
+    virtual OUString SAL_CALL getTitledBorderText()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getToolTipText()
+    virtual OUString SAL_CALL getToolTipText()
         throw (::com::sun::star::uno::RuntimeException);
 
     // the following interface is implemented in AccessibleBase, however it is
@@ -114,7 +114,7 @@ public:
     virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XServiceInfo ________
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index a2e206a49929..d6827e30fe80 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -50,7 +50,7 @@ public:
     virtual ~AccessibleChartShape();
 
     // ________ XServiceInfo ________
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleContext ________
@@ -62,9 +62,9 @@ public:
                ::com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getAccessibleRole()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+    virtual OUString SAL_CALL getAccessibleDescription()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+    virtual OUString SAL_CALL getAccessibleName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleComponent ________
@@ -81,9 +81,9 @@ public:
     // ________ XAccessibleExtendedComponent ________
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getTitledBorderText()
+    virtual OUString SAL_CALL getTitledBorderText()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getToolTipText()
+    virtual OUString SAL_CALL getToolTipText()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 946cc3735e75..3b1be85ad49b 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -48,7 +48,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::WeakReference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using osl::MutexGuard;
 
 //.............................................................................
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 039b38520cb2..6a2b04235f5c 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::accessibility;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 8fec5d533bf8..feac067d1f62 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -66,7 +66,7 @@ public:
                ::com::sun::star::uno::RuntimeException);
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual ::rtl::OUString SAL_CALL getShapeType()
+    virtual OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XComponent ____
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 65ef53cac25c..f6290969a2a9 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -102,7 +102,7 @@ public:
                ::com::sun::star::uno::RuntimeException);
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual ::rtl::OUString SAL_CALL getShapeType()
+    virtual OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XNumberFormatsSupplier ____
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 13d5316f5c67..f892059f2ea9 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
@@ -233,7 +232,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const
     if( pProvider )
     {
         uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) );
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
         aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
     }
     return aSize;
@@ -246,7 +245,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const
     if( pProvider )
     {
         uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) );
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
         aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
     }
     return aPoint;
@@ -259,7 +258,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference<
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
     if( pProvider && xTitle.is() )
     {
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
         aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
     }
     return aSize;
@@ -272,7 +271,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference<
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
     if( pProvider && xTitle.is() )
     {
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
         aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
     }
     return aPoint;
@@ -285,7 +284,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference<
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
     if( pProvider && xAxis.is() )
     {
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
         aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
     }
     return aSize;
@@ -298,7 +297,7 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference<
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
     if( pProvider && xAxis.is() )
     {
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
         aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
     }
     return aPoint;
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index a56ee6a07d06..86d9128df4d3 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -149,7 +149,7 @@ private: //member
     mutable ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XUnoTunnel >        m_xChartView;
 
-    typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc.
+    typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc.
     tTableMap   m_aTableMap;
 };
 
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 44e22077c7e9..0ff551e9d61d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -77,17 +77,17 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
         getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexRowDescriptions(
         const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions )
+        ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
         getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexColumnDescriptions(
         const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions )
+        ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
@@ -100,16 +100,16 @@ protected:
                                    double > >& aData )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence<
-        ::rtl::OUString > SAL_CALL getRowDescriptions()
+        OUString > SAL_CALL getRowDescriptions()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence<
-                                              ::rtl::OUString >& aRowDescriptions )
+                                              OUString >& aRowDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence<
-        ::rtl::OUString > SAL_CALL getColumnDescriptions()
+        OUString > SAL_CALL getColumnDescriptions()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence<
-                                                 ::rtl::OUString >& aColumnDescriptions )
+                                                 OUString >& aColumnDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XChartData (base of XChartDataArray) ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index af34ef0dc924..48c39c180279 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -73,7 +73,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;
 
 namespace
 {
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index e3dd0f8ca647..09d5596979ed 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -104,14 +104,14 @@ protected:
     // ____ WrappedPropertySet ____
     virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence();
     virtual const std::vector< WrappedProperty* > createWrappedProperties();
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference<
                         ::com::sun::star::beans::XPropertySet > getInnerPropertySet();
 
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //own methods
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index d7013539cdc6..edb3289c1cce 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -74,7 +74,6 @@ using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::chart::XAxis;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index ee3a69017618..87323b186689 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -95,7 +95,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XDiagram ____
-    virtual ::rtl::OUString SAL_CALL getDiagramType()
+    virtual OUString SAL_CALL getDiagramType()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow )
@@ -118,7 +118,7 @@ public:
                ::com::sun::star::uno::RuntimeException);
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual ::rtl::OUString SAL_CALL getShapeType()
+    virtual OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XAxisSupplier ____
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 96ccd65e3edf..563817814c09 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -50,7 +50,6 @@ using ::osl::MutexGuard;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 //-----------------------------------------------------------------------------
 
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 1aed315740a2..94e05bf431b2 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -74,7 +74,7 @@ public:
                ::com::sun::star::uno::RuntimeException);
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual ::rtl::OUString SAL_CALL getShapeType()
+    virtual OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XComponent ____
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index d2b072c98874..29ecbf883db7 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -77,33 +77,33 @@ public:
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 private: //methods
     ::cppu::IPropertyArrayHelper&   getInfoHelper();
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 9c3d4a23f5a7..34af3c4d89f5 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -41,7 +41,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::beans::Property;
 using ::osl::MutexGuard;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index f8ca9a575468..5a437115de86 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -74,7 +74,7 @@ protected:
                ::com::sun::star::uno::RuntimeException);
 
     // ____ XShapeDescriptor (base of XShape) ____
-    virtual ::rtl::OUString SAL_CALL getShapeType()
+    virtual OUString SAL_CALL getShapeType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XComponent ____
@@ -93,16 +93,16 @@ protected:
         throw (::com::sun::star::uno::Exception);
 
     // ____ WrappedPropertySet ____
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet();
 
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index d80169a0a3c6..ed66e266a63f 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -39,7 +39,6 @@ using ::osl::MutexGuard;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index abb5b49ec779..cc63338de0dd 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -76,33 +76,33 @@ public:
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 private: //methods
     ::cppu::IPropertyArrayHelper&   getInfoHelper();
@@ -111,7 +111,7 @@ private: //member
     ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
     ::cppu::OInterfaceContainerHelper           m_aEventListenerContainer;
 
-    rtl::OUString       m_aPropertySetName;
+    OUString       m_aPropertySetName;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index c905e665b442..af7f07e34c33 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -23,7 +23,6 @@
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 
 //.............................................................................
@@ -72,7 +71,7 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty()
 void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
                         throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
 {
-    rtl::OUString aBaseDiagram;
+    OUString aBaseDiagram;
     if( ! (rOuterValue >>= aBaseDiagram) )
         throw lang::IllegalArgumentException( "BaseDiagram properties require type OUString", 0, 0 );
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 5fcdf8cde1f2..4bdb59ac315c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -52,7 +51,7 @@ public:
 };
 
 WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
-    : ::chart::WrappedProperty( "AutomaticPosition" , rtl::OUString() )
+    : ::chart::WrappedProperty( "AutomaticPosition" , OUString() )
 {
 }
 WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty()
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 5701dc58b87e..d21f485166fe 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -286,7 +285,7 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
 
     if( bNewValue )
     {
-        rtl::OUString aTitleText;
+        OUString aTitleText;
         TitleHelper::createTitle(  m_eTitleType, aTitleText
             , m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
     }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 1c82ac132c68..a8923502b4c7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -26,7 +26,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 //.............................................................................
 
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index 54d247f07da9..4f40de00153d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -34,7 +34,7 @@ class ReferenceSizePropertyProvider;
 class WrappedCharacterHeightProperty_Base : public WrappedProperty
 {
 public:
-    WrappedCharacterHeightProperty_Base( const ::rtl::OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
+    WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
     virtual ~WrappedCharacterHeightProperty_Base();
 
     virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 6e34e4f7b6d8..5c4765297777 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 67c8f31558fe..77083d950958 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 
 //.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index c2490cd9bd23..e018e72af6f0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -33,8 +33,8 @@ class WrappedBarPositionProperty_Base : public WrappedDefaultProperty
 {
 public:
     WrappedBarPositionProperty_Base(
-              const ::rtl::OUString& rOuterName
-            , const ::rtl::OUString& rInnerSequencePropertyName
+              const OUString& rOuterName
+            , const OUString& rInnerSequencePropertyName
             , sal_Int32 nDefaultValue
             , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
     virtual ~WrappedBarPositionProperty_Base();
@@ -53,7 +53,7 @@ protected:
     ::boost::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
 
     sal_Int32                                   m_nDefaultValue;
-    ::rtl::OUString                             m_InnerSequencePropertyName;
+    OUString                             m_InnerSequencePropertyName;
 
     mutable ::com::sun::star::uno::Any          m_aOuterValue;
 };
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index cc0e6c262587..53ec6a5b08bb 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -24,7 +24,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -105,7 +104,7 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr
 //-----------------------------------------------------------------------------
 
 WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty )
-    : WrappedProperty( "LinkNumberFormatToSource", rtl::OUString() )
+    : WrappedProperty( "LinkNumberFormatToSource", OUString() )
         , m_pWrappedNumberFormatProperty( pWrappedNumberFormatProperty )
 {
     if( m_pWrappedNumberFormatProperty )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 175adf65b8ae..e3ffbea7331e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::com::sun::star::chart::TimeIncrement;
 
 //.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 19bdcc0312bf..43fc6ba744dc 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -55,7 +54,7 @@ private:
 };
 
 WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
-    : ::chart::WrappedProperty( "ScaleText" , rtl::OUString() )
+    : ::chart::WrappedProperty( "ScaleText" , OUString() )
     , m_spChart2ModelContact( spChart2ModelContact )
 {
 }
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index f2cacc74cf8f..621593c4a878 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 327cc7ce3cd7..f31f14cfeb07 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -23,7 +23,6 @@
 #include "macros.hxx"
 
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 
 //.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
index b2cfa390925a..9051aded4905 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
@@ -31,17 +31,17 @@ class DataSeriesPointWrapper;
 class WrappedSeriesAreaOrLineProperty : public WrappedProperty
 {
 public:
-    WrappedSeriesAreaOrLineProperty( const ::rtl::OUString& rOuterName
-        , const ::rtl::OUString& rInnerAreaTypeName, const ::rtl::OUString& rInnerLineTypeName
+    WrappedSeriesAreaOrLineProperty( const OUString& rOuterName
+        , const OUString& rInnerAreaTypeName, const OUString& rInnerLineTypeName
         , DataSeriesPointWrapper* pDataSeriesPointWrapper );
     virtual ~WrappedSeriesAreaOrLineProperty();
 
-    virtual ::rtl::OUString getInnerName() const;
+    virtual OUString getInnerName() const;
 
 protected:
     DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
-    ::rtl::OUString m_aInnerAreaTypeName;
-    ::rtl::OUString m_aInnerLineTypeName;
+    OUString m_aInnerAreaTypeName;
+    OUString m_aInnerLineTypeName;
 };
 
 } //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 5caee3847f46..3934c8e8bcf0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -49,10 +49,10 @@ public:
     virtual PROPERTYTYPE getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const =0;
     virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, PROPERTYTYPE aNewValue ) const =0;
 
-    explicit WrappedSeriesOrDiagramProperty( const ::rtl::OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue
+    explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue
         , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
         , tSeriesOrDiagramPropertyType ePropertyType )
-            : WrappedProperty(rName,::rtl::OUString())
+            : WrappedProperty(rName,OUString())
             , m_spChart2ModelContact(spChart2ModelContact)
             , m_aOuterValue(rDefaulValue)
             , m_aDefaultValue(rDefaulValue)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 846dd0a5e489..2b0294107fff 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -30,7 +30,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 88dc00d6cfd3..23e7de1fbb19 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -40,7 +40,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 76a461a3d14e..fc8096067b9f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -32,7 +32,6 @@ using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 9d9ba85a39dd..96fedf6f9b20 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -24,7 +24,6 @@
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 
 //.............................................................................
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 43ee9d836df4..d751df52992a 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -86,7 +86,7 @@ public:
     bool                bSortByXValues;
 };
 
-typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
+typedef ::comphelper::MakeMap< OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
 
 class ChartTypeDialogController : public ChangingResource
 {
@@ -114,13 +114,13 @@ public:
                                      , const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const;
     virtual void    setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException);
 
-    virtual bool                isSubType( const rtl::OUString& rServiceName );
-    virtual ChartTypeParameter  getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference<
+    virtual bool                isSubType( const OUString& rServiceName );
+    virtual ChartTypeParameter  getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference<
                                                                 ::com::sun::star::beans::XPropertySet >& xTemplateProps );
     virtual void                adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index
     virtual void                adjustParameterToSubType( ChartTypeParameter& rParameter );
     virtual void                adjustParameterToMainType( ChartTypeParameter& rParameter );
-    virtual rtl::OUString       getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
+    virtual OUString       getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
     virtual bool                commitToModel( const ChartTypeParameter& rParameter
         , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel );
     virtual ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 3d5a5b88a586..a5bfad071e96 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -85,7 +85,7 @@ public:
     */
     double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const;
 
-    bool isDateString( rtl::OUString aInputString, double& fOutDateValue );
+    bool isDateString( OUString aInputString, double& fOutDateValue );
 
     // Window
     virtual void Resize();
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 83d0be282947..62e3e2ff1af0 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -77,21 +77,21 @@ public:
     eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const;
     /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan
     double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow );
-    ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+    OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     ::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow );
     sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow );
 
     /// returns </sal_True> if the number could successfully be set at the given position
     bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
     /// returns </sal_True> if the text could successfully be set at the given position
-    bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
+    bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText );
     bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
 
     sal_Int32 getColumnCount() const;
     sal_Int32 getMaxRowCount() const;
 
     // returns the UI string of the corresponding role
-    ::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
+    OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
     bool isCategoriesColumn( sal_Int32 nColumnIndex ) const;
 
     struct tDataHeader
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index dc99c398c969..cc0b5aeb29d7 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -56,14 +56,14 @@ public:
     ~DialogModel();
 
     typedef ::std::pair<
-                ::rtl::OUString,
+                OUString,
                 ::std::pair< ::com::sun::star::uno::Reference<
                                  ::com::sun::star::chart2::XDataSeries >,
                              ::com::sun::star::uno::Reference<
                                  ::com::sun::star::chart2::XChartType > > >
         tSeriesWithChartTypeByName;
 
-    typedef ::std::map< ::rtl::OUString, ::rtl::OUString >
+    typedef ::std::map< OUString, OUString >
         tRolesWithRanges;
 
     void setTemplate(
@@ -91,7 +91,7 @@ public:
     tRolesWithRanges getRolesWithRanges(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XDataSeries > & xSeries,
-        const ::rtl::OUString & aRoleOfSequenceForLabel,
+        const OUString & aRoleOfSequenceForLabel,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartType > & xChartType ) const;
 
@@ -127,12 +127,12 @@ public:
     void setCategories( const ::com::sun::star::uno::Reference<
                         ::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories );
 
-    ::rtl::OUString getCategoriesRange() const;
+    OUString getCategoriesRange() const;
 
     bool isCategoryDiagram() const;
 
     void detectArguments(
-        ::rtl::OUString & rOutRangeString,
+        OUString & rOutRangeString,
         bool & rOutUseColumns, bool & rOutFirstCellAsLabel, bool & rOutHasCategories ) const;
 
     bool allArgumentsForRectRangeDetected() const;
@@ -142,12 +142,12 @@ public:
 
     void startControllerLockTimer();
 
-    static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString );
-    static ::rtl::OUString GetRoleDataLabel();
+    static OUString ConvertRoleFromInternalToUI( const OUString & rRoleString );
+    static OUString GetRoleDataLabel();
 
     // pass a role string (not translated) and get an index that serves for
     // relative ordering, to get e.g. x-values and y-values in the right order
-    static sal_Int32 GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString );
+    static sal_Int32 GetRoleIndexForSorting( const OUString & rInternalRoleString );
 
 private:
     ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index 032f0b528760..2662c1d20d9a 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 5fb035bfde94..9406c3bad501 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -40,7 +40,6 @@
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 
 namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index e7ed3a36cd49..80bc72355acf 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -39,7 +39,6 @@ using namespace ::chart;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 // --------------------------------------------------------------------------------
 
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 28075c5df2f7..4112ee228dbe 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/chart2/XAxis.hpp>
 #include <com/sun/star/chart2/XDiagram.hpp>
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 11a98c6efe2f..73dd06b475c2 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -316,7 +316,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
         else
         {
             m_aED_CrossesAtCategory.SetNoSelection();
-            m_aED_CrossesAt.SetTextValue(rtl::OUString());
+            m_aED_CrossesAt.SetTextValue(OUString());
         }
     }
     else
@@ -438,7 +438,7 @@ void AxisPositionsTabPage::SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCa
     m_bCrossingAxisIsCategoryAxis = bCrossingAxisIsCategoryAxis;
 }
 
-void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories )
+void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories )
 {
     m_aCategories = rCategories;
 }
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 7e05ca19d094..aed839bf350b 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -46,7 +46,7 @@ public:
     void SetNumFormatter( SvNumberFormatter* pFormatter );
 
     void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis );
-    void SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories );
+    void SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories );
 
     void SupportAxisPositioning( bool bSupportAxisPositioning );
 
@@ -91,7 +91,7 @@ private: //member:
     SvNumberFormatter*  m_pNumFormatter;
 
     bool    m_bCrossingAxisIsCategoryAxis;
-    ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories;
+    ::com::sun::star::uno::Sequence< OUString > m_aCategories;
 
     bool    m_bSupportAxisPositioning;
 };
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 9413046a7d15..13a2fe4517e9 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -50,8 +50,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 // --------------------------------------------------------------------------------
 
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 8eed40cfe86d..c83e86cdd773 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -93,7 +93,7 @@ protected:
     DECL_LINK( DownButtonClickedHdl, void* );
 
     // ____ RangeSelectionListenerParent ____
-    virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+    virtual void listeningFinished( const OUString & rNewRange );
     virtual void disposingRangeSelection();
 
     void updateControlState();
@@ -146,7 +146,7 @@ private:
     RangeEdit               m_aEDT_CATEGORIES;
     RangeSelectionButton    m_aIMB_RANGE_CAT;
 
-    ::rtl::OUString         m_aFixedTextRange;
+    OUString         m_aFixedTextRange;
 
     ChartTypeTemplateProvider * m_pTemplateProvider;
     DialogModel &               m_rDialogModel;
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index 602831e464ce..f193943fe60a 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 2f0bc8d683bf..1cff9464e6e5 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -56,7 +56,7 @@ public:
 virtual ~RangeChooserTabPage();
 
     //RangeSelectionListenerParent
-    virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+    virtual void listeningFinished( const OUString & rNewRange );
     virtual void disposingRangeSelection();
 
     void commitPage();
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 00f2231757d4..ea2ca55ebe38 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -254,7 +254,7 @@ protected:
     virtual sal_Int16 SAL_CALL getAccessibleRole()
         throw (::com::sun::star::uno::RuntimeException);
     // has to be implemented by derived classes
-//     virtual ::rtl::OUString SAL_CALL getAccessibleName()
+//     virtual OUString SAL_CALL getAccessibleName()
 //         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
         getAccessibleRelationSet()
@@ -266,7 +266,7 @@ protected:
         throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
                ::com::sun::star::uno::RuntimeException);
     // has to be implemented by derived classes
-//     virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+//     virtual OUString SAL_CALL getAccessibleDescription()
 //         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleComponent ________
@@ -293,12 +293,12 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XServiceInfo ________
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL supportsService(
-        const ::rtl::OUString& ServiceName )
+        const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XEventListener ________
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 2dc75d4ceaa9..205f0257ec05 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -88,13 +88,13 @@ public:
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
     // ________ XAccessibleContext ________
-    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+    virtual OUString SAL_CALL getAccessibleDescription()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent()
         throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+    virtual OUString SAL_CALL getAccessibleName()
         throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL getAccessibleRole()
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 7683449b8526..008ac83da0b0 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -82,9 +82,9 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int16 SAL_CALL getAccessibleRole()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+    virtual OUString SAL_CALL getAccessibleDescription()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getAccessibleName()
+    virtual OUString SAL_CALL getAccessibleName()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 419f642a2b4a..6acda96287ab 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -45,7 +45,7 @@ public:
             ::com::sun::star::beans::XPropertySet > & rPropertySet,
         SfxItemPool& rItemPool,
         ::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize,
-        const ::rtl::OUString & rRefSizePropertyName,
+        const OUString & rRefSizePropertyName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & rRefSizePropSet =
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() );
@@ -68,7 +68,7 @@ private:
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize;
     SAL_WNODEPRECATED_DECLARATIONS_POP
-    ::rtl::OUString                                m_aRefSizePropertyName;
+    OUString                                m_aRefSizePropertyName;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::beans::XPropertySet >    m_xRefSizePropSet;
 };
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 685f1e40ab7d..fd9f75ca706c 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -74,8 +74,8 @@ public:
     void setUpdateAddIn( sal_Bool bUpdateAddIn );
     sal_Bool getUpdateAddIn() const;
 
-    void setBaseDiagram( const rtl::OUString& rBaseDiagram );
-    rtl::OUString getBaseDiagram() const;
+    void setBaseDiagram( const OUString& rBaseDiagram );
+    OUString getBaseDiagram() const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const;
 
@@ -112,10 +112,10 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XModel ____
-    virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence<
+    virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence<
                                               ::com::sun::star::beans::PropertyValue >& Arguments )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getURL()
+    virtual OUString SAL_CALL getURL()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence<
         ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs()
@@ -167,17 +167,17 @@ protected:
 
     // ____ XMultiServiceFactory ____
     virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+            ::com::sun::star::uno::XInterface > SAL_CALL 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,
+                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 getAvailableServiceNames()
+            OUString > SAL_CALL getAvailableServiceNames()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XAggregation ____
@@ -209,7 +209,7 @@ private: //member
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xArea;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn;
-    rtl::OUString   m_aBaseDiagram;
+    OUString   m_aBaseDiagram;
     sal_Bool        m_bUpdateAddIn;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >   m_xChartView;
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 41434d629379..5831a2351909 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -82,7 +82,7 @@ public:
 
     SfxItemSet   getPositionAndSizeItemSetFromMarkedObject() const;
 
-    SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const;
+    SdrObject* getNamedSdrObject( const OUString& rName ) const;
     bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const;
 
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 6f2eca96f514..d8762bac9c5d 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -82,7 +82,7 @@ public:
     // typedefs -------------------------------
 
     typedef sal_uInt16          tWhichIdType;
-    typedef ::rtl::OUString tPropertyNameType;
+    typedef OUString tPropertyNameType;
     typedef sal_uInt8            tMemberIdType;
 
     typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId;
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 6c7f066bbec7..2ff51e53f754 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -37,40 +37,40 @@ namespace chart
 class ObjectNameProvider
 {
 public:
-    static rtl::OUString getName( ObjectType eObjectType, bool bPlural=false );
-    static rtl::OUString getAxisName( const rtl::OUString& rObjectCID
+    static OUString getName( ObjectType eObjectType, bool bPlural=false );
+    static OUString getAxisName( const OUString& rObjectCID
                         , const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel >& xChartModel  );
-    static rtl::OUString getGridName( const rtl::OUString& rObjectCID
+    static OUString getGridName( const OUString& rObjectCID
                         , const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel >& xChartModel );
-    static rtl::OUString getTitleName( const rtl::OUString& rObjectCID
+    static OUString getTitleName( const OUString& rObjectCID
                         , const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel >& xChartModel );
-    static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType );
+    static OUString getTitleNameByType( TitleHelper::eTitleType eType );
 
-    static rtl::OUString getNameForCID(
-        const rtl::OUString& rObjectCID,
+    static OUString getNameForCID(
+        const OUString& rObjectCID,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument >& xChartDocument );
 
-    static rtl::OUString getName_ObjectForSeries(
+    static OUString getName_ObjectForSeries(
         ObjectType eObjectType,
-        const rtl::OUString& rSeriesCID,
+        const OUString& rSeriesCID,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XChartDocument >& xChartDocument );
-    static rtl::OUString getName_ObjectForAllSeries( ObjectType eObjectType );
+    static OUString getName_ObjectForAllSeries( ObjectType eObjectType );
 
     /** Provides help texts for the various chart elements.
         The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier.
      */
-    static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
-    static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false );
+    static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
+    static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false );
 
     /** This is used for showing the currently selected object in the status bar
         (command "Context")
      */
-    static rtl::OUString getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
+    static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
index 0b246f432c58..07f9250259c8 100644
--- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
+++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
@@ -40,7 +40,7 @@ public:
             , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize
             , const ::com::sun::star::awt::Rectangle& rPageRectangle );
 
-    static bool moveObject( const rtl::OUString& rObjectCID
+    static bool moveObject( const OUString& rObjectCID
             , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
             , const ::com::sun::star::awt::Rectangle& rNewPositionAndSize
             , const ::com::sun::star::awt::Rectangle& rPageRectangle );
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index f3016fc8f991..3d1456703823 100644
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -48,11 +48,11 @@ public:
             ::com::sun::star::sheet::XRangeSelection > getRangeSelection();
     void raiseRangeSelectionDocument();
     bool chooseRange(
-        const ::rtl::OUString & aCurrentRange,
-        const ::rtl::OUString & aUIString,
+        const OUString & aCurrentRange,
+        const OUString & aUIString,
         RangeSelectionListenerParent & rListenerParent );
     void stopRangeListening( bool bRemoveListener = true );
-    bool verifyCellRange( const ::rtl::OUString & rRangeStr );
+    bool verifyCellRange( const OUString & rRangeStr );
     bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments );
 
 private:
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index 4b0c72d679d6..79364423f35c 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -30,7 +30,7 @@ namespace chart
 class RangeSelectionListenerParent
 {
 public:
-    virtual void listeningFinished( const ::rtl::OUString & rNewRange ) = 0;
+    virtual void listeningFinished( const OUString & rNewRange ) = 0;
     virtual void disposingRangeSelection() = 0;
 
 protected:
@@ -46,7 +46,7 @@ class RangeSelectionListener : public
 public:
     explicit RangeSelectionListener(
         RangeSelectionListenerParent & rParent,
-        const ::rtl::OUString & rInitialRange,
+        const OUString & rInitialRange,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel >& xModelToLockController );
     virtual ~RangeSelectionListener();
@@ -64,7 +64,7 @@ protected:
 
 private:
     RangeSelectionListenerParent & m_rParent;
-    ::rtl::OUString m_aRange;
+    OUString m_aRange;
     ControllerLockGuard m_aControllerLockGuard;
 };
 
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 96dd48c774ee..c07df8998447 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -38,7 +38,7 @@ struct TitleDialogData
 {
     ::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList;
     ::com::sun::star::uno::Sequence< sal_Bool > aExistenceList;
-    ::com::sun::star::uno::Sequence< rtl::OUString > aTextList;
+    ::com::sun::star::uno::Sequence< OUString > aTextList;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     ::std::auto_ptr< ReferenceSizeProvider >    apReferenceSizeProvider;
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index ac3679fa93a4..a7746b0e16e6 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -39,8 +39,8 @@ public:
     ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
 
     // XServiceInfo - static methods
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void);
-    static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void);
+    static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
             SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&);
 private:
@@ -53,7 +53,7 @@ private:
     // XTypeProvider
     virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(com::sun::star::uno::RuntimeException);
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
     virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // XPropertySet
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5396b2310e50..2c7328787ff0 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -70,7 +70,7 @@ public:
     APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg)
 
     // XExecutableDialog
-    virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Int16 SAL_CALL execute(  ) throw (::com::sun::star::uno::RuntimeException);
 
     // XInitialization
@@ -84,12 +84,12 @@ public:
 
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     DECL_LINK( DialogEventHdl, VclWindowEvent* );
 
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 4c4c75803f83..9d14cac4e674 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -48,7 +48,7 @@ public:
             ::com::sun::star::frame::XModel >& xChartModel,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XInterface >& xChartView,
-        const ::rtl::OUString& rSelectedObjectCID );
+        const OUString& rSelectedObjectCID );
 
     void FillItemSet( SfxItemSet& rOutAttrs );
     virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 8daa13a7a592..8a8080e96c67 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -32,12 +32,12 @@ namespace chart
 class ObjectPropertiesDialogParameter
 {
 public:
-    ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID );
+    ObjectPropertiesDialogParameter( const OUString& rObjectCID );
     virtual ~ObjectPropertiesDialogParameter();
 
     void            init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
     ObjectType      getObjectType() const;
-    rtl::OUString   getLocalizedName() const;
+    OUString   getLocalizedName() const;
 
     bool HasGeometryProperties() const;
     bool HasStatisticProperties() const;
@@ -55,7 +55,7 @@ public:
     bool IsSupportingAxisPositioning() const;
     bool ShowAxisOrigin() const;
     bool IsCrossingAxisIsCategoryAxis() const;
-    const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const;
+    const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
         getDocument() const;
@@ -63,11 +63,11 @@ public:
     bool IsComplexCategoriesAxis() const;
 
 private:
-    rtl::OUString   m_aObjectCID;
+    OUString   m_aObjectCID;
     ObjectType      m_eObjectType;
     bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles)
 
-    rtl::OUString   m_aLocalizedName;
+    OUString   m_aLocalizedName;
 
     bool m_bHasGeometryProperties;
     bool m_bHasStatisticProperties;
@@ -86,7 +86,7 @@ private:
     bool m_bSupportingAxisPositioning;
     bool m_bShowAxisOrigin;
     bool m_bIsCrossingAxisIsCategoryAxis;
-    ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories;
+    ::com::sun::star::uno::Sequence< OUString > m_aCategories;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument;
 
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 98addc7dfd83..f0ea1c9e4b93 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -69,7 +69,7 @@ public:
     void FillValueSets();
 
     // ____ RangeSelectionListenerParent ____
-    virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+    virtual void listeningFinished( const OUString & rNewRange );
     virtual void disposingRangeSelection();
 
 private:
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 72cdcf714e54..5a6e5b1ed28e 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -213,7 +213,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
                 catch( const uno::Exception &ex )
                 {
                     (void)ex;
-                    OSL_FAIL( ::rtl::OUStringToOString(
+                    OSL_FAIL( OUStringToOString(
                                     ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
                 }
             }
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 21bad8fcafe0..c3e98b01cab5 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -122,7 +122,7 @@ public:
      */
     virtual bool requestQuickHelp(
         ::Point aAtLogicPosition, bool bIsBalloonHelp,
-        ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0;
+        OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() = 0;
 };
@@ -219,7 +219,7 @@ public:
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::frame::XDispatch> SAL_CALL
         queryDispatch( const ::com::sun::star::util::URL& rURL
-                            , const rtl::OUString& rTargetFrameName
+                            , const OUString& rTargetFrameName
                             , sal_Int32 nSearchFlags)
                             throw (::com::sun::star::uno::RuntimeException);
 
@@ -398,16 +398,16 @@ public:
     // ::com::sun::star::lang 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);
 
@@ -453,7 +453,7 @@ public:
 
     virtual bool requestQuickHelp(
         ::Point aAtLogicPosition, bool bIsBalloonHelp,
-        ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect );
+        OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect );
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 
@@ -599,9 +599,9 @@ private:
 
     //executeDispatch methods
     void SAL_CALL       executeDispatch_ObjectProperties();
-    void SAL_CALL       executeDispatch_FormatObject( const ::rtl::OUString& rDispatchCommand );
-    void SAL_CALL       executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID );
-    bool                executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso );
+    void SAL_CALL       executeDispatch_FormatObject( const OUString& rDispatchCommand );
+    void SAL_CALL       executeDlg_ObjectProperties( const OUString& rObjectCID );
+    bool                executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso );
 
     void SAL_CALL       executeDispatch_ChartType();
 
@@ -694,10 +694,10 @@ private:
     };
     /// @return </sal_True>, if resize/move was successful
     bool impl_moveOrResizeObject(
-        const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
-    bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset );
+        const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
+    bool impl_DragDataPoint( const OUString & rCID, double fOffset );
 
-    ::std::set< ::rtl::OUString > impl_getAvailableCommands();
+    ::std::set< OUString > impl_getAvailableCommands();
 
     /** Creates a helper accesibility class that must be initialized via XInitialization.  For
         parameters see
@@ -713,7 +713,7 @@ private:
     void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic,
                             const ::Point & aPosition );
     void impl_PasteShapes( SdrModel* pModel );
-    void impl_PasteStringAsTextShape( const ::rtl::OUString& rString, const ::com::sun::star::awt::Point& rPosition );
+    void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition );
     void impl_SetMousePointer( const MouseEvent & rEvent );
 
     void impl_ClearSelection();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 8c7c733ff59b..8741ec9a21b7 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 //.............................................................................
 
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 8091aa63046f..b0c56b81fe26 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -116,7 +116,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang
 
 void SAL_CALL ChartController::executeDispatch_PositionAndSize()
 {
-    const ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+    const OUString aCID( m_aSelection.getSelectedCID() );
 
     if( aCID.isEmpty() )
         return;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 145e7e34ca8a..f06c271b5c89 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -69,7 +69,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 80056ac468b8..8fd50b0a64d7 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -135,7 +135,7 @@ bool ChartController::EndTextEdit()
                             pOutliner->GetParagraph( 0 ),
                             pOutliner->GetParagraphCount() );
 
-        ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
+        OUString aObjectCID = m_aSelection.getSelectedCID();
         if ( !aObjectCID.isEmpty() )
         {
             uno::Reference< beans::XPropertySet > xPropSet =
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 17581e3b06ab..889be4313877 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -84,7 +84,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
@@ -601,7 +600,7 @@ bool ChartController::executeDispatch_Delete()
     bool bReturn = false;
 
     // remove the selected object
-    rtl::OUString aCID( m_aSelection.getSelectedCID() );
+    OUString aCID( m_aSelection.getSelectedCID() );
     if( !aCID.isEmpty() )
     {
         if( !isObjectDeleteable( uno::Any( aCID ) ) )
@@ -759,7 +758,7 @@ bool ChartController::executeDispatch_Delete()
                 {
                     UndoGuard aUndoGuard = UndoGuard(
                         ActionDescriptionProvider::createDescription(
-                        ActionDescriptionProvider::DELETE, ::rtl::OUString( String(
+                        ActionDescriptionProvider::DELETE, OUString( String(
                             SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))),
                                 m_xUndoManager );
                     chart2::DataPointLabel aLabel;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index a104d13b9a60..0c748f13d7c5 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -82,7 +82,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -134,9 +133,9 @@ bool lcl_MoveObjectLogic(
 void lcl_insertMenuCommand(
     const uno::Reference< awt::XPopupMenu > & xMenu,
     const uno::Reference< awt::XMenuExtended > & xMenuEx,
-    sal_Int16 nId, const ::rtl::OUString & rCommand )
+    sal_Int16 nId, const OUString & rCommand )
 {
-    static ::rtl::OUString aEmptyString;
+    static OUString aEmptyString;
     xMenu->insertItem( nId, aEmptyString, 0, -1 );
     xMenuEx->setCommand( nId, rCommand );
 }
@@ -729,7 +728,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
         }
         else
         {
-            rtl::OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) );
+            OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) );
             if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) )
                 pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() );
         }
@@ -936,7 +935,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel )
     bool bEditText = false;
     if ( m_aSelection.hasSelection() )
     {
-        ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+        OUString aCID( m_aSelection.getSelectedCID() );
         if ( !aCID.isEmpty() )
         {
             ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
@@ -1404,7 +1403,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
                 nCode == KEY_DOWN )
             {
                 bDrag = true;
-                rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() ));
+                OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() ));
                 sal_Int32 nOffsetPercentDummy( 0 );
                 awt::Point aMinimumPosition( 0, 0 );
                 awt::Point aMaximumPosition( 0, 0 );
@@ -1577,7 +1576,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
 bool ChartController::requestQuickHelp(
     ::Point aAtLogicPosition,
     bool bIsBalloonHelp,
-    ::rtl::OUString & rOutQuickHelpText,
+    OUString & rOutQuickHelpText,
     awt::Rectangle & rOutEqualRect )
 {
     uno::Reference< frame::XModel > xChartModel;
@@ -1587,7 +1586,7 @@ bool ChartController::requestQuickHelp(
         return false;
 
     // help text
-    ::rtl::OUString aCID;
+    OUString aCID;
     if( m_pDrawViewWrapper )
     {
         aCID = SelectionHelper::getHitObjectCID(
@@ -1622,9 +1621,9 @@ bool ChartController::requestQuickHelp(
     if ( rSelection.hasValue() )
     {
         const uno::Type& rType = rSelection.getValueType();
-        if ( rType == ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) ) )
+        if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) )
         {
-            ::rtl::OUString aNewCID;
+            OUString aNewCID;
             if ( ( rSelection >>= aNewCID ) && m_aSelection.setSelection( aNewCID ) )
             {
                 bSuccess = true;
@@ -1672,7 +1671,7 @@ bool ChartController::requestQuickHelp(
     uno::Any aReturn;
     if ( m_aSelection.hasSelection() )
     {
-        ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+        OUString aCID( m_aSelection.getSelectedCID() );
         if ( !aCID.isEmpty() )
         {
             aReturn = uno::makeAny( aCID );
@@ -1746,7 +1745,7 @@ void ChartController::impl_selectObjectAndNotiy()
 }
 
 bool ChartController::impl_moveOrResizeObject(
-    const ::rtl::OUString & rCID,
+    const OUString & rCID,
     eMoveOrResizeType eType,
     double fAmountLogicX,
     double fAmountLogicY )
@@ -1829,7 +1828,7 @@ bool ChartController::impl_moveOrResizeObject(
     return bResult;
 }
 
-bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double fAdditionalOffset )
+bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditionalOffset )
 {
     bool bResult = false;
     if( fAdditionalOffset < -1.0 || fAdditionalOffset > 1.0 || fAdditionalOffset == 0.0 )
@@ -1985,7 +1984,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
                 return;
             }
 
-            ::rtl::OUString aHitObjectCID(
+            OUString aHitObjectCID(
                 SelectionHelper::getHitObjectCID(
                     aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ ));
 
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 83d075a045c5..e09c298ddfa0 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 5b2c03b3aaf6..2e2713ba3b67 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -62,10 +62,10 @@ ChartFrameLoader::~ChartFrameLoader()
 
 APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME)
 
-    uno::Sequence< rtl::OUString > ChartFrameLoader
+    uno::Sequence< OUString > ChartFrameLoader
 ::getSupportedServiceNames_Static()
 {
-    uno::Sequence< rtl::OUString > aSNS( 1 );
+    uno::Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME;
     return aSNS;
 }
@@ -146,7 +146,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
             comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
             if( aIt != aMediaDescriptor.end())
             {
-                ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >());
+                OUString aURL( (*aIt).second.get< OUString >());
                 if( aURL.matchAsciiL(
                     RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" )))
                 {
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index efc9782c1874..a1742ea40502 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.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;
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index d4b78aa7256b..2e1bd460a2e1 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -203,7 +203,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
     {
 //         Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel()
         Point aLogicHitPos = PixelToLogic( GetPointerPosPixel());
-        ::rtl::OUString aQuickHelpText;
+        OUString aQuickHelpText;
         awt::Rectangle aHelpRect;
         bool bIsBalloonHelp( Help::IsBalloonHelpEnabled() );
         bHelpHandled = m_pWindowController->requestQuickHelp( aLogicHitPos, bIsBalloonHelp, aQuickHelpText, aHelpRect );
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 0f609260aea5..2c547fba4c04 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index c0a82ecb61ca..b1d8b9f14000 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -73,10 +73,10 @@ protected:
             called with this parameter set to give an initial state.
      */
     virtual void fireStatusEvent(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0;
 
-    /** calls fireStatusEvent( ::rtl::OUString, xSingleListener )
+    /** calls fireStatusEvent( OUString, xSingleListener )
      */
     void fireAllStatusEvents(
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
@@ -90,12 +90,12 @@ protected:
             called with this parameter set to give an initial state.
      */
     void fireStatusEventForURL(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Any & rState,
         bool bEnabled,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener =
             ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >(),
-        const ::rtl::OUString & rFeatureDescriptor = ::rtl::OUString() );
+        const OUString & rFeatureDescriptor = OUString() );
 
     // ____ XDispatch ____
     virtual void SAL_CALL dispatch(
@@ -130,7 +130,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer >  m_xURLTransformer;
 
 private:
-    typedef ::std::map< ::rtl::OUString, ::cppu::OInterfaceContainerHelper* >
+    typedef ::std::map< OUString, ::cppu::OInterfaceContainerHelper* >
         tListenerMap;
 
     tListenerMap m_aListeners;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 2c02b0261291..483fedf4d9d3 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx
index 2e4a3b3131f6..0f568f7bf08c 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -84,7 +84,7 @@ public:
     void setChartDispatch(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XDispatch > xChartDispatch,
-        const ::std::set< ::rtl::OUString > & rChartCommands );
+        const ::std::set< OUString > & rChartCommands );
 
     /** Returns the dispatch that is able to do the command given in rURL, if
         implemented here.  If the URL is not implemented here, it should be
@@ -117,7 +117,7 @@ public:
 
 private:
     typedef
-        ::std::map< ::rtl::OUString,
+        ::std::map< OUString,
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::frame::XDispatch > >
         tDispatchMap;
@@ -132,9 +132,9 @@ private:
     ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel >         m_xModel;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher;
-    ::std::set< ::rtl::OUString >                                          m_aChartCommands;
+    ::std::set< OUString >                                          m_aChartCommands;
 
-    ::std::set< ::rtl::OUString >                                          m_aContainerDocumentCommands;
+    ::std::set< OUString >                                          m_aContainerDocumentCommands;
 
     ChartController* m_pChartController;
     DrawCommandDispatch* m_pDrawCommandDispatch;
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 812dbe58a050..31a088120f35 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -57,11 +57,11 @@ public:
 
     FieldUnit getFieldUnit();
     virtual void                    Commit();
-    virtual void                    Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void                    Notify( const uno::Sequence<OUString>& aPropertyNames);
 };
 
 CalcConfigItem::CalcConfigItem()
-    : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" ))
+    : ConfigItem( OUString( "Office.Calc/Layout" ))
 {
 }
 
@@ -70,7 +70,7 @@ CalcConfigItem::~CalcConfigItem()
 }
 
 void CalcConfigItem::Commit() {}
-void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {}
+void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {}
 
 FieldUnit CalcConfigItem::getFieldUnit()
 {
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index bcde205f12e4..f4c1669c3753 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
@@ -701,7 +700,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
     return false;
 }
 
-bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand )
+bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const OUString& rCommand )
 {
     ShapeController* pShapeController = ( m_pDispatchContainer ? m_pDispatchContainer->getShapeController() : NULL );
     if ( pShapeController )
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index bf0895edfabb..a165bc259b46 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -82,7 +82,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual void fireStatusEvent(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
 
     // ____ XModifyListener ____
@@ -97,13 +97,13 @@ protected:
 
 private:
     void fireStatusEventForURLImpl(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
 
-    bool commandAvailable( const ::rtl::OUString & rCommand );
+    bool commandAvailable( const OUString & rCommand );
     void updateCommandAvailability();
 
-    bool isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand );
+    bool isShapeControllerCommandAvailable( const OUString& rCommand );
 
     ChartController* m_pChartController;
     ::com::sun::star::uno::Reference<
@@ -116,8 +116,8 @@ private:
     ::std::auto_ptr< impl::ModelState > m_apModelState;
     ::std::auto_ptr< impl::ControllerState > m_apControllerState;
 
-    mutable ::std::map< ::rtl::OUString, bool > m_aCommandAvailability;
-    mutable ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > m_aCommandArguments;
+    mutable ::std::map< OUString, bool > m_aCommandAvailability;
+    mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments;
 
     CommandDispatchContainer* m_pDispatchContainer;
 };
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 0c107d0a3538..2724551354a3 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -41,7 +41,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::WeakReference;
 
 DragMethod_Base::DragMethod_Base( DrawViewWrapper& rDrawViewWrapper
-                                             , const rtl::OUString& rObjectCID
+                                             , const OUString& rObjectCID
                                              , const Reference< frame::XModel >& xChartModel
                                              , ActionDescriptionProvider::ActionType eActionType )
     : SdrDragMethod( rDrawViewWrapper )
@@ -61,7 +61,7 @@ Reference< frame::XModel > DragMethod_Base::getChartModel() const
     return Reference< frame::XModel >( m_xChartModel );
 }
 
-rtl::OUString DragMethod_Base::getUndoDescription() const
+OUString DragMethod_Base::getUndoDescription() const
 {
     return ActionDescriptionProvider::createDescription(
                 m_eActionType,
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index 148378040243..28ffa918d6da 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -33,12 +33,12 @@ namespace chart
 class DragMethod_Base : public SdrDragMethod
 {
 public:
-    DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID
+    DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID
         , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
         , ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE );
     virtual ~DragMethod_Base();
 
-    virtual rtl::OUString getUndoDescription() const;
+    virtual OUString getUndoDescription() const;
 
     virtual void TakeSdrDragComment(String& rStr) const;
     virtual Pointer GetSdrDragPointer() const;
@@ -48,7 +48,7 @@ protected:
 
 protected:
     DrawViewWrapper&    m_rDrawViewWrapper;
-    rtl::OUString       m_aObjectCID;
+    OUString       m_aObjectCID;
     ActionDescriptionProvider::ActionType m_eActionType;
 
 private:
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 27267eaab5a6..abf58cbc149e 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference;
 using ::basegfx::B2DVector;
 
 DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper
-                                             , const rtl::OUString& rObjectCID
+                                             , const OUString& rObjectCID
                                              , const Reference< frame::XModel >& xChartModel )
     : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel )
     , m_aStartVector(100.0,100.0)
@@ -48,7 +48,7 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper
     , m_aDragDirection(1000.0,1000.0)
     , m_fDragRange( 1.0 )
 {
-    rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) );
+    OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) );
 
     sal_Int32 nOffsetPercent(0);
     awt::Point aMinimumPosition(0,0);
@@ -75,7 +75,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
 void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
 {
     rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
-    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+    rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
 }
 bool DragMethod_PieSegment::BeginSdrDrag()
 {
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx
index 022a188dda9a..a92a855e21ce 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.hxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx
@@ -28,7 +28,7 @@ namespace chart
 class DragMethod_PieSegment : public DragMethod_Base
 {
 public:
-    DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID
+    DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID
         , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
     virtual ~DragMethod_PieSegment();
 
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index ce8a0e120aaa..00cada78f8a1 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 
 DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper
-        , const rtl::OUString& rObjectCID
+        , const OUString& rObjectCID
         , const Reference< frame::XModel >& xChartModel
         , RotationDirection eRotationDirection )
     : DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE )
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index 04d6f6e46cff..e48ff981231a 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -39,7 +39,7 @@ public:
     };
 
     DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper
-        , const rtl::OUString& rObjectCID
+        , const OUString& rObjectCID
         , const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
         , RotationDirection eRotationDirection
         );
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 57b629e0fd05..ffe3ccb95cb8 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -59,13 +59,13 @@ namespace
 //.............................................................................
 
     // comparing two PropertyValue instances
-    struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString, bool >
+    struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool >
     {
-        bool operator() ( const beans::PropertyValue& rPropValue, const ::rtl::OUString& rName ) const
+        bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const
         {
             return rPropValue.Name.equals( rName );
         }
-        bool operator() ( const ::rtl::OUString& rName, const beans::PropertyValue& rPropValue ) const
+        bool operator() ( const OUString& rName, const beans::PropertyValue& rPropValue ) const
         {
             return rName.equals( rPropValue.Name );
         }
@@ -97,11 +97,11 @@ void DrawCommandDispatch::initialize()
     FeatureCommandDispatchBase::initialize();
 }
 
-bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL )
+bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
 {
     sal_uInt16 nFeatureId = 0;
-    ::rtl::OUString aBaseCommand;
-    ::rtl::OUString aCustomShapeType;
+    OUString aBaseCommand;
+    OUString aCustomShapeType;
     return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType );
 }
 
@@ -137,7 +137,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
             sal_Bool bAttributesAppliedFromGallery = sal_False;
             if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
             {
-                ::std::vector< ::rtl::OUString > aObjList;
+                ::std::vector< OUString > aObjList;
                 if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
                 {
                     for ( sal_uInt16 i = 0; i < aObjList.size(); ++i )
@@ -244,15 +244,15 @@ void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ )
 {
 }
 
-FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand )
+FeatureState DrawCommandDispatch::getState( const OUString& rCommand )
 {
     FeatureState aReturn;
     aReturn.bEnabled = false;
     aReturn.aState <<= false;
 
     sal_uInt16 nFeatureId = 0;
-    ::rtl::OUString aBaseCommand;
-    ::rtl::OUString aCustomShapeType;
+    OUString aBaseCommand;
+    OUString aCustomShapeType;
     if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
     {
         switch ( nFeatureId )
@@ -288,7 +288,7 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand )
     return aReturn;
 }
 
-void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
+void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
 {
     (void)rArgs;
 
@@ -297,8 +297,8 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
     bool bCreate = false;
 
     sal_uInt16 nFeatureId = 0;
-    ::rtl::OUString aBaseCommand;
-    ::rtl::OUString aCustomShapeType;
+    OUString aBaseCommand;
+    OUString aCustomShapeType;
     if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
     {
         m_nFeatureId = nFeatureId;
@@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
                     pDrawViewWrapper->SetCreateMode();
                 }
 
-                const ::rtl::OUString sKeyModifier( "KeyModifier" );
+                const OUString sKeyModifier( "KeyModifier" );
                 const beans::PropertyValue* pIter = rArgs.getConstArray();
                 const beans::PropertyValue* pEnd  = pIter + rArgs.getLength();
                 const beans::PropertyValue* pKeyModifier = ::std::find_if(
@@ -577,7 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
 }
 
 bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId,
-    OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType )
+    OUString* pBaseCommand, OUString* pCustomShapeType )
 {
     bool bFound = true;
     sal_uInt16 nFeatureId = 0;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index 1510346f395b..afa6799ab11c 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -45,7 +45,7 @@ public:
     // late initialisation, especially for adding as listener
     virtual void initialize();
 
-    virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
+    virtual bool isFeatureSupported( const OUString& rCommandURL );
 
     void setAttributes( SdrObject* pObj );
     void setLineEnds( SfxItemSet& rAttr );
@@ -59,10 +59,10 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // state of a feature
-    virtual FeatureState getState( const ::rtl::OUString& rCommand );
+    virtual FeatureState getState( const OUString& rCommand );
 
     // execute a feature
-    virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
+    virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
 
     // all the features which should be handled by this class
     virtual void describeSupportedFeatures();
@@ -71,10 +71,10 @@ private:
     void setInsertObj( sal_uInt16 eObj );
     SdrObject* createDefaultObject( const sal_uInt16 nID );
 
-    bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType );
+    bool parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, OUString* pBaseCommand, OUString* pCustomShapeType );
 
     ChartController* m_pChartController;
-    ::rtl::OUString m_aCustomShapeType;
+    OUString m_aCustomShapeType;
 };
 
 //.............................................................................
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index b59945579bbb..2711702d8e7f 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -71,7 +71,7 @@ void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierar
     while( aIt != aChildren.end() )
     {
         ObjectHierarchy::tOID aOID = *aIt;
-        ::rtl::OUString aCID = aOID.getObjectCID();
+        OUString aCID = aOID.getObjectCID();
         ListBoxEntryData aEntry;
         aEntry.OID = aOID;
         aEntry.UIName += ObjectNameProvider::getNameForCID( aCID, xChartDoc );
@@ -97,7 +97,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
     {
         Reference< view::XSelectionSupplier > xSelectionSupplier( xChartController, uno::UNO_QUERY);
         ObjectHierarchy::tOID aSelectedOID;
-        rtl::OUString aSelectedCID;
+        OUString aSelectedCID;
         if( xSelectionSupplier.is() )
         {
             aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() );
@@ -123,7 +123,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
         {
             if ( aSelectedOID.isAutoGeneratedObject() )
             {
-                rtl::OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) );
+                OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) );
                 for( aIt = m_aEntries.begin(); aIt != m_aEntries.end(); ++aIt )
                 {
                     if( aIt->OID.getObjectCID().match( aSeriesCID ) )
@@ -144,8 +144,8 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
             {
                 ListBoxEntryData aEntry;
                 SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() );
-                rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString();
-                aEntry.UIName = ( aName.isEmpty() ?  ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName );
+                OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString();
+                aEntry.UIName = ( aName.isEmpty() ?  OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName );
                 aEntry.OID = aSelectedOID;
                 m_aEntries.push_back( aEntry );
             }
@@ -252,9 +252,9 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat
 APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName );
 
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
+Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
 {
-    Sequence< ::rtl::OUString > aServices(1);
+    Sequence< OUString > aServices(1);
     aServices[ 0 ] = "com.sun.star.frame.ToolbarController";
     return aServices;
 }
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index f32fa37c32f6..025500f9f2ef 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -37,7 +37,7 @@ namespace chart
 
 struct ListBoxEntryData
 {
-    rtl::OUString UIName;
+    OUString UIName;
     ObjectHierarchy::tOID OID;
     sal_Int32 nHierarchyDepth;
 
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 5362827d47f1..c3b3ce7f5f58 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -44,7 +44,7 @@ void FeatureCommandDispatchBase::initialize()
     fillSupportedFeatures();
 }
 
-bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL )
+bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL )
 {
     SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL );
     if ( aIter != m_aSupportedFeatures.end() )
@@ -54,7 +54,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom
     return false;
 }
 
-void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL,
+void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL,
     const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ )
 {
     if ( rURL.isEmpty() )
@@ -78,7 +78,7 @@ void FeatureCommandDispatchBase::dispatch( const util::URL& URL,
     const Sequence< beans::PropertyValue >& Arguments )
     throw (uno::RuntimeException)
 {
-    ::rtl::OUString aCommand( URL.Complete );
+    OUString aCommand( URL.Complete );
     if ( getState( aCommand ).bEnabled )
     {
         execute( aCommand, Arguments );
@@ -89,7 +89,7 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p
     sal_uInt16 nId, sal_Int16 nGroup )
 {
     ControllerFeature aFeature;
-    aFeature.Command = ::rtl::OUString::createFromAscii( pAsciiCommandURL );
+    aFeature.Command = OUString::createFromAscii( pAsciiCommandURL );
     aFeature.nFeatureId = nId;
     aFeature.GroupId = nGroup;
 
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 06a534251cd5..59d1b32451b9 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -33,9 +33,9 @@ struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation
     sal_uInt16 nFeatureId;
 };
 
-typedef ::std::map< ::rtl::OUString,
+typedef ::std::map< OUString,
                     ControllerFeature,
-                    ::std::less< ::rtl::OUString > > SupportedFeatures;
+                    ::std::less< OUString > > SupportedFeatures;
 
 struct FeatureState
 {
@@ -57,7 +57,7 @@ public:
     // late initialisation, especially for adding as listener
     virtual void initialize();
 
-    virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
+    virtual bool isFeatureSupported( const OUString& rCommandURL );
 
 protected:
     // XDispatch
@@ -65,14 +65,14 @@ protected:
         const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments )
         throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void fireStatusEvent( const ::rtl::OUString& rURL,
+    virtual void fireStatusEvent( const OUString& rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener );
 
     // state of a feature
-    virtual FeatureState getState( const ::rtl::OUString& rCommand ) = 0;
+    virtual FeatureState getState( const OUString& rCommand ) = 0;
 
     // execute a feature
-    virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0;
+    virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0;
 
     // all the features which should be handled by this class
     virtual void describeSupportedFeatures() = 0;
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 6ed11f9f64fd..ebcb60569747 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
@@ -375,12 +374,12 @@ void ImplObjectHierarchy::createWallAndFloor(
     if( bHasWall && bIsThreeD )
     {
         rContainer.push_back(
-            ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) ) );
+            ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) );
 
         Reference< beans::XPropertySet > xFloor( xDiagram->getFloor());
         if( xFloor.is())
             rContainer.push_back(
-                ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) ) );
+                ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) );
     }
 
 }
@@ -443,7 +442,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
                     // data lablels
                     if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) )
                     {
-                        rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
+                        OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
                         aChildParticle+=("=");
                         aSeriesSubContainer.push_back(
                                     ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) );
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 047d55dd5709..fa57560005f7 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -128,7 +128,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
     return true;
 }
 
-bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID
+bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID
                 , const uno::Reference< frame::XModel >& xChartModel
                 , const awt::Rectangle& rNewPositionAndSize
                 , const awt::Rectangle& rPageRectangle
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 16c795875aa6..950c05df949b 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -43,11 +43,11 @@ using namespace ::com::sun::star;
 namespace
 {
 
-rtl::OUString lcl_getObjectName( SdrObject* pObj )
+OUString lcl_getObjectName( SdrObject* pObj )
 {
     if(pObj)
        return pObj->GetName();
-    return rtl::OUString();
+    return OUString();
 }
 
 void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper )
@@ -71,7 +71,7 @@ bool Selection::hasSelection()
     return m_aSelectedOID.isValid();
 }
 
-rtl::OUString Selection::getSelectedCID()
+OUString Selection::getSelectedCID()
 {
     return m_aSelectedOID.getObjectCID();
 }
@@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const
     return m_aSelectedOID;
 }
 
-bool Selection::setSelection( const ::rtl::OUString& rCID )
+bool Selection::setSelection( const OUString& rCID )
 {
     if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) )
     {
@@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
 
             if ( !m_aSelectedOID.isAdditionalShape() )
             {
-                rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+                OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
 
                 if ( !m_aSelectedOID.isAutoGeneratedObject() )
                 {
@@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
                 }
 
                 //check whether the diagram was hit but not selected (e.g. because it has no filling):
-                rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
-                rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+                OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
                 bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
                 if( bBackGroundHit )
                 {
@@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
                 //check whether the legend was hit but not selected (e.g. because it has no filling):
                 if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) )
                 {
-                    rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
+                    OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
                     SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID );
                     if( pLegend )
                     {
@@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
-                                      , rtl::OUString& rOutName
+                                      , OUString& rOutName
                                       , bool bGivenObjectMayBeResult )
 {
     SolarMutexGuard aSolarGuard;
     //find the deepest named group
     SdrObject* pObj = pInOutObject;
-    rtl::OUString aName;
+    OUString aName;
     if( bGivenObjectMayBeResult )
         aName = lcl_getObjectName( pObj );
 
@@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
                                       , ObjectIdentifier& rOutObject
                                       , bool bGivenObjectMayBeResult )
 {
-    rtl::OUString aName;
+    OUString aName;
     if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) )
     {
         rOutObject = ObjectIdentifier( aName );
@@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
 }
 
 bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
-                    , const rtl::OUString& rNameOfSelectedObject
+                    , const OUString& rNameOfSelectedObject
                     , const DrawViewWrapper& rDrawViewWrapper )
 {
     if(rNameOfSelectedObject.isEmpty())
@@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     return true;
 }
 
-::rtl::OUString SelectionHelper::getHitObjectCID(
+OUString SelectionHelper::getHitObjectCID(
     const Point& rMPos,
     DrawViewWrapper& rDrawViewWrapper,
     bool bGetDiagramInsteadOf_Wall )
 {
     // //- solar mutex
     SolarMutexGuard aSolarGuard;
-    rtl::OUString aRet;
+    OUString aRet;
 
     SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos);
     aRet = lcl_getObjectName( pNewObj );//name of pNewObj
@@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     //accept only named objects while searching for the object to select
     if( !findNamedParent( pNewObj, aRet, true ) )
     {
-        aRet = ::rtl::OUString();
+        aRet = OUString();
     }
 
-    rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+    OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
     //get page when nothing was hit
     if( aRet.isEmpty() && !pNewObj )
     {
@@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     {
         if( aRet.equals( aPageCID ) )
         {
-            rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+            OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
             //todo: if more than one diagram is available in future do chack the list of all diagrams here
             SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
             if( pDiagram )
@@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
         }
         else if( bGetDiagramInsteadOf_Wall )
         {
-            rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+            OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
 
             if( aRet.equals( aWallCID ) )
             {
-                rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+                OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
                 aRet = aDiagramCID;
             }
         }
@@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
     // \\- solar mutex
 }
 
-bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
+bool SelectionHelper::isRotateableObject( const OUString& rCID
                     , const uno::Reference< frame::XModel >& xChartModel )
 {
     if( !ObjectIdentifier::isRotateableObject( rCID ) )
@@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
 {
     if(!pObj)
         return 0;
-    rtl::OUString aName( lcl_getObjectName( pObj ) );
+    OUString aName( lcl_getObjectName( pObj ) );
     if( aName.match("MarkHandles") || aName.match("HandlesOnly") )
         return pObj;
     if( !aName.isEmpty() )//dont't get the markhandles of a different object
@@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
     if( !pSubList )//no group object !pObj->IsGroupObject()
         return false;
 
-    rtl::OUString aName( lcl_getObjectName( pObj ) );
+    OUString aName( lcl_getObjectName( pObj ) );
     ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) );
     if( OBJECTTYPE_DATA_POINT == eObjectType
         || OBJECTTYPE_DATA_LABEL == eObjectType
@@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
         SdrObject* pSubObj = aIterator.Next();
         if( OBJECTTYPE_DATA_SERIES == eObjectType )
         {
-            rtl::OUString aSubName( lcl_getObjectName( pSubObj ) );
+            OUString aSubName( lcl_getObjectName( pSubObj ) );
             ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) );
             if( eSubObjectType!=OBJECTTYPE_DATA_POINT  )
                 return false;
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 992043f68867..5a4273a7fb2a 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -41,7 +41,7 @@ class Selection
 public: //methods
     bool hasSelection();
 
-    rtl::OUString getSelectedCID();
+    OUString getSelectedCID();
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape > getSelectedAdditionalShape();
     ObjectIdentifier getSelectedOID() const;
@@ -54,7 +54,7 @@ public: //methods
     bool isAdditionalShapeSelected() const;
 
     //returns true if selection has changed
-    bool setSelection( const ::rtl::OUString& rCID );
+    bool setSelection( const OUString& rCID );
     bool setSelection( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape >& xShape );
 
@@ -87,7 +87,7 @@ class SelectionHelper : public MarkHandleProvider
 {
 public:
     static bool             findNamedParent( SdrObject*& pInOutObject
-                                , rtl::OUString& rOutName
+                                , OUString& rOutName
                                 , bool bGivenObjectMayBeResult );
     static bool             findNamedParent( SdrObject*& pInOutObject
                                 , ObjectIdentifier& rOutObject
@@ -95,15 +95,15 @@ public:
     static SdrObject*       getMarkHandlesObject( SdrObject* pObj );
     static E3dScene*        getSceneToRotate( SdrObject* pObj );
     static bool             isDragableObjectHitTwice( const Point& rMPos
-                                , const rtl::OUString& rNameOfSelectedObject
+                                , const OUString& rNameOfSelectedObject
                                 , const DrawViewWrapper& rDrawViewWrapper );
 
-    static ::rtl::OUString getHitObjectCID(
+    static OUString getHitObjectCID(
         const Point& rMPos,
         DrawViewWrapper& rDrawViewWrapper,
         bool bGetDiagramInsteadOf_Wall=false );
 
-    static bool isRotateableObject( const ::rtl::OUString& rCID
+    static bool isRotateableObject( const OUString& rCID
                     , const ::com::sun::star::uno::Reference<
                         ::com::sun::star::frame::XModel >& xChartModel );
 
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 49c94d5b129d..1e7adfd522d4 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -83,7 +83,7 @@ void ShapeController::disposing( const lang::EventObject& /* Source */ )
 {
 }
 
-FeatureState ShapeController::getState( const ::rtl::OUString& rCommand )
+FeatureState ShapeController::getState( const OUString& rCommand )
 {
     FeatureState aReturn;
     aReturn.bEnabled = false;
@@ -150,7 +150,7 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand )
     return aReturn;
 }
 
-void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
+void ShapeController::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
 {
     (void)rArgs;
 
@@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject()
             SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
             if ( pSelectedObj )
             {
-                rtl::OUString aName = pSelectedObj->GetName();
+                OUString aName = pSelectedObj->GetName();
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 if ( pFact )
                 {
diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx
index 268f94e3e1a1..ff3b5a0afc6b 100644
--- a/chart2/source/controller/main/ShapeController.hxx
+++ b/chart2/source/controller/main/ShapeController.hxx
@@ -55,10 +55,10 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // state of a feature
-    virtual FeatureState getState( const ::rtl::OUString& rCommand );
+    virtual FeatureState getState( const OUString& rCommand );
 
     // execute a feature
-    virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
+    virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
 
     // all the features which should be handled by this class
     virtual void describeSupportedFeatures();
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index f3107688f053..4c5d70df90c8 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -56,7 +56,7 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t
     return aSupported;
 }
 
-::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
 {
     return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() );
 }
@@ -198,7 +198,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
                 {
                     continue;
                 }
-                ::rtl::OUString aCmd = rTb.GetItemCommand( nId );
+                OUString aCmd = rTb.GetItemCommand( nId );
                 if ( aCmd == Event.FeatureURL.Complete )
                 {
                     rTb.EnableItem( nId, Event.IsEnabled );
@@ -208,7 +208,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
                     }
                     else
                     {
-                        ::rtl::OUString aItemText;
+                        OUString aItemText;
                         if ( Event.State >>= aItemText )
                         {
                             rTb.SetItemText( nId, aItemText );
@@ -246,7 +246,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
              m_nSlotId == SID_DRAWTBX_CS_STAR );
 }
 
-::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
+OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -255,10 +255,10 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
     {
         return xSub->getSubToolbarName();
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 
-void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException)
+void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException)
 {
     SolarMutexGuard aSolarMutexGuard;
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index 97390e9954db..c8c7d83e1fd8 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -61,15 +61,15 @@ public:
     virtual void SAL_CALL release() throw ();
 
     // ::com::sun::star::lang::XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // needed by registration
-    static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException);
+    static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
+    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException);
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
 
     // ::com::sun::star::lang::XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
@@ -82,8 +82,8 @@ public:
 
     // ::com::sun::star::frame::XSubToolbarController
     virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException);
 };
 
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 55da8a8bf1e1..db7cfc9be370 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index bfabd3d785de..39fef92a8ced 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -79,7 +79,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual void fireStatusEvent(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
 
     // ____ XSelectionChangeListener ____
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index 7aca7704be7e..e27276cf18d0 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -37,7 +37,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
 
 namespace chart
 {
@@ -87,7 +86,7 @@ void SAL_CALL UndoElement::disposing()
 }
 
 // ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException)
+OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException)
 {
     return m_sActionString;
 }
@@ -133,10 +132,10 @@ ShapeUndoElement::~ShapeUndoElement()
 }
 
 // ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException)
+OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException)
 {
     if ( !m_pAction )
-        throw DisposedException( ::rtl::OUString(), *this );
+        throw DisposedException( OUString(), *this );
     return m_pAction->GetComment();
 }
 
@@ -144,7 +143,7 @@ ShapeUndoElement::~ShapeUndoElement()
 void SAL_CALL ShapeUndoElement::undo(  ) throw (UndoFailedException, RuntimeException)
 {
     if ( !m_pAction )
-        throw DisposedException( ::rtl::OUString(), *this );
+        throw DisposedException( OUString(), *this );
     m_pAction->Undo();
 }
 
@@ -152,7 +151,7 @@ void SAL_CALL ShapeUndoElement::undo(  ) throw (UndoFailedException, RuntimeExce
 void SAL_CALL ShapeUndoElement::redo(  ) throw (UndoFailedException, RuntimeException)
 {
     if ( !m_pAction )
-        throw DisposedException( ::rtl::OUString(), *this );
+        throw DisposedException( OUString(), *this );
     m_pAction->Redo();
 }
 
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index cda2b656b1e5..7f3687abdfa0 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -63,13 +63,13 @@ public:
             is the cloned model from before the changes, which the Undo action represents, have been applied.
             Upon <member>invoking</member>, the clone model is applied to the document model.
     */
-    UndoElement( const ::rtl::OUString & i_actionString,
+    UndoElement( const OUString & i_actionString,
                  const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel,
                  const ::boost::shared_ptr< ChartModelClone >& i_modelClone
                );
 
     // XUndoAction
-    virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
 
@@ -83,7 +83,7 @@ private:
     void    impl_toggleModelState();
 
 private:
-    ::rtl::OUString                                                     m_sActionString;
+    OUString                                                     m_sActionString;
     ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel;
     ::boost::shared_ptr< ChartModelClone >                              m_pModelClone;
 };
@@ -98,7 +98,7 @@ public:
     ShapeUndoElement( SdrUndoAction& i_sdrUndoAction );
 
     // XUndoAction
-    virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL undo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL redo(  ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
 
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 27d23d137a44..5d059915da4d 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index f0b9ae769978..88a727521ed1 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -59,7 +59,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual void fireStatusEvent(
-        const ::rtl::OUString & rURL,
+        const OUString & rURL,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
 
 private:
diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx
index ac3be8abca98..01727c88b4a7 100644
--- a/chart2/source/controller/main/UndoGuard.cxx
+++ b/chart2/source/controller/main/UndoGuard.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx
index 85d6923b7eaa..755f38ff85bd 100644
--- a/chart2/source/controller/main/UndoGuard.hxx
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -38,7 +38,7 @@ class UndoGuard
 {
 public:
     explicit UndoGuard(
-        const ::rtl::OUString& i_undoMessage,
+        const OUString& i_undoMessage,
         const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager,
         const ModelFacet i_facet = E_MODEL
     );
@@ -58,7 +58,7 @@ private:
     const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager >  m_xUndoManager;
 
     ::boost::shared_ptr< ChartModelClone >  m_pDocumentSnapshot;
-    rtl::OUString                           m_aUndoString;
+    OUString                           m_aUndoString;
     bool                                    m_bActionPosted;
 };
 
@@ -69,7 +69,7 @@ class UndoLiveUpdateGuard : public UndoGuard
 {
 public:
     explicit UndoLiveUpdateGuard(
-        const ::rtl::OUString& i_undoMessage,
+        const OUString& i_undoMessage,
         const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
     );
     ~UndoLiveUpdateGuard();
@@ -83,7 +83,7 @@ class UndoLiveUpdateGuardWithData :
 {
 public:
     explicit UndoLiveUpdateGuardWithData(
-        const ::rtl::OUString& i_undoMessage,
+        const OUString& i_undoMessage,
         const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
     );
     ~UndoLiveUpdateGuardWithData();
@@ -93,7 +93,7 @@ class UndoGuardWithSelection : public UndoGuard
 {
 public:
     explicit UndoGuardWithSelection(
-        const ::rtl::OUString& i_undoMessage,
+        const OUString& i_undoMessage,
         const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
     );
     virtual ~UndoGuardWithSelection();
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 5d4ef5e0228d..3fa9ee7b9034 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -75,7 +75,7 @@ public:
     /** creates a sequence and initializes it with the given string.  This is
         especially useful for labels, which only have one element.
      */
-    explicit CachedDataSequence( const ::rtl::OUString & rSingleText );
+    explicit CachedDataSequence( const OUString & rSingleText );
 
     /// Copy CTOR
     explicit CachedDataSequence( const CachedDataSequence & rSource );
@@ -105,9 +105,9 @@ protected:
     // ____ XDataSequence ____
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation()
+    virtual OUString SAL_CALL getSourceRangeRepresentation()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel(
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
         ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
@@ -120,7 +120,7 @@ protected:
 
     // ____ XTextualDataSequence ____
     /// @see ::com::sun::star::chart::data::XTextualDataSequence
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
@@ -140,7 +140,7 @@ protected:
 
     // <properties>
     sal_Int32                                       m_nNumberFormatKey;
-    ::rtl::OUString                                 m_sRole;
+    OUString                                 m_sRole;
     // </properties>
 
     enum DataType
@@ -161,7 +161,7 @@ private:
     ::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const;
     /** is used by interface method getTextualData().
      */
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const;
+    ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const;
     /** is used by interface method getData().
      */
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const;
@@ -170,7 +170,7 @@ private:
     enum DataType                                       m_eCurrentDataType;
 
     ::com::sun::star::uno::Sequence< double >           m_aNumericalSequence;
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aTextualSequence;
+    ::com::sun::star::uno::Sequence< OUString >  m_aTextualSequence;
     ::com::sun::star::uno::Sequence<
         ::com::sun::star::uno::Any >                    m_aMixedSequence;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 2ea057e012ce..c1165429c2a8 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -79,10 +79,10 @@ public:
                     getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType
                                 , sal_Int32 nDimensionIndex );
 
-    static rtl::OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference<
+    static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XChartType >& xChartType );
 
-    static rtl::OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference<
+    static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XChartType >& xChartType );
 
     static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index cf4d7f069df5..32885299aab4 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -210,7 +210,7 @@ OOO_DLLPUBLIC_CHARTTOOLS
         ::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Sequence< rtl::OUString > DataSequenceToStringSequence(
+::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
 
@@ -261,9 +261,9 @@ OOO_DLLPUBLIC_CHARTTOOLS
 sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny );
 
 OOO_DLLPUBLIC_CHARTTOOLS
-bool replaceParamterInString( rtl::OUString & rInOutResourceString,
-                            const rtl::OUString & rParamToReplace,
-                            const rtl::OUString & rReplaceWith );
+bool replaceParamterInString( OUString & rInOutResourceString,
+                            const OUString & rParamToReplace,
+                            const OUString & rReplaceWith );
 
 //.............................................................................
 } //namespace chart
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index a88650d6e797..458d29d7177f 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -70,18 +70,18 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co
 };
 
 /** unary function to convert ::com::sun::star::uno::Any into an
-    ::rtl::OUString.
+    OUString.
 */
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any,  ::rtl::OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any,  OUString >
 {
-    ::rtl::OUString operator() ( const ::com::sun::star::uno::Any & rAny )
+    OUString operator() ( const ::com::sun::star::uno::Any & rAny )
     {
         ::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
         if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
         {
             const double* pDouble = reinterpret_cast< const double * >( rAny.getValue() );
             if( ::rtl::math::isNan(*pDouble) )
-                return ::rtl::OUString();
+                return OUString();
             return ::rtl::math::doubleToUString(
                 * pDouble,
                 rtl_math_StringFormat_Automatic,
@@ -92,20 +92,20 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co
         }
         else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
         {
-            return * reinterpret_cast< const ::rtl::OUString * >( rAny.getValue() );
+            return * reinterpret_cast< const OUString * >( rAny.getValue() );
         }
 
-        return ::rtl::OUString();
+        return OUString();
     }
 };
 
-/** unary function to convert an ::rtl::OUString into a double number.
+/** unary function to convert an OUString into a double number.
 
     <p>For conversion rtl::math::StringToDouble is used.</p>
  */
-struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double >
+struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double >
 {
-    double operator() ( const ::rtl::OUString & rStr )
+    double operator() ( const OUString & rStr )
     {
         rtl_math_ConversionStatus eConversionStatus;
         double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus, NULL );
@@ -117,13 +117,13 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function<
     }
 };
 
-/** unary function to convert a double number into an ::rtl::OUString.
+/** unary function to convert a double number into an OUString.
 
     <p>For conversion rtl::math::DoubleToOUString is used.</p>
  */
-struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString >
 {
-    ::rtl::OUString operator() ( double fNumber )
+    OUString operator() ( double fNumber )
     {
         return ::rtl::math::doubleToUString(
             fNumber,
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index c22df438b4c8..e6d5a3686bce 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -66,7 +66,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ ConfigItemListener ____
-    SAL_DLLPRIVATE virtual void notify( const ::rtl::OUString & rPropertyName );
+    SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName );
 
 private:
     SAL_DLLPRIVATE void retrieveConfigColors();
diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx
index 4526b4291bd5..d050fa59fcb3 100644
--- a/chart2/source/inc/ConfigItemListener.hxx
+++ b/chart2/source/inc/ConfigItemListener.hxx
@@ -28,7 +28,7 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener
 {
 public:
-    virtual void notify( const ::rtl::OUString & rPropertyName ) = 0;
+    virtual void notify( const OUString & rPropertyName ) = 0;
 
 protected:
     ~ConfigItemListener() {}
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 55c1a2247b0f..c92803097860 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -136,7 +136,7 @@ template< typename T >
 
     example:
 
-    ::std::multimap< sal_Int32, ::rtl::OUString > aMyMultiMap;
+    ::std::multimap< sal_Int32, OUString > aMyMultiMap;
     uno::Sequence< sal_Int32 > aMyKeys( ContainerHelper::MapKeysToSequence( aMyMultiMap ));
     // note: aMyKeys may contain duplicate keys here
  */
@@ -154,8 +154,8 @@ template< class Map >
 
     example:
 
-    ::std::map< sal_Int32, ::rtl::OUString > aMyMultiMap;
-    uno::Sequence< ::rtl::OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap ));
+    ::std::map< sal_Int32, OUString > aMyMultiMap;
+    uno::Sequence< OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap ));
  */
 template< class Map >
 ::com::sun::star::uno::Sequence< typename Map::mapped_type > MapValuesToSequence(
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index a8a2dc8aa470..02f64f8ee5f3 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -39,7 +39,7 @@ namespace chart
 namespace DataSeriesHelper
 {
 
-::rtl::OUString GetRole(
+OUString GetRole(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence );
 
@@ -56,7 +56,7 @@ namespace DataSeriesHelper
 OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
     getDataSequenceByRole( const ::com::sun::star::uno::Reference<
                                ::com::sun::star::chart2::data::XDataSource > & xSource,
-                           ::rtl::OUString aRole,
+                           OUString aRole,
                            bool bMatchPrefix = false );
 
 /** Retrieves all data sequences in the given data source that match the given
@@ -73,7 +73,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector<
     getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence<
                                    ::com::sun::star::uno::Reference<
                                        ::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences,
-                               ::rtl::OUString aRole,
+                               OUString aRole,
                                bool bMatchPrefix = false );
 
 /** Retrieves all data sequences found in the given data series and puts them
@@ -93,14 +93,14 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
         The data sequence contained in xSeries that has this role will be used
         to take its label.
  */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getDataSeriesLabel(
+OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XDataSeries > & xSeries,
-    const ::rtl::OUString & rLabelSequenceRole );
+    const OUString & rLabelSequenceRole );
 
 /** Get the label of a labeled sequence including neccessary automatic generation
  */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getLabelForLabeledDataSequence(
+OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq );
 
@@ -157,13 +157,13 @@ void makeLinesThickOrThin( const ::com::sun::star::uno::Reference<
 OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XDataSeries >& xSeries,
-        const ::rtl::OUString& rPropertyName,
+        const OUString& rPropertyName,
         const ::com::sun::star::uno::Any& rPropertyValue );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue(
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XDataSeries >& xSeries,
-    const ::rtl::OUString& rPropertyName,
+    const OUString& rPropertyName,
     const ::com::sun::star::uno::Any& rPropertyValue );
 
 OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis(
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index bfad44998bf2..d5ab613b5ada 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -53,7 +53,7 @@ public:
             createCachedDataSequence();
 
         static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
-            createCachedDataSequence( const ::rtl::OUString & rSingleText );
+            createCachedDataSequence( const OUString & rSingleText );
 
         static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
             createLabeledDataSequence(
@@ -74,12 +74,12 @@ public:
 
         static ::com::sun::star::uno::Sequence<
                ::com::sun::star::beans::PropertyValue > createArguments(
-                   const ::rtl::OUString & rRangeRepresentation,
+                   const OUString & rRangeRepresentation,
                    const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping,
                    bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories );
 
         SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments
-            , ::rtl::OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+            , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories );
 
         static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >
@@ -90,13 +90,13 @@ public:
         static void addRangeRepresentationsFromLabeledDataSequence(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence
-            ,  ::std::vector< ::rtl::OUString >& rOutRangeRepresentations );
+            ,  ::std::vector< OUString >& rOutRangeRepresentations );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges(
+        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XDiagram > & xDiagram );
 
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges(
+        static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::frame::XModel > & xChartModel );
 
@@ -113,7 +113,7 @@ public:
         static bool detectRangeSegmentation(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::frame::XModel >& xChartModel
-            , ::rtl::OUString& rOutRangeString
+            , OUString& rOutRangeString
             , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& rOutUseColumns
             , bool& rOutFirstCellAsLabel
@@ -137,15 +137,15 @@ public:
         static bool allArgumentsForRectRangeDetected(
             const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence(
+        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
 
-        SAL_DLLPRIVATE static ::rtl::OUString getRangeFromValues(
+        SAL_DLLPRIVATE static OUString getRangeFromValues(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
 
-        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource(
+        SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::data::XDataSource > & xSource );
 };
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 51896e85b51e..5b1bb7bda23f 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -53,7 +53,7 @@ public:
     typedef ::std::pair<
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XChartTypeTemplate >,
-            ::rtl::OUString >
+            OUString >
         tTemplateWithServiceName;
 
     /** tries to find a template in the chart-type manager that matches the
@@ -75,7 +75,7 @@ public:
                 ::com::sun::star::chart2::XDiagram > & xDiagram,
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager,
-            const ::rtl::OUString & rPreferredTemplateName = ::rtl::OUString());
+            const OUString & rPreferredTemplateName = OUString());
 
     /** Sets the "SwapXAndYAxis" property at all coordinate systems found in the
         given diagram.
@@ -224,12 +224,12 @@ public:
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XDiagram > & xDiagram );
 
-    static ::com::sun::star::uno::Sequence< rtl::OUString >
+    static ::com::sun::star::uno::Sequence< OUString >
         getExplicitSimpleCategories(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XChartDocument > & xChartDoc );
 
-    SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< rtl::OUString >
+    SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString >
         generateAutomaticCategoriesFromCooSys(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::chart2::XCoordinateSystem > & xCooSys );
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index d96ef67253a1..a8feca551032 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -34,10 +34,10 @@ namespace chart
 
 struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory
 {
-    rtl::OUString Text;
+    OUString Text;
     sal_Int32 Count;
 
-    ComplexCategory( const rtl::OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount)
+    ComplexCategory( const OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount)
     {}
 };
 
@@ -47,7 +47,7 @@ public:
     virtual ~SplitCategoriesProvider();
 
     virtual sal_Int32 getLevelCount() const = 0;
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
+    virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
 };
 
 struct DatePlusIndex
@@ -83,20 +83,20 @@ public:
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XDataSequence > getOriginalCategories();
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories();
+    ::com::sun::star::uno::Sequence< OUString > getSimpleCategories();
     const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel );
 
-    static ::rtl::OUString getCategoryByIndex(
+    static OUString getCategoryByIndex(
           const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel
         , const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel >& xChartModel
         , sal_Int32 nIndex );
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getExplicitSimpleCategories(
+    static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories(
             const SplitCategoriesProvider& rSplitCategoriesProvider );
 
-    static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< rtl::OUString >& rOutTexts
+    static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts
         , const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys
         , ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xChartModel );
 
@@ -119,7 +119,7 @@ private: //member
         ::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
 
     bool m_bIsExplicitCategoriesInited;
-    ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aExplicitCategories;
+    ::com::sun::star::uno::Sequence< OUString >  m_aExplicitCategories;
     ::std::vector< ::std::vector< ComplexCategory > >   m_aComplexCats;
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index bb80a956e280..b928db423322 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~ExponentialRegressionCurveCalculator();
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const;
 
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index ae964dc29a0d..0dadc937cea6 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -38,7 +38,7 @@ public:
             createFormattedStringSequence(
                      const ::com::sun::star::uno::Reference<
                         ::com::sun::star::uno::XComponentContext > & xContext
-                    , const ::rtl::OUString & rString
+                    , const OUString & rString
                     , const ::com::sun::star::uno::Reference<
                         ::com::sun::star::beans::XPropertySet > & xTextProperties ) throw();
 };
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index e2f93d4c4f3b..3b6cd9a46da0 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -83,13 +83,13 @@ public:
     APPHELPER_SERVICE_FACTORY_HELPER(InternalDataProvider)
 
     // ____ XInternalDataProvider ____
-    virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const ::rtl::OUString& aRange )
+    virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
-        getDataByRangeRepresentation( const ::rtl::OUString& aRange )
+        getDataByRangeRepresentation( const OUString& aRange )
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDataByRangeRepresentation(
-        const ::rtl::OUString& aRange,
+        const OUString& aRange,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData )
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex )
@@ -124,22 +124,22 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
-        const ::rtl::OUString& aRangeRepresentation )
+        const OUString& aRangeRepresentation )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
-        const ::rtl::OUString& aRangeRepresentation )
+        const OUString& aRangeRepresentation )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XRangeXMLConversion ____
-    virtual ::rtl::OUString SAL_CALL convertRangeToXML(
-        const ::rtl::OUString& aRangeRepresentation )
+    virtual OUString SAL_CALL convertRangeToXML(
+        const OUString& aRangeRepresentation )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL convertRangeFromXML(
-        const ::rtl::OUString& aXMLRange )
+    virtual OUString SAL_CALL convertRangeFromXML(
+        const OUString& aXMLRange )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
 
@@ -162,17 +162,17 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
         getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexRowDescriptions(
         const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions )
+        ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
         getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setComplexColumnDescriptions(
         const ::com::sun::star::uno::Sequence<
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions )
+        ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
@@ -181,15 +181,15 @@ public:
     virtual void SAL_CALL setData(
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRowDescriptions(
-        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions )
+        const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setColumnDescriptions(
-        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions )
+        const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XChartData (base of XChartDataArray) ____
@@ -214,28 +214,28 @@ public:
 
 private:
     void lcl_addDataSequenceToMap(
-        const ::rtl::OUString & rRangeRepresentation,
+        const OUString & rRangeRepresentation,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataSequence > & xSequence );
 
     ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataSequence >
-        lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation,
-                                       const ::rtl::OUString & rRole );
+        lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation,
+                                       const OUString & rRole );
     ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataSequence >
-        lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation );
+        lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation );
 
-    void lcl_deleteMapReferences( const ::rtl::OUString & rRangeRepresentation );
+    void lcl_deleteMapReferences( const OUString & rRangeRepresentation );
 
     void lcl_adaptMapReferences(
-        const ::rtl::OUString & rOldRangeRepresentation,
-        const ::rtl::OUString & rNewRangeRepresentation );
+        const OUString & rOldRangeRepresentation,
+        const OUString & rNewRangeRepresentation );
 
     void lcl_increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
     void lcl_decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
 
-    typedef ::std::multimap< ::rtl::OUString,
+    typedef ::std::multimap< OUString,
             ::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > >
         tSequenceMap;
     typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange;
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index b48c6a3825b8..c2cc8807671b 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~LinearRegressionCurveCalculator();
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const;
 
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index 053cb5d8c413..b3709105b1f7 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~LogarithmicRegressionCurveCalculator();
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const;
 
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 69be677cfe2e..bc842e513b03 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~MeanValueRegressionCurveCalculator();
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const;
 
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 0976b1352bb6..48896c7c9003 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -80,34 +80,34 @@ public:
     //@todo define this for debug only, except URL
     sal_Bool            AsTemplate; //document is a template.
     sal_Bool            ISSET_AsTemplate;
-    ::rtl::OUString     Author;
+    OUString     Author;
     sal_Bool            ISSET_Author;
-    ::rtl::OUString     CharacterSet; //identifier of used character set.
+    OUString     CharacterSet; //identifier of used character set.
     sal_Bool            ISSET_CharacterSet;
-    ::rtl::OUString     Comment;
+    OUString     Comment;
     sal_Bool            ISSET_Comment;
 
     ::com::sun::star::uno::Any
                         ComponentData;
     sal_Bool            ISSET_ComponentData;
-    ::rtl::OUString     FileName; //deprecated, same as url
+    OUString     FileName; //deprecated, same as url
     sal_Bool            ISSET_FileName;
     ::com::sun::star::uno::Any
                         FilterData;
     sal_Bool            ISSET_FilterData;
-    ::rtl::OUString     FilterName; //internal filter name.
+    OUString     FilterName; //internal filter name.
     sal_Bool            ISSET_FilterName;
-    ::rtl::OUString     FilterFlags;//deprecated,
+    OUString     FilterFlags;//deprecated,
     sal_Bool            ISSET_FilterFlags;
-    ::rtl::OUString     FilterOptions;
+    OUString     FilterOptions;
     sal_Bool            ISSET_FilterOptions;
             //not documented ... @todo remove?
-    ::rtl::OUString     FrameName; //name of target frame.
+    OUString     FrameName; //name of target frame.
     sal_Bool            ISSET_FrameName;
     sal_Bool            Hidden; //load document, invisible.
     sal_Bool            ISSET_Hidden;
 
-    ::rtl::OUString     HierarchicalDocumentName;
+    OUString     HierarchicalDocumentName;
     sal_Bool            ISSET_HierarchicalDocumentName;
 
 
@@ -121,17 +121,17 @@ public:
                         InteractionHandler; //::com::sun::star::task::XInteractionHandler
     sal_Bool            ISSET_InteractionHandler;
 
-    ::rtl::OUString     JumpMark;   //specifies the name of a mark within the document where the first view is to position itself.
+    OUString     JumpMark;   //specifies the name of a mark within the document where the first view is to position itself.
     sal_Bool            ISSET_JumpMark;
-    ::rtl::OUString     MediaType; //mime type.
+    OUString     MediaType; //mime type.
     sal_Bool            ISSET_MediaType;
-    ::rtl::OUString     OpenFlags; //deprecated
+    OUString     OpenFlags; //deprecated
     sal_Bool            ISSET_OpenFlags;
     sal_Bool            OpenNewView; //opens a new view for an already loaded document.
     sal_Bool            ISSET_OpenNewView;
     sal_Bool            Overwrite; //opens a new view for an already loaded document.
     sal_Bool            ISSET_Overwrite;
-    ::rtl::OUString     Password;
+    OUString     Password;
     sal_Bool            ISSET_Password;
 
         //not documented ... @todo remove?
@@ -142,13 +142,13 @@ public:
     ::com::sun::star::uno::Sequence< sal_Int8 >
                         PostData; //contains the data for HTTP post method as a sequence of bytes.
     sal_Bool            ISSET_PostData;
-    ::rtl::OUString     PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
+    OUString     PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
     sal_Bool            ISSET_PostString;
     sal_Bool            Preview; //show preview.
     sal_Bool            ISSET_Preview;
     sal_Bool            ReadOnly; //open document readonly.
     sal_Bool            ISSET_ReadOnly;
-    ::rtl::OUString     Referer; //name of document referrer.
+    OUString     Referer; //name of document referrer.
     sal_Bool            ISSET_Referer;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -157,13 +157,13 @@ public:
         //not documented ... @todo remove?
     sal_Bool            Silent; //prevents dialogs to query for more information.
     sal_Bool            ISSET_Silent;
-    ::rtl::OUString     TemplateName; //deprecated, name of the template instead of the URL.
+    OUString     TemplateName; //deprecated, name of the template instead of the URL.
     sal_Bool            ISSET_TemplateName;
-    ::rtl::OUString     TemplateRegionName; //deprecated, name of the region of the template.
+    OUString     TemplateRegionName; //deprecated, name of the region of the template.
     sal_Bool            ISSET_TemplateRegionName;
     sal_Bool            Unpacked;
     sal_Bool            ISSET_Unpacked;
-    ::rtl::OUString     URL;// FileName, URL of the document.
+    OUString     URL;// FileName, URL of the document.
     sal_Bool            ISSET_URL;
     sal_Int16           Version; //storage version.
     sal_Bool            ISSET_Version;
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 3ce68aa73a91..029f4521674e 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -35,7 +35,7 @@ namespace chart
 //.............................................................................
 
 OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer(
-    const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName );
+    const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
 
 namespace impl
 {
@@ -49,26 +49,26 @@ typedef ::cppu::WeakImplHelper3<
 class NameContainer : public impl::NameContainer_Base
 {
 public:
-    NameContainer( const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName );
+    NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
     explicit NameContainer( const NameContainer & rOther );
     virtual ~NameContainer();
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const  rtl::OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const  rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertByName( const  OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeByName( const  OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const  rtl::OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL replaceByName( const  OUString& aName, const  com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
 
     // XNameAccess
-    virtual com::sun::star::uno::Any SAL_CALL getByName( const  rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
-    virtual com::sun::star::uno::Sequence<  rtl::OUString > SAL_CALL getElementNames(  ) throw( com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const  rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Any SAL_CALL getByName( const  OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+    virtual com::sun::star::uno::Sequence<  OUString > SAL_CALL getElementNames(  ) throw( com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName( const  OUString& aName ) throw( com::sun::star::uno::RuntimeException);
 
     // XElementAccess
     virtual sal_Bool SAL_CALL hasElements(  ) throw( com::sun::star::uno::RuntimeException);
@@ -82,10 +82,10 @@ private: //methods
 
 private: //member
     const ::com::sun::star::uno::Type   m_aType;
-    const rtl::OUString                 m_aServicename;
-    const rtl::OUString                 m_aImplementationName;
+    const OUString                 m_aServicename;
+    const OUString                 m_aImplementationName;
 
-    typedef ::std::map< ::rtl::OUString, com::sun::star::uno::Any > tContentMap;
+    typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap;
 
     tContentMap m_aMap;
 };
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index d4f6441bcb1b..f15f65150464 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -43,7 +43,7 @@ public:
     ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
                 getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; };
 
-    rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
+    OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
     Date    getNullDate() const;
 
 private: //private member
@@ -62,7 +62,7 @@ public:
         , sal_Int32 nNumberFormatKey );
     virtual ~FixedNumberFormatter();
 
-    rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
+    OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
 
 private:
     NumberFormatterWrapper      m_aNumberFormatterWrapper;
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 5e26b7482d60..cc226a5031bd 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -172,19 +172,19 @@ protected:
 
     // ____ XPropertyState ____
     virtual ::com::sun::star::beans::PropertyState SAL_CALL
-        getPropertyState( const ::rtl::OUString& PropertyName )
+        getPropertyState( const OUString& PropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
-        getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+        getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
-        setPropertyToDefault( const ::rtl::OUString& PropertyName )
+        setPropertyToDefault( const OUString& PropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL
-        getPropertyDefault( const ::rtl::OUString& aPropertyName )
+        getPropertyDefault( const OUString& aPropertyName )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::lang::WrappedTargetException,
                ::com::sun::star::uno::RuntimeException);
@@ -196,11 +196,11 @@ protected:
         setAllPropertiesToDefault()
         throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL
-        setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
-        getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
         throw (::com::sun::star::beans::UnknownPropertyException,
                ::com::sun::star::lang::WrappedTargetException,
                ::com::sun::star::uno::RuntimeException);
@@ -214,7 +214,7 @@ protected:
 
     // ____ XMultiPropertySet ____
     virtual void SAL_CALL setPropertyValues(
-        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
+        const ::com::sun::star::uno::Sequence< OUString >& PropertyNames,
         const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values )
         throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 0c4b3c516621..b2e127dbb6be 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -93,7 +93,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier
 
 public:
     ObjectIdentifier();
-    ObjectIdentifier( const ::rtl::OUString& rObjectCID );
+    ObjectIdentifier( const OUString& rObjectCID );
     ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape );
     ObjectIdentifier( const ::com::sun::star::uno::Any& rAny );
     virtual ~ObjectIdentifier();
@@ -104,152 +104,152 @@ public:
     bool operator!=( const ObjectIdentifier& rOID ) const;
     bool operator<( const ObjectIdentifier& rOID ) const;
 
-    static rtl::OUString createClassifiedIdentifierForObject(
+    static OUString createClassifiedIdentifierForObject(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::uno::XInterface >& xObject
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
-    static rtl::OUString createClassifiedIdentifierForParticle(
-        const rtl::OUString& rParticle );
+    static OUString createClassifiedIdentifierForParticle(
+        const OUString& rParticle );
 
-    static rtl::OUString createClassifiedIdentifierForParticles(
-            const rtl::OUString& rParentParticle
-          , const rtl::OUString& rChildParticle
-          , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
-          , const rtl::OUString& rDragParameterString = rtl::OUString() );
+    static OUString createClassifiedIdentifierForParticles(
+            const OUString& rParentParticle
+          , const OUString& rChildParticle
+          , const OUString& rDragMethodServiceName = OUString()
+          , const OUString& rDragParameterString = OUString() );
 
-    static rtl::OUString createClassifiedIdentifierForGrid(
+    static OUString createClassifiedIdentifierForGrid(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel
         , sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc
 
-    SAL_DLLPRIVATE static rtl::OUString createParticleForDiagram(
+    SAL_DLLPRIVATE static OUString createParticleForDiagram(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XDiagram >& xDiagram
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
 
-    static rtl::OUString createParticleForCoordinateSystem(
+    static OUString createParticleForCoordinateSystem(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XCoordinateSystem >& xCooSys
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
-    static rtl::OUString createParticleForAxis(
+    static OUString createParticleForAxis(
                       sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
-    static rtl::OUString createParticleForGrid(
+    static OUString createParticleForGrid(
                       sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
-    static rtl::OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
+    static OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
             , sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex );
 
-    static rtl::OUString createParticleForLegend(
+    static OUString createParticleForLegend(
           const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XLegend >& xLegend
         , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
-    static rtl::OUString addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle );
-    static rtl::OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
-    static sal_Int32 getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID );
+    static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle );
+    static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
+    static sal_Int32 getIndexFromParticleOrCID( const OUString& rParticleOrCID );
 
-    static rtl::OUString createClassifiedIdentifier(
+    static OUString createClassifiedIdentifier(
         enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
-        , const rtl::OUString& rParticleID );//e.g. SeriesID
+        , const OUString& rParticleID );//e.g. SeriesID
 
-    static rtl::OUString createClassifiedIdentifierWithParent(
+    static OUString createClassifiedIdentifierWithParent(
         enum ObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
-        , const rtl::OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
-        , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
-        , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
-        , const rtl::OUString& rDragParameterString = rtl::OUString()
+        , const OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
+        , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
+        , const OUString& rDragMethodServiceName = OUString()
+        , const OUString& rDragParameterString = OUString()
         );
 
-    static bool isCID( const rtl::OUString& rName );
-    static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier );
-    static rtl::OUString getDragParameterString( const rtl::OUString& rCID );
-    static bool isDragableObject( const rtl::OUString& rClassifiedIdentifier );
+    static bool isCID( const OUString& rName );
+    static OUString getDragMethodServiceName( const OUString& rClassifiedIdentifier );
+    static OUString getDragParameterString( const OUString& rCID );
+    static bool isDragableObject( const OUString& rClassifiedIdentifier );
     bool isDragableObject();
-    static bool isRotateableObject( const rtl::OUString& rClassifiedIdentifier );
-    static bool isMultiClickObject( const rtl::OUString& rClassifiedIdentifier );
-    static bool areSiblings( const rtl::OUString& rCID1, const rtl::OUString& rCID2 );//identical object is no sibling
-    static bool areIdenticalObjects( const ::rtl::OUString& rCID1, const ::rtl::OUString& rCID2 );
+    static bool isRotateableObject( const OUString& rClassifiedIdentifier );
+    static bool isMultiClickObject( const OUString& rClassifiedIdentifier );
+    static bool areSiblings( const OUString& rCID1, const OUString& rCID2 );//identical object is no sibling
+    static bool areIdenticalObjects( const OUString& rCID1, const OUString& rCID2 );
 
-    static rtl::OUString getStringForType( ObjectType eObjectType );
-    static ObjectType    getObjectType( const rtl::OUString& rCID );
+    static OUString getStringForType( ObjectType eObjectType );
+    static ObjectType    getObjectType( const OUString& rCID );
     ObjectType getObjectType();
 
-    static rtl::OUString createSeriesSubObjectStub( ObjectType eSubObjectType
-                    , const rtl::OUString& rSeriesParticle
-                    , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
-                    , const rtl::OUString& rDragParameterString = rtl::OUString() );
-    static rtl::OUString createPointCID( const rtl::OUString& rPointCID_Stub, sal_Int32 nIndex  );
+    static OUString createSeriesSubObjectStub( ObjectType eSubObjectType
+                    , const OUString& rSeriesParticle
+                    , const OUString& rDragMethodServiceName = OUString()
+                    , const OUString& rDragParameterString = OUString() );
+    static OUString createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex  );
 
-    static rtl::OUString createDataCurveCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
-    static rtl::OUString createDataCurveEquationCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex );
+    static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
+    static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex );
 
-    SAL_DLLPRIVATE static rtl::OUString getObjectID( const rtl::OUString& rCID );
-    static rtl::OUString getParticleID( const rtl::OUString& rCID );
-    static rtl::OUString getFullParentParticle( const rtl::OUString& rCID );
+    SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID );
+    static OUString getParticleID( const OUString& rCID );
+    static OUString getFullParentParticle( const OUString& rCID );
 
     //returns the series particle of a CID when the CID is a child of the series
-    static rtl::OUString getSeriesParticleFromCID( const rtl::OUString& rCID );
+    static OUString getSeriesParticleFromCID( const OUString& rCID );
 
     //return the model object that is indicated by rObjectCID
     static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
             getObjectPropertySet(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
     static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
             getObjectPropertySet(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XChartDocument >& xChartDocument );
 
     //return the axis object that belongs to rObjectCID if any
     static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >
             getAxisForCID(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
     //return the series object that belongs to rObjectCID if any
     static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
             getDataSeriesForCID(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >
             getDiagramForCID(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const ::com::sun::star::uno::Reference<
                     ::com::sun::star::frame::XModel >& xChartModel );
 
-    static const ::rtl::OUString& getPieSegmentDragMethodServiceName();
-    static ::rtl::OUString createPieSegmentDragParameterString(
+    static const OUString& getPieSegmentDragMethodServiceName();
+    static OUString createPieSegmentDragParameterString(
           sal_Int32 nOffsetPercent
         , const ::com::sun::star::awt::Point& rMinimumPosition
         , const ::com::sun::star::awt::Point& rMaximumPosition );
-    static bool parsePieSegmentDragParameterString( const rtl::OUString& rDragParameterString
+    static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString
         , sal_Int32& rOffsetPercent
         , ::com::sun::star::awt::Point& rMinimumPosition
         , ::com::sun::star::awt::Point& rMaximumPosition );
 
-    static TitleHelper::eTitleType getTitleTypeForCID( const ::rtl::OUString& rCID );
+    static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID );
 
-    static ::rtl::OUString getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward );
+    static OUString getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward );
 
     bool isValid() const;
     bool isAutoGeneratedObject() const;
     bool isAdditionalShape() const;
-    ::rtl::OUString getObjectCID() const;
+    OUString getObjectCID() const;
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const;
     ::com::sun::star::uno::Any getAny() const;
 
@@ -259,7 +259,7 @@ private:
     // for all other objects m_xAdditionalShape is set.
     // Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty
     // and vice versa.
-    ::rtl::OUString m_aObjectCID;
+    OUString m_aObjectCID;
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape;
 };
 
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 452c96987f35..10a999047cbe 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~PotentialRegressionCurveCalculator();
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const;
 
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index ae3add738262..9bbcb84c3e01 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -44,22 +44,22 @@ namespace PropertyHelper
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addLineDashUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
     const ::com::sun::star::uno::Any & rValue,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > & xFact,
-    const ::rtl::OUString & rPreferredName );
+    const OUString & rPreferredName );
 
 /** adds a gradient with a unique name to the gradient obtained by the given
     factory.
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
     const ::com::sun::star::uno::Any & rValue,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > & xFact,
-    const ::rtl::OUString & rPreferredName );
+    const OUString & rPreferredName );
 
 /** adds a transparency gradient with a unique name to the gradient obtained
     by the given factory.
@@ -67,33 +67,33 @@ OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable(
     @return The name used for storing this element in the table
 */
 OOO_DLLPUBLIC_CHARTTOOLS
-::rtl::OUString addTransparencyGradientUniqueNameToTable(
+OUString addTransparencyGradientUniqueNameToTable(
     const ::com::sun::star::uno::Any & rValue,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > & xFact,
-    const ::rtl::OUString & rPreferredName );
+    const OUString & rPreferredName );
 
 /** adds a hatch with a unique name to the gradient obtained by the given
     factory.
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addHatchUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
     const ::com::sun::star::uno::Any & rValue,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > & xFact,
-    const ::rtl::OUString & rPreferredName );
+    const OUString & rPreferredName );
 
 /** adds a bitmap with a unique name to the gradient obtained by the given
     factory.
 
     @return The name used for storing this element in the table
 */
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addBitmapUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
     const ::com::sun::star::uno::Any & rValue,
     const ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XMultiServiceFactory > & xFact,
-    const ::rtl::OUString & rPreferredName );
+    const OUString & rPreferredName );
 
 // --------------------------------------------------------------------------------
 
@@ -170,7 +170,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyLess : public ::std::binary_function<
 
 struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool >
 {
-    explicit PropertyValueNameEquals( const ::rtl::OUString & rName ) :
+    explicit PropertyValueNameEquals( const OUString & rName ) :
             m_aName( rName )
     {}
 
@@ -180,7 +180,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_fu
     }
 
 private:
-    ::rtl::OUString m_aName;
+    OUString m_aName;
 };
 
 } //  namespace chart
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index 01291c104c61..27af18bd5830 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -40,11 +40,11 @@ public:
         const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > & xScaling );
 
 protected:
-    virtual ::rtl::OUString ImplGetRepresentation(
+    virtual OUString ImplGetRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey ) const = 0;
 
-    ::rtl::OUString getFormattedString(
+    OUString getFormattedString(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
         ::sal_Int32 nNumberFormatKey,
         double fNumber ) const;
@@ -71,9 +71,9 @@ protected:
                ::com::sun::star::uno::RuntimeException);
     virtual double SAL_CALL getCorrelationCoefficient()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getRepresentation()
+    virtual OUString SAL_CALL getRepresentation()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getFormattedRepresentation(
+    virtual OUString SAL_CALL getFormattedRepresentation(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier,
         ::sal_Int32 nNumberFormatKey )
         throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 725112a20af7..743f0bd990d2 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -50,7 +50,7 @@ public:
         createRegressionCurveByServiceName(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::uno::XComponentContext > & xContext,
-            ::rtl::OUString aServiceName );
+            OUString aServiceName );
 
     // ------------------------------------------------------------
 
@@ -163,7 +163,7 @@ public:
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XRegressionCurveCalculator >
         createRegressionCurveCalculatorByServiceName(
-            ::rtl::OUString aServiceName );
+            OUString aServiceName );
 
     /** recalculates the regression parameters according to the data given in
         the data source.
@@ -200,7 +200,7 @@ public:
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XModel > & xModel );
 
-    static ::rtl::OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference<
+    static OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XRegressionCurve >& xCurve );
 
     static ::std::vector< ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 5a0ae97806cb..ac25d268d8a6 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -63,7 +63,7 @@ public:
         getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
@@ -105,7 +105,7 @@ public:
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
@@ -145,7 +145,7 @@ public:
         getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
@@ -186,7 +186,7 @@ public:
     getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
index 9e0bba409be4..ab60ee5a6c04 100644
--- a/chart2/source/inc/ServiceMacros.hxx
+++ b/chart2/source/inc/ServiceMacros.hxx
@@ -23,7 +23,7 @@
 to use these macros the supported services and the implementation name needs to be static
 especially you need to implement (declaration is contained in macro already):
 
-static com::sun::star::uno::Sequence< rtl::OUString >
+static com::sun::star::uno::Sequence< OUString >
     Class::getSupportedServiceNames_Static();
 */
 
@@ -36,18 +36,18 @@ namespace apphelper
 {
 
 #define APPHELPER_XSERVICEINFO_DECL()                                                   \
-    virtual ::rtl::OUString SAL_CALL                                        \
+    virtual OUString SAL_CALL                                        \
         getImplementationName()                                             \
             throw( ::com::sun::star::uno::RuntimeException );               \
     virtual sal_Bool SAL_CALL                                               \
-        supportsService( const ::rtl::OUString& ServiceName )               \
+        supportsService( const OUString& ServiceName )               \
             throw( ::com::sun::star::uno::RuntimeException );               \
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL     \
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL     \
         getSupportedServiceNames()                                          \
             throw( ::com::sun::star::uno::RuntimeException );               \
                                                                             \
-    static ::rtl::OUString getImplementationName_Static();                  \
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString >               \
+    static OUString getImplementationName_Static();                  \
+    static ::com::sun::star::uno::Sequence< OUString >               \
         getSupportedServiceNames_Static();
 
 //=========================================================================
@@ -57,24 +57,24 @@ namespace apphelper
 //=========================================================================
 
 #define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName )                              \
-::rtl::OUString SAL_CALL Class::getImplementationName()                     \
+OUString SAL_CALL Class::getImplementationName()                     \
     throw( ::com::sun::star::uno::RuntimeException )                        \
 {                                                                           \
     return getImplementationName_Static();                                  \
 }                                                                           \
                                                                             \
-::rtl::OUString Class::getImplementationName_Static()                       \
+OUString Class::getImplementationName_Static()                       \
 {                                                                           \
     return ImplName;                                                        \
 }                                                                           \
                                                                             \
 sal_Bool SAL_CALL                                                           \
-Class::supportsService( const ::rtl::OUString& ServiceName )                \
+Class::supportsService( const OUString& ServiceName )                \
     throw( ::com::sun::star::uno::RuntimeException )                        \
 {                                                                           \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL =               \
+    ::com::sun::star::uno::Sequence< OUString > aSNL =               \
                                         getSupportedServiceNames();         \
-    const ::rtl::OUString* pArray = aSNL.getArray();                        \
+    const OUString* pArray = aSNL.getArray();                        \
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )                       \
     {                                                                       \
         if( pArray[ i ] == ServiceName )                                    \
@@ -84,7 +84,7 @@ Class::supportsService( const ::rtl::OUString& ServiceName )                \
     return sal_False;                                                       \
 }                                                                           \
                                                                             \
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL                 \
+::com::sun::star::uno::Sequence< OUString > SAL_CALL                 \
 Class::getSupportedServiceNames()                                           \
     throw( ::com::sun::star::uno::RuntimeException )                        \
 {                                                                           \
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index 695f22ff26fb..87c1b6099c53 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -76,10 +76,10 @@ public:
             ::com::sun::star::chart2::data::XDataSource > & xDataSource,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataProvider > & xDataProvider,
-        const ::rtl::OUString & rNewRange,
+        const OUString & rNewRange,
         bool bPositiveValue,
         bool bYError = true,
-        ::rtl::OUString * pXMLRange = 0 );
+        OUString * pXMLRange = 0 );
 
     /// @return the newly created or existing error bar object
     static ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index fd4ef07c22e9..ec9db23e2401 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -60,7 +60,7 @@ public:
     static ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XTitle >
         createTitle(  eTitleType nTitleIndex
-                    , const rtl::OUString& rTitleText
+                    , const OUString& rTitleText
                     , const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel >& xModel
                     , const ::com::sun::star::uno::Reference<
@@ -71,9 +71,9 @@ public:
                     , const ::com::sun::star::uno::Reference<
                             ::com::sun::star::frame::XModel >& xModel );
 
-    static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference<
+    static OUString getCompleteString( const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XTitle >& xTitle );
-    static void setCompleteString( const rtl::OUString& rNewText
+    static void setCompleteString( const OUString& rNewText
         , const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XTitle >& xTitle
         , const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 6b3e8a4bd7ca..6dc447be4045 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -75,12 +75,12 @@ public:
     UncachedDataSequence(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
-        const ::rtl::OUString & rRangeRepresentation );
+        const OUString & rRangeRepresentation );
     UncachedDataSequence(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
-        const ::rtl::OUString & rRangeRepresentation,
-        const ::rtl::OUString & rRole );
+        const OUString & rRangeRepresentation,
+        const OUString & rRole );
     UncachedDataSequence( const UncachedDataSequence & rSource );
     virtual ~UncachedDataSequence();
 
@@ -105,9 +105,9 @@ protected:
     // ____ XDataSequence ____
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation()
+    virtual OUString SAL_CALL getSourceRangeRepresentation()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel(
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
         ::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
@@ -120,7 +120,7 @@ protected:
 
     // ____ XTextualDataSequence ____
     /// @see ::com::sun::star::chart::data::XTextualDataSequence
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XIndexReplace ____
     virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
@@ -144,9 +144,9 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XNamed (for setting a new range representation) ____
-    virtual ::rtl::OUString SAL_CALL getName()
+    virtual OUString SAL_CALL getName()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setName( const ::rtl::OUString& aName )
+    virtual void SAL_CALL setName( const OUString& aName )
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
@@ -174,8 +174,8 @@ protected:
 
     // <properties>
     sal_Int32                                       m_nNumberFormatKey;
-    ::rtl::OUString                                 m_sRole;
-    ::rtl::OUString                                 m_aXMLRange;
+    OUString                                 m_sRole;
+    OUString                                 m_aXMLRange;
     // </properties>
 
     /** This method registers all properties.  It should be called by all
@@ -186,7 +186,7 @@ protected:
 private:
     ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider;
-    ::rtl::OUString                 m_aSourceRepresentation;
+    OUString                 m_aSourceRepresentation;
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
         m_xModifyEventForwarder;
 };
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index 961031f6663d..b90961f985c7 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -29,7 +29,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty
 {
 public:
     explicit WrappedDefaultProperty(
-        const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName,
+        const OUString& rOuterName, const OUString& rInnerName,
         const ::com::sun::star::uno::Any& rNewOuterDefault );
     virtual ~WrappedDefaultProperty();
 
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index cac3dd38d774..f292272b09b6 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -30,7 +30,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty :
 {
 public:
     explicit WrappedDirectStateProperty(
-        const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName );
+        const OUString& rOuterName, const OUString& rInnerName );
     virtual ~WrappedDirectStateProperty();
 
     virtual ::com::sun::star::beans::PropertyState getPropertyState(
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index c95b3a143a94..9d55c8a94025 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -32,7 +32,7 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty
 {
 public:
-    WrappedIgnoreProperty( const ::rtl::OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue );
+    WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue );
     virtual ~WrappedIgnoreProperty();
 
     virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index d24d6ff2b7f5..1410ee1e37e6 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -36,11 +36,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty
     a corresponding property of the inner PropertySet. Use this class to do the conversion between the two.
     */
 public:
-    WrappedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName );
+    WrappedProperty( const OUString& rOuterName, const OUString& rInnerName );
     virtual ~WrappedProperty();
 
-    const ::rtl::OUString& getOuterName() const;
-    virtual ::rtl::OUString getInnerName() const;
+    const OUString& getOuterName() const;
+    virtual OUString getInnerName() const;
 
     virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
                         throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -62,8 +62,8 @@ protected:
     virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const;
 
 protected:
-    ::rtl::OUString             m_aOuterName;
-    ::rtl::OUString             m_aInnerName;
+    OUString             m_aOuterName;
+    OUString             m_aInnerName;
 };
 
 //.............................................................................
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 9eed3075692b..6968f319ff9f 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -61,33 +61,33 @@ public:
     //XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertySet
     //getPropertySetInfo() already declared in XPropertySet
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
     //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //XMultiPropertyStates
     //getPropertyStates() already declared in XPropertyState
     virtual void SAL_CALL setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 protected: //methods
     /** give all the properties that should be visible to the outer side
@@ -108,7 +108,7 @@ protected: //methods
     ::cppu::IPropertyArrayHelper&   getInfoHelper();
     SAL_DLLPRIVATE tWrappedPropertyMap&            getWrappedPropertyMap();
 
-    const WrappedProperty*          getWrappedProperty( const ::rtl::OUString& rOuterName );
+    const WrappedProperty*          getWrappedProperty( const OUString& rOuterName );
     const WrappedProperty*          getWrappedProperty( sal_Int32 nHandle );
 
 protected: //member
diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx
index ce95dc13a2ff..e583f5a67fd2 100644
--- a/chart2/source/inc/XMLRangeHelper.hxx
+++ b/chart2/source/inc/XMLRangeHelper.hxx
@@ -51,12 +51,12 @@ struct OOO_DLLPUBLIC_CHARTTOOLS CellRange
 {
     Cell aUpperLeft;
     Cell aLowerRight;
-    ::rtl::OUString aTableName;
+    OUString aTableName;
 };
 
-CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString );
+CellRange getCellRangeFromXMLString( const OUString & rXMLString );
 
-::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange );
+OUString getXMLStringFromCellRange( const CellRange & rRange );
 
 
 } //  namespace XMLRangeHelper
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 1e89f8c442fa..1872ed49534b 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -94,7 +94,7 @@ public:
     XHatchListRef     GetHatchList() const;
     XBitmapListRef    GetBitmapList() const;
 
-    SdrObject* getNamedSdrObject( const rtl::OUString& rName );
+    SdrObject* getNamedSdrObject( const OUString& rName );
     static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList );
 
     static bool removeShape( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 4c518843cd41..dfe7afccaaad 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -58,12 +58,12 @@ public:
         if bSnapRect is set to true you get the resulting visible position (left-top) and size
     */
     virtual ::com::sun::star::awt::Rectangle
-        getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false )=0;
+        getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0;
 
     virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-        getShapeForCID( const rtl::OUString& rObjectCID )=0;
+        getShapeForCID( const OUString& rObjectCID )=0;
 
     virtual ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
 
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 2555b25395e8..7ba2ca95da54 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -57,7 +57,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 // ----------------------------------------
@@ -90,7 +89,7 @@ LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service,      "com.sun.star.comp.C
 
 uno::Reference< embed::XStorage > lcl_getWriteStorage(
     const Sequence< beans::PropertyValue >& rMediaDescriptor,
-    const uno::Reference< uno::XComponentContext >& xContext,const ::rtl::OUString& _sMediaType)
+    const uno::Reference< uno::XComponentContext >& xContext,const OUString& _sMediaType)
 {
     uno::Reference< embed::XStorage > xStorage;
     try
@@ -793,7 +792,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes
         rOutOASIS = aMDHelper.FilterName == "chart8";
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString XMLFilter::getMediaType(bool _bOasis)
+OUString XMLFilter::getMediaType(bool _bOasis)
 {
     return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART;
 }
@@ -809,7 +808,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
         rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart";
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString XMLReportFilterHelper::getMediaType(bool )
+OUString XMLReportFilterHelper::getMediaType(bool )
 {
     return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART;
 }
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index c702c6db366b..cfa3e66c4ce5 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -37,9 +37,9 @@ public:
     virtual ~CartesianCoordinateSystem();
 
     // ____ XCoordinateSystem ____
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemType()
+    virtual OUString SAL_CALL getCoordinateSystemType()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getViewServiceName()
+    virtual OUString SAL_CALL getViewServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 6035d5ddc899..63fc3a7643d0 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -50,18 +50,18 @@ public:
 protected:
     // ____ XMultiServiceFactory ____
     virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+            ::com::sun::star::uno::XInterface > SAL_CALL 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,
+            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 getAvailableServiceNames()
+        OUString > SAL_CALL getAvailableServiceNames()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XChartTypeManager ____
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index 1efe95e31ea7..f69d2b550306 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -37,9 +37,9 @@ public:
     virtual ~PolarCoordinateSystem();
 
     // ____ XCoordinateSystem ____
-    virtual ::rtl::OUString SAL_CALL getCoordinateSystemType()
+    virtual OUString SAL_CALL getCoordinateSystemType()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getViewServiceName()
+    virtual OUString SAL_CALL getViewServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 76f0ef19553e..ad8e32f35f19 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -91,10 +91,10 @@ protected:
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
 
-    inline ::rtl::OUString getDocumentHandler() const { return m_sDocumentHandler; }
-    inline void setDocumentHandler(const ::rtl::OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
+    inline OUString getDocumentHandler() const { return m_sDocumentHandler; }
+    inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
 
-    virtual ::rtl::OUString getMediaType(bool _bOasis);
+    virtual OUString getMediaType(bool _bOasis);
 
     /** fills the oasis flag only when a filtername was set
     *
@@ -114,8 +114,8 @@ private:
                                ::com::sun::star::beans::PropertyValue > & aMediaDescriptor );
     /// @return a warning code, or 0 for successful operation
     sal_Int32 impl_ImportStream(
-        const ::rtl::OUString & rStreamName,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rStreamName,
+        const OUString & rServiceName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::embed::XStorage > & xStorage,
         const ::com::sun::star::uno::Reference<
@@ -134,8 +134,8 @@ private:
                                ::com::sun::star::beans::PropertyValue > & aMediaDescriptor );
     /// @return a warning code, or 0 for successful operation
     sal_Int32 impl_ExportStream(
-        const ::rtl::OUString & rStreamName,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rStreamName,
+        const OUString & rServiceName,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::embed::XStorage > & xStorage,
         const ::com::sun::star::uno::Reference<
@@ -152,7 +152,7 @@ private:
         ::com::sun::star::lang::XComponent >       m_xTargetDoc;
     ::com::sun::star::uno::Reference<
         ::com::sun::star::lang::XComponent >       m_xSourceDoc;
-    ::rtl::OUString                                m_sDocumentHandler; // when set it will be set as doc handler
+    OUString                                m_sDocumentHandler; // when set it will be set as doc handler
 
     volatile bool                                  m_bCancelOperation;
     ::osl::Mutex                                   m_aMutex;
@@ -179,7 +179,7 @@ public:
         return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
     }
 protected:
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
         getImplementationName()
             throw( ::com::sun::star::uno::RuntimeException )
     {
@@ -207,7 +207,7 @@ protected:
         XMLFilter::setSourceDocument(Document);
     }
 
-    virtual ::rtl::OUString getMediaType(bool _bOasis);
+    virtual OUString getMediaType(bool _bOasis);
 };
 
 } //  namespace chart
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;
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 2a06ac188695..ef0b11485072 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -46,15 +46,15 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL AreaChartType::getChartType()
+OUString SAL_CALL AreaChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
 }
 
-uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     return aServices;
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index dcfffca24506..00a1fc10585f 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -42,7 +42,7 @@ protected:
     explicit AreaChartType( const AreaChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 27fccbb09058..6bd6e5d89e5e 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -31,7 +31,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;
@@ -126,7 +125,7 @@ namespace chart
 AreaChartTypeTemplate::AreaChartTypeTemplate(
     uno::Reference<
         uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     StackMode eStackMode,
     sal_Int32 nDim /* = 2 */ ) :
         ChartTypeTemplate( xContext, rServiceName ),
@@ -248,9 +247,9 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN
 
 // ----------------------------------------
 
-uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
     return aServices;
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index d7f347b7fcb7..92fd4b86f054 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
     explicit AreaChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StackMode eStackMode,
         sal_Int32 nDim = 2 );
     virtual ~AreaChartTypeTemplate();
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index cec160893c6c..3193cf60b35a 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -47,15 +47,15 @@ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL BarChartType::getChartType()
+OUString SAL_CALL BarChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_BAR;
 }
 
-uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     return aServices;
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 649daabbcfe0..3495c6e7560e 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -42,7 +42,7 @@ protected:
     explicit BarChartType( const BarChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 1c1ec10e069b..3cb469b1c400 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -36,7 +36,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;
 
 namespace
 {
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx
index 68744a4e13af..e8f606169bf7 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -44,7 +44,7 @@ public:
     explicit BarChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StackMode eStackMode,
         BarDirection eDirection,
         sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index d18219356b6a..dc8302aa6de1 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -31,7 +31,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;
@@ -158,16 +157,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
     return xResult;
 }
 
-::rtl::OUString SAL_CALL BubbleChartType::getChartType()
+OUString SAL_CALL BubbleChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aMandRolesSeq(4);
+    uno::Sequence< OUString > aMandRolesSeq(4);
     aMandRolesSeq.realloc( 4 );
     aMandRolesSeq[0] = "label";
     aMandRolesSeq[1] = "values-x";
@@ -206,9 +205,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS
     return *StaticBubbleChartTypeInfo::get();
 }
 
-uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index e648f1479f79..c3e25e8c145f 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -43,16 +43,16 @@ protected:
     explicit BubbleChartType( const BubbleChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedMandatoryRoles()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
         createCoordinateSystem( ::sal_Int32 DimensionCount )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ OPropertySet ____
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index c85b12ee6ba3..3fd97691c2f1 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -36,7 +36,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;
 using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index 867db887a984..4eca50973328 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -36,7 +36,7 @@ public:
     explicit BubbleChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName );
+        const OUString & rServiceName );
     virtual ~BubbleChartTypeTemplate();
 
     /// XServiceInfo declarations
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index 8dc2ff9b1742..462da8a22d50 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -34,7 +34,6 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index d1ccc532ef0e..f5b723ffcca1 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -28,7 +28,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;
@@ -216,13 +215,13 @@ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL CandleStickChartType::getChartType()
+OUString SAL_CALL CandleStickChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
     bool bShowFirst = true;
@@ -328,9 +327,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
     ::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue );
 }
 
-uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index a05890f19689..75df4c24a8e8 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -42,15 +42,15 @@ protected:
     explicit CandleStickChartType( const CandleStickChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedMandatoryRoles()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedOptionalRoles()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ OPropertySet ____
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index d78d16ed0e89..bf8002dbaa12 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -31,7 +31,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;
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index c153a261a349..96f3b8a64c49 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -66,19 +66,19 @@ protected:
 
     // ____ XChartType ____
     // still abstract ! implement !
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException) = 0;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
         createCoordinateSystem( ::sal_Int32 DimensionCount )
         throw (::com::sun::star::lang::IllegalArgumentException,
                ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedMandatoryRoles()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedOptionalRoles()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+    virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XDataSeriesContainer ____
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index c72abbe06993..187d1c4f2717 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -47,7 +47,6 @@
 
 using namespace ::com::sun::star;
 
-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/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7858edf87cac..2312dc9a0725 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -44,7 +44,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
@@ -130,7 +129,7 @@ namespace chart
 
 ChartTypeTemplate::ChartTypeTemplate(
     Reference< uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName ) :
+    const OUString & rServiceName ) :
         m_xContext( xContext ),
         m_aServiceName( rServiceName )
 {
@@ -523,7 +522,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
 }
 
 // ____ XServiceName ____
-    ::rtl::OUString SAL_CALL ChartTypeTemplate::getServiceName()
+    OUString SAL_CALL ChartTypeTemplate::getServiceName()
     throw (uno::RuntimeException)
 {
     return m_aServiceName;
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 5e855b4ec5a6..061647d764ff 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -79,7 +79,7 @@ public:
     explicit ChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName );
+        const OUString & rServiceName );
     virtual ~ChartTypeTemplate();
 
     APPHELPER_XSERVICEINFO_DECL()
@@ -126,7 +126,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // Methods to overload for automatic creation
@@ -265,7 +265,7 @@ protected:
             ::com::sun::star::chart2::XDataInterpreter > m_xDataInterpreter;
 
 private:
-    const ::rtl::OUString m_aServiceName;
+    const OUString m_aServiceName;
 
 private:
     /** modifies the given diagram
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 90bf825e42de..0427a844967a 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -148,7 +148,7 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL ColumnChartType::getChartType()
+OUString SAL_CALL ColumnChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
@@ -178,9 +178,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS
 }
 
 
-uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     return aServices;
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index 80f9255000c6..068260d3b545 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -42,7 +42,7 @@ protected:
     explicit ColumnChartType( const ColumnChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ OPropertySet ____
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 3355d9ee33a5..1013c0ef96e1 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -38,7 +38,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;
 using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
@@ -131,7 +130,7 @@ namespace chart
 ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(
     Reference<
         uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     StackMode eStackMode,
     sal_Int32 nNumberOfLines ) :
         ChartTypeTemplate( xContext, rServiceName ),
@@ -419,9 +418,9 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter
 
 // ----------------------------------------
 
-uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
     return aServices;
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index 14d7a2194e5e..2363a6140b1d 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
     explicit ColumnLineChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StackMode eStackMode,
         sal_Int32 nNumberOfLines );
     virtual ~ColumnLineChartTypeTemplate();
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 51fbaf39690f..a111954387b2 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -36,7 +36,6 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 696e2a1b1c99..5078346a6cc0 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -39,7 +39,6 @@ using namespace ::chart::ContainerHelper;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 #if OSL_DEBUG_LEVEL > 1
 namespace
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index f250fd970696..bba38e48e7e9 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -44,19 +44,19 @@ public:
     APPHELPER_XSERVICEINFO_DECL()
 
     // convenience methods
-    static  ::rtl::OUString GetRole(
+    static  OUString GetRole(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataSequence > & xSeq );
 
     static void SetRole(
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::chart2::data::XDataSequence > & xSeq,
-        const ::rtl::OUString & rRole );
+        const OUString & rRole );
 
     static ::com::sun::star::uno::Any GetProperty(
         const ::com::sun::star::uno::Sequence<
             ::com::sun::star::beans::PropertyValue > & aArguments,
-        const ::rtl::OUString & rName );
+        const OUString & rName );
 
     static bool HasCategories(
         const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 4c267fe40679..4a71becbcaa3 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -31,7 +31,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -62,15 +61,15 @@ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL FilledNetChartType::getChartType()
+OUString SAL_CALL FilledNetChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
 }
 
-uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index 4a52aee0c929..0c5aeac28d0d 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -41,7 +41,7 @@ protected:
     explicit FilledNetChartType( const FilledNetChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index d35dde6fe776..e7616c76a76e 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.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;
@@ -159,7 +158,7 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL LineChartType::getChartType()
+OUString SAL_CALL LineChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_LINE;
@@ -189,9 +188,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet
     return *StaticLineChartTypeInfo::get();
 }
 
-uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index df54fb70a974..2df426d13ca0 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -43,7 +43,7 @@ protected:
     explicit LineChartType( const LineChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ OPropertySet ____
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index a0d370d36f7d..1b9d635c296d 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -35,7 +35,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;
 using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
@@ -148,7 +147,7 @@ namespace chart
 LineChartTypeTemplate::LineChartTypeTemplate(
     uno::Reference<
         uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     StackMode eStackMode,
     bool bSymbols,
     bool bHasLines /* = true */,
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx
index 66dda4a24ccd..b0ed7dd2d7b2 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
     explicit LineChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StackMode eStackMode,
         bool bSymbols,
         bool bHasLines = true,
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index ca3ddc545056..fd593daa6b51 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -32,7 +32,6 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
@@ -168,15 +167,15 @@ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL NetChartType::getChartType()
+OUString SAL_CALL NetChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_NET;
 }
 
-uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index 210df23e8d91..e4b1a25f2d9d 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -71,7 +71,7 @@ protected:
     explicit NetChartType( const NetChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 13f01f50fe9b..1672ba23f907 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -31,7 +31,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::uno::Any;
 using ::osl::MutexGuard;
 
@@ -46,7 +45,7 @@ namespace chart
 
 NetChartTypeTemplate::NetChartTypeTemplate(
     Reference< uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     StackMode eStackMode,
     bool bSymbols,
     bool bHasLines ,
diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx
index 683950f36cd6..2462f200a6f0 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.hxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.hxx
@@ -31,7 +31,7 @@ public:
     explicit NetChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StackMode eStackMode,
         bool bSymbols,
         bool bHasLines = true,
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index b54d9769d41f..99d01bc8e938 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -30,7 +30,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;
@@ -152,7 +151,7 @@ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone()
 }
 
 // ____ XChartType ____
-::rtl::OUString SAL_CALL PieChartType::getChartType()
+OUString SAL_CALL PieChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_PIE;
@@ -220,9 +219,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI
     return *StaticPieChartTypeInfo::get();
 }
 
-uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index a737ae12ecbf..962da335231f 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -43,7 +43,7 @@ protected:
     explicit PieChartType( const PieChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
         createCoordinateSystem( ::sal_Int32 DimensionCount )
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index ebf2c690568f..2fe296658cdb 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -40,7 +40,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;
@@ -159,7 +158,7 @@ namespace chart
 PieChartTypeTemplate::PieChartTypeTemplate(
     uno::Reference<
         uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     chart2::PieChartOffsetMode eMode,
     bool bRings            /* = false */,
     sal_Int32 nDim         /* = 2 */    ) :
@@ -620,9 +619,9 @@ void PieChartTypeTemplate::adaptDiagram( const uno::Reference< chart2::XDiagram
 
 // ----------------------------------------
 
-uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PieChartTypeTemplate::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
     return aServices;
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx
index f0a876c58ac2..697a00f8ab6c 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
     PieChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         ::com::sun::star::chart2::PieChartOffsetMode eMode,
         bool bRings = false,
         sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 20e89cb15ff7..d4dd2014d8a4 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -31,7 +31,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;
@@ -208,26 +207,26 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
     return xResult;
 }
 
-::rtl::OUString SAL_CALL ScatterChartType::getChartType()
+OUString SAL_CALL ScatterChartType::getChartType()
     throw (uno::RuntimeException)
 {
     return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
     throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aMandRolesSeq(3);
+    uno::Sequence< OUString > aMandRolesSeq(3);
     aMandRolesSeq[0] = "label";
     aMandRolesSeq[1] = "values-x";
     aMandRolesSeq[2] = "values-y";
     return aMandRolesSeq;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
+uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
     throw (uno::RuntimeException)
 {
-    return uno::Sequence< ::rtl::OUString >();
+    return uno::Sequence< OUString >();
 }
 
 
@@ -255,9 +254,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty
     return *StaticScatterChartTypeInfo::get();
 }
 
-uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 3 );
+    uno::Sequence< OUString > aServices( 3 );
     aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER;
     aServices[ 1 ] = "com.sun.star.chart2.ChartType";
     aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index 8e0ea71642a7..e39265e9497c 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -47,12 +47,12 @@ protected:
     explicit ScatterChartType( const ScatterChartType & rOther );
 
     // ____ XChartType ____
-    virtual ::rtl::OUString SAL_CALL getChartType()
+    virtual OUString SAL_CALL getChartType()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedMandatoryRoles()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedOptionalRoles()
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 7496a5314ba2..da73968d3a15 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -37,7 +37,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;
 using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index ff26084d9b12..ef7afc26a7b2 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -37,7 +37,7 @@ public:
     explicit ScatterChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         bool bSymbols,
         bool bHasLines = true,
         sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 951aba452e20..8fb076771ea8 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::com::sun::star::beans::Property;
 using ::com::sun::star::uno::Any;
 using ::osl::MutexGuard;
@@ -162,7 +161,7 @@ namespace chart
 StockChartTypeTemplate::StockChartTypeTemplate(
     uno::Reference<
         uno::XComponentContext > const & xContext,
-    const ::rtl::OUString & rServiceName,
+    const OUString & rServiceName,
     StockVariant eVariant,
     bool bJapaneseStyle ) :
         ChartTypeTemplate( xContext, rServiceName ),
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx
index 26b0f217e951..6c203d92d467 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -52,7 +52,7 @@ public:
     explicit StockChartTypeTemplate(
         ::com::sun::star::uno::Reference<
             ::com::sun::star::uno::XComponentContext > const & xContext,
-        const ::rtl::OUString & rServiceName,
+        const OUString & rServiceName,
         StockVariant eVariant,
         bool bJapaneseStyle );
     virtual ~StockChartTypeTemplate();
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 0cafbd98a14a..ba55fbd2f79d 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -37,7 +37,6 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using namespace ::chart::ContainerHelper;
 
 namespace chart
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 48d742421d83..3876d2a29d9c 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -34,7 +34,6 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 614236dff6d7..a91d05ace485 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
                 Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
                 if( xCTCnt.is() )
                 {
-                    ::rtl::OUString aRoleToMatch;
+                    OUString aRoleToMatch;
                     if( nDimensionIndex == 0 )
                         aRoleToMatch = "values-x";
                     Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 898699d50f19..deada2065cb3 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -37,7 +37,6 @@ using namespace ::chart::ContainerHelper;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 // necessary for MS compiler
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 241f08add123..40c79a3cb55d 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::beans::Property;
 
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
index c4f621e62098..a1817b0313a9 100644
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ b/chart2/source/tools/ChartDebugTrace.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 51b760de355d..658b6b03ea91 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -50,7 +50,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide(
         StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 );
         if( eStackMode == StackMode_NONE && !bAmbiguous )
         {
-            rtl::OUString aChartTypeName = xChartType->getChartType();
+            OUString aChartTypeName = xChartType->getChartType();
             bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ||
                         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) );
         }
@@ -68,7 +68,7 @@ sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference<
     {
         if(nDimensionCount==3)
         {
-            rtl::OUString aChartTypeName = xChartType->getChartType();
+            OUString aChartTypeName = xChartType->getChartType();
             if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
                 return sal_True;
             if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
@@ -88,7 +88,7 @@ sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference<
         if(nDimensionCount==3)
             return sal_False;
 
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return sal_False;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -118,7 +118,7 @@ sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XCha
     {
          if(nDimensionCount==2)
         {
-            rtl::OUString aChartTypeName = xChartType->getChartType();
+            OUString aChartTypeName = xChartType->getChartType();
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
                 return sal_False;
             if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
@@ -142,7 +142,7 @@ sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XC
         if(nDimensionCount==3)
             return sal_False;
 
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
             return sal_True;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
@@ -161,7 +161,7 @@ sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType
     //@todo ask charttype itself --> need model change first
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return sal_False;
 
@@ -181,7 +181,7 @@ sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChar
          if(nDimensionCount==3)
             return sal_False;
 
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return sal_False;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -203,7 +203,7 @@ sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
          if(nDimensionCount==3)
             return sal_False;
 
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
             return sal_True;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
@@ -229,7 +229,7 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors(
         if( eStackMode != StackMode_Y_STACKED || bAmbiguous )
             return sal_False;
 
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
             return sal_True;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
@@ -248,7 +248,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
     if( !xChartType.is() )
         return aRet;
 
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
     {
         bool bDonut = false;
@@ -359,7 +359,7 @@ sal_Bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< cha
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return sal_False;
     }
@@ -370,7 +370,7 @@ bool ChartTypeHelper::isSupportingStartingAngle( const uno::Reference< chart2::X
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return true;
     }
@@ -380,7 +380,7 @@ bool ChartTypeHelper::isSupportingBaseValue( const uno::Reference< chart2::XChar
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
             || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
             || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA)
@@ -394,7 +394,7 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2:
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
             return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
@@ -414,7 +414,7 @@ bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChart
         sal_Int32 nType = ChartTypeHelper::getAxisType( xChartType, nDimensionIndex );
         if( nType != AxisType::CATEGORY )
             return false;
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return false;
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -429,7 +429,7 @@ bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< c
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
             || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
             || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
@@ -442,7 +442,7 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC
 {
     if(xChartType.is())
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return sal_True;
     }
@@ -454,7 +454,7 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::
     sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey
     if( xChartType .is() )
     {
-        rtl::OUString aChartType = xChartType->getChartType();
+        OUString aChartType = xChartType->getChartType();
         if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
         {
             if( bSimple )
@@ -474,7 +474,7 @@ sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno:
     sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40
     if( xChartType .is() )
     {
-        rtl::OUString aChartType = xChartType->getChartType();
+        OUString aChartType = xChartType->getChartType();
         if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
         {
             if( bSimple )
@@ -491,7 +491,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultSimpleLightDirection( const uno:
     drawing::Direction3D aRet(0.0, 0.0, 1.0);
     if( xChartType .is() )
     {
-        rtl::OUString aChartType = xChartType->getChartType();
+        OUString aChartType = xChartType->getChartType();
         if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             aRet = drawing::Direction3D(0.0, 0.8, 0.5);
         else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE)
@@ -506,7 +506,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u
     drawing::Direction3D aRet(0.0, 0.0, 1.0);
     if( xChartType .is() )
     {
-        rtl::OUString aChartType = xChartType->getChartType();
+        OUString aChartType = xChartType->getChartType();
         if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             aRet = drawing::Direction3D(0.6, 0.6, 0.6);
         else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE)
@@ -525,7 +525,7 @@ sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference<
     if(!xChartType.is())
         return AxisType::CATEGORY;
 
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if(2==nDimensionIndex)//z-axis
         return AxisType::SERIES;
     if(1==nDimensionIndex)//y-axis
@@ -548,7 +548,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries(
     {
         try
         {
-            rtl::OUString aChartTypeName = xChartType->getChartType();
+            OUString aChartTypeName = xChartType->getChartType();
             if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE))
             {
                 uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW );
@@ -580,7 +580,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
     StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 );
     bStacked = bFound && (StackMode_Y_STACKED == eStackMode);
 
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
@@ -634,30 +634,30 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const uno::Reference< XChartTyp
 {
     if( xChartType.is() )
     {
-        rtl::OUString aChartTypeName = xChartType->getChartType();
+        OUString aChartTypeName = xChartType->getChartType();
         if( aChartTypeName.match( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
             return false;
     }
     return true;
 }
 
-rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
+OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
 {
-    rtl::OUString aRet( "values-y" );
+    OUString aRet( "values-y" );
     if( !xChartType.is() )
         return aRet;
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
         aRet = xChartType->getRoleOfSequenceForSeriesLabel();
     return aRet;
 }
 
-rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
+OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
 {
-    rtl::OUString aRet( "values-y" );
+    OUString aRet( "values-y" );
     if( !xChartType.is() )
         return aRet;
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK)
         || aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
         aRet = xChartType->getRoleOfSequenceForSeriesLabel();
@@ -667,7 +667,7 @@ rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetectio
 bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const uno::Reference< XChartType >& xChartType )
 {
     bool bRet = true;
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
         bRet = false;
     return bRet;
@@ -679,7 +679,7 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X
     if( !xChartType.is() )
         return bRet;
 
-    rtl::OUString aChartTypeName = xChartType->getChartType();
+    OUString aChartTypeName = xChartType->getChartType();
     if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ||
         aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) )
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index f9c986225893..829780d02519 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -459,10 +459,10 @@ uno::Sequence< double > DataSequenceToDoubleSequence(
     return aResult;
 }
 
-uno::Sequence< rtl::OUString > DataSequenceToStringSequence(
+uno::Sequence< OUString > DataSequenceToStringSequence(
     const uno::Reference< data::XDataSequence >& xDataSequence )
 {
-    uno::Sequence< rtl::OUString > aResult;
+    uno::Sequence< OUString > aResult;
     if(!xDataSequence.is())
         return aResult;
 
@@ -519,9 +519,9 @@ sal_Int16 getShortForLongAlso( const uno::Any& rAny )
     return nRet;
 }
 
-bool replaceParamterInString( rtl::OUString & rInOutResourceString,
-                            const rtl::OUString & rParamToReplace,
-                            const rtl::OUString & rReplaceWith )
+bool replaceParamterInString( OUString & rInOutResourceString,
+                            const OUString & rParamToReplace,
+                            const OUString & rReplaceWith )
 {
     sal_Int32 nPos = rInOutResourceString.indexOf( rParamToReplace );
     if( nPos == -1 )
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index f56ce504d80d..d1425e9c8dd7 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx
index 727eef634f53..ce57ac442428 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index f9a8b64dc792..d7ec4ac688db 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -49,8 +49,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 // ----------------------------------------
 namespace
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 262e6fe2e11e..71b6a5cb40fe 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -21,7 +21,6 @@
 #include "DataSource.hxx"
 #include "LabeledDataSequence.hxx"
 
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index cef1dc179d89..fab7b55011b8 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -45,11 +45,10 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
-void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult,
+void lcl_addRanges( ::std::vector< OUString > & rOutResult,
                     const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq )
 {
     if( ! xLabeledSeq.is())
@@ -63,7 +62,7 @@ void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult,
 }
 
 void lcl_addDataSourceRanges(
-    ::std::vector< ::rtl::OUString > & rOutResult,
+    ::std::vector< OUString > & rOutResult,
     const uno::Reference< data::XDataSource > & xDataSource )
 {
     if( xDataSource.is() )
@@ -75,7 +74,7 @@ void lcl_addDataSourceRanges(
 }
 
 void lcl_addErrorBarRanges(
-    ::std::vector< ::rtl::OUString > & rOutResult,
+    ::std::vector< OUString > & rOutResult,
     const uno::Reference< XDataSeries > & xDataSeries )
 {
     uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY );
@@ -129,7 +128,7 @@ Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSeque
     return new ::chart::CachedDataSequence();
 }
 
-Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const ::rtl::OUString& rSingleText )
+Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const OUString& rSingleText )
 {
     return new ::chart::CachedDataSequence( rSingleText );
 }
@@ -175,7 +174,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
 }
 
 uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
-                                            const ::rtl::OUString & rRangeRepresentation,
+                                            const OUString & rRangeRepresentation,
                                             const uno::Sequence< sal_Int32 >& rSequenceMapping,
                                             bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories )
 {
@@ -197,7 +196,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
 }
 
 void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue >& rArguments
-                                     , ::rtl::OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping
+                                     , OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping
             , bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories )
 {
     const beans::PropertyValue* pArguments = rArguments.getConstArray();
@@ -269,10 +268,10 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
     return new DataSource( aResultSequence );
 }
 
-uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges(
+uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
     const uno::Reference< chart2::XDiagram > & xDiagram )
 {
-    ::std::vector< ::rtl::OUString > aResult;
+    ::std::vector< OUString > aResult;
 
     if( xDiagram.is())
     {
@@ -293,7 +292,7 @@ uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges(
     return ContainerHelper::ContainerToSequence( aResult );
 }
 
-uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel )
+uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel )
 {
     uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
     return getUsedDataRanges( xDiagram );
@@ -334,7 +333,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
 bool DataSourceHelper::detectRangeSegmentation(
     const uno::Reference<
         frame::XModel >& xChartModel
-    , ::rtl::OUString& rOutRangeString
+    , OUString& rOutRangeString
     , ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
     , bool& rOutUseColumns
     , bool& rOutFirstCellAsLabel
@@ -400,7 +399,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
             }
             else if ( aProperty.Name == "CellRangeRepresentation" )
             {
-                ::rtl::OUString aRange;
+                OUString aRange;
                 bHasCellRangeRepresentation =
                     (aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty());
             }
@@ -435,7 +434,7 @@ void DataSourceHelper::setRangeSegmentation(
     if( !xTemplateFactory.is() )
         return;
 
-    ::rtl::OUString aRangeString;
+    OUString aRangeString;
     bool bDummy;
     uno::Sequence< sal_Int32 > aDummy;
     readArguments( xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument )),
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 1b54b355edbe..1356237d5515 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -65,7 +65,6 @@ using namespace ::std;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::com::sun::star::chart2::XAnyDescriptionAccess;
 
 namespace chart
@@ -955,12 +954,12 @@ Reference< data::XLabeledDataSequence >
 }
 
 void lcl_generateAutomaticCategoriesFromChartType(
-            Sequence< rtl::OUString >& rRet,
+            Sequence< OUString >& rRet,
             const Reference< XChartType >& xChartType )
 {
     if(!xChartType.is())
         return;
-    rtl::OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() );
+    OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() );
         Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
     if( xSeriesCnt.is() )
     {
@@ -984,9 +983,9 @@ void lcl_generateAutomaticCategoriesFromChartType(
     }
 }
 
-Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys )
+Sequence< OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys )
 {
-    Sequence< rtl::OUString > aRet;
+    Sequence< OUString > aRet;
 
     Reference< XChartTypeContainer > xTypeCntr( xCooSys, uno::UNO_QUERY );
     if( xTypeCntr.is() )
@@ -1002,10 +1001,10 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys(
     return aRet;
 }
 
-Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
+Sequence< OUString > DiagramHelper::getExplicitSimpleCategories(
             const Reference< XChartDocument >& xChartDoc )
 {
-    Sequence< rtl::OUString > aRet;
+    Sequence< OUString > aRet;
     uno::Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY );
     if(xChartModel.is())
     {
@@ -1251,8 +1250,8 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy
     if( !xFirstType.is() || !xSecondType.is() )
         return false;
 
-    ::std::vector< ::rtl::OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
-    ::std::vector< ::rtl::OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
+    ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
+    ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
     ::std::sort( aFirstRoles.begin(), aFirstRoles.end() );
     ::std::sort( aSecondRoles.begin(), aSecondRoles.end() );
     return ( aFirstRoles == aSecondRoles );
@@ -1497,7 +1496,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
 
     if( xChartType .is() )
     {
-        rtl::OUString aChartType = xChartType->getChartType();
+        OUString aChartType = xChartType->getChartType();
         if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
             return true;
     }
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 3e9a3d7c5e38..29f40e8c9925 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -33,8 +33,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::com::sun::star::beans::Property;
 using ::osl::MutexGuard;
 
@@ -327,9 +325,9 @@ void ErrorBar::fireModifyEvent()
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.ErrorBar";
     return aServices;
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 538a9d0dad80..949e18990ade 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::std::vector;
 
 
@@ -109,7 +108,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
                             if( !aSeries.empty() )
                             {
                                 uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY );
-                                ::rtl::OUString aStringDummy;
+                                OUString aStringDummy;
                                 bool bDummy;
                                 uno::Sequence< sal_Int32 > aSeqDummy;
                                 DataSourceHelper::readArguments( xDataProvider->detectArguments( xSeriesSource),
@@ -180,7 +179,7 @@ std::vector<sal_Int32> lcl_getLimitingBorders( const std::vector< ComplexCategor
     return aLimitingBorders;
 }
 
-void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel )
+void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel )
 {
     sal_Int32 nCount = rInAnys.getLength();
     if(!nCount)
@@ -207,7 +206,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::
 
     for(sal_Int32 nN=0;nN<nCount;nN++)
     {
-        rtl::OUString aText;
+        OUString aText;
         uno::Any aAny = rInAnys[nN];
         if( aAny.hasValue() )
         {
@@ -247,7 +246,7 @@ public:
     {}
 
     virtual sal_Int32 getLevelCount() const;
-    virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const;
+    virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const;
 
 private:
     const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
@@ -260,9 +259,9 @@ sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const
 {
     return m_rSplitCategoriesList.getLength();
 }
-uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const
+uno::Sequence< OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const
 {
-    uno::Sequence< rtl::OUString > aRet;
+    uno::Sequence< OUString > aRet;
     Reference< data::XLabeledDataSequence > xLabeledDataSequence( m_rSplitCategoriesList[nLevel] );
     if( xLabeledDataSequence.is() )
     {
@@ -274,7 +273,7 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::
 }
 
 std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector(
-    const uno::Sequence< rtl::OUString >& rStrings
+    const uno::Sequence< OUString >& rStrings
     , const std::vector<sal_Int32>& rLimitingBorders, bool bCreateSingleCategories )
 {
     std::vector< ComplexCategory > aResult;
@@ -535,7 +534,7 @@ void ExplicitCategoriesProvider::init()
 }
 
 
-Sequence< ::rtl::OUString > ExplicitCategoriesProvider::getSimpleCategories()
+Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories()
 {
     if( !m_bIsExplicitCategoriesInited )
     {
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 75e66ce52a32..c76138ac809f 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 64b822edd314..f70332535489 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -61,7 +61,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
     rOutProperties.push_back(
         Property( "FillTransparenceGradientName",
                   FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -69,7 +69,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
     rOutProperties.push_back(
         Property( "FillGradientName",
                   FillProperties::PROP_FILL_GRADIENT_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -84,7 +84,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
     rOutProperties.push_back(
         Property( "FillHatchName",
                   FillProperties::PROP_FILL_HATCH_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -104,7 +104,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
     rOutProperties.push_back(
         Property( "FillBitmapName",
                   FillProperties::PROP_FILL_BITMAP_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEVOID
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index 43593bcd49f7..82ad2392bf69 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using rtl::OUString;
 
 Sequence< Reference< chart2::XFormattedString > >
             FormattedStringHelper::createFormattedStringSequence(
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index db2031d52918..27632e1d070d 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -27,7 +27,6 @@
 
 using namespace ::com::sun::star;
 
-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/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index e8d4def8f24d..61dfaa96598f 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -27,7 +27,6 @@
 #include <iterator>
 
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 using namespace ::com::sun::star;
 using namespace ::std;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 3a4303b08528..147afc8a2935 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -52,8 +52,6 @@ using namespace ::std;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
@@ -329,7 +327,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
 
             //data in columns?
             {
-                ::rtl::OUString aRangeString;
+                OUString aRangeString;
                 bool bFirstCellAsLabel = true;
                 bool bHasCategories = true;
                 uno::Sequence< sal_Int32 > aSequenceMapping;
@@ -1269,7 +1267,7 @@ public:
     {}
 
     virtual sal_Int32 getLevelCount() const;
-    virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const;
+    virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const;
 
 private:
     const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions;
@@ -1279,9 +1277,9 @@ sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const
 {
     return lcl_getInnerLevelCount( m_rComplexDescriptions );
 }
-uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const
+uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const
 {
-    uno::Sequence< rtl::OUString > aResult;
+    uno::Sequence< OUString > aResult;
     if( nLevel < lcl_getInnerLevelCount( m_rComplexDescriptions ) )
     {
         aResult.realloc( m_rComplexDescriptions.size() );
@@ -1354,15 +1352,15 @@ Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDes
 {
     return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() );
 }
-void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
 {
     m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) );
 }
-Sequence< Sequence< ::rtl::OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
 {
     return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() );
 }
-void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
 {
     m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) );
 }
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index a7ac13fb9b15..8b8785d5d353 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index 54de032cf02c..e3c88d9860c3 100644
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -54,7 +54,7 @@ void LineProperties::AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "LineDashName",
                   PROP_LINE_DASH_NAME,
-                  ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+                  ::getCppuType( reinterpret_cast< const OUString * >(0)),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT
                   | beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index f168f63429d3..5b388ee4139e 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 29ea58f996ff..af56a64e19c6 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 0551cbdbb901..10bebac3c077 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -25,8 +25,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3cb8953f0c3a..359017940244 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index fe181d360dbd..130d277329f6 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -25,7 +25,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 
 //.............................................................................
@@ -34,7 +33,7 @@ namespace chart
 //.............................................................................
 
 uno::Reference< container::XNameContainer > createNameContainer(
-        const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName )
+        const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
 {
     return new NameContainer( rType, rServicename, rImplementationName );
 }
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 508e2716f489..a1080b34c792 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -46,7 +46,7 @@ FixedNumberFormatter::~FixedNumberFormatter()
 {
 }
 
-rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
+OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
     return m_aNumberFormatterWrapper.getFormattedString(
         m_nNumberFormatKey, fValue, rLabelColor, rbColorChanged );
@@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum
 
 {
     uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY);
-    rtl::OUString sNullDate( "NullDate" );
+    OUString sNullDate( "NullDate" );
     if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) )
         m_aNullDate = xProp->getPropertyValue(sNullDate);
     SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
@@ -99,7 +99,7 @@ Date NumberFormatterWrapper::getNullDate() const
     return aRet;
 }
 
-rtl::OUString NumberFormatterWrapper::getFormattedString(
+OUString NumberFormatterWrapper::getFormattedString(
     sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
 {
     String aText;
@@ -130,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
     {
         m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear);
     }
-    rtl::OUString aRet( aText );
+    OUString aRet( aText );
 
     if(pTextColor)
     {
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index a6f437686add..f244f955a894 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -33,7 +33,6 @@ using ::com::sun::star::style::XStyleSupplier;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 // needed for MS compiler
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 8779f1dd9942..1097984274e3 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -46,8 +46,6 @@ namespace chart
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 
-using rtl::OUString;
-using rtl::OUStringBuffer;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
 
@@ -366,11 +364,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
         if( xAxis.is() )
         {
             Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ) ) );
-            rtl::OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) );
+            OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) );
             sal_Int32 nDimensionIndex=-1;
             sal_Int32 nAxisIndex=-1;
             AxisHelper::getIndicesForAxis( xAxis, xCooSys, nDimensionIndex, nAxisIndex );
-            rtl::OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) );
+            OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) );
             return createClassifiedIdentifierForParticles( aCooSysParticle, aAxisParticle );
         }
 
@@ -515,8 +513,8 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
 {
     //-1: main grid, 0: first subgrid etc
 
-    rtl::OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) );
-    rtl::OUString aGridCID( addChildParticle( aAxisCID
+    OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) );
+    OUString aGridCID( addChildParticle( aAxisCID
         , createChildParticleWithIndex( OBJECTTYPE_GRID, 0 ) ) );
     if( nSubGridIndex >= 0 )
     {
@@ -1004,7 +1002,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
     return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
 }
 
-OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle )
+OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OUString& rChildParticle )
 {
     OUStringBuffer aRet(rParticle);
 
@@ -1016,7 +1014,7 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, con
     return aRet.makeStringAndClear();
 }
 
-rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex )
+OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex )
 {
     OUStringBuffer aRet( getStringForType( eObjectType ) );
     if( aRet.getLength() )
@@ -1027,7 +1025,7 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObject
     return aRet.makeStringAndClear();
 }
 
-sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID )
+sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticleOrCID )
 {
     sal_Int32 nRet = -1;
 
@@ -1039,9 +1037,9 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar
 }
 
 OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
-                    , const rtl::OUString& rSeriesParticle
-                    , const rtl::OUString& rDragMethodServiceName
-                    , const rtl::OUString& rDragParameterString )
+                    , const OUString& rSeriesParticle
+                    , const OUString& rDragMethodServiceName
+                    , const OUString& rDragParameterString )
 {
     OUString aChildParticle( getStringForType( eSubObjectType ) );
     aChildParticle+=("=");
@@ -1084,7 +1082,7 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
     return aRet;
 }
 
-OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
+OUString ObjectIdentifier::getObjectID( const OUString& rCID )
 {
     OUString aRet;
 
@@ -1341,7 +1339,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
 }
 
 Reference< XDiagram > ObjectIdentifier::getDiagramForCID(
-                  const rtl::OUString& rObjectCID
+                  const OUString& rObjectCID
                 , const uno::Reference< frame::XModel >& xChartModel )
 {
     Reference< XDiagram > xDiagram;
@@ -1385,7 +1383,7 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
     return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex );
 }
 
-OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward )
+OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward )
 {
     sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) );
     sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) );
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index b84032790e06..ef53b5dc4a55 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 namespace chart
 {
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 746cf6a1a35b..fb6b0bfadd84 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -30,7 +30,6 @@
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 545e4e697626..1d1a1d22edf8 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index f039aa67f7ce..9e41285f2afc 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 // ================================================================================
 
diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx
index da1c0ca9c5d0..4cf49663e678 100644
--- a/chart2/source/tools/RegressionCalculationHelper.hxx
+++ b/chart2/source/tools/RegressionCalculationHelper.hxx
@@ -25,7 +25,7 @@
 #include <functional>
 #include <vector>
 
-#define NUMBER_TO_STR(number) (::rtl::OStringToOUString(::rtl::math::doubleToString( \
+#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \
           number, rtl_math_StringFormat_G, 4, '.', true ),RTL_TEXTENCODING_ASCII_US ))
 
 #define UC_SPACE (sal_Unicode(' '))
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 8d811aef8f7d..b2f6b52f6db0 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -32,7 +32,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4c346c6f6938..08228bc0961f 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -43,7 +43,6 @@ using ::com::sun::star::uno::XComponentContext;
 using ::com::sun::star::lang::XServiceName;
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::uno::Exception;
-using ::rtl::OUString;
 
 namespace
 {
@@ -87,7 +86,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
 
 Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName(
     const Reference< XComponentContext > & xContext,
-    ::rtl::OUString aServiceName )
+    OUString aServiceName )
 {
     Reference< XRegressionCurve > xResult;
 
@@ -115,7 +114,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
 // ------------------------------------------------------------
 
 Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
-    ::rtl::OUString aServiceName )
+    OUString aServiceName )
 {
     Reference< XRegressionCurveCalculator > xResult;
 
@@ -166,7 +165,7 @@ void RegressionCurveHelper::initializeCurveCalculator(
         {
             Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues());
             Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
-            ::rtl::OUString aRole;
+            OUString aRole;
             if( xProp->getPropertyValue( "Role" ) >>= aRole )
             {
                 if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" )
@@ -349,7 +348,7 @@ void RegressionCurveHelper::addRegressionCurve(
     }
 
     uno::Reference< chart2::XRegressionCurve > xCurve;
-    ::rtl::OUString aServiceName( lcl_getServiceNameForType( eType ));
+    OUString aServiceName( lcl_getServiceNameForType( eType ));
 
     if( !aServiceName.isEmpty())
     {
@@ -508,7 +507,7 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
         Reference< lang::XServiceName > xServName( xCurve, uno::UNO_QUERY );
         if( xServName.is())
         {
-            ::rtl::OUString aServiceName( xServName->getServiceName() );
+            OUString aServiceName( xServName->getServiceName() );
 
             if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
             {
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 7312081755be..0522af8b4cc5 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -32,8 +32,6 @@
 
 using namespace ::com::sun::star;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using ::com::sun::star::beans::Property;
 using ::osl::MutexGuard;
 
@@ -176,7 +174,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
 }
 
 // ____ XServiceName ____
-::rtl::OUString SAL_CALL RegressionCurveModel::getServiceName()
+OUString SAL_CALL RegressionCurveModel::getServiceName()
     throw (uno::RuntimeException)
 {
     switch( m_eRegressionCurveType )
@@ -193,7 +191,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
             return OUString("com.sun.star.chart2.PotentialRegressionCurve");
     }
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 // ____ XModifyBroadcaster ____
@@ -299,9 +297,9 @@ MeanValueRegressionCurve::MeanValueRegressionCurve(
 {}
 MeanValueRegressionCurve::~MeanValueRegressionCurve()
 {}
-uno::Sequence< ::rtl::OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve";
     return aServices;
@@ -327,9 +325,9 @@ LinearRegressionCurve::LinearRegressionCurve(
 {}
 LinearRegressionCurve::~LinearRegressionCurve()
 {}
-uno::Sequence< ::rtl::OUString > LinearRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve";
     return aServices;
@@ -355,9 +353,9 @@ LogarithmicRegressionCurve::LogarithmicRegressionCurve(
 {}
 LogarithmicRegressionCurve::~LogarithmicRegressionCurve()
 {}
-uno::Sequence< ::rtl::OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve";
     return aServices;
@@ -383,9 +381,9 @@ ExponentialRegressionCurve::ExponentialRegressionCurve(
 {}
 ExponentialRegressionCurve::~ExponentialRegressionCurve()
 {}
-uno::Sequence< ::rtl::OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve";
     return aServices;
@@ -411,9 +409,9 @@ PotentialRegressionCurve::PotentialRegressionCurve(
 {}
 PotentialRegressionCurve::~PotentialRegressionCurve()
 {}
-uno::Sequence< ::rtl::OUString > PotentialRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Static()
 {
-    uno::Sequence< ::rtl::OUString > aServices( 2 );
+    uno::Sequence< OUString > aServices( 2 );
     aServices[ 0 ] = lcl_aServiceName;
     aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve";
     return aServices;
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index 1670316defdf..8434d21731de 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -99,7 +99,7 @@ protected:
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XCloneable ____
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ef2c4934d93c..16f771a16729 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -115,7 +115,7 @@ private:
 
         ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
         ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
-        //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' )));
+        //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' )));
 
         // override other defaults
         ::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
@@ -309,11 +309,11 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
 
 // ================================================================================
 
-uno::Sequence< ::rtl::OUString > RegressionEquation::getSupportedServiceNames_Static()
+uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static()
 {
     const sal_Int32 nNumServices( 5 );
     sal_Int32 nI = 0;
-    uno::Sequence< ::rtl::OUString > aServices( nNumServices );
+    uno::Sequence< OUString > aServices( nNumServices );
     aServices[ nI++ ] = lcl_aServiceName;
     aServices[ nI++ ] = "com.sun.star.beans.PropertySet";
     aServices[ nI++ ] = "com.sun.star.drawing.FillProperties";
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 53883ae0c1f7..bc4dca1bf67a 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -30,7 +30,6 @@ using namespace ::std;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::makeAny;
 using ::com::sun::star::uno::Exception;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 04ce78c5fcb8..5dc408359749 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -74,16 +74,16 @@ LogarithmicScaling::getInverseScaling()
     return new ExponentialScaling( m_fBase );
 }
 
-    ::rtl::OUString SAL_CALL
+    OUString SAL_CALL
 LogarithmicScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_Logarithmic;
 }
 
-uno::Sequence< ::rtl::OUString > LogarithmicScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Logarithmic, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_Logarithmic, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -125,16 +125,16 @@ ExponentialScaling::getInverseScaling()
     return new LogarithmicScaling( m_fBase );
 }
 
-    ::rtl::OUString SAL_CALL
+    OUString SAL_CALL
 ExponentialScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_Exponential;
 }
 
-uno::Sequence< ::rtl::OUString > ExponentialScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Exponential, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_Exponential, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -178,16 +178,16 @@ uno::Reference< XScaling > SAL_CALL
     return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope );
 }
 
-    ::rtl::OUString SAL_CALL
+    OUString SAL_CALL
 LinearScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_Linear;
 }
 
-uno::Sequence< ::rtl::OUString > LinearScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Linear, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_Linear, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -229,16 +229,16 @@ uno::Reference< XScaling > SAL_CALL
     return new PowerScaling( 1.0 / m_fExponent );
 }
 
-    ::rtl::OUString SAL_CALL
+    OUString SAL_CALL
 PowerScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_Power;
 }
 
-uno::Sequence< ::rtl::OUString > PowerScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Power, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_Power, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 81f47e0c2da9..99d9e4267835 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -33,8 +33,6 @@
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 using namespace ::com::sun::star;
 
 namespace
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 4805390c4b8c..32406a57770b 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 using ::rtl::math::cos;
 using ::rtl::math::sin;
 using ::rtl::math::tan;
@@ -1339,8 +1338,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
             DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
         sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
 
-        rtl::OUString aPercentDiagonalPropertyName( "PercentDiagonal" );
-        rtl::OUString aBorderStylePropertyName( "BorderStyle" );
+        OUString aPercentDiagonalPropertyName( "PercentDiagonal" );
+        OUString aBorderStylePropertyName( "BorderStyle" );
 
         for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS )
         {
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index f618780e8876..c5b74b54fcd9 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -132,7 +132,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn
 
 uno::Reference< XTitle > TitleHelper::createTitle(
       TitleHelper::eTitleType eTitleType
-    , const rtl::OUString& rTitleText
+    , const OUString& rTitleText
     , const uno::Reference< frame::XModel >& xModel
     , const uno::Reference< uno::XComponentContext > & xContext
     , ReferenceSizeProvider * pRefSizeProvider )
@@ -239,9 +239,9 @@ uno::Reference< XTitle > TitleHelper::createTitle(
 
 }
 
-rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle )
+OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle )
 {
-    rtl::OUString aRet;
+    OUString aRet;
     if(!xTitle.is())
         return aRet;
     uno::Sequence< uno::Reference< XFormattedString > > aStringList = xTitle->getText();
@@ -250,7 +250,7 @@ rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xT
     return aRet;
 }
 
-void TitleHelper::setCompleteString( const rtl::OUString& rNewText
+void TitleHelper::setCompleteString( const OUString& rNewText
                     , const uno::Reference< XTitle >& xTitle
                     , const uno::Reference< uno::XComponentContext > & xContext
                     , float * pDefaultCharHeight /* = 0 */ )
@@ -259,7 +259,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText
     if(!xTitle.is())
         return;
 
-    rtl::OUString aNewText = rNewText;
+    OUString aNewText = rNewText;
 
     bool bStacked = false;
     uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY );
@@ -269,8 +269,8 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText
     if( bStacked )
     {
         //#i99841# remove linebreaks that were added for vertical stacking
-        rtl::OUStringBuffer aUnstackedStr;
-        rtl::OUStringBuffer aSource(rNewText);
+        OUStringBuffer aUnstackedStr;
+        OUStringBuffer aSource(rNewText);
 
         bool bBreakIgnored = false;
         sal_Int32 nLen = rNewText.getLength();
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 59c26759add0..33c99e554f2c 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 using ::osl::MutexGuard;
 
 // necessary for MS compiler
@@ -282,7 +281,7 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType()
 }
 
 // ____ XNamed ____
-::rtl::OUString SAL_CALL UncachedDataSequence::getName()
+OUString SAL_CALL UncachedDataSequence::getName()
     throw (uno::RuntimeException)
 {
     return m_aSourceRepresentation;
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 899e28dd7bb2..0c8b9736c6aa 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index f75c62b4d657..6304660930e2 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -25,7 +25,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx
index f98c029d8b07..7ba667b355bf 100644
--- a/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -25,7 +25,6 @@ using namespace ::com::sun::star;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace chart
 {
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 069d18ab2b00..101fd03bd3fe 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -32,7 +32,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 //.............................................................................
 namespace chart
@@ -85,7 +84,7 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
 void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
 {
     rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( rtl::OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) );
     rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) );
@@ -103,20 +102,20 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
     rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( ::rtl::OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) );
 //    rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( ::rtl::OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) );
 //    rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) );
-    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( ::rtl::OUString() ) ) );
+    rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) );
 //    rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) );
 }
 
 void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
 {
-//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( ::rtl::OUString() ) ) );
+//     rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) );
 //    rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) );
-//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( ::rtl::OUString() ) ) );
+//    rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) );
     rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) );
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index c4156a4efff7..dd4d6e93a5ec 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -25,7 +25,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 
 //.............................................................................
@@ -47,7 +46,7 @@ const OUString& WrappedProperty::getOuterName() const
     return m_aOuterName;
 }
 
-::rtl::OUString WrappedProperty::getInnerName() const
+OUString WrappedProperty::getInnerName() const
 {
     return m_aInnerName;
 }
@@ -108,7 +107,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
                         throw (beans::UnknownPropertyException, uno::RuntimeException)
 {
     beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
-    rtl::OUString aInnerName( this->getInnerName() );
+    OUString aInnerName( this->getInnerName() );
     if( xInnerPropertyState.is() && !aInnerName.isEmpty() )
         aState = xInnerPropertyState->getPropertyState( aInnerName );
     else
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 5b82509d70d1..07a0cdfc6147 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
 
 WrappedPropertySet::WrappedPropertySet()
                     : MutexContainer()
@@ -248,7 +247,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
     sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
     for(sal_Int32 nN=0; nN<nMinCount; nN++)
     {
-        ::rtl::OUString aPropertyName( rNameSeq[nN] );
+        OUString aPropertyName( rNameSeq[nN] );
         try
         {
             this->setPropertyValue( aPropertyName, rValueSeq[nN] );
@@ -276,7 +275,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
         {
             try
             {
-                ::rtl::OUString aPropertyName( rNameSeq[nN] );
+                OUString aPropertyName( rNameSeq[nN] );
                 aRetSeq[nN] = this->getPropertyValue( aPropertyName );
             }
             catch( const beans::UnknownPropertyException& ex )
@@ -328,7 +327,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri
     return aState;
 }
 
-const WrappedProperty* WrappedPropertySet::getWrappedProperty( const ::rtl::OUString& rOuterName )
+const WrappedProperty* WrappedPropertySet::getWrappedProperty( const OUString& rOuterName )
 {
     sal_Int32 nHandle = getInfoHelper().getHandleByName( rOuterName );
     return getWrappedProperty( nHandle );
@@ -351,7 +350,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
         aRetSeq.realloc( rNameSeq.getLength() );
         for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
         {
-            ::rtl::OUString aPropertyName( rNameSeq[nN] );
+            OUString aPropertyName( rNameSeq[nN] );
             aRetSeq[nN] = this->getPropertyState( aPropertyName );
         }
     }
@@ -394,7 +393,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault(  )
     const Sequence< beans::Property >&  rPropSeq = getPropertySequence();
     for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
     {
-        ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
+        OUString aPropertyName( rPropSeq[nN].Name );
         this->setPropertyToDefault( aPropertyName );
     }
 }
@@ -403,7 +402,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
 {
     for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
     {
-        ::rtl::OUString aPropertyName( rNameSeq[nN] );
+        OUString aPropertyName( rNameSeq[nN] );
         this->setPropertyToDefault( aPropertyName );
     }
 }
@@ -416,7 +415,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
         aRetSeq.realloc( rNameSeq.getLength() );
         for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
         {
-            ::rtl::OUString aPropertyName( rNameSeq[nN] );
+            OUString aPropertyName( rNameSeq[nN] );
             aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
         }
     }
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 77b79820d552..387bfd0fa4c1 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -25,8 +25,6 @@
 #include <algorithm>
 #include <functional>
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 // ================================================================================
 
@@ -39,7 +37,7 @@ namespace
 class lcl_Escape : public ::std::unary_function< sal_Unicode, void >
 {
 public:
-    lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+    lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
     void operator() ( sal_Unicode aChar )
     {
         static const sal_Unicode m_aQuote( '\'' );
@@ -52,7 +50,7 @@ public:
     }
 
 private:
-    ::rtl::OUStringBuffer & m_aResultBuffer;
+    OUStringBuffer & m_aResultBuffer;
 };
 
 // ----------------------------------------
@@ -64,7 +62,7 @@ private:
 class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void >
 {
 public:
-    lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+    lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
     void operator() ( sal_Unicode aChar )
     {
         static const sal_Unicode m_aBackslash( '\\' );
@@ -74,12 +72,12 @@ public:
     }
 
 private:
-    ::rtl::OUStringBuffer & m_aResultBuffer;
+    OUStringBuffer & m_aResultBuffer;
 };
 
 // ----------------------------------------
 
-void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output )
+void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output )
 {
     OSL_ASSERT(output != 0);
 
@@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::
 }
 
 void lcl_getSingleCellAddressFromXMLString(
-    const ::rtl::OUString& rXMLString,
+    const OUString& rXMLString,
     sal_Int32 nStartPos, sal_Int32 nEndPos,
     ::chart::XMLRangeHelper::Cell & rOutCell )
 {
@@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString(
     static const sal_Unicode aDollar( '$' );
     static const sal_Unicode aLetterA( 'A' );
 
-    ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
+    OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
     const sal_Unicode* pStrArray = aCellStr.getStr();
     sal_Int32 nLength = aCellStr.getLength();
     sal_Int32 i = nLength - 1, nColumn = 0;
@@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString(
 }
 
 bool lcl_getCellAddressFromXMLString(
-    const ::rtl::OUString& rXMLString,
+    const OUString& rXMLString,
     sal_Int32 nStartPos, sal_Int32 nEndPos,
     ::chart::XMLRangeHelper::Cell & rOutCell,
-    ::rtl::OUString& rOutTableName )
+    OUString& rOutTableName )
 {
     static const sal_Unicode aDot( '.' );
     static const sal_Unicode aQuote( '\'' );
@@ -191,7 +189,7 @@ bool lcl_getCellAddressFromXMLString(
     {
         // there is a table name before the address
 
-        ::rtl::OUStringBuffer aTableNameBuffer;
+        OUStringBuffer aTableNameBuffer;
         const sal_Unicode * pTableName = rXMLString.getStr();
 
         // remove escapes from table name
@@ -204,7 +202,7 @@ bool lcl_getCellAddressFromXMLString(
         if( pBuf[ 0 ] == aQuote &&
             pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote )
         {
-            ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear();
+            OUString aName = aTableNameBuffer.makeStringAndClear();
             rOutTableName = aName.copy( 1, aName.getLength() - 2 );
         }
         else
@@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString(
 }
 
 bool lcl_getCellRangeAddressFromXMLString(
-    const ::rtl::OUString& rXMLString,
+    const OUString& rXMLString,
     sal_Int32 nStartPos, sal_Int32 nEndPos,
     ::chart::XMLRangeHelper::CellRange & rOutRange )
 {
@@ -275,7 +273,7 @@ bool lcl_getCellRangeAddressFromXMLString(
         if( rOutRange.aTableName.isEmpty() )
             bResult = false;
 
-        ::rtl::OUString sTableSecondName;
+        OUString sTableSecondName;
         if( bResult )
         {
             bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos,
@@ -359,7 +357,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
     static const sal_Unicode aSpace( ' ' );
     static const sal_Unicode aQuote( '\'' );
 
-    ::rtl::OUStringBuffer aBuffer;
+    OUStringBuffer aBuffer;
 
     if( !(rRange.aTableName).isEmpty())
     {
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 2839c4d51bcf..934a01f85e60 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -99,15 +99,15 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling()
     return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
 }
 
-::rtl::OUString SAL_CALL DateScaling::getServiceName()
+OUString SAL_CALL DateScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_DateScaling;
 }
 
-uno::Sequence< ::rtl::OUString > DateScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_DateScaling, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_DateScaling, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -180,15 +180,15 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling()
     return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
 }
 
-::rtl::OUString SAL_CALL InverseDateScaling::getServiceName()
+OUString SAL_CALL InverseDateScaling::getServiceName()
     throw (uno::RuntimeException)
 {
     return lcl_aServiceName_InverseDateScaling;
 }
 
-uno::Sequence< ::rtl::OUString > InverseDateScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static()
 {
-    return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
+    return uno::Sequence< OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
 }
 
 // implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
index 67a92bff985d..1ef6b448ca55 100644
--- a/chart2/source/view/axes/DateScaling.hxx
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -58,7 +58,7 @@ public:
         getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
@@ -90,7 +90,7 @@ public:
         getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
 
     // ____ XServiceName ____
-    virtual ::rtl::OUString SAL_CALL getServiceName()
+    virtual OUString SAL_CALL getServiceName()
         throw (::com::sun::star::uno::RuntimeException);
 
 private:
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index 1fd4e42378e7..ae9a15228601 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -51,7 +51,7 @@ struct TickInfo
     ::com::sun::star::uno::Reference<
         ::com::sun::star::drawing::XShape > xTextShape;
 
-    rtl::OUString aText;//used only for complex categories so far
+    OUString aText;//used only for complex categories so far
     sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category
 
 //methods:
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index c2a12a6bcb7a..48b4f6698004 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -195,7 +195,7 @@ bool VAxisBase::prepareShapeCreation()
     return true;
 }
 
-sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< rtl::OUString >& rLabels )
+sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< OUString >& rLabels )
 {
     sal_Int32 nRet = 0;
     sal_Int32 nLength = 0;
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index fa609241a785..c037ff5cf67b 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -66,7 +66,7 @@ public:
     //-------------------------------------------------------------------------
     //-------------------------------------------------------------------------
 protected: //methods
-    sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< rtl::OUString >& rLabels );
+    sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels );
     void removeTextShapesFromTicks();
     void updateUnscaledValuesAtTicks( TickIter& rIter );
 
@@ -82,7 +82,7 @@ protected: //member
     ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >  m_xNumberFormatsSupplier;
     AxisProperties                                                                      m_aAxisProperties;
     AxisLabelProperties                                                                 m_aAxisLabelProperties;
-    ::com::sun::star::uno::Sequence< rtl::OUString >                                    m_aTextLabels;
+    ::com::sun::star::uno::Sequence< OUString >                                    m_aTextLabels;
     bool                                                                                m_bUseTextLabels;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape_Shapes;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index fee4c6b8878c..9d62fac1b35c 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -79,7 +79,7 @@ Reference< drawing::XShape > createSingleLabel(
             const Reference< lang::XMultiServiceFactory>& xShapeFactory
           , const Reference< drawing::XShapes >& xTarget
           , const awt::Point& rAnchorScreenPosition2D
-          , const rtl::OUString& rLabel
+          , const OUString& rLabel
           , const AxisLabelProperties& rAxisLabelProperties
           , const AxisProperties& rAxisProperties
           , const tNameSequence& rPropNames
@@ -92,7 +92,7 @@ Reference< drawing::XShape > createSingleLabel(
     // #i78696# use mathematically correct rotation now
     const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0));
     uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi );
-    rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters );
+    OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters );
 
     Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory)
                     .createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation );
@@ -447,11 +447,11 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties&
 
 struct ComplexCategoryPlacement
 {
-    rtl::OUString Text;
+    OUString Text;
     sal_Int32 Count;
     double TickValue;
 
-    ComplexCategoryPlacement( const rtl::OUString& rText, sal_Int32 nCount, double fTickValue )
+    ComplexCategoryPlacement( const OUString& rText, sal_Int32 nCount, double fTickValue )
         : Text(rText), Count(nCount), TickValue(fTickValue)
     {}
 };
@@ -629,7 +629,7 @@ bool VCartesianAxis::createTextShapes(
         }
     }
 
-    uno::Sequence< rtl::OUString >* pCategories = 0;
+    uno::Sequence< OUString >* pCategories = 0;
     if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories )
         pCategories = &m_aTextLabels;
 
@@ -712,7 +712,7 @@ bool VCartesianAxis::createTextShapes(
         bool bHasExtraColor=false;
         sal_Int32 nExtraColor=0;
 
-        rtl::OUString aLabel;
+        OUString aLabel;
         if(pCategories)
         {
             sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 031d3cc9571f..c79a1a16b3ad 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -43,7 +43,7 @@ class TextualDataProvider : public ::cppu::WeakImplHelper1<
         >
 {
 public:
-    TextualDataProvider( const uno::Sequence< ::rtl::OUString >& rTextSequence )
+    TextualDataProvider( const uno::Sequence< OUString >& rTextSequence )
         : m_aTextSequence( rTextSequence )
     {
     }
@@ -52,14 +52,14 @@ public:
     }
 
     //XTextualDataSequence
-    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData()
+    virtual uno::Sequence< OUString > SAL_CALL getTextualData()
         throw ( uno::RuntimeException)
     {
         return m_aTextSequence;
     }
 
 private: //member
-    uno::Sequence< ::rtl::OUString > m_aTextSequence;
+    uno::Sequence< OUString > m_aTextSequence;
 };
 
 //.............................................................................
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 90343690ee59..314d8121e4ef 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -56,7 +56,7 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem(
     if( !xCooSysModel.is() )
         return 0;
 
-    rtl::OUString aViewServiceName = xCooSysModel->getViewServiceName();
+    OUString aViewServiceName = xCooSysModel->getViewServiceName();
 
     //@todo: in future the coordinatesystems should be instanciated via service factory
     VCoordinateSystem* pRet=NULL;
@@ -125,7 +125,7 @@ void VCoordinateSystem::initPlottingTargets(  const Reference< drawing::XShapes
     m_xShapeFactory = xShapeFactory;
 }
 
-void VCoordinateSystem::setParticle( const rtl::OUString& rCooSysParticle )
+void VCoordinateSystem::setParticle( const OUString& rCooSysParticle )
 {
     m_aCooSysParticle = rCooSysParticle;
 }
@@ -325,14 +325,14 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens
     return aRet;
 }
 
-rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
 {
-    rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
+    OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
     return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aAxisParticle );
 }
-rtl::OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
 {
-    rtl::OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) );
+    OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) );
     return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aGridParticle );
 }
 
@@ -574,7 +574,7 @@ bool VCoordinateSystem::needSeriesNamesForAxis() const
 {
     return ( m_xCooSysModel.is() && m_xCooSysModel->getDimension() == 3 );
 }
-void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< rtl::OUString >& rSeriesNames )
+void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< OUString >& rSeriesNames )
 {
     m_aSeriesNamesForZAxis = rSeriesNames;
 }
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 8d65bc74f392..981a9b6311d7 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -78,7 +78,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
     if(pColorAny)
         *pColorAny >>= nColor;
 
-    const uno::Sequence< rtl::OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0;
+    const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0;
 
     //------------------------------------------------
 
@@ -107,7 +107,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
             bool bHasExtraColor=false;
             sal_Int32 nExtraColor=0;
 
-            rtl::OUString aLabel;
+            OUString aLabel;
             if(pLabels)
             {
                 sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
@@ -133,7 +133,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
             const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0));
 
             uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi );
-            rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters );
+            OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters );
 
             pTickInfo->xTextShape = aShapeFactory.createText( xTarget, aStackedLabel, aPropNames, aPropValues, aATransformation );
         }
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index af151e2fede6..67f2dc5715dd 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -73,7 +73,7 @@ void VPolarRadiusAxis::setExplicitScaleAndIncrement(
 void VPolarRadiusAxis::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
-       , const rtl::OUString& rCID )
+       , const OUString& rCID )
             throw (uno::RuntimeException)
 {
     VPolarAxis::initPlotter(  xLogicTarget, xFinalTarget, xShapeFactory, rCID );
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index cf10f167739c..6114a46f3689 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -49,7 +49,7 @@ public:
                 ::com::sun::star::drawing::XShapes >& xFinalTarget
         , const ::com::sun::star::uno::Reference<
                 ::com::sun::star::lang::XMultiServiceFactory >& xFactory
-        , const rtl::OUString& rCID
+        , const OUString& rCID
                 ) throw (::com::sun::star::uno::RuntimeException );
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 03f13b17db62..b4b3940a8b73 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -719,13 +719,13 @@ void AreaChart::createShapes()
 
     //therefore create an own group for the texts and the error bars to move them to front
     //(because the text group is created after the series group the texts are displayed on top)
-    m_xSeriesTarget   = createGroupShape( m_xLogicTarget,rtl::OUString() );
+    m_xSeriesTarget   = createGroupShape( m_xLogicTarget,OUString() );
     if( m_bArea )
-        m_xErrorBarTarget = createGroupShape( m_xLogicTarget,rtl::OUString() );
+        m_xErrorBarTarget = createGroupShape( m_xLogicTarget,OUString() );
     else
         m_xErrorBarTarget = m_xSeriesTarget;
-    m_xTextTarget     = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() );
-    m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() );
+    m_xTextTarget     = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() );
+    m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() );
 
     //---------------------------------------------
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
@@ -979,7 +979,7 @@ void AreaChart::createShapes()
                         continue;
 
                     //create a group shape for this point and add to the series shape:
-                    rtl::OUString aPointCID = ObjectIdentifier::createPointCID(
+                    OUString aPointCID = ObjectIdentifier::createPointCID(
                         (*aSeriesIter)->getPointCID_Stub(), nIndex );
                     uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
                         createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index c78a495506d3..c8942b6049bb 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -419,16 +419,16 @@ void BarChart::createShapes()
     //to achieve this the regression curve target is created after the series target and before the text target
 
     uno::Reference< drawing::XShapes > xSeriesTarget(
-        createGroupShape( m_xLogicTarget,rtl::OUString() ));
+        createGroupShape( m_xLogicTarget,OUString() ));
     uno::Reference< drawing::XShapes > xRegressionCurveTarget(
-        createGroupShape( m_xLogicTarget,rtl::OUString() ));
+        createGroupShape( m_xLogicTarget,OUString() ));
     uno::Reference< drawing::XShapes > xTextTarget(
-        m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+        m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
 
 
     //---------------------------------------------
     uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget(
-        m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+        m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
 
     double fLogicZ        = 1.0;//as defined
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 0352621b3ca4..c06ebd5e7bcf 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -207,9 +207,9 @@ void BubbleChart::createShapes()
     //therefore create an own group for the texts and the error bars to move them to front
     //(because the text group is created after the series group the texts are displayed on top)
     uno::Reference< drawing::XShapes > xSeriesTarget(
-        createGroupShape( m_xLogicTarget,rtl::OUString() ));
+        createGroupShape( m_xLogicTarget,OUString() ));
     uno::Reference< drawing::XShapes > xTextTarget(
-        m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+        m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
 
     //update/create information for current group
     double fLogicZ        = 1.0;//as defined
@@ -311,7 +311,7 @@ void BubbleChart::createShapes()
                         continue;
 
                     //create a group shape for this point and add to the series shape:
-                    rtl::OUString aPointCID = ObjectIdentifier::createPointCID(
+                    OUString aPointCID = ObjectIdentifier::createPointCID(
                         pSeries->getPointCID_Stub(), nIndex );
                     uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
                         createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 98ad906708e9..1860b39c1874 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
 using namespace ::rtl::math;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
 
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
@@ -106,15 +105,15 @@ void CandleStickChart::createShapes()
     //(because the text group is created after the series group the texts are displayed on top)
 
     uno::Reference< drawing::XShapes > xSeriesTarget(
-        createGroupShape( m_xLogicTarget,rtl::OUString() ));
+        createGroupShape( m_xLogicTarget,OUString() ));
     uno::Reference< drawing::XShapes > xLossTarget(
         createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
-            OBJECTTYPE_DATA_STOCK_LOSS, rtl::OUString() )));
+            OBJECTTYPE_DATA_STOCK_LOSS, OUString() )));
     uno::Reference< drawing::XShapes > xGainTarget(
         createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
-            OBJECTTYPE_DATA_STOCK_GAIN, rtl::OUString() )));
+            OBJECTTYPE_DATA_STOCK_GAIN, OUString() )));
     uno::Reference< drawing::XShapes > xTextTarget(
-        m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+        m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
 
     //---------------------------------------------
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
@@ -242,7 +241,7 @@ void CandleStickChart::createShapes()
                     uno::Reference< beans::XPropertySet > xPointProp( (*aSeriesIter)->getPropertiesOfPoint( nIndex ));
                     uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(0);
                     {
-                        rtl::OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex );
+                        OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex );
                         uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) );
                         xPointGroupShape_Shapes = createGroupShape(xSeriesGroupShape_Shapes,aPointCID);
                     }
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 80ec134a94d3..06be798a46e1 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -324,9 +324,9 @@ void PieChart::createShapes()
     //therefore create an own group for the texts to move them to front
     //(because the text group is created after the series group the texts are displayed on top)
     uno::Reference< drawing::XShapes > xSeriesTarget(
-        createGroupShape( m_xLogicTarget,rtl::OUString() ));
+        createGroupShape( m_xLogicTarget,OUString() ));
     uno::Reference< drawing::XShapes > xTextTarget(
-        m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+        m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
     //---------------------------------------------
     //check necessary here that different Y axis can not be stacked in the same group? ... hm?
 
@@ -531,7 +531,7 @@ void PieChart::createShapes()
                         aNewOrigin, m_xLogicTarget, m_pShapeFactory, m_nDimension ) );
 
                     //enable draging of piesegments
-                    rtl::OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT
+                    OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT
                         , pSeries->getSeriesParticle()
                         , ObjectIdentifier::getPieSegmentDragMethodServiceName()
                         , ObjectIdentifier::createPieSegmentDragParameterString(
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 884df9a6dcd5..a49fed9edddb 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -79,7 +79,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using rtl::OUString;
 
 //-----------------------------------------------------------------------------
 
@@ -477,8 +476,8 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
 
         }
         //prepare text
-        ::rtl::OUStringBuffer aText;
-        ::rtl::OUString aSeparator(sal_Unicode(' '));
+        OUStringBuffer aText;
+        OUString aSeparator(sal_Unicode(' '));
         double fRotationDegrees = 0.0;
         try
         {
@@ -1088,7 +1087,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
         if( ! (bShowEquation || bShowCorrCoeff))
             return;
 
-        ::rtl::OUStringBuffer aFormula;
+        OUStringBuffer aFormula;
         sal_Int32 nNumberFormatKey = 0;
         xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey;
 
@@ -1895,11 +1894,11 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const
     return 0;
 }
 
-uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
+uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
 {
-    ::std::vector< rtl::OUString > aRetVector;
+    ::std::vector< OUString > aRetVector;
 
-    rtl::OUString aRole;
+    OUString aRole;
     if( m_xChartTypeModel.is() )
         aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel();
 
@@ -1919,7 +1918,7 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
                 uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : 0 );
                 if( xSeries.is() )
                 {
-                    rtl::OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) );
+                    OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) );
                     aRetVector.push_back( aSeriesName );
                 }
             }
@@ -2385,7 +2384,7 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
     , sal_Int32 nDimensionCount
     , bool bExcludingPositioning )
 {
-    rtl::OUString aChartType = xChartTypeModel->getChartType();
+    OUString aChartType = xChartTypeModel->getChartType();
 
     //@todo: in future the plotter should be instanciated via service factory
     VSeriesPlotter* pRet=NULL;
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 4c26350b802f..5b018c5235c8 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -206,7 +206,7 @@ void VDiagram::createShapes_2d()
                 else
                 {
                     //CID for selection handling
-                    rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+                    OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
                     xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) );
                 }
             }
@@ -499,7 +499,7 @@ void VDiagram::createShapes_3d()
 
     //-------------------------------------------------------------------------
     //create additional group to manipulate the aspect ratio of the whole diagram:
-    xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, rtl::OUString() );
+    xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() );
 
     m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY );
 
@@ -516,9 +516,9 @@ void VDiagram::createShapes_3d()
         if( m_xDiagram.is() )
             xWallProp=uno::Reference< beans::XPropertySet >( m_xDiagram->getWall());
 
-        rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+        OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
         if( !bAddFloorAndWall )
-            aWallCID = rtl::OUString();
+            aWallCID = OUString();
         uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) );
 
         CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) );
@@ -657,7 +657,7 @@ void VDiagram::createShapes_3d()
         }
         else
         {
-            rtl::OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) );//@todo read CID from model
+            OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );//@todo read CID from model
             ShapeFactory::setShapeName( xShape, aFloorCID );
         }
     }
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 25d0989420da..cb04561deac1 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -53,7 +53,7 @@ public:
                 ::com::sun::star::drawing::XShapes >& xFinalTarget
         , const ::com::sun::star::uno::Reference<
                 ::com::sun::star::lang::XMultiServiceFactory >& xFactory
-        , const rtl::OUString& rCID
+        , const OUString& rCID
                 ) throw (::com::sun::star::uno::RuntimeException );
 
     virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
@@ -72,7 +72,7 @@ protected: //methods
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
         createGroupShape( const ::com::sun::star::uno::Reference<
                 ::com::sun::star::drawing::XShapes >& xTarget
-                , ::rtl::OUString rName=::rtl::OUString() );
+                , OUString rName=OUString() );
 
 protected: //member
     ::com::sun::star::uno::Reference<
@@ -82,7 +82,7 @@ protected: //member
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::lang::XMultiServiceFactory>       m_xShapeFactory;
     ShapeFactory*                                                       m_pShapeFactory;
-    rtl::OUString   m_aCID;
+    OUString   m_aCID;
 
     sal_Int32                                           m_nDimension;
     // needs to be created and deleted by the derived class
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index 60982bc98004..04159ed9b588 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -32,14 +32,14 @@ namespace chart
 /**
 */
 
-typedef ::std::map< ::rtl::OUString, ::rtl::OUString >            tPropertyNameMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakePropertyNameMap;
+typedef ::std::map< OUString, OUString >            tPropertyNameMap;
+typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap;
 
-typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any >            tPropertyNameValueMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap;
+typedef ::std::map< OUString, ::com::sun::star::uno::Any >            tPropertyNameValueMap;
+typedef ::comphelper::MakeMap< OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap;
 
-typedef ::com::sun::star::uno::Sequence< rtl::OUString > tNameSequence;
-typedef ::comphelper::MakeSequence< rtl::OUString >      tMakeNameSequence;
+typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence;
+typedef ::comphelper::MakeSequence< OUString >      tMakeNameSequence;
 
 typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence;
 typedef ::comphelper::MakeSequence< ::com::sun::star::uno::Any >      tMakeAnySequence;
@@ -78,7 +78,7 @@ public:
     static ::com::sun::star::uno::Any*
                 getValuePointer( tAnySequence& rPropValues
                          , const tNameSequence& rPropNames
-                         , const rtl::OUString& rPropName );
+                         , const OUString& rPropName );
 
     static ::com::sun::star::uno::Any*
                 getValuePointerForLimitedSpace( tAnySequence& rPropValues
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 7401edd09b2c..83ee1a89ca45 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -49,14 +49,14 @@ public:
         createGroup2D(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::drawing::XShapes >& xTarget
-                , ::rtl::OUString aName = ::rtl::OUString() );
+                , OUString aName = OUString() );
 
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
         createGroup3D(
             const ::com::sun::star::uno::Reference<
                 ::com::sun::star::drawing::XShapes >& xTarget
-                , ::rtl::OUString aName = ::rtl::OUString() );
+                , OUString aName = OUString() );
 
     //------
 
@@ -163,7 +163,7 @@ public:
 
     ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
         createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D
-                    , const ::rtl::OUString& rText
+                    , const OUString& rText
                     , const tNameSequence& rPropNames
                     , const tAnySequence& rPropValues
                     , const ::com::sun::star::uno::Any& rATransformation
@@ -189,14 +189,14 @@ public:
 
      static void setShapeName( const ::com::sun::star::uno::Reference<
                                      ::com::sun::star::drawing::XShape >& xShape
-                             , const rtl::OUString& rName );
+                             , const OUString& rName );
 
-     static rtl::OUString getShapeName( const ::com::sun::star::uno::Reference<
+     static OUString getShapeName( const ::com::sun::star::uno::Reference<
                                      ::com::sun::star::drawing::XShape >& xShape );
 
      static ::com::sun::star::uno::Any makeTransformation( const ::com::sun::star::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 );
 
-     static rtl::OUString getStackedString( const rtl::OUString& rString, bool bStacked=true );
+     static OUString getStackedString( const OUString& rString, bool bStacked=true );
 
      static bool hasPolygonAnyLines( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly );
      static bool isPolygonEmptyOrSinglePoint( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly );
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index b6c199d66947..6c33b3719015 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -66,7 +66,7 @@ public:
                         ::com::sun::star::drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
                         throw (::com::sun::star::uno::RuntimeException);
 
-    void setParticle( const rtl::OUString& rCooSysParticle );
+    void setParticle( const OUString& rCooSysParticle );
 
     virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
     ::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen();
@@ -122,7 +122,7 @@ public:
     sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const;
 
     virtual bool needSeriesNamesForAxis() const;
-    void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< rtl::OUString >& rSeriesNames );
+    void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames );
 
 protected: //methods
     VCoordinateSystem( const ::com::sun::star::uno::Reference<
@@ -135,10 +135,10 @@ protected: //methods
 
     VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
-    rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
+    OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
                     , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
-    rtl::OUString createCIDForGrid( const ::com::sun::star::uno::Reference<
+    OUString createCIDForGrid( const ::com::sun::star::uno::Reference<
                     ::com::sun::star::chart2::XAxis >& xAxis
                     , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
 
@@ -155,7 +155,7 @@ protected: //member
     ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel;
 
-    rtl::OUString m_aCooSysParticle;
+    OUString m_aCooSysParticle;
 
     typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis
 
@@ -177,7 +177,7 @@ protected: //member
     //
     MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose
 
-    ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis;
+    ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis;
 
     typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap;
 
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 56aff51b4371..38c7929bc3e7 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -73,7 +73,7 @@ public:
         ::com::sun::star::chart2::data::XDataSequence >& xValues );
     void setXValuesIfNone( const ::com::sun::star::uno::Reference<
         ::com::sun::star::chart2::data::XDataSequence >& xValues );
-    void setParticle( const rtl::OUString& rSeriesParticle );
+    void setParticle( const OUString& rSeriesParticle );
     void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
     void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
 
@@ -137,7 +137,7 @@ public:
     void setStartingAngle( sal_Int32 nStartingAngle );
     sal_Int32 getStartingAngle() const;
 
-    void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole );
+    void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole );
 
     //this is only temporarily here for area chart:
     ::com::sun::star::drawing::PolyPolygonShape3D       m_aPolyPolygonShape3D;
@@ -148,19 +148,19 @@ public:
     //this is here for deep stacking:
     double m_fLogicZPos;//from 0 to series count -1
 
-    rtl::OUString       getCID() const;
-    rtl::OUString       getSeriesParticle() const;
-    rtl::OUString       getPointCID_Stub() const;
-    rtl::OUString       getErrorBarsCID( bool bYError ) const;
-    rtl::OUString       getLabelsCID() const;
-    rtl::OUString       getLabelCID_Stub() const;
-    rtl::OUString       getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
+    OUString       getCID() const;
+    OUString       getSeriesParticle() const;
+    OUString       getPointCID_Stub() const;
+    OUString       getErrorBarsCID( bool bYError ) const;
+    OUString       getLabelsCID() const;
+    OUString       getLabelCID_Stub() const;
+    OUString       getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
 
     ::com::sun::star::chart2::DataPointLabel*
                         getDataPointLabelIfLabel( sal_Int32 index ) const;
     bool    getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const;
 
-    rtl::OUString       getDataCurveEquationCID( sal_Int32 nCurveIndex ) const;
+    OUString       getDataCurveEquationCID( sal_Int32 nCurveIndex ) const;
     bool    isAttributedDataPoint( sal_Int32 index ) const;
 
     bool    isVaryColorsByPoint() const;
@@ -224,10 +224,10 @@ private: //member
 
     sal_Int32               m_nStartingAngle;
 
-    rtl::OUString           m_aSeriesParticle;
-    rtl::OUString           m_aCID;
-    rtl::OUString           m_aPointCID_Stub;
-    rtl::OUString           m_aLabelCID_Stub;
+    OUString           m_aSeriesParticle;
+    OUString           m_aCID;
+    OUString           m_aPointCID_Stub;
+    OUString           m_aLabelCID_Stub;
 
     sal_Int32               m_nGlobalSeriesIndex;
 
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index c3bba76ad5aa..ce6596aa0f63 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -251,7 +251,7 @@ public:
     void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider );
 
     //get series names for the z axis labels
-    ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const;
+    ::com::sun::star::uno::Sequence< OUString > getSeriesNames() const;
 
     void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
     //better performance for big data
@@ -317,7 +317,7 @@ protected:
                 , LabelAlignment eAlignment=LABEL_ALIGN_CENTER
                 , sal_Int32 nOffset=0 );
 
-    ::rtl::OUString getLabelTextForValue( VDataSeries& rDataSeries
+    OUString getLabelTextForValue( VDataSeries& rDataSeries
                 , sal_Int32 nPointIndex
                 , double fValue
                 , bool bAsPercentage );
@@ -370,7 +370,7 @@ protected:
                 ::com::sun::star::drawing::XShapes >& xEquationTarget
         , bool bMaySkipPointsInRegressionCalculation );
 
-    virtual void createRegressionCurveEquationShapes( const ::rtl::OUString & rEquationCID
+    virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID
         , const ::com::sun::star::uno::Reference<
             ::com::sun::star::beans::XPropertySet > & xEquationProperties
         , const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 0a55a7ff2c82..620558b06357 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -116,7 +116,6 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Any;
-using rtl::OUString;
 
 namespace
 {
@@ -366,10 +365,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla
 
 APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME)
 
-    uno::Sequence< rtl::OUString > ChartView
+    uno::Sequence< OUString > ChartView
 ::getSupportedServiceNames_Static()
 {
-    uno::Sequence< rtl::OUString > aSNS( 1 );
+    uno::Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[ 0 ] = CHART_VIEW_SERVICE_NAME;
     return aSNS;
 }
@@ -410,7 +409,7 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL
         pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys );
         if(pVCooSys)
         {
-            rtl::OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) );
+            OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) );
             pVCooSys->setParticle(aCooSysParticle);
 
             pVCooSys->setExplicitCategoriesProvider( new ExplicitCategoriesProvider(xCooSys,xChartModel) );
@@ -726,7 +725,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
 
                 pSeries->setMissingValueTreatment( nMissingValueTreatment );
 
-                rtl::OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) );
+                OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) );
                 pSeries->setParticle(aSeriesParticle);
 
                 OUString aRole( ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( xChartType ) );
@@ -769,7 +768,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
     //transport seriesnames to the coordinatesystems if needed
     if( !m_aSeriesPlotterList.empty() )
     {
-        uno::Sequence< rtl::OUString > aSeriesNames;
+        uno::Sequence< OUString > aSeriesNames;
         bool bSeriesNamesInitialized = false;
         for( size_t nC=0; nC < m_rVCooSysList.size(); nC++)
         {
@@ -1224,7 +1223,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
                             uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY );
                             if( xPageStyles.is() )
                             {
-                                rtl::OUString aPageStyle;
+                                OUString aPageStyle;
 
                                 uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY );
                                 if( xTextDocument.is() )
@@ -1238,7 +1237,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
                                         uno::Reference< container::XNameAccess > xEmbeddedObjects( xTextEmbeddedObjectsSupplier->getEmbeddedObjects() );
                                         if( xEmbeddedObjects.is() )
                                         {
-                                            uno::Sequence< rtl::OUString > aNames( xEmbeddedObjects->getElementNames() );
+                                            uno::Sequence< OUString > aNames( xEmbeddedObjects->getElementNames() );
 
                                             sal_Int32 nCount = aNames.getLength();
                                             for( sal_Int32 nN=0; nN<nCount; nN++ )
@@ -1246,8 +1245,8 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
                                                 uno::Reference< beans::XPropertySet > xEmbeddedProps( xEmbeddedObjects->getByName( aNames[nN] ), uno::UNO_QUERY );
                                                 if( xEmbeddedProps.is() )
                                                 {
-                                                    static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
-                                                    rtl::OUString aCLSID;
+                                                    static OUString aChartCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
+                                                    OUString aCLSID;
                                                     xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID;
                                                     if( aCLSID.equals(aChartCLSID) )
                                                     {
@@ -1500,7 +1499,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
     {
         //------------ set transformation to plotter / create series
         VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
-        rtl::OUString aCID; //III
+        OUString aCID; //III
         uno::Reference< drawing::XShapes > xSeriesTarget(0);
         if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() )
             xSeriesTarget = xSeriesTargetInFrontOfAxis;
@@ -1701,7 +1700,7 @@ SdrPage* ChartView::getSdrPage()
     return pPage;
 }
 
-uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString& rObjectCID )
+uno::Reference< drawing::XShape > ChartView::getShapeForCID( const OUString& rObjectCID )
 {
     SolarMutexGuard aSolarGuard;
     SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() );
@@ -1716,7 +1715,7 @@ awt::Rectangle ChartView::getDiagramRectangleExcludingAxes()
     return m_aResultingDiagramRectangleExcludingAxes;
 }
 
-awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect )
+awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect )
 {
     impl_updateView();
 
@@ -1828,7 +1827,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
     if( !xSeriesOrPointProp.is() )
         return nFormat;
 
-    rtl::OUString aPropName( "NumberFormat" );
+    OUString aPropName( "NumberFormat" );
     if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) )
     {
         uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) );
@@ -1907,28 +1906,28 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
 
             if( xTitle_Height.is() )
             {
-                rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
+                OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
                 nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nTitleSpaceHeight )
                     nTitleSpaceHeight+=lcl_getDiagramTitleSpace();
             }
             if( xTitle_Width.is() )
             {
-                rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
+                OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
                 nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if(nTitleSpaceWidth)
                     nTitleSpaceWidth+=lcl_getDiagramTitleSpace();
             }
             if( xSecondTitle_Height.is() )
             {
-                rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
+                OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
                 nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nSecondTitleSpaceHeight )
                     nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace();
             }
             if( xSecondTitle_Width.is() )
             {
-                rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
+                OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
                 nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if( nSecondTitleSpaceWidth )
                     nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
@@ -1974,28 +1973,28 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
 
             if( xTitle_Height.is() )
             {
-                rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
+                OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
                 nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nTitleSpaceHeight )
                     nTitleSpaceHeight+=lcl_getDiagramTitleSpace();
             }
             if( xTitle_Width.is() )
             {
-                rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
+                OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
                 nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if(nTitleSpaceWidth)
                     nTitleSpaceWidth+=lcl_getDiagramTitleSpace();
             }
             if( xSecondTitle_Height.is() )
             {
-                rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
+                OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
                 nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
                 if( nSecondTitleSpaceHeight )
                     nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace();
             }
             if( xSecondTitle_Width.is() )
             {
-                rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
+                OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
                 nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
                 if( nSecondTitleSpaceWidth )
                     nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
@@ -2169,12 +2168,12 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
     }
 
     uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) );
-    rtl::OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) );
+    OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) );
     if( !aCompleteString.isEmpty() )
     {
         //create title
         apVTitle.reset(new VTitle(xTitle));
-        rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) );
+        OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) );
         apVTitle->init(xPageShapes,xShapeFactory,aCID);
         apVTitle->createShapes( awt::Point(0,0), rPageSize );
         awt::Size aTitleUnrotatedSize = apVTitle->getUnrotatedSize();
@@ -2349,8 +2348,8 @@ void formatPage(
             tPropertyNameValueMap aNameValueMap;
             PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage );
 
-            rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );
-            aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString
+            OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
+            aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString
 
             tNameSequence aNames;
             tAnySequence aValues;
@@ -2473,7 +2472,7 @@ void ChartView::createShapes()
 
         //create the group shape for diagram and axes first to have title and legends on top of it
         uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
-        rtl::OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
+        OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
         uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) );
 
         uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
@@ -2713,7 +2712,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
         uno::Reference< view::XSelectionSupplier > xSelectionSupplier( m_xChartModel->getCurrentController(), uno::UNO_QUERY );
         if ( xSelectionSupplier.is() )
         {
-            ::rtl::OUString aSelObjCID;
+            OUString aSelObjCID;
             uno::Any aSelObj( xSelectionSupplier->getSelection() );
             aSelObj >>= aSelObjCID;
             if ( !aSelObjCID.isEmpty() )
@@ -2764,7 +2763,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
         xModifiable->setModified( sal_True );
 }
 
-void ChartView::impl_notifyModeChangeListener( const rtl::OUString& rNewMode )
+void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
 {
     try
     {
@@ -2835,7 +2834,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
     return 0;
 }
 
-void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
+void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName
                                                      , const Any& rValue )
     throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
           , lang::WrappedTargetException, uno::RuntimeException)
@@ -2890,7 +2889,7 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
         throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 );
 }
 
-Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     Any aRet;
@@ -2904,25 +2903,25 @@ Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName )
 }
 
 void SAL_CALL ChartView::addPropertyChangeListener(
-    const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
+    const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
         throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL("not implemented");
 }
 void SAL_CALL ChartView::removePropertyChangeListener(
-    const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
+    const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL("not implemented");
 }
 
-void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL("not implemented");
 }
 
-void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
     throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 {
     OSL_FAIL("not implemented");
@@ -2930,7 +2929,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /*
 
 // ____ XMultiServiceFactory ____
 
-Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& aServiceSpecifier )
+Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier )
     throw (uno::Exception, uno::RuntimeException)
 {
     SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL );
@@ -2989,7 +2988,7 @@ Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& a
     return 0;
 }
 
-Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
+Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
     throw (uno::Exception, uno::RuntimeException)
 {
     OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" );
@@ -2997,9 +2996,9 @@ Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl
     return createInstance( ServiceSpecifier );
 }
 
-uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException)
+uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aServiceNames( 6 );
+    uno::Sequence< OUString > aServiceNames( 6 );
 
     aServiceNames[0] = "com.sun.star.drawing.DashTable";
     aServiceNames[1] = "com.sun.star.drawing.GradientTable";
@@ -3011,14 +3010,14 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un
     return aServiceNames;
 }
 
-rtl::OUString ChartView::dump() throw (uno::RuntimeException)
+OUString ChartView::dump() throw (uno::RuntimeException)
 {
     impl_updateView();
     uno::Reference<drawing::XShapes> xPageShapes( ShapeFactory(m_xShapeFactory)
         .getOrCreateChartRootShape( m_xDrawPage ) );
 
     if (!xPageShapes.is())
-        return rtl::OUString();
+        return OUString();
     else
     {
         XShapeDumper dumper;
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index 5b58d5d3c746..a6e9e916807c 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -94,9 +94,9 @@ public:
         , ExplicitScaleData&  rExplicitScale
         , ExplicitIncrementData& rExplicitIncrement );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
-        getShapeForCID( const rtl::OUString& rObjectCID );
+        getShapeForCID( const OUString& rObjectCID );
 
-    virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false );
+    virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false );
 
     virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes();
 
@@ -147,22 +147,22 @@ public:
     // ::com::sun::star::beans::XPropertySet
     //-----------------------------------------------------------------
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     //-----------------------------------------------------------------
     // ::com::sun::star::lang::XMultiServiceFactory
     //-----------------------------------------------------------------
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL 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, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
+        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 getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
 
     // for ExplicitValueProvider
     // ____ XUnoTunnel ___
@@ -170,7 +170,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);
 
 private: //methods
@@ -183,7 +183,7 @@ private: //methods
 
     void impl_setChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
     void impl_deleteCoordinateSystems();
-    void impl_notifyModeChangeListener( const rtl::OUString& rNewMode );
+    void impl_notifyModeChangeListener( const OUString& rNewMode );
 
     void impl_refreshAddIn();
     bool impl_AddInDrawsAllByItself();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index ff2a6c8e56ea..2a2bc1838db1 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -353,7 +353,7 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const
     return this->SdrModel::GetBitmapList();
 }
 
-SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName )
+SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
 {
     if( rName.isEmpty() )
         return 0;
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 709f22fd4b76..0067632842b8 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -48,7 +48,7 @@ PlotterBase::PlotterBase( sal_Int32 nDimensionCount )
 void PlotterBase::initPlotter(  const uno::Reference< drawing::XShapes >& xLogicTarget
        , const uno::Reference< drawing::XShapes >& xFinalTarget
        , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
-       , const rtl::OUString& rCID )
+       , const OUString& rCID )
             throw (uno::RuntimeException)
 {
     OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
@@ -82,7 +82,7 @@ void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix&
 
 uno::Reference< drawing::XShapes > PlotterBase::createGroupShape(
             const uno::Reference< drawing::XShapes >& xTarget
-            , ::rtl::OUString rName )
+            , OUString rName )
 {
     if(!m_xShapeFactory.is())
         return NULL;
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 08bc546fe16d..811a7de04a2d 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -84,8 +84,8 @@ void PropertyMapper::getValueMap(
 
     for( ; aIt != aEnd; ++aIt )
     {
-        rtl::OUString aTarget = aIt->first;
-        rtl::OUString aSource = aIt->second;
+        OUString aTarget = aIt->first;
+        OUString aSource = aIt->second;
         try
         {
             uno::Any aAny( xSourceProp->getPropertyValue(aSource) );
@@ -143,7 +143,7 @@ void PropertyMapper::getMultiPropertyListsFromValueMap(
 
 uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues
                          , const tNameSequence& rPropNames
-                         , const rtl::OUString& rPropName )
+                         , const OUString& rPropName )
 {
     sal_Int32 nCount = rPropNames.getLength();
     for( sal_Int32 nN = 0; nN < nCount; nN++ )
@@ -373,7 +373,7 @@ void PropertyMapper::setMultiProperties(
     try
     {
         sal_Int32 nCount = std::max( rNames.getLength(), rValues.getLength() );
-        rtl::OUString aPropName;
+        OUString aPropName;
         uno::Any aValue;
         for( sal_Int32 nN = 0; nN < nCount; nN++ )
         {
@@ -416,7 +416,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
     aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool
     aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool
     if( bName )
-        aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point
+        aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
 
     if( nLimitedSpace > 0 )
     {
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index e83445fe8e58..5ce6f7290597 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -67,7 +67,7 @@ namespace chart
 //-----------------------------------------------------------------------------
 
 void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
-                               , const rtl::OUString& rName )
+                               , const OUString& rName )
 {
     if(!xShape.is())
         return;
@@ -89,9 +89,9 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
 
 //-----------------------------------------------------------------------------
 
-rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
+OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
 {
-    rtl::OUString aRet;
+    OUString aRet;
 
     uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
     OSL_ENSURE(xProp.is(), "shape offers no XPropertySet");
@@ -540,7 +540,7 @@ uno::Reference<drawing::XShape>
     if( !xTarget.is() )
         return 0;
 
-    Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, rtl::OUString() ) );
+    Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) );
 
     sal_Bool bDoubleSided = false;
     short nRotatedTexture = 0;
@@ -1872,7 +1872,7 @@ uno::Reference< drawing::XShape >
 
 uno::Reference< drawing::XShapes >
         ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget
-        , ::rtl::OUString aName )
+        , OUString aName )
 {
     if( !xTarget.is() )
         return 0;
@@ -1907,7 +1907,7 @@ uno::Reference< drawing::XShapes >
 
 uno::Reference< drawing::XShapes >
         ShapeFactory::createGroup3D( const uno::Reference< drawing::XShapes >& xTarget
-        , ::rtl::OUString aName )
+        , OUString aName )
 {
     if( !xTarget.is() )
         return 0;
@@ -2188,7 +2188,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle(
 
 uno::Reference< drawing::XShape >
         ShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget
-                    , const ::rtl::OUString& rText
+                    , const OUString& rText
                     , const tNameSequence& rPropNames
                     , const tAnySequence& rPropValues
                     , const uno::Any& rATransformation )
@@ -2230,13 +2230,13 @@ uno::Reference< drawing::XShape >
     return xShape;
 }
 
-rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked )
+OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked )
 {
     sal_Int32 nLen = rString.getLength();
     if(!bStacked || !nLen)
         return rString;
 
-    rtl::OUStringBuffer aStackStr;
+    OUStringBuffer aStackStr;
 
     //add a newline after each letter
     //as we do not no letters here add a newline after each char
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index a5059dcec222..ac6da72da1d2 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -118,7 +118,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref
     }
     //no double value is countained
     //is there any text?
-    uno::Sequence< rtl::OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) );
+    uno::Sequence< OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) );
     sal_Int32 nTextCount = aStrings.getLength();
     for( sal_Int32 j = 0; j < nTextCount; ++j )
     {
@@ -216,7 +216,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
             try
             {
                 uno::Any aARole = xProp->getPropertyValue("Role");
-                rtl::OUString aRole;
+                OUString aRole;
                 aARole >>= aRole;
 
                 if (aRole == "values-x")
@@ -363,7 +363,7 @@ void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex )
     m_nGlobalSeriesIndex = nGlobalSeriesIndex;
 }
 
-void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle )
+void VDataSeries::setParticle( const OUString& rSeriesParticle )
 {
     m_aSeriesParticle = rSeriesParticle;
 
@@ -372,51 +372,51 @@ void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle )
     m_aPointCID_Stub = ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT, m_aSeriesParticle );
 
     m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
-                        OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), getLabelsCID() );
+                        OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() );
 }
-rtl::OUString VDataSeries::getSeriesParticle() const
+OUString VDataSeries::getSeriesParticle() const
 {
     return m_aSeriesParticle;
 }
-rtl::OUString VDataSeries::getCID() const
+OUString VDataSeries::getCID() const
 {
     return m_aCID;
 }
-rtl::OUString VDataSeries::getPointCID_Stub() const
+OUString VDataSeries::getPointCID_Stub() const
 {
     return m_aPointCID_Stub;
 }
-rtl::OUString VDataSeries::getErrorBarsCID(bool bYError) const
+OUString VDataSeries::getErrorBarsCID(bool bYError) const
 {
-    rtl::OUString aChildParticle( ObjectIdentifier::getStringForType(
+    OUString aChildParticle( ObjectIdentifier::getStringForType(
                                       bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) );
     aChildParticle += "=";
 
     return ObjectIdentifier::createClassifiedIdentifierForParticles(
             m_aSeriesParticle, aChildParticle );
 }
-rtl::OUString VDataSeries::getLabelsCID() const
+OUString VDataSeries::getLabelsCID() const
 {
-    rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
+    OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
     aChildParticle += "=";
 
     return ObjectIdentifier::createClassifiedIdentifierForParticles(
             m_aSeriesParticle, aChildParticle );
 }
-rtl::OUString VDataSeries::getLabelCID_Stub() const
+OUString VDataSeries::getLabelCID_Stub() const
 {
     return m_aLabelCID_Stub;
 }
-rtl::OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const
+OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const
 {
-    rtl::OUString aRet;
+    OUString aRet;
     aRet = ObjectIdentifier::createDataCurveCID( m_aSeriesParticle, nCurveIndex, bAverageLine );
     return aRet;
 }
 
-rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const
+OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const
 {
-    rtl::OUString aRet;
+    OUString aRet;
     aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex );
     return aRet;
 }
@@ -555,7 +555,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor
         xPointProp->getPropertyValue(aPropName) >>= nNumberFormat;
     return nNumberFormat;
 }
-void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole )
+void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole )
 {
     if (rRole == "values-y")
         m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y;
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 764274883e74..4b7d699d9ab0 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -47,8 +47,6 @@ using namespace ::com::sun::star::chart2;
 
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 //.............................................................................
 namespace chart
@@ -300,7 +298,7 @@ awt::Size lcl_placeLegendEntries(
     const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm
     const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance;
     sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth;
-    rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" );
+    OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" );
     uno::Any* pFrameWidthAny = PropertyMapper::getValuePointer( rTextProperties.second, rTextProperties.first, aPropNameTextMaximumFrameWidth);
     if(pFrameWidthAny)
     {
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index a22cd9cffeb2..b3b1a1580cd0 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -28,7 +28,6 @@
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
 
 namespace
 {
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index 9fcd762d6fff..0fb341b1ef18 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -58,7 +58,7 @@ VTitle::~VTitle()
 void VTitle::init(
               const uno::Reference< drawing::XShapes >& xTargetPage
             , const uno::Reference< lang::XMultiServiceFactory >& xFactory
-            , const rtl::OUString& rCID )
+            , const OUString& rCID )
 {
     m_xTarget = xTargetPage;
     m_xShapeFactory = xFactory;
@@ -159,7 +159,7 @@ void VTitle::createShapes(
 
             //set name/classified ObjectID (CID)
             if( !m_aCID.isEmpty() )
-                aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID rtl::OUString
+                aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( m_aCID ) ) ); //CID OUString
         }
 
         //set global title properties
@@ -184,7 +184,7 @@ void VTitle::createShapes(
             //if the characters should be stacked we use only the first character properties for code simplicity
             if( aStringList.getLength()>0 )
             {
-                rtl::OUString aLabel;
+                OUString aLabel;
                 for( sal_Int32 nN=0; nN<aStringList.getLength();nN++ )
                     aLabel += aStringList[nN]->getString();
                 aLabel = ShapeFactory::getStackedString( aLabel, bStackCharacters );
diff --git a/chart2/source/view/main/VTitle.hxx b/chart2/source/view/main/VTitle.hxx
index f9e9bb9f7645..f9699cd85548 100644
--- a/chart2/source/view/main/VTitle.hxx
+++ b/chart2/source/view/main/VTitle.hxx
@@ -42,7 +42,7 @@ public:
     void    init( const ::com::sun::star::uno::Reference<
                      ::com::sun::star::drawing::XShapes >& xTargetPage
              , const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory
-             , const rtl::OUString& rCID );
+             , const OUString& rCID );
 
     void    createShapes( const ::com::sun::star::awt::Point& rPos
                           , const ::com::sun::star::awt::Size& rReferenceSize );
@@ -61,7 +61,7 @@ private:
         ::com::sun::star::chart2::XTitle >                  m_xTitle;
     ::com::sun::star::uno::Reference<
                     ::com::sun::star::drawing::XShape >             m_xShape;
-    rtl::OUString   m_aCID;
+    OUString   m_aCID;
 
     double      m_fRotationAngleDegree;
     sal_Int32   m_nXPos;
diff --git a/chart2/workbench/addin/sampleaddin.cxx b/chart2/workbench/addin/sampleaddin.cxx
index 0131e060087a..726e9b20d3fa 100644
--- a/chart2/workbench/addin/sampleaddin.cxx
+++ b/chart2/workbench/addin/sampleaddin.cxx
@@ -29,7 +29,6 @@
 
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 // code for creating instances of SampleAddIn
 
@@ -163,7 +162,7 @@ OUString SampleAddIn::getImplementationName_Static()
     return "SampleAddIn";
 }
 
-uno::Sequence< ::rtl::OUString > SampleAddIn::getSupportedServiceNames_Static()
+uno::Sequence< OUString > SampleAddIn::getSupportedServiceNames_Static()
 {
     uno::Sequence< OUString > aSeq( 4 );
 
@@ -476,7 +475,7 @@ void SAL_CALL SampleAddIn::setPosition( const awt::Point& aPos )
 }
 
 // XShapeDescriptor ( ::XShape ::XDiagram )
-rtl::OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
+OUString SAL_CALL SampleAddIn::getShapeType() throw( com::sun::star::uno::RuntimeException )
 {
     return "com.sun.star.chart.SampleAddinShape";
 }
diff --git a/chart2/workbench/addin/sampleaddin.hxx b/chart2/workbench/addin/sampleaddin.hxx
index 0f691ee8d73a..0e50da3cdb04 100644
--- a/chart2/workbench/addin/sampleaddin.hxx
+++ b/chart2/workbench/addin/sampleaddin.hxx
@@ -62,8 +62,8 @@ public:
     virtual ~SampleAddIn();
 
     // class specific code
-    static ::rtl::OUString  getImplementationName_Static();
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static();
+    static OUString  getImplementationName_Static();
+    static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     sal_Bool getLogicalPosition( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xAxis,
                                  double fValue,
@@ -76,7 +76,7 @@ public:
                ::com::sun::star::uno::RuntimeException );
 
     // XDiagram
-    virtual ::rtl::OUString SAL_CALL getDiagramType() throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getDiagramType() throw( ::com::sun::star::uno::RuntimeException );
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow )
         throw( ::com::sun::star::lang::IndexOutOfBoundsException,
                ::com::sun::star::uno::RuntimeException );
@@ -96,7 +96,7 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     // XShapeDescriptor ( ::XShape ::XDiagram )
-    virtual rtl::OUString SAL_CALL getShapeType() throw( com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getShapeType() throw( com::sun::star::uno::RuntimeException );
 
     // XAxisXSupplier
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > SAL_CALL getXAxisTitle()
@@ -127,13 +127,13 @@ public:
         throw( ::com::sun::star::uno::RuntimeException );
 
     // XServiceName
-    virtual ::rtl::OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getServiceName() throw( ::com::sun::star::uno::RuntimeException );
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+    virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
         throw( ::com::sun::star::uno::RuntimeException );
 
     // XRefreshable
diff --git a/cli_ure/source/climaker/climaker_share.h b/cli_ure/source/climaker/climaker_share.h
index b1d1b09c5dac..85ed6fcab8cc 100755
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -80,17 +80,17 @@ ref struct Constants
 };
 
 //------------------------------------------------------------------------------
-inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr )
+inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
     return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
 }
 
 //------------------------------------------------------------------------------
-inline ::rtl::OUString String_to_ustring( ::System::String ^ str )
+inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<const wchar_t> chars = PtrToStringChars( str );
-    return ::rtl::OUString( chars, str->Length );
+    return OUString( chars, str->Length );
 }
 
 /* If the argument type is a typedef for an interface then the interface
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index e4aa0cf6babf..3c37f6c4f6bb 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -32,16 +32,16 @@ namespace util
 {
 
 //------------------------------------------------------------------------------
-inline ::System::String ^ ustring_to_String( ::rtl::OUString const & ustr )
+inline ::System::String ^ ustring_to_String( OUString const & ustr )
 {
     return gcnew ::System::String( ustr.getStr(), 0, ustr.getLength() );
 }
 //------------------------------------------------------------------------------
-inline ::rtl::OUString String_to_ustring( ::System::String ^ str )
+inline OUString String_to_ustring( ::System::String ^ str )
 {
     OSL_ASSERT( sizeof (wchar_t) == sizeof (sal_Unicode) );
     pin_ptr<wchar_t const> chars = PtrToStringChars( str );
-    return ::rtl::OUString( chars, str->Length );
+    return OUString( chars, str->Length );
 }
 
 template< typename T >
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index b03504fcc90c..441f5adeaf7b 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -40,7 +40,7 @@ System::Type^ loadCliType(System::String ^ typeName);
 System::Type^ mapUnoType(typelib_TypeDescription const * pTD);
 System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD);
 typelib_TypeDescriptionReference* mapCliType(System::Type^ cliType);
-rtl::OUString mapCliString(System::String ^ data);
+OUString mapCliString(System::String ^ data);
 System::String^ mapUnoString(rtl_uString const * data);
 System::String^ mapUnoTypeName(rtl_uString const * typeName);
 
@@ -105,9 +105,9 @@ ref struct Constants
 
 struct BridgeRuntimeError
 {
-    ::rtl::OUString m_message;
+    OUString m_message;
 
-    inline BridgeRuntimeError( ::rtl::OUString const & message )
+    inline BridgeRuntimeError( OUString const & message )
         : m_message( message )
         {}
 };
@@ -160,7 +160,7 @@ inline TypeDescr::TypeDescr( typelib_TypeDescriptionReference * td_ref )
     {
         throw BridgeRuntimeError(
             "cannot get comprehensive type description for " +
-            *reinterpret_cast< ::rtl::OUString const * >( &td_ref->pTypeName ) );
+            *reinterpret_cast< OUString const * >( &td_ref->pTypeName ) );
     }
 }
 
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx
index b68d04c329e2..6195e2f4967a 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.cxx
+++ b/cli_ure/source/uno_bridge/cli_bridge.cxx
@@ -33,9 +33,6 @@
 #include "cli_proxy.h"
 
 namespace sri= System::Runtime::InteropServices;
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 namespace cli_uno
 {
@@ -147,8 +144,8 @@ void SAL_CALL Mapping_uno2cli(
     catch (BridgeRuntimeError & err)
     {
 #if OSL_DEBUG_LEVEL >= 1
-        rtl::OString cstr_msg(
-            rtl::OUStringToOString(
+        OString cstr_msg(
+            OUStringToOString(
                 "[cli_uno bridge error] " + err.m_message, RTL_TEXTENCODING_ASCII_US ) );
         OSL_FAIL( cstr_msg.getStr() );
 #else
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index 828e7f4f41e1..f8b5d4b7c348 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -44,8 +44,6 @@ namespace ucss = unoidl::com::sun::star;
 
 using namespace std;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 
 namespace cli_uno
@@ -183,7 +181,7 @@ System::Type^ loadCliType(System::String ^ unoName)
     }
     catch( System::Exception ^ e)
     {
-        rtl::OUString ouMessage(mapCliString(e->Message));
+        OUString ouMessage(mapCliString(e->Message));
         throw BridgeRuntimeError(ouMessage);
     }
     return retVal;
@@ -237,7 +235,7 @@ System::Type^ mapUnoType(typelib_TypeDescriptionReference const * pTD)
     case typelib_TypeClass_INTERFACE:
     {
         //special handling for XInterface, since it does not exist in cli.
-        rtl::OUString usXInterface("com.sun.star.uno.XInterface");
+        OUString usXInterface("com.sun.star.uno.XInterface");
         if (usXInterface.equals(pTD->pTypeName))
             retVal= System::Object::typeid;
         else
@@ -1072,7 +1070,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
             {
                 typelib_TypeDescriptionReference * member_type= NULL;
 
-                rtl::OUString usUnoException("com.sun.star.uno.Exception");
+                OUString usUnoException("com.sun.star.uno.Exception");
                 for (; nPos < nMembers; ++nPos)
                 {
                     member_type= comp_td->ppTypeRefs[nPos];
@@ -1092,7 +1090,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                         // System.Exception property. Type.GetField("Message") returns null
                         if ( ! aField && usUnoException.equals(td.get()->pTypeName))
                         {// get Exception.Message property
-                            rtl::OUString usMessageMember("Message");
+                            OUString usMessageMember("Message");
                             if (usMessageMember.equals(comp_td->ppMemberNames[nPos]))
                             {
                                 sr::PropertyInfo^ pi= cliType->GetProperty(
@@ -1625,7 +1623,7 @@ void Bridge::map_to_cli(
                     pCTD = pCTD->pBaseTypeDescription;
                 int nPos = -1;
 
-                rtl::OUString usMessageMember("Message");
+                OUString usMessageMember("Message");
                 for (int i = 0; i < pCTD->nMembers; i ++)
                 {
 #if OSL_DEBUG_LEVEL >= 2
@@ -1685,7 +1683,7 @@ void Bridge::map_to_cli(
                 ((typelib_TypeDescription *)comp_td->pBaseTypeDescription)->pWeakRef, nullptr,
                 true);
         }
-        rtl::OUString usUnoException("com.sun.star.uno.Exception");
+        OUString usUnoException("com.sun.star.uno.Exception");
         for (sal_Int32 nPos = comp_td->nMembers; nPos--; )
         {
             typelib_TypeDescriptionReference * member_type = comp_td->ppTypeRefs[ nPos ];
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index 0aa031161daa..f7f865f4b802 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -39,10 +39,6 @@ namespace ucss = unoidl::com::sun::star;
 
 using namespace cli_uno;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
-using ::rtl::OUStringBuffer;
 extern "C"
 {
 //------------------------------------------------------------------------------
@@ -651,7 +647,7 @@ srrm::IMessage^ UnoInterfaceProxy::constructReturnMessage(
 //################################################################################
 CliProxy::CliProxy(Bridge const* bridge, System::Object^ cliI,
                          typelib_TypeDescription const* td,
-                         const rtl::OUString& usOid):
+                         const OUString& usOid):
     m_ref(1),
     m_bridge(bridge),
     m_cliI(cliI),
@@ -776,7 +772,7 @@ void CliProxy::makeMethodInfos()
 }
 
 sr::MethodInfo^ CliProxy::getMethodInfo(int nUnoFunctionPos,
-                                           const rtl::OUString& usMethodName, MethodKind methodKind)
+                                           const OUString& usMethodName, MethodKind methodKind)
 {
     sr::MethodInfo^ ret = nullptr;
 #if OSL_DEBUG_LEVEL >= 2
@@ -877,7 +873,7 @@ CliProxy::~CliProxy()
 uno_Interface* CliProxy::create(Bridge const * bridge,
                                  System::Object^ cliI,
                                  typelib_TypeDescription const* pTD,
-                                 const rtl::OUString& ousOid)
+                                 const OUString& ousOid)
 {
     uno_Interface* proxy= static_cast<uno_Interface*>(
         new CliProxy(bridge, cliI, pTD, ousOid));
diff --git a/cli_ure/source/uno_bridge/cli_proxy.h b/cli_ure/source/uno_bridge/cli_proxy.h
index 657cc69c0c98..5f63a7581d88 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.h
+++ b/cli_ure/source/uno_bridge/cli_proxy.h
@@ -99,7 +99,7 @@ public:
     static System::Object^ create(Bridge * bridge,
                                   uno_Interface * pUnoI,
                                   typelib_InterfaceTypeDescription* pTd,
-                                  const rtl::OUString& oid);
+                                  const OUString& oid);
 
     /** RealProxy::Invoke */
     virtual srrm::IMessage^ Invoke(srrm::IMessage^ msg) override;
@@ -139,7 +139,7 @@ private:
         Bridge * bridge,
         uno_Interface * pUnoI,
         typelib_InterfaceTypeDescription* pTD,
-        const rtl::OUString& oid );
+        const OUString& oid );
 
     static srrm::IMessage^ constructReturnMessage(System::Object^ retVal,
                            array<System::Object^>^ outArgs,
@@ -178,7 +178,7 @@ struct CliProxy: public uno_Interface
     gcroot<System::Type^> m_type;
     const com::sun::star::uno::TypeDescription m_unoType;
     const gcroot<System::String^> m_oid;
-    const rtl::OUString m_usOid;
+    const OUString m_usOid;
 
     enum MethodKind {MK_METHOD = 0, MK_SET, MK_GET};
     /** The array contains MethodInfos  of the cli object. Each one reflects an
@@ -235,13 +235,13 @@ struct CliProxy: public uno_Interface
 
     CliProxy( Bridge const* bridge, System::Object^ cliI,
                  typelib_TypeDescription const* pTD,
-                 const rtl::OUString& usOid);
+                 const OUString& usOid);
     ~CliProxy();
 
     static uno_Interface* create(Bridge const * bridge,
                                  System::Object^ cliI,
                                  typelib_TypeDescription const * TD,
-                                 rtl::OUString const & usOid );
+                                 OUString const & usOid );
 
     /** Prepares an array (m_arMethoInfos) containing MethodInfo object of the
         interface and all inherited interfaces. At index null is the first
@@ -276,7 +276,7 @@ struct CliProxy: public uno_Interface
        Position of the method in the uno interface.
      */
     sr::MethodInfo^ getMethodInfo(int nUnoFunctionPos,
-                                  const rtl::OUString & usMethodName,
+                                  const OUString & usMethodName,
                                   MethodKind mk);
 
     void SAL_CALL uno_DispatchMethod(
diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx
index 93ab81e62328..c1598d98f376 100644
--- a/cli_ure/source/uno_bridge/cli_uno.cxx
+++ b/cli_ure/source/uno_bridge/cli_uno.cxx
@@ -24,7 +24,6 @@
 
 namespace sr=System::Reflection;
 
-using ::rtl::OUStringBuffer;
 
 namespace cli_uno
 {
diff --git a/codemaker/inc/codemaker/codemaker.hxx b/codemaker/inc/codemaker/codemaker.hxx
index a1c3a14eea6c..9a821bea78ba 100644
--- a/codemaker/inc/codemaker/codemaker.hxx
+++ b/codemaker/inc/codemaker/codemaker.hxx
@@ -36,13 +36,13 @@ class TypeManager;
 
 namespace codemaker {
 
-rtl::OString convertString(rtl::OUString const & string);
+OString convertString(OUString const & string);
 
 codemaker::UnoType::Sort decomposeAndResolve(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool resolveTypedefs, bool allowVoid, bool allowExtraEntities,
-    RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank,
-    std::vector< rtl::OString > * arguments);
+    RTTypeClass * typeClass, OString * name, sal_Int32 * rank,
+    std::vector< OString > * arguments);
 
 }
 
diff --git a/codemaker/inc/codemaker/commoncpp.hxx b/codemaker/inc/codemaker/commoncpp.hxx
index 3cfd7133c0f1..4f81f98fff23 100644
--- a/codemaker/inc/codemaker/commoncpp.hxx
+++ b/codemaker/inc/codemaker/commoncpp.hxx
@@ -33,11 +33,11 @@ namespace codemaker { namespace cpp {
     Use common namespace aliases instead of fully specified (nested)
     namespace. currently replaces com::sun::star with css.
  */
-rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true);
+OString scopedCppName(OString const & type, bool ns_alias=true);
 
-rtl::OString translateUnoToCppType(
+OString translateUnoToCppType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, bool shortname);
+    OString const & nucleus, bool shortname);
 
 enum IdentifierTranslationMode {
     ITM_GLOBAL,
@@ -45,10 +45,10 @@ enum IdentifierTranslationMode {
     ITM_KEYWORDSONLY
 };
 
-rtl::OString translateUnoToCppIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix,
+OString translateUnoToCppIdentifier(
+    OString const & identifier, OString const & prefix,
     IdentifierTranslationMode transmode = ITM_GLOBAL,
-    rtl::OString const * forbidden = 0);
+    OString const * forbidden = 0);
 
 } }
 
diff --git a/codemaker/inc/codemaker/commonjava.hxx b/codemaker/inc/codemaker/commonjava.hxx
index 26c87e123fdb..f2e77ee9d1fa 100644
--- a/codemaker/inc/codemaker/commonjava.hxx
+++ b/codemaker/inc/codemaker/commonjava.hxx
@@ -24,12 +24,12 @@
 
 namespace codemaker { namespace java {
 
-rtl::OString translateUnoToJavaType(
+OString translateUnoToJavaType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, bool referenceType);
+    OString const & nucleus, bool referenceType);
 
-rtl::OString translateUnoToJavaIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix);
+OString translateUnoToJavaIdentifier(
+    OString const & identifier, OString const & prefix);
 
 } }
 
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx
index c45db676d667..47e5e249c48f 100644
--- a/codemaker/inc/codemaker/dependencies.hxx
+++ b/codemaker/inc/codemaker/dependencies.hxx
@@ -26,8 +26,8 @@
 
 #include "rtl/ref.hxx"
 #include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
 
-namespace rtl { class OUString; }
 class TypeManager;
 
 /// @HTML
@@ -47,7 +47,7 @@ public:
      */
     enum Kind { KIND_NO_BASE, KIND_BASE };
 
-    typedef std::map< rtl::OString, Kind > Map;
+    typedef std::map< OString, Kind > Map;
 
     /**
        Constructs the dependencies for a given type.
@@ -63,7 +63,7 @@ public:
      */
     Dependencies(
         rtl::Reference< TypeManager > const & manager,
-        rtl::OString const & type);
+        OString const & type);
 
     ~Dependencies();
 
@@ -73,7 +73,7 @@ public:
 
        @param type a UNO type registry name
      */
-    void add(rtl::OString const & type) { insert(type, false); }
+    void add(OString const & type) { insert(type, false); }
 
     bool isValid() const { return m_valid; }
 
@@ -117,9 +117,9 @@ private:
     Dependencies(Dependencies &); // not implemented
     void operator =(Dependencies); // not implemented
 
-    void insert(rtl::OUString const & type, bool base);
+    void insert(OUString const & type, bool base);
 
-    void insert(rtl::OString const & type, bool base);
+    void insert(OString const & type, bool base);
 
     Map m_map;
     bool m_valid;
diff --git a/codemaker/inc/codemaker/exceptiontree.hxx b/codemaker/inc/codemaker/exceptiontree.hxx
index fed0e5b9e4d7..91a0cae3f839 100644
--- a/codemaker/inc/codemaker/exceptiontree.hxx
+++ b/codemaker/inc/codemaker/exceptiontree.hxx
@@ -37,7 +37,7 @@ struct ExceptionTreeNode {
     typedef std::vector< ExceptionTreeNode * > Children;
 
     // Internally used by ExceptionTree:
-    ExceptionTreeNode(rtl::OString const & theName):
+    ExceptionTreeNode(OString const & theName):
         name(theName), present(false) {}
 
     // Internally used by ExceptionTree:
@@ -47,9 +47,9 @@ struct ExceptionTreeNode {
     void setPresent() { present = true; clearChildren(); }
 
     // Internally used by ExceptionTree:
-    ExceptionTreeNode * add(rtl::OString const & theName);
+    ExceptionTreeNode * add(OString const & theName);
 
-    rtl::OString name;
+    OString name;
     bool present;
     Children children;
 
@@ -94,7 +94,7 @@ public:
        type managers
      */
     void add(
-        rtl::OString const & name,
+        OString const & name,
         rtl::Reference< TypeManager > const & manager)
         throw( CannotDumpException );
 
diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx
index 2081fc715ddd..3d1a5615b0b1 100644
--- a/codemaker/inc/codemaker/generatedtypeset.hxx
+++ b/codemaker/inc/codemaker/generatedtypeset.hxx
@@ -47,7 +47,7 @@ public:
 
        @param type a UNO type registry name
      */
-    void add(rtl::OString const & type) { m_set.insert(type); }
+    void add(OString const & type) { m_set.insert(type); }
 
     /**
        Checks whether a given type has already been generated.
@@ -56,14 +56,14 @@ public:
 
        @return true iff the given type has already been generated
      */
-    bool contains(rtl::OString const & type) const
+    bool contains(OString const & type) const
     { return m_set.find(type) != m_set.end(); }
 
 private:
     GeneratedTypeSet(GeneratedTypeSet &); // not implemented
     void operator =(GeneratedTypeSet); // not implemented
 
-    boost::unordered_set< rtl::OString, rtl::OStringHash > m_set;
+    boost::unordered_set< OString, OStringHash > m_set;
 };
 
 }
diff --git a/codemaker/inc/codemaker/global.hxx b/codemaker/inc/codemaker/global.hxx
index 17f78a886b65..891ed4705e87 100644
--- a/codemaker/inc/codemaker/global.hxx
+++ b/codemaker/inc/codemaker/global.hxx
@@ -32,7 +32,7 @@
 
 struct EqualString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 == str2);
     }
@@ -40,7 +40,7 @@ struct EqualString
 
 struct HashString
 {
-    size_t operator()(const ::rtl::OString& str) const
+    size_t operator()(const OString& str) const
     {
         return str.hashCode();
     }
@@ -48,15 +48,15 @@ struct HashString
 
 struct LessString
 {
-    sal_Bool operator()(const ::rtl::OString& str1, const ::rtl::OString& str2) const
+    sal_Bool operator()(const OString& str1, const OString& str2) const
     {
         return (str1 < str2);
     }
 };
 
-typedef ::std::list< ::rtl::OString >               StringList;
-typedef ::std::vector< ::rtl::OString >             StringVector;
-typedef ::std::set< ::rtl::OString, LessString >    StringSet;
+typedef ::std::list< OString >               StringList;
+typedef ::std::vector< OString >             StringVector;
+typedef ::std::set< OString, LessString >    StringSet;
 
 //*************************************************************************
 // FileStream
@@ -77,45 +77,45 @@ public:
 
     sal_Bool isValid();
 
-    void createTempFile(const ::rtl::OString& sPath);
+    void createTempFile(const OString& sPath);
     void close();
 
-    ::rtl::OString  getName() { return m_name; }
+    OString  getName() { return m_name; }
 
     bool write(void const * buffer, sal_uInt64 size);
 
     // friend functions
     friend FileStream &operator<<(FileStream& o, sal_uInt32 i);
     friend FileStream &operator<<(FileStream& o, char const * s);
-    friend FileStream &operator<<(FileStream& o, ::rtl::OString* s);
-    friend FileStream &operator<<(FileStream& o, const ::rtl::OString& s);
-    friend FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s);
-    friend FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s);
+    friend FileStream &operator<<(FileStream& o, OString* s);
+    friend FileStream &operator<<(FileStream& o, const OString& s);
+    friend FileStream &operator<<(FileStream& o, OStringBuffer* s);
+    friend FileStream &operator<<(FileStream& o, const OStringBuffer& s);
 
 private:
     oslFileHandle m_file;
-    ::rtl::OString  m_name;
+    OString  m_name;
 };
 
 
 //*************************************************************************
 // Helper functions
 //*************************************************************************
-::rtl::OString getTempDir(const ::rtl::OString& sFileName);
+OString getTempDir(const OString& sFileName);
 
-::rtl::OString createFileNameFromType(const ::rtl::OString& destination,
-                                      const ::rtl::OString type,
-                                      const ::rtl::OString postfix,
+OString createFileNameFromType(const OString& destination,
+                                      const OString type,
+                                      const OString postfix,
                                       sal_Bool bLowerCase=sal_False,
-                                      const ::rtl::OString prefix="");
+                                      const OString prefix="");
 
-sal_Bool fileExists(const ::rtl::OString& fileName);
-sal_Bool makeValidTypeFile(const ::rtl::OString& targetFileName,
-                           const ::rtl::OString& tmpFileName,
+sal_Bool fileExists(const OString& fileName);
+sal_Bool makeValidTypeFile(const OString& targetFileName,
+                           const OString& tmpFileName,
                            sal_Bool bFileCheck);
-sal_Bool removeTypeFile(const ::rtl::OString& fileName);
+sal_Bool removeTypeFile(const OString& fileName);
 
-::rtl::OUString convertToFileUrl(const ::rtl::OString& fileName);
+OUString convertToFileUrl(const OString& fileName);
 
 //*************************************************************************
 // Global exception to signal problems when a type cannot be dumped
@@ -123,10 +123,10 @@ sal_Bool removeTypeFile(const ::rtl::OString& fileName);
 class CannotDumpException
 {
 public:
-    CannotDumpException(const ::rtl::OString& msg)
+    CannotDumpException(const OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    OString  m_message;
 };
 
 
diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx
index 22b09ce00165..053cda9cf44b 100644
--- a/codemaker/inc/codemaker/options.hxx
+++ b/codemaker/inc/codemaker/options.hxx
@@ -26,8 +26,8 @@
 
 typedef ::boost::unordered_map
 <
-    ::rtl::OString,
-    ::rtl::OString,
+    OString,
+    OString,
     HashString,
     EqualString
 > OptionMap;
@@ -35,10 +35,10 @@ typedef ::boost::unordered_map
 class IllegalArgument
 {
 public:
-    IllegalArgument(const ::rtl::OString& msg)
+    IllegalArgument(const OString& msg)
         : m_message(msg) {}
 
-    ::rtl::OString  m_message;
+    OString  m_message;
 };
 
 class Options
@@ -50,11 +50,11 @@ public:
     virtual sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
         throw( IllegalArgument ) = 0;
 
-    virtual ::rtl::OString  prepareHelp() = 0;
+    virtual OString  prepareHelp() = 0;
 
-    const ::rtl::OString&   getProgramName() const;
-    sal_Bool                isValid(const ::rtl::OString& option);
-    const ::rtl::OString    getOption(const ::rtl::OString& option)
+    const OString&   getProgramName() const;
+    sal_Bool                isValid(const OString& option);
+    const OString    getOption(const OString& option)
         throw( IllegalArgument );
 
     const StringVector& getInputFiles();
@@ -64,7 +64,7 @@ public:
     inline const StringVector& getExtraInputFiles() const
         { return m_extra_input_files; }
 protected:
-    ::rtl::OString  m_program;
+    OString  m_program;
     StringVector    m_inputFiles;
     StringVector    m_extra_input_files;
     OptionMap       m_options;
diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx
index 1b16115b85da..886aee54648c 100644
--- a/codemaker/inc/codemaker/typemanager.hxx
+++ b/codemaker/inc/codemaker/typemanager.hxx
@@ -37,7 +37,7 @@ typedef ::std::vector< KeyPair >    RegistryKeyList;
 
 typedef ::boost::unordered_map
 <
-    ::rtl::OString, // Typename
+    OString, // Typename
     RTTypeClass,    // TypeClass
     HashString,
     EqualString
@@ -50,38 +50,38 @@ public:
 
     sal_Bool init(const StringVector& regFiles, const StringVector& extraFiles = StringVector() );
 
-    ::rtl::OString getTypeName(RegistryKey& rTypeKey) const;
+    OString getTypeName(RegistryKey& rTypeKey) const;
 
-    sal_Bool    isValidType(const ::rtl::OString& name) const
+    sal_Bool    isValidType(const OString& name) const
         { return searchTypeKey(name, 0).isValid(); }
     RegistryKey getTypeKey(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const
         { return searchTypeKey(name, pIsExtraType); }
-    RegistryKeyList getTypeKeys(const ::rtl::OString& name) const;
+    RegistryKeyList getTypeKeys(const OString& name) const;
     typereg::Reader getTypeReader(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const;
     typereg::Reader getTypeReader(RegistryKey& rTypeKey) const;
-    RTTypeClass getTypeClass(const ::rtl::OString& name) const;
+    RTTypeClass getTypeClass(const OString& name) const;
     RTTypeClass getTypeClass(RegistryKey& rTypeKey) const;
 
-    void setBase(const ::rtl::OString& base);
-    ::rtl::OString getBase() const { return m_base; }
+    void setBase(const OString& base);
+    OString getBase() const { return m_base; }
 
     sal_Int32 getSize() const { return m_t2TypeClass.size(); }
 
-    static sal_Bool isBaseType(const ::rtl::OString& name);
+    static sal_Bool isBaseType(const OString& name);
 
 private:
     virtual ~TypeManager();
 
     RegistryKey searchTypeKey(
-        const ::rtl::OString& name, sal_Bool * pIsExtraType = 0 ) const;
+        const OString& name, sal_Bool * pIsExtraType = 0 ) const;
     void        freeRegistries();
 
     mutable T2TypeClassMap m_t2TypeClass;
     RegistryList    m_registries;
     RegistryList    m_extra_registries;
-    ::rtl::OString  m_base;
+    OString  m_base;
 };
 
 #endif // INCLUDED_CODEMAKER_TYPEMANAGER_HXX
diff --git a/codemaker/inc/codemaker/unotype.hxx b/codemaker/inc/codemaker/unotype.hxx
index 23cf0668074e..ce22e62959dd 100644
--- a/codemaker/inc/codemaker/unotype.hxx
+++ b/codemaker/inc/codemaker/unotype.hxx
@@ -21,11 +21,10 @@
 #define INCLUDED_CODEMAKER_UNOTYPE_HXX
 
 #include "sal/types.h"
+#include <rtl/ustring.hxx>
 
 #include <vector>
 
-namespace rtl { class OString; }
-
 namespace codemaker {
 
 namespace UnoType {
@@ -64,7 +63,7 @@ namespace UnoType {
        is a UNO type registry name that denotes something other than a UNO type,
        SORT_COMPLEX is returned)
      */
-    Sort getSort(rtl::OString const & type);
+    Sort getSort(OString const & type);
 
     /**
        Determines whether a UNO type name or UNO type registry name denotes a
@@ -75,7 +74,7 @@ namespace UnoType {
        @return true iff the given type denotes a UNO sequence type; the
        detection is purely syntactical
      */
-    bool isSequenceType(rtl::OString const & type);
+    bool isSequenceType(OString const & type);
 
     /**
        Decomposes a UNO type name or UNO type registry name.
@@ -92,9 +91,9 @@ namespace UnoType {
 
        @return the base part of the given type
      */
-    rtl::OString decompose(
-        rtl::OString const & type, sal_Int32 * rank = 0,
-        std::vector< rtl::OString > * arguments = 0);
+    OString decompose(
+        OString const & type, sal_Int32 * rank = 0,
+        std::vector< OString > * arguments = 0);
 }
 
 }
diff --git a/codemaker/source/codemaker/codemaker.cxx b/codemaker/source/codemaker/codemaker.cxx
index b797a2c47358..0412e36d066b 100644
--- a/codemaker/source/codemaker/codemaker.cxx
+++ b/codemaker/source/codemaker/codemaker.cxx
@@ -39,7 +39,7 @@
 
 namespace {
 
-void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) {
+void checkNoTypeArguments(std::vector< OString > const & arguments) {
     if (!arguments.empty()) {
         throw CannotDumpException("Bad type information");
             //TODO
@@ -50,8 +50,8 @@ void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) {
 
 namespace codemaker {
 
-rtl::OString convertString(rtl::OUString const & string) {
-    rtl::OString s;
+OString convertString(OUString const & string) {
+    OString s;
     if (!string.convertToString(
             &s, RTL_TEXTENCODING_UTF8,
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
@@ -63,14 +63,14 @@ rtl::OString convertString(rtl::OUString const & string) {
 }
 
 codemaker::UnoType::Sort decomposeAndResolve(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool resolveTypedefs, bool allowVoid, bool allowExtraEntities,
-    RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank,
-    std::vector< rtl::OString > * arguments)
+    RTTypeClass * typeClass, OString * name, sal_Int32 * rank,
+    std::vector< OString > * arguments)
 {
     OSL_ASSERT(typeClass != 0 && name != 0 && rank != 0 && arguments != 0);
     *rank = 0;
-    for (rtl::OString t(type);;) {
+    for (OString t(type);;) {
         sal_Int32 n = 0;
         *name = codemaker::UnoType::decompose(t, &n, arguments);
         if (n > SAL_MAX_INT32 - *rank) {
diff --git a/codemaker/source/codemaker/dependencies.cxx b/codemaker/source/codemaker/dependencies.cxx
index d920ac4e7119..143dc98ffdc3 100644
--- a/codemaker/source/codemaker/dependencies.cxx
+++ b/codemaker/source/codemaker/dependencies.cxx
@@ -42,7 +42,7 @@ struct Bad {};
 }
 
 Dependencies::Dependencies(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type):
+    rtl::Reference< TypeManager > const & manager, OString const & type):
     m_voidDependency(false), m_booleanDependency(false),
     m_byteDependency(false), m_shortDependency(false),
     m_unsignedShortDependency(false), m_longDependency(false),
@@ -122,8 +122,8 @@ Dependencies::Dependencies(
 Dependencies::~Dependencies()
 {}
 
-void Dependencies::insert(rtl::OUString const & type, bool base) {
-    rtl::OString t;
+void Dependencies::insert(OUString const & type, bool base) {
+    OString t;
     if (!type.convertToString(
             &t, RTL_TEXTENCODING_UTF8,
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
@@ -134,10 +134,10 @@ void Dependencies::insert(rtl::OUString const & type, bool base) {
     insert(t, base);
 }
 
-void Dependencies::insert(rtl::OString const & type, bool base) {
+void Dependencies::insert(OString const & type, bool base) {
     sal_Int32 rank;
-    std::vector< rtl::OString > args;
-    rtl::OString t(UnoType::decompose(type, &rank, &args));
+    std::vector< OString > args;
+    OString t(UnoType::decompose(type, &rank, &args));
     if (rank > 0) {
         m_sequenceDependency = true;
     }
@@ -249,7 +249,7 @@ void Dependencies::insert(rtl::OString const & type, bool base) {
 
     case UnoType::SORT_COMPLEX:
         {
-            for (std::vector< rtl::OString >::iterator i(args.begin());
+            for (std::vector< OString >::iterator i(args.begin());
                  i != args.end(); ++i)
             {
                 insert(*i, false);
diff --git a/codemaker/source/codemaker/exceptiontree.cxx b/codemaker/source/codemaker/exceptiontree.cxx
index 52f968493274..1b4915b65224 100644
--- a/codemaker/source/codemaker/exceptiontree.cxx
+++ b/codemaker/source/codemaker/exceptiontree.cxx
@@ -34,7 +34,7 @@
 using codemaker::ExceptionTree;
 using codemaker::ExceptionTreeNode;
 
-ExceptionTreeNode * ExceptionTreeNode::add(rtl::OString const & theName) {
+ExceptionTreeNode * ExceptionTreeNode::add(OString const & theName) {
     std::auto_ptr< ExceptionTreeNode > node(new ExceptionTreeNode(theName));
     children.push_back(node.get());
     return node.release();
@@ -48,13 +48,13 @@ void ExceptionTreeNode::clearChildren() {
 }
 
 void ExceptionTree::add(
-    rtl::OString const & name, rtl::Reference< TypeManager > const & manager)
+    OString const & name, rtl::Reference< TypeManager > const & manager)
     throw( CannotDumpException )
 {
-    typedef std::vector< rtl::OString > OStringList;
+    typedef std::vector< OString > OStringList;
     OStringList stringlist;
     bool runtimeException = false;
-    for (rtl::OString n(name); n != "com/sun/star/uno/Exception";) {
+    for (OString n(name); n != "com/sun/star/uno/Exception";) {
         if (n == "com/sun/star/uno/RuntimeException") {
             runtimeException = true;
             break;
@@ -63,13 +63,13 @@ void ExceptionTree::add(
         typereg::Reader reader(manager->getTypeReader(n));
         if (!reader.isValid())
             throw CannotDumpException(
-                ::rtl::OString("Unknown type '" + n.replace('/', '.')
+                OString("Unknown type '" + n.replace('/', '.')
                                + "', incomplete type library."));
 
         OSL_ASSERT(
             reader.getTypeClass() == RT_TYPE_EXCEPTION
             && reader.getSuperTypeCount() == 1);
-        n = rtl::OUStringToOString(
+        n = OUStringToOString(
             reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     if (!runtimeException) {
diff --git a/codemaker/source/codemaker/global.cxx b/codemaker/source/codemaker/global.cxx
index 34b0490c7d17..2630ee8b81ce 100644
--- a/codemaker/source/codemaker/global.cxx
+++ b/codemaker/source/codemaker/global.cxx
@@ -364,23 +364,23 @@ FileStream &operator<<(FileStream& o, char const * s) {
     osl_writeFile(o.m_file, s, strlen(s), &writtenBytes);
     return o;
 }
-FileStream &operator<<(FileStream& o, ::rtl::OString* s) {
+FileStream &operator<<(FileStream& o, OString* s) {
     sal_uInt64 writtenBytes;
     osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
 }
-FileStream &operator<<(FileStream& o, const ::rtl::OString& s) {
+FileStream &operator<<(FileStream& o, const OString& s) {
     sal_uInt64 writtenBytes;
     osl_writeFile(o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
 
 }
-FileStream &operator<<(FileStream& o, ::rtl::OStringBuffer* s) {
+FileStream &operator<<(FileStream& o, OStringBuffer* s) {
     sal_uInt64 writtenBytes;
     osl_writeFile(o.m_file, s->getStr(), s->getLength() * sizeof(sal_Char), &writtenBytes);
     return o;
 }
-FileStream &operator<<(FileStream& o, const ::rtl::OStringBuffer& s) {
+FileStream &operator<<(FileStream& o, const OStringBuffer& s) {
     sal_uInt64 writtenBytes;
     osl_writeFile(
         o.m_file, s.getStr(), s.getLength() * sizeof(sal_Char), &writtenBytes);
diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx
index 59706d99c179..d233f6ff0bfc 100644
--- a/codemaker/source/codemaker/options.cxx
+++ b/codemaker/source/codemaker/options.cxx
@@ -20,7 +20,6 @@
 
 #include "codemaker/options.hxx"
 
-using ::rtl::OString;
 
 Options::Options()
 {
diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx
index 116684dbfb66..9d4cf63f58f5 100644
--- a/codemaker/source/codemaker/typemanager.cxx
+++ b/codemaker/source/codemaker/typemanager.cxx
@@ -23,12 +23,8 @@
 #include "registry/reader.hxx"
 #include "registry/version.h"
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringToOString;
 
-sal_Bool TypeManager::isBaseType(const ::rtl::OString& name)
+sal_Bool TypeManager::isBaseType(const OString& name)
 {
     if ( name == "short" )
         return sal_True;
@@ -108,7 +104,7 @@ sal_Bool TypeManager::init(
     return sal_True;
 }
 
-::rtl::OString TypeManager::getTypeName(RegistryKey& rTypeKey) const
+OString TypeManager::getTypeName(RegistryKey& rTypeKey) const
 {
     OString typeName = OUStringToOString(rTypeKey.getName(), RTL_TEXTENCODING_UTF8);
 
@@ -306,7 +302,7 @@ RegistryKey TypeManager::searchTypeKey(const OString& name_, sal_Bool * pIsExtra
     return key;
 }
 
-RegistryKeyList TypeManager::getTypeKeys(const ::rtl::OString& name_) const
+RegistryKeyList TypeManager::getTypeKeys(const OString& name_) const
 {
     RegistryKeyList keyList= RegistryKeyList();
     OString tmpName;
diff --git a/codemaker/source/codemaker/unotype.cxx b/codemaker/source/codemaker/unotype.cxx
index 9adb9e1bc47b..8f2c89537c77 100644
--- a/codemaker/source/codemaker/unotype.cxx
+++ b/codemaker/source/codemaker/unotype.cxx
@@ -26,7 +26,7 @@
 
 #include <vector>
 
-codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type)
+codemaker::UnoType::Sort codemaker::UnoType::getSort(OString const & type)
 {
     return type == "void" ? SORT_VOID
         : type == "boolean" ? SORT_BOOLEAN
@@ -46,13 +46,13 @@ codemaker::UnoType::Sort codemaker::UnoType::getSort(rtl::OString const & type)
         : SORT_COMPLEX;
 }
 
-bool codemaker::UnoType::isSequenceType(rtl::OString const & type) {
+bool codemaker::UnoType::isSequenceType(OString const & type) {
     return !type.isEmpty() && type[0] == '[';
 }
 
-rtl::OString codemaker::UnoType::decompose(
-    rtl::OString const & type, sal_Int32 * rank,
-    std::vector< rtl::OString > * arguments)
+OString codemaker::UnoType::decompose(
+    OString const & type, sal_Int32 * rank,
+    std::vector< OString > * arguments)
 {
     sal_Int32 len = type.getLength();
     sal_Int32 i = 0;
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index 5db10d481c75..6f530409f745 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -56,7 +56,7 @@ OString scopedCppName(OString const & type, bool ns_alias)
         tmpBuf.append("::" + type.getToken(0, c, nPos));
     } while( nPos != -1 );
 
-    rtl::OString s(tmpBuf.makeStringAndClear());
+    OString s(tmpBuf.makeStringAndClear());
     if (ns_alias && s.indexOf("::com::sun::star::") == 0)
     {
         return s.replaceAt(0, 18, "css::"); // nicer shorthand
@@ -70,10 +70,10 @@ OString translateUnoToCppType(
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
     OString const & nucleus, bool shortname)
 {
-    rtl::OStringBuffer buf;
+    OStringBuffer buf;
     if (sort == codemaker::UnoType::SORT_COMPLEX) {
         if (typeClass == RT_TYPE_INTERFACE
-            && nucleus == rtl::OString("com/sun/star/uno/XInterface"))
+            && nucleus == OString("com/sun/star/uno/XInterface"))
         {
             buf.append("::com::sun::star::uno::XInterface");
         } else {
@@ -84,13 +84,13 @@ OString translateUnoToCppType(
         static char const * const cppTypes[codemaker::UnoType::SORT_ANY + 1] = {
             "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16",
             "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64",
-            "float", "double", "::sal_Unicode", "::rtl::OUString",
+            "float", "double", "::sal_Unicode", "rtl::OUString",
             "::com::sun::star::uno::Type", "::com::sun::star::uno::Any" };
         buf.append(cppTypes[sort]);
     }
 
     if (shortname) {
-        rtl::OString s(buf.makeStringAndClear());
+        OString s(buf.makeStringAndClear());
         if (s.indexOf("::com::sun::star") == 0)
             return s.replaceAt(0, 16, "css");
         else
@@ -100,9 +100,9 @@ OString translateUnoToCppType(
     return buf.makeStringAndClear();
 }
 
-rtl::OString translateUnoToCppIdentifier(
-    rtl::OString const & unoIdentifier, rtl::OString const & prefix,
-    IdentifierTranslationMode transmode, rtl::OString const * forbidden)
+OString translateUnoToCppIdentifier(
+    OString const & unoIdentifier, OString const & prefix,
+    IdentifierTranslationMode transmode, OString const * forbidden)
 {
     if (// Keywords:
         unoIdentifier == "asm"
diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx
index 8049c98295a0..8c8a630d1bda 100644
--- a/codemaker/source/commonjava/commonjava.cxx
+++ b/codemaker/source/commonjava/commonjava.cxx
@@ -54,7 +54,7 @@ OString translateUnoToJavaType(
             buf.append(nucleus);
         }
     } else {
-        rtl::OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = {
+        OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = {
             { "void", "java/lang/Void" },
             { "boolean", "java/lang/Boolean" },
             { "byte", "java/lang/Byte" },
@@ -75,8 +75,8 @@ OString translateUnoToJavaType(
     return buf.makeStringAndClear();
 }
 
-rtl::OString translateUnoToJavaIdentifier(
-    rtl::OString const & identifier, rtl::OString const & prefix)
+OString translateUnoToJavaIdentifier(
+    OString const & identifier, OString const & prefix)
 {
     if (identifier == "abstract"
         || identifier == "assert" // since Java 1.4
diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx
index d18a952502e1..1f63ef26b5b2 100644
--- a/codemaker/source/cppumaker/cppumaker.cxx
+++ b/codemaker/source/cppumaker/cppumaker.cxx
@@ -29,14 +29,12 @@
 #include "cppuoptions.hxx"
 #include "cpputype.hxx"
 
-using ::rtl::OString;
-using ::rtl::OUString;
 
 namespace {
 
-void failed(rtl::OString const & typeName, CppuOptions * options) {
+void failed(OString const & typeName, CppuOptions * options) {
     fprintf(stderr, "%s ERROR: %s\n", options->getProgramName().getStr(),
-            rtl::OString("cannot dump Type '" + typeName + "'").getStr());
+            OString("cannot dump Type '" + typeName + "'").getStr());
     exit(99);
 }
 
@@ -52,7 +50,7 @@ void produce(
 }
 
 void produce(
-    rtl::OString const & typeName,
+    OString const & typeName,
     rtl::Reference< TypeManager > const & typeMgr,
     codemaker::GeneratedTypeSet & generated, CppuOptions * options)
 {
diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx
index 10b1d0c2d414..8affab24dd56 100644
--- a/codemaker/source/cppumaker/cppuoptions.cxx
+++ b/codemaker/source/cppumaker/cppuoptions.cxx
@@ -24,9 +24,6 @@
 #include "osl/thread.h"
 #include "osl/process.h"
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx
index f2dd04549d3f..f07e945d1ff5 100644
--- a/codemaker/source/cppumaker/cppuoptions.hxx
+++ b/codemaker/source/cppumaker/cppuoptions.hxx
@@ -33,9 +33,9 @@ public:
     sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
+    OString  prepareHelp();
 
-    ::rtl::OString  prepareVersion();
+    OString  prepareVersion();
 
 protected:
 };
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index b5e52681a598..4f90a53139e3 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -43,19 +43,16 @@
 
 using namespace codemaker::cpp;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringBuffer;
 
 namespace {
 
-rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) {
-    static rtl::OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = {
+OString translateSimpleUnoType(OString const & unoType, bool cppuUnoType=false) {
+    static OString const trans[codemaker::UnoType::SORT_COMPLEX + 1] = {
         "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16",
         "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", "float",
-        "double", "::sal_Unicode", "::rtl::OUString",
+        "double", "::sal_Unicode", "rtl::OUString",
         "::com::sun::star::uno::Type", "::com::sun::star::uno::Any",
-        rtl::OString() };
+        OString() };
 
     const codemaker::UnoType::Sort sort = codemaker::UnoType::getSort(unoType);
     if (cppuUnoType &&
@@ -71,7 +68,7 @@ rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoTy
     return trans[sort];
 }
 
-bool isBootstrapType(rtl::OString const & name) {
+bool isBootstrapType(OString const & name) {
     static char const * const names[] = {
         "com/sun/star/beans/PropertyAttribute",
         "com/sun/star/beans/PropertyState",
@@ -192,7 +189,7 @@ void CppuType::dumpDeclaration(FileStream &) throw (CannotDumpException) {
     OSL_ASSERT(false);
 }
 
-bool CppuType::dumpFiles(CppuOptions * options, rtl::OString const & outPath) {
+bool CppuType::dumpFiles(CppuOptions * options, OString const & outPath) {
     return dumpFile(options, ".hdl", m_typeName, outPath)
         && dumpFile(options, ".hpp", m_typeName, outPath);
 }
@@ -441,15 +438,15 @@ void CppuType::addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes)
 }
 
 void CppuType::dumpInitializer(
-    FileStream & out, bool parameterized, rtl::OUString const & type) const
+    FileStream & out, bool parameterized, OUString const & type) const
 {
     out << "(";
     if (!parameterized) {
-        for (rtl::OString t(
-                 rtl::OUStringToOString(type, RTL_TEXTENCODING_UTF8));;)
+        for (OString t(
+                 OUStringToOString(type, RTL_TEXTENCODING_UTF8));;)
         {
             sal_Int32 rank;
-            std::vector< rtl::OString > args;
+            std::vector< OString > args;
             t = codemaker::UnoType::decompose(t, &rank, &args);
             if (rank == 0) {
                 switch (codemaker::UnoType::getSort(t)) {
@@ -477,7 +474,7 @@ void CppuType::dumpInitializer(
                             typereg::Reader reader(m_typeMgr->getTypeReader(t));
                             OSL_ASSERT(reader.isValid());
                             out << scopedCppName(t) << "_"
-                                << rtl::OUStringToOString(
+                                << OUStringToOString(
                                     reader.getFieldName(0),
                                     RTL_TEXTENCODING_UTF8);
                             break;
@@ -600,7 +597,7 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
 
     OString superType;
     if (m_reader.getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     sal_Bool bIsBaseException = sal_False;
@@ -636,10 +633,10 @@ void CppuType::dumpNormalGetCppuType(FileStream& o)
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = checkRealBaseType(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8),
                 sal_True);
 
@@ -711,7 +708,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "{\n";
     inc();
 
-    o << indent() << "::rtl::OUString sTypeName( \""
+    o << indent() << "rtl::OUString sTypeName( \""
       << m_typeName.replace('/', '.') << "\" );\n\n";
 
     o << indent() << "// Start inline typedescription generation\n"
@@ -719,7 +716,7 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
 
     OString superType;
     if (m_reader.getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     if (!superType.isEmpty()) {
@@ -748,17 +745,17 @@ void CppuType::dumpComprehensiveGetCppuType(FileStream& o)
                 continue;
             }
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             fieldType = checkRealBaseType(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8),
                 sal_True);
 
-            o << indent() << "::rtl::OUString sMemberType" << i
+            o << indent() << "rtl::OUString sMemberType" << i
               << "( \""
               << fieldType.replace('/', '.') << "\" );\n";
-            o << indent() << "::rtl::OUString sMemberName" << i
+            o << indent() << "rtl::OUString sMemberName" << i
               << "( \"";
             o << fieldName << "\" );\n";
             o << indent() << "aMembers[" << i << "].eTypeClass = "
@@ -829,8 +826,8 @@ void CppuType::dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag)
             || (access & RT_ACCESS_PARAMETERIZED_TYPE) != 0)
             continue;
 
-        rtl::OString typeName(
-            rtl::OUStringToOString(
+        OString typeName(
+            OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
         if (aFinishedTypes.count(typeName) == 0)
         {
@@ -875,7 +872,7 @@ sal_uInt32 CppuType::checkInheritedMemberCount(const typereg::Reader* pReader)
     sal_uInt32 count = 0;
     OString superType;
     if (pReader->getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             pReader->getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     if (!superType.isEmpty())
@@ -1000,8 +997,8 @@ void CppuType::dumpType(FileStream& o, const OString& type,
     const throw( CannotDumpException )
 {
     sal_Int32 seqNum;
-    std::vector< rtl::OString > args;
-    rtl::OString relType(
+    std::vector< OString > args;
+    OString relType(
         codemaker::UnoType::decompose(
             checkRealBaseType(type, true), &seqNum, &args));
 
@@ -1044,7 +1041,7 @@ void CppuType::dumpType(FileStream& o, const OString& type,
                 o << scopedCppName(relType);
                 if (!args.empty()) {
                     o << "< ";
-                    for (std::vector< rtl::OString >::iterator i(args.begin());
+                    for (std::vector< OString >::iterator i(args.begin());
                          i != args.end(); ++i)
                     {
                         if (i != args.begin()) {
@@ -1070,7 +1067,7 @@ void CppuType::dumpType(FileStream& o, const OString& type,
 
 void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl, CppuTypeDecl eDeclFlag)
 {
-    rtl::OString relType(
+    OString relType(
         codemaker::UnoType::decompose(checkRealBaseType(type, true)));
 
     if (eDeclFlag == CPPUTYPEDECL_ONLYINTERFACES)
@@ -1108,7 +1105,7 @@ void CppuType::dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDec
 OString CppuType::typeToIdentifier(const OString& type)
 {
     sal_Int32 seqNum;
-    rtl::OString relType(codemaker::UnoType::decompose(type, &seqNum));
+    OString relType(codemaker::UnoType::decompose(type, &seqNum));
     OString sIdentifier;
 
     while( seqNum > 0 )
@@ -1135,8 +1132,8 @@ OString CppuType::typeToIdentifier(const OString& type)
     return sIdentifier;
 }
 
-bool CppuType::passByReference(rtl::OString const & unoType) {
-    rtl::OString type(resolveTypedefs(unoType));
+bool CppuType::passByReference(OString const & unoType) {
+    OString type(resolveTypedefs(unoType));
     switch (codemaker::UnoType::getSort(type)) {
     default:
         return false;
@@ -1169,7 +1166,7 @@ OString CppuType::resolveTypedefs(const OString& type) const
             typeClass = reader.getTypeClass();
 
             if (typeClass == RT_TYPE_TYPEDEF)
-                baseType = rtl::OUStringToOString(
+                baseType = OUStringToOString(
                     reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
             else
                 isTypeDef = sal_False;
@@ -1185,7 +1182,7 @@ OString CppuType::resolveTypedefs(const OString& type) const
 OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly) const
 {
     sal_Int32 rank;
-    rtl::OString baseType(codemaker::UnoType::decompose(type, &rank));
+    OString baseType(codemaker::UnoType::decompose(type, &rank));
 
     RegistryKey     key;
     RTTypeClass     typeClass;
@@ -1204,7 +1201,7 @@ OString CppuType::checkRealBaseType(const OString& type, sal_Bool bResolveTypeOn
             {
                 sal_Int32 n;
                 baseType = codemaker::UnoType::decompose(
-                    rtl::OUStringToOString(
+                    OUStringToOString(
                         reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8),
                     &n);
                 OSL_ASSERT(n <= SAL_MAX_INT32 - rank); //TODO
@@ -1272,7 +1269,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index)
             if (constValue.m_value.aHyper == SAL_MIN_INT64) {
                 o << "SAL_MIN_INT64";
             } else {
-                ::rtl::OString tmp(OString::valueOf(constValue.m_value.aHyper));
+                OString tmp(OString::valueOf(constValue.m_value.aHyper));
                 o << "(sal_Int64) SAL_CONST_INT64(" << tmp.getStr() << ")";
             }
             break;
@@ -1290,7 +1287,7 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index)
                     for (std::vector< char >::reverse_iterator i(buf.rbegin());
                          i != buf.rend(); ++i)
                     {
-                        o << rtl::OString::valueOf(*i).getStr();
+                        o << OString::valueOf(*i).getStr();
                     }
                 }
                 o << ")";
@@ -1298,21 +1295,21 @@ void CppuType::dumpConstantValue(FileStream& o, sal_uInt16 index)
             break;
         case RT_TYPE_FLOAT:
             {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aFloat) );
+                OString tmp( OString::valueOf(constValue.m_value.aFloat) );
                 o << "(float)" << tmp.getStr();
             }
             break;
         case RT_TYPE_DOUBLE:
             {
-                ::rtl::OString tmp( OString::valueOf(constValue.m_value.aDouble) );
+                OString tmp( OString::valueOf(constValue.m_value.aDouble) );
                 o << "(double)" << tmp.getStr();
             }
             break;
         case RT_TYPE_STRING:
             {
-                ::rtl::OUString aUStr(constValue.m_value.aString);
-                ::rtl::OString aStr = ::rtl::OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
-                o << "::rtl::OUString( \"" << aStr.getStr() << "\" )";
+                OUString aUStr(constValue.m_value.aString);
+                OString aStr = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
+                o << "rtl::OUString( \"" << aStr.getStr() << "\" )";
             }
             break;
     }
@@ -1392,7 +1389,7 @@ void InterfaceType::dumpDeclaration(FileStream& o)
 
     for (sal_Int16 i = 0; i < m_reader.getSuperTypeCount(); ++i) {
         o << (i == 0 ? " :" : ",") << " public "
-          << scopedCppName(rtl::OUStringToOString(
+          << scopedCppName(OUStringToOString(
                             m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8));
     }
 
@@ -1458,9 +1455,9 @@ void InterfaceType::dumpAttributes(FileStream& o)
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        rtl::OUString name(m_reader.getFieldName(i));
-        fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8);
-        fieldType = rtl::OUStringToOString(
+        OUString name(m_reader.getFieldName(i));
+        fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8);
+        fieldType = OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
         bool depr = m_isDeprecated
@@ -1517,9 +1514,9 @@ void InterfaceType::dumpMethods(FileStream& o)
             continue;
         }
 
-        methodName = rtl::OUStringToOString(
+        methodName = OUStringToOString(
             m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8);
-        returnType = rtl::OUStringToOString(
+        returnType = OUStringToOString(
             m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8);
         paramCount = m_reader.getMethodParameterCount(i);
 
@@ -1551,9 +1548,9 @@ void InterfaceType::dumpMethods(FileStream& o)
             o << " SAL_CALL " << methodName << "( ";
             for (sal_uInt16 j=0; j < paramCount; j++)
             {
-                paramName = rtl::OUStringToOString(
+                paramName = OUStringToOString(
                     m_reader.getMethodParameterName(i, j), RTL_TEXTENCODING_UTF8);
-                paramType = rtl::OUStringToOString(
+                paramType = OUStringToOString(
                     m_reader.getMethodParameterTypeName(i, j),
                     RTL_TEXTENCODING_UTF8);
                 paramMode = m_reader.getMethodParameterFlags(i, j);
@@ -1607,7 +1604,7 @@ void InterfaceType::dumpNormalGetCppuType(FileStream& o)
             o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< ";
             dumpType(
                 o,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8),
                 true, false, false, true);
             o << " >::get().getTypeLibType();\n";
@@ -1651,7 +1648,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "{\n";
 
     inc();
-    o << indent() << "::rtl::OUString sTypeName( \""
+    o << indent() << "rtl::OUString sTypeName( \""
       << m_typeName.replace('/', '.') << "\" );\n\n";
 
     o << indent() << "// Start inline typedescription generation\n"
@@ -1664,7 +1661,7 @@ void InterfaceType::dumpComprehensiveGetCppuType(FileStream& o)
         o << indent() << "aSuperTypes[" << i << "] = ::cppu::UnoType< ";
         dumpType(
             o,
-            rtl::OUStringToOString(
+            OUStringToOString(
                 m_reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8),
             false, false, false, true);
         o << " >::get().getTypeLibType();\n";
@@ -1798,10 +1795,10 @@ void InterfaceType::dumpCppuAttributeRefs(FileStream& o, sal_uInt32& index)
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
 
-        o << indent() << "::rtl::OUString sAttributeName" << i << "( \""
+        o << indent() << "rtl::OUString sAttributeName" << i << "( \""
           << scope.replace('/', '.') << "::" << fieldName << "\" );\n";
         o << indent() << "typelib_typedescriptionreference_new( &pMembers["
           << index << "],\n";
@@ -1826,10 +1823,10 @@ void InterfaceType::dumpCppuMethodRefs(FileStream& o, sal_uInt32& index)
             continue;
         }
 
-        methodName = rtl::OUStringToOString(
+        methodName = OUStringToOString(
             m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8);
 
-        o << indent() << "::rtl::OUString sMethodName" << i << "( \""
+        o << indent() << "rtl::OUString sMethodName" << i << "( \""
           << scope.replace('/', '.') << "::" << methodName << "\" );\n";
         o << indent() << "typelib_typedescriptionreference_new( &pMembers["
           << index << "],\n";
@@ -1878,7 +1875,7 @@ private:
     void calculate(typereg::Reader const & reader);
 
     rtl::Reference< TypeManager > manager;
-    std::set< rtl::OString > set;
+    std::set< OString > set;
     sal_Int32 offset;
 };
 
@@ -1895,7 +1892,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) {
     for (sal_Int16 i = 0; i < reader.getSuperTypeCount(); ++i) {
         typereg::Reader super(
             manager->getTypeReader(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     reader.getSuperTypeName(i), RTL_TEXTENCODING_UTF8)));
         if (super.isValid()) {
             calculate(super);
@@ -1905,7 +1902,7 @@ void BaseOffset::calculateBases(typereg::Reader const & reader) {
 
 void BaseOffset::calculate(typereg::Reader const & reader) {
     if (set.insert(
-            rtl::OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8))
+            OUStringToOString(reader.getTypeName(), RTL_TEXTENCODING_UTF8))
         .second)
     {
         calculateBases(reader);
@@ -1980,19 +1977,19 @@ void InterfaceType::dumpCppuAttributes(FileStream& o, sal_uInt32& index)
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            rtl::OUString name(m_reader.getFieldName(i));
-            fieldName = rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8);
+            OUString name(m_reader.getFieldName(i));
+            fieldName = OUStringToOString(name, RTL_TEXTENCODING_UTF8);
             fieldType = checkRealBaseType(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8),
                 sal_True);
 
             o << indent() << "{\n";
             inc();
-            o << indent() << "::rtl::OUString sAttributeType" << i << "( \""
+            o << indent() << "rtl::OUString sAttributeType" << i << "( \""
               << fieldType.replace('/', '.') << "\" );\n";
 
-            o << indent() << "::rtl::OUString sAttributeName" << i << "( \""
+            o << indent() << "rtl::OUString sAttributeName" << i << "( \""
               << scope.replace('/', '.') << "::" << fieldName << "\" );\n";
 
             sal_Int32 getExceptions = dumpAttributeExceptionTypeNames(
@@ -2048,10 +2045,10 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
                 continue;
             }
 
-            methodName = rtl::OUStringToOString(
+            methodName = OUStringToOString(
                 m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8);
             returnType = checkRealBaseType(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8),
                 sal_True);
             paramCount = m_reader.getMethodParameterCount(i);
@@ -2071,19 +2068,19 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
 
             for (sal_uInt16 j = 0; j < paramCount; j++)
             {
-                paramName = rtl::OUStringToOString(
+                paramName = OUStringToOString(
                     m_reader.getMethodParameterName(i, j),
                     RTL_TEXTENCODING_UTF8);
                 paramType = checkRealBaseType(
-                    rtl::OUStringToOString(
+                    OUStringToOString(
                         m_reader.getMethodParameterTypeName(i, j),
                         RTL_TEXTENCODING_UTF8),
                     sal_True);
                 paramMode = m_reader.getMethodParameterFlags(i, j);
 
-                o << indent() << "::rtl::OUString sParamName" << j << "( \""
+                o << indent() << "rtl::OUString sParamName" << j << "( \""
                   << paramName << "\" );\n";
-                o << indent() << "::rtl::OUString sParamType" << j << "( \""
+                o << indent() << "rtl::OUString sParamType" << j << "( \""
                   << paramType.replace('/', '.') << "\" );\n";
                 o << indent() << "aParameters[" << j << "].pParamName = sParamName" << j << ".pData;\n";
                 o << indent() << "aParameters[" << j << "].eTypeClass = (typelib_TypeClass)"
@@ -2104,9 +2101,9 @@ void InterfaceType::dumpCppuMethods(FileStream& o, sal_uInt32& index)
             sal_Int32 excCount = dumpExceptionTypeNames(
                 o, "", i, bWithRuntimeException);
 
-            o << indent() << "::rtl::OUString sReturnType" << i << "( \""
+            o << indent() << "rtl::OUString sReturnType" << i << "( \""
               << returnType.replace('/', '.') << "\" );\n";
-            o << indent() << "::rtl::OUString sMethodName" << i <<
+            o << indent() << "rtl::OUString sMethodName" << i <<
                 "( \""
               << scope.replace('/', '.') << "::" << methodName << "\" );\n";
             o << indent() << "typelib_typedescription_newInterfaceMethod( &pMethod,\n";
@@ -2153,9 +2150,9 @@ void InterfaceType::dumpAttributesCppuDecl(FileStream& o, StringSet* pFinishedTy
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-        fieldType = rtl::OUStringToOString(
+        fieldType = OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
         if (pFinishedTypes->count(fieldType) == 0)
@@ -2175,7 +2172,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
 
     for (sal_uInt16 i=0; i < methodCount; i++)
     {
-        returnType = rtl::OUStringToOString(
+        returnType = OUStringToOString(
             m_reader.getMethodReturnTypeName(i), RTL_TEXTENCODING_UTF8);
         paramCount = m_reader.getMethodParameterCount(i);
         excCount = m_reader.getMethodExceptionCount(i);
@@ -2188,7 +2185,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
         sal_uInt16 j;
         for (j=0; j < paramCount; j++)
         {
-            paramType = rtl::OUStringToOString(
+            paramType = OUStringToOString(
                 m_reader.getMethodParameterTypeName(i, j),
                 RTL_TEXTENCODING_UTF8);
 
@@ -2201,7 +2198,7 @@ void InterfaceType::dumpMethodsCppuDecl(FileStream& o, StringSet* pFinishedTypes
 
         for (j=0; j < excCount; j++)
         {
-            excType = rtl::OUStringToOString(
+            excType = OUStringToOString(
                 m_reader.getMethodExceptionTypeName(i, j),
                 RTL_TEXTENCODING_UTF8);
             if (pFinishedTypes->count(excType) == 0)
@@ -2230,7 +2227,7 @@ void InterfaceType::dumpExceptionSpecification(
         sal_uInt16 count = m_reader.getMethodExceptionCount(
             static_cast< sal_uInt16 >(methodIndex));
         for (sal_uInt16 i = 0; i < count; ++i) {
-            rtl::OUString name(
+            OUString name(
                 m_reader.getMethodExceptionTypeName(
                     static_cast< sal_uInt16 >(methodIndex), i));
             if ( name != "com/sun/star/uno/RuntimeException" )
@@ -2240,7 +2237,7 @@ void InterfaceType::dumpExceptionSpecification(
                 }
                 first = false;
                 out << scopedCppName(
-                    rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8));
+                    OUStringToOString(name, RTL_TEXTENCODING_UTF8));
             }
         }
     }
@@ -2255,7 +2252,7 @@ void InterfaceType::dumpExceptionSpecification(
 }
 
 void InterfaceType::dumpAttributeExceptionSpecification(
-    FileStream & out, rtl::OUString const & name, RTMethodMode sort)
+    FileStream & out, OUString const & name, RTMethodMode sort)
 {
     sal_uInt16 methodCount = m_reader.getMethodCount();
     for (sal_uInt16 i = 0; i < methodCount; ++i) {
@@ -2270,11 +2267,11 @@ void InterfaceType::dumpAttributeExceptionSpecification(
 }
 
 void InterfaceType::dumpExceptionTypeName(
-    FileStream & out, char const * prefix, sal_uInt32 index, rtl::OUString name)
+    FileStream & out, char const * prefix, sal_uInt32 index, OUString name)
 {
-    out << indent() << "::rtl::OUString the_" << prefix << "ExceptionName"
+    out << indent() << "rtl::OUString the_" << prefix << "ExceptionName"
         << index << "( \""
-        << rtl::OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.')
+        << OUStringToOString(name, RTL_TEXTENCODING_UTF8).replace('/', '.')
         << "\" );\n";
 }
 
@@ -2285,7 +2282,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames(
     sal_Int32 count = 0;
     sal_uInt16 n = m_reader.getMethodExceptionCount(methodIndex);
     for (sal_uInt16 i = 0; i < n; ++i) {
-        rtl::OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i));
+        OUString name(m_reader.getMethodExceptionTypeName(methodIndex, i));
         if ( name != "com/sun/star/uno/RuntimeException" )
         {
             dumpExceptionTypeName(out, prefix, count++, name);
@@ -2294,7 +2291,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames(
     if (runtimeException) {
         dumpExceptionTypeName(
             out, prefix, count++,
-            rtl::OUString("com/sun/star/uno/RuntimeException"));
+            OUString("com/sun/star/uno/RuntimeException"));
     }
     if (count > 0) {
         out << indent() << "rtl_uString * the_" << prefix << "Exceptions[] = {";
@@ -2308,7 +2305,7 @@ sal_Int32 InterfaceType::dumpExceptionTypeNames(
 }
 
 sal_Int32 InterfaceType::dumpAttributeExceptionTypeNames(
-    FileStream & out, char const * prefix, rtl::OUString const & name,
+    FileStream & out, char const * prefix, OUString const & name,
     RTMethodMode sort)
 {
     sal_uInt16 methodCount = m_reader.getMethodCount();
@@ -2397,9 +2394,9 @@ void ConstantsType::dumpDeclaration(FileStream& o)
     OString         fieldType;
     for (sal_uInt16 i=0; i < fieldCount; i++)
     {
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-        fieldType = rtl::OUStringToOString(
+        fieldType = OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
         o << "static const ";
@@ -2429,7 +2426,7 @@ sal_Bool ConstantsType::dumpHxxFile(
     OString headerDefine(dumpHeaderDefine(o, "HPP", bSpecialDefine));
     o << "\n";
 
-    rtl::OString suffix;
+    OString suffix;
     if (bSpecialDefine) {
         suffix = m_name;
     }
@@ -2456,9 +2453,9 @@ ModuleType::~ModuleType()
 }
 
 bool ModuleType::dumpFiles(
-    CppuOptions * options, rtl::OString const & outPath)
+    CppuOptions * options, OString const & outPath)
 {
-    rtl::OString tmpName(m_typeName);
+    OString tmpName(m_typeName);
     if (tmpName == "/") {
         tmpName = "global";
     } else {
@@ -2474,7 +2471,7 @@ bool ModuleType::dumpFiles(
 
 namespace {
 
-void dumpTypeParameterName(FileStream & out, rtl::OString const & name) {
+void dumpTypeParameterName(FileStream & out, OString const & name) {
     // Prefix all type parameters with "typeparam_" to avoid problems when a
     // struct member has the same name as a type parameter, as in
     // struct<T> { T T; };
@@ -2514,9 +2511,9 @@ void StructureType::dumpDeclaration(FileStream& o)
     o << indent();
     dumpTemplateHead(o);
     o << "struct " << m_name;
-    rtl::OString base;
+    OString base;
     if (m_reader.getSuperTypeCount() != 0) {
-        base = rtl::OUStringToOString(
+        base = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
         OSL_ASSERT(!base.isEmpty()); //TODO
     }
@@ -2535,8 +2532,8 @@ void StructureType::dumpDeclaration(FileStream& o)
                 o << ", ";
             }
             prev = true;
-            rtl::OString type(
-                rtl::OUStringToOString(
+            OString type(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
             if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0)
             {
@@ -2546,7 +2543,7 @@ void StructureType::dumpDeclaration(FileStream& o)
                 dumpType(o, type, true, true);
             }
             o << " "
-              << rtl::OUStringToOString(
+              << OUStringToOString(
                   m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
               << "_";
         }
@@ -2559,8 +2556,8 @@ void StructureType::dumpDeclaration(FileStream& o)
             bool parameterized
                 = ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE)
                    != 0);
-            rtl::OString type(
-                rtl::OUStringToOString(
+            OString type(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
             if (parameterized) {
                 dumpTypeParameterName(o, type);
@@ -2568,7 +2565,7 @@ void StructureType::dumpDeclaration(FileStream& o)
                 dumpType(o, type);
             }
             o << " "
-                << rtl::OUStringToOString(
+                << OUStringToOString(
                     m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
             if (i == 0 && !base.isEmpty() && type != "double"
                 && type != "hyper" && type != "unsigned hyper")
@@ -2609,7 +2606,7 @@ sal_Bool StructureType::dumpHxxFile(
     inc();
     OString superType;
     if (m_reader.getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     sal_Bool first = sal_True;
@@ -2631,7 +2628,7 @@ sal_Bool StructureType::dumpHxxFile(
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
 
         if (first)
@@ -2666,9 +2663,9 @@ sal_Bool StructureType::dumpHxxFile(
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-            fieldType = rtl::OUStringToOString(
+            fieldType = OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
             if (superHasMember)
@@ -2703,7 +2700,7 @@ sal_Bool StructureType::dumpHxxFile(
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
 
             if (first)
@@ -2734,8 +2731,8 @@ sal_Bool StructureType::dumpHxxFile(
             if (i > 0) {
                 o << ", ";
             }
-            rtl::OString type(
-                rtl::OUStringToOString(
+            OString type(
+                OUStringToOString(
                     m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
             if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0)
             {
@@ -2745,7 +2742,7 @@ sal_Bool StructureType::dumpHxxFile(
                 dumpType(o, type, true, true);
             }
             o << " "
-              << rtl::OUStringToOString(
+              << OUStringToOString(
                   m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
               << "_";
         }
@@ -2759,7 +2756,7 @@ sal_Bool StructureType::dumpHxxFile(
             if (i > 0) {
                 o << ", ";
             }
-            o << rtl::OUStringToOString(
+            o << OUStringToOString(
                   m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
               << "_";
         }
@@ -2791,16 +2788,16 @@ void StructureType::dumpLightGetCppuType(FileStream & out) {
         << indent() << "if (the_type == 0) {\n";
     inc();
     if (isPolymorphic()) {
-        out << indent() << "::rtl::OStringBuffer the_buffer(\""
+        out << indent() << "OStringBuffer the_buffer(\""
             << m_typeName.replace('/', '.') << "<\");\n";
         sal_uInt16 n = m_reader.getReferenceCount();
         for (sal_uInt16 i = 0; i < n; ++i) {
             out << indent()
-                << ("the_buffer.append(::rtl::OUStringToOString("
+                << ("the_buffer.append(rtl::OUStringToOString("
                     "::cppu::getTypeFavourChar(static_cast< ");
             dumpTypeParameterName(
                 out,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8));
             out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n";
             if (i != n - 1) {
@@ -2835,16 +2832,16 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
         << indent() << "if (the_type == 0) {\n";
     inc();
     if (isPolymorphic()) {
-        out << indent() << "::rtl::OStringBuffer the_buffer(\""
+        out << indent() << "OStringBuffer the_buffer(\""
             << m_typeName.replace('/', '.') << "<\");\n";
         sal_uInt16 n = m_reader.getReferenceCount();
         for (sal_uInt16 i = 0; i < n; ++i) {
             out << indent()
-                << ("the_buffer.append(::rtl::OUStringToOString("
+                << ("the_buffer.append(rtl::OUStringToOString("
                     "::cppu::getTypeFavourChar(static_cast< ");
             dumpTypeParameterName(
                 out,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8));
             out << " * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));\n";
             if (i != n - 1) {
@@ -2859,8 +2856,8 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
     sal_uInt16 fields = m_reader.getFieldCount();
     for (sal_uInt16 i = 0; i < fields; ++i) {
         out << indent();
-        rtl::OString type(
-            rtl::OUStringToOString(
+        OString type(
+            OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
         if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) {
             out << "::cppu::getTypeFavourChar(static_cast< ";
@@ -2901,7 +2898,7 @@ void StructureType::dumpNormalGetCppuType(FileStream & out) {
         out << "::cppu::UnoType< ";
         dumpType(
             out,
-            rtl::OUStringToOString(
+            OUStringToOString(
                 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8),
             false, false, false, true);
         out << " >::get().getTypeLibType()";
@@ -2950,7 +2947,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
                 << "the_buffer.append(::cppu::getTypeFavourChar(static_cast< ";
             dumpTypeParameterName(
                 out,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8));
             out << " * >(0)).getTypeName());\n";
             if (i != n - 1) {
@@ -2969,12 +2966,12 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
             << m_typeName.replace('/', '.') << "\" );\n";
     }
     sal_uInt16 fields = m_reader.getFieldCount();
-    typedef std::map< rtl::OString, sal_uInt32 > Map;
+    typedef std::map< OString, sal_uInt32 > Map;
     Map parameters;
     Map types;
     for (sal_uInt16 i = 0; i < fields; ++i) {
-        rtl::OString type(
-            rtl::OUStringToOString(
+        OString type(
+            OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
         if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) {
             if (parameters.insert(
@@ -2991,7 +2988,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
                     << "::typelib_TypeClass the_pclass" << n
                     << " = (::typelib_TypeClass) the_ptype" << n
                     << ".getTypeClass();\n" << indent()
-                    << "::rtl::OUString the_pname" << n << "(the_ptype" << n
+                    << "rtl::OUString the_pname" << n << "(the_ptype" << n
                     << ".getTypeName());\n";
             }
         } else if (types.insert(
@@ -3013,14 +3010,14 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
             // above getCppuType call will make available information about the
             // resolved type); no extra #include for the resolved type is
             // needed, as the header for the typedef includes it already:
-            out << indent() << "::rtl::OUString the_tname"
+            out << indent() << "rtl::OUString the_tname"
                 << static_cast< sal_uInt32 >(types.size() - 1)
                 << "( \""
                 << checkRealBaseType(type, true).replace('/', '.') << "\" );\n";
         }
-        out << indent() << "::rtl::OUString the_name" << i
+        out << indent() << "rtl::OUString the_name" << i
             << "( \""
-            << rtl::OUStringToOString(
+            << OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8).replace(
                     '/', '.')
             << "\" );\n";
@@ -3029,8 +3026,8 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
     inc();
     for (sal_uInt16 i = 0; i < fields; ++i) {
         out << indent() << "{ { ";
-        rtl::OString type(
-            rtl::OUStringToOString(
+        OString type(
+            OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8));
         if ((m_reader.getFieldFlags(i) & RT_ACCESS_PARAMETERIZED_TYPE) != 0) {
             sal_uInt32 n = parameters.find(type)->second;
@@ -3054,7 +3051,7 @@ void StructureType::dumpComprehensiveGetCppuType(FileStream & out)
         out << "::cppu::UnoType< ";
         dumpType(
             out,
-            rtl::OUStringToOString(
+            OUStringToOString(
                 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8),
             false, false, false, true);
         out << " >::get().getTypeLibType()";
@@ -3094,9 +3091,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
 
         if (aSuperReader.isValid())
         {
-            rtl::OString superSuper;
+            OString superSuper;
             if (aSuperReader.getSuperTypeCount() >= 1) {
-                superSuper = rtl::OUStringToOString(
+                superSuper = OUStringToOString(
                     aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
             }
             hasMember = dumpSuperMember(o, superSuper, bWithType);
@@ -3112,9 +3109,9 @@ sal_Bool StructureType::dumpSuperMember(FileStream& o, const OString& superType,
                 if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                     continue;
 
-                fieldName = rtl::OUStringToOString(
+                fieldName = OUStringToOString(
                     aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-                fieldType = rtl::OUStringToOString(
+                fieldType = OUStringToOString(
                     aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
                 if (hasMember)
@@ -3203,7 +3200,7 @@ void StructureType::dumpTemplateHead(FileStream & out) const {
             out << "typename ";
             dumpTypeParameterName(
                 out,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8));
         }
         out << " > ";
@@ -3222,7 +3219,7 @@ void StructureType::dumpTemplateParameters(FileStream & out) const {
                 && m_reader.getReferenceSort(i) == RT_REF_TYPE_PARAMETER);
             dumpTypeParameterName(
                 out,
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getReferenceTypeName(i), RTL_TEXTENCODING_UTF8));
         }
         out << " >";
@@ -3259,7 +3256,7 @@ void ExceptionType::dumpDeclaration(FileStream& o)
 
     OString superType;
     if (m_reader.getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     if (!superType.isEmpty())
@@ -3289,9 +3286,9 @@ void ExceptionType::dumpDeclaration(FileStream& o)
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                             continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-            fieldType = rtl::OUStringToOString(
+            fieldType = OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
             if (superHasMember)
@@ -3317,9 +3314,9 @@ void ExceptionType::dumpDeclaration(FileStream& o)
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-        fieldType = rtl::OUStringToOString(
+        fieldType = OUStringToOString(
             m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
         o << indent();
@@ -3358,7 +3355,7 @@ sal_Bool ExceptionType::dumpHxxFile(
     inc();
     OString superType;
     if (m_reader.getSuperTypeCount() >= 1) {
-        superType = rtl::OUStringToOString(
+        superType = OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
     }
     sal_Bool first = sal_True;
@@ -3380,7 +3377,7 @@ sal_Bool ExceptionType::dumpHxxFile(
         if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
 
         if (first)
@@ -3420,9 +3417,9 @@ sal_Bool ExceptionType::dumpHxxFile(
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-            fieldType = rtl::OUStringToOString(
+            fieldType = OUStringToOString(
                 m_reader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
             if (superHasMember)
@@ -3452,7 +3449,7 @@ sal_Bool ExceptionType::dumpHxxFile(
             if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                 continue;
 
-            fieldName = rtl::OUStringToOString(
+            fieldName = OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
 
             if (first)
@@ -3486,8 +3483,8 @@ sal_Bool ExceptionType::dumpHxxFile(
         first = false;
     }
     for (sal_uInt16 i = 0; i < fieldCount; ++i) {
-        rtl::OString name(
-            rtl::OUStringToOString(
+        OString name(
+            OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8));
         o << (first ? ": " : ", ") << name << "(the_other." << name << ")";
         first = false;
@@ -3505,8 +3502,8 @@ sal_Bool ExceptionType::dumpHxxFile(
           << "::operator =(the_other);\n";
     }
     for (sal_uInt16 i = 0; i < fieldCount; ++i) {
-        rtl::OString name(
-            rtl::OUStringToOString(
+        OString name(
+            OUStringToOString(
                 m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8));
         o << indent() << name << " = the_other." << name << ";\n";
     }
@@ -3535,9 +3532,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
 
         if (aSuperReader.isValid())
         {
-            rtl::OString superSuper;
+            OString superSuper;
             if (aSuperReader.getSuperTypeCount() >= 1) {
-                superSuper = rtl::OUStringToOString(
+                superSuper = OUStringToOString(
                     aSuperReader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8);
             }
             hasMember = dumpSuperMember(o, superSuper, bWithType);
@@ -3553,9 +3550,9 @@ sal_Bool ExceptionType::dumpSuperMember(FileStream& o, const OString& superType,
                 if (access == RT_ACCESS_CONST || access == RT_ACCESS_INVALID)
                     continue;
 
-                fieldName = rtl::OUStringToOString(
+                fieldName = OUStringToOString(
                     aSuperReader.getFieldName(i), RTL_TEXTENCODING_UTF8);
-                fieldType = rtl::OUStringToOString(
+                fieldType = OUStringToOString(
                     aSuperReader.getFieldTypeName(i), RTL_TEXTENCODING_UTF8);
 
                 if (hasMember)
@@ -3620,7 +3617,7 @@ void EnumType::dumpDeclaration(FileStream& o)
         if (access != RT_ACCESS_CONST)
             continue;
 
-        fieldName = rtl::OUStringToOString(
+        fieldName = OUStringToOString(
             m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8);
         constValue = m_reader.getFieldValue(i);
 
@@ -3669,7 +3666,7 @@ void EnumType::dumpNormalGetCppuType(FileStream& o)
     inc(31);
     o << indent() << "\"" << m_typeName.replace('/', '.') << "\",\n"
       << indent() << scopedCppName(m_typeName) << "_"
-      << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8)
+      << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8)
       << " );\n";
     dec(31);
     dec();
@@ -3697,7 +3694,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "{\n";
 
     inc();
-    o << indent() << "::rtl::OUString sTypeName( \""
+    o << indent() << "rtl::OUString sTypeName( \""
       << m_typeName.replace('/', '.') << "\" );\n\n";
 
     o << indent() << "// Start inline typedescription generation\n"
@@ -3708,9 +3705,9 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     sal_uInt16 i;
     for (i = 0; i < count; i++)
     {
-        o << indent() << "::rtl::OUString sEnumValue" << i
+        o << indent() << "rtl::OUString sEnumValue" << i
           << "( \""
-          << rtl::OUStringToOString(
+          << OUStringToOString(
               m_reader.getFieldName(i), RTL_TEXTENCODING_UTF8)
           << "\" );\n";
         o << indent() << "enumValueNames[" << i << "] = sEnumValue" << i
@@ -3736,7 +3733,7 @@ void EnumType::dumpComprehensiveGetCppuType(FileStream& o)
     o << indent() << "sTypeName.pData,\n"
       << indent() << "(sal_Int32)" << scopedCppName(m_typeName, sal_False)
       << "_"
-      << rtl::OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8)
+      << OUStringToOString(m_reader.getFieldName(0), RTL_TEXTENCODING_UTF8)
       << ",\n"
       << indent() << count << ", enumValueNames, enumValues );\n\n";
     dec();
@@ -3813,7 +3810,7 @@ void TypeDefType::dumpDeclaration(FileStream& o)
     o << "\ntypedef ";
     dumpType(
         o,
-        rtl::OUStringToOString(
+        OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8));
     o << " " << m_name << ";\n\n";
 }
@@ -3845,7 +3842,7 @@ sal_Bool ConstructiveType::dumpHFile(
 }
 
 bool ConstructiveType::dumpFiles(
-    CppuOptions * options, rtl::OString const & outPath)
+    CppuOptions * options, OString const & outPath)
 {
     return dumpFile(options, ".hpp", m_typeName, outPath);
 }
@@ -3905,7 +3902,7 @@ sal_Bool ServiceType::dumpHxxFile(
                     for (sal_uInt16 j = 0; j < params; ++j) {
                         if (codemaker::UnoType::getSort(
                                 codemaker::UnoType::decompose(
-                                    rtl::OUStringToOString(
+                                    OUStringToOString(
                                         m_reader.getMethodParameterTypeName(
                                             i, j),
                                         RTL_TEXTENCODING_UTF8),
@@ -3922,7 +3919,7 @@ sal_Bool ServiceType::dumpHxxFile(
                      ++j)
                 {
                     tree.add(
-                        rtl::OUStringToOString(
+                        OUStringToOString(
                             m_reader.getMethodExceptionTypeName(i, j),
                             RTL_TEXTENCODING_UTF8),
                         m_typeMgr);
@@ -3935,9 +3932,9 @@ sal_Bool ServiceType::dumpHxxFile(
             }
         }
     }
-    rtl::OString cppName(translateUnoToCppIdentifier(
+    OString cppName(translateUnoToCppIdentifier(
                              m_name, "service", isGlobal()));
-    rtl::OString headerDefine(dumpHeaderDefine(o, "HPP"));
+    OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
     includes.dump(o, 0);
     o << "\n";
@@ -3947,12 +3944,12 @@ sal_Bool ServiceType::dumpHxxFile(
     o << "\nclass " << cppName << " {\n";
     inc();
     if (ctors > 0) {
-        rtl::OString fullName(m_typeName.replace('/', '.'));
-        rtl::OString baseName(
-            rtl::OUStringToOString(
+        OString fullName(m_typeName.replace('/', '.'));
+        OString baseName(
+            OUStringToOString(
                 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8));
-        rtl::OString fullBaseName(baseName.replace('/', '.'));
-        rtl::OString scopedBaseName(scopedCppName(baseName));
+        OString fullBaseName(baseName.replace('/', '.'));
+        OString scopedBaseName(scopedCppName(baseName));
         o << "public:\n";
         for (sal_uInt16 i = 0; i < ctors; ++i) {
             if (isDefaultConstructor(i)) {
@@ -3972,7 +3969,7 @@ sal_Bool ServiceType::dumpHxxFile(
                   << "the_instance = ::com::sun::star::uno::Reference< "
                   << scopedBaseName
                   << (" >(the_context->getServiceManager()->"
-                      "createInstanceWithContext(::rtl::OUString("
+                      "createInstanceWithContext(rtl::OUString("
                       " \"")
                   << fullName
                   << "\" ), the_context), ::com::sun::star::uno::UNO_QUERY);\n";
@@ -3988,7 +3985,7 @@ sal_Bool ServiceType::dumpHxxFile(
                 inc();
                 o << indent()
                   << ("throw ::com::sun::star::uno::DeploymentException("
-                      "::rtl::OUString( "
+                      "rtl::OUString( "
                       "\"component context fails to supply service ")
                   << fullName << " of type " << fullBaseName
                   << ": \" ) + the_exception.Message, the_context);\n";
@@ -3998,7 +3995,7 @@ sal_Bool ServiceType::dumpHxxFile(
                 inc();
                 o << indent()
                   << ("throw ::com::sun::star::uno::DeploymentException("
-                      "::rtl::OUString( "
+                      "rtl::OUString( "
                       "\"component context fails to supply service ")
                   << fullName << " of type " << fullBaseName
                   << "\" ), the_context);\n";
@@ -4010,7 +4007,7 @@ sal_Bool ServiceType::dumpHxxFile(
                 o << indent() << "static ::com::sun::star::uno::Reference< "
                   << scopedBaseName << " > "
                   << translateUnoToCppIdentifier(
-                      rtl::OUStringToOString(
+                      OUStringToOString(
                           m_reader.getMethodName(i), RTL_TEXTENCODING_UTF8),
                       "method", ITM_NONGLOBAL, &cppName)
                   << ("(::com::sun::star::uno::Reference<"
@@ -4020,22 +4017,22 @@ sal_Bool ServiceType::dumpHxxFile(
                 bool rest = hasRestParameter(i);
                 for (sal_uInt16 j = 0; j < params; ++j) {
                     o << ", ";
-                    rtl::OStringBuffer buf;
+                    OStringBuffer buf;
                     if ((m_reader.getMethodParameterFlags(i, j) & RT_PARAM_REST)
                         != 0)
                     {
                         buf.append("[]");
                     }
                     buf.append(
-                        rtl::OUStringToOString(
+                        OUStringToOString(
                             m_reader.getMethodParameterTypeName(i, j),
                             RTL_TEXTENCODING_UTF8));
-                    rtl::OString type(buf.makeStringAndClear());
+                    OString type(buf.makeStringAndClear());
                     bool byRef = passByReference(type);
                     dumpType(o, type, byRef, byRef);
                     o << " "
                       << translateUnoToCppIdentifier(
-                          rtl::OUStringToOString(
+                          OUStringToOString(
                               m_reader.getMethodParameterName(i, j),
                               RTL_TEXTENCODING_UTF8),
                           "param", ITM_NONGLOBAL);
@@ -4050,16 +4047,16 @@ sal_Bool ServiceType::dumpHxxFile(
                       << params << ");\n";
                     for (sal_uInt16 j = 0; j < params; ++j) {
                         o << indent() << "the_arguments[" << j << "] ";
-                        rtl::OString param(
+                        OString param(
                             translateUnoToCppIdentifier(
-                                rtl::OUStringToOString(
+                                OUStringToOString(
                                     m_reader.getMethodParameterName(i, j),
                                     RTL_TEXTENCODING_UTF8),
                                 "param", ITM_NONGLOBAL));
                         sal_Int32 rank;
                         if (codemaker::UnoType::getSort(
                                 codemaker::UnoType::decompose(
-                                    rtl::OUStringToOString(
+                                    OUStringToOString(
                                         m_reader.getMethodParameterTypeName(
                                             i, j),
                                         RTL_TEXTENCODING_UTF8),
@@ -4088,7 +4085,7 @@ sal_Bool ServiceType::dumpHxxFile(
                 sal_uInt16 exceptions = m_reader.getMethodExceptionCount(i);
                 for (sal_uInt16 j = 0; j < exceptions; ++j) {
                     tree.add(
-                        rtl::OUStringToOString(
+                        OUStringToOString(
                             m_reader.getMethodExceptionTypeName(i, j),
                             RTL_TEXTENCODING_UTF8),
                         m_typeMgr);
@@ -4101,12 +4098,12 @@ sal_Bool ServiceType::dumpHxxFile(
                   << "the_instance = ::com::sun::star::uno::Reference< "
                   << scopedBaseName
                   << (" >(the_context->getServiceManager()->"
-                      "createInstanceWithArgumentsAndContext(::rtl::OUString("
+                      "createInstanceWithArgumentsAndContext(rtl::OUString("
                       " \"")
                   << fullName << "\" ), ";
                 if (rest) {
                     o << translateUnoToCppIdentifier(
-                        rtl::OUStringToOString(
+                        OUStringToOString(
                             m_reader.getMethodParameterName(i, 0),
                             RTL_TEXTENCODING_UTF8),
                         "param", ITM_NONGLOBAL);
@@ -4132,7 +4129,7 @@ sal_Bool ServiceType::dumpHxxFile(
                     inc();
                     o << indent()
                       << ("throw ::com::sun::star::uno::DeploymentException("
-                          "::rtl::OUString( "
+                          "rtl::OUString( "
                           "\"component context fails to supply service ")
                       << fullName << " of type " << fullBaseName
                       << ": \" ) + the_exception.Message, the_context);\n";
@@ -4143,7 +4140,7 @@ sal_Bool ServiceType::dumpHxxFile(
                 inc();
                 o << indent()
                   << ("throw ::com::sun::star::uno::DeploymentException("
-                      "::rtl::OUString( "
+                      "rtl::OUString( "
                       "\"component context fails to supply service ")
                   << fullName << " of type " << fullBaseName
                   << "\" ), the_context);\n";
@@ -4172,7 +4169,7 @@ void ServiceType::addSpecialDependencies() {
     if (m_reader.getMethodCount() > 0) {
         OSL_ASSERT(m_reader.getSuperTypeCount() == 1);
         m_dependencies.add(
-            rtl::OUStringToOString(
+            OUStringToOString(
                 m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8));
     }
 }
@@ -4213,7 +4210,7 @@ void ServiceType::dumpCatchClauses(
 
 bool SingletonType::isInterfaceBased() {
     return (m_typeMgr->getTypeClass(
-                rtl::OUStringToOString(
+                OUStringToOString(
                     m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8)))
         == RT_TYPE_INTERFACE;
 }
@@ -4222,15 +4219,15 @@ sal_Bool SingletonType::dumpHxxFile(
     FileStream & o, codemaker::cppumaker::Includes & includes)
     throw (CannotDumpException)
 {
-    rtl::OString cppName(translateUnoToCppIdentifier(
+    OString cppName(translateUnoToCppIdentifier(
                              m_name, "singleton", isGlobal()));
-    rtl::OString fullName(m_typeName.replace('/', '.'));
-    rtl::OString baseName(
-        rtl::OUStringToOString(
+    OString fullName(m_typeName.replace('/', '.'));
+    OString baseName(
+        OUStringToOString(
             m_reader.getSuperTypeName(0), RTL_TEXTENCODING_UTF8));
-    rtl::OString fullBaseName(baseName.replace('/', '.'));
-    rtl::OString scopedBaseName(scopedCppName(baseName));
-    rtl::OString headerDefine(dumpHeaderDefine(o, "HPP"));
+    OString fullBaseName(baseName.replace('/', '.'));
+    OString scopedBaseName(scopedCppName(baseName));
+    OString headerDefine(dumpHeaderDefine(o, "HPP"));
     o << "\n";
     //TODO: Decide whether the types added to includes should rather be added to
     // m_dependencies (and thus be generated during dumpDependedTypes):
@@ -4259,12 +4256,12 @@ sal_Bool SingletonType::dumpHxxFile(
       << "::com::sun::star::uno::Reference< " << scopedBaseName
       << " > instance;\n" << indent()
       << ("if (!(the_context->getValueByName("
-          "::rtl::OUString( \"/singletons/")
+          "rtl::OUString( \"/singletons/")
       << fullName << "\" )) >>= instance) || !instance.is()) {\n";
     inc();
     o << indent()
       << ("throw ::com::sun::star::uno::DeploymentException("
-          "::rtl::OUString( \"component context"
+          "rtl::OUString( \"component context"
           " fails to supply singleton ")
       << fullName << " of type " << fullBaseName << "\" ), the_context);\n";
     dec();
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx
index 09d0e5130ffa..9d92a014b8bd 100644
--- a/codemaker/source/cppumaker/cpputype.hxx
+++ b/codemaker/source/cppumaker/cpputype.hxx
@@ -29,7 +29,6 @@
 #include "rtl/ref.hxx"
 #include "rtl/string.hxx"
 
-namespace rtl { class OUString; }
 namespace codemaker {
     namespace cppumaker { class Includes; }
     struct ExceptionTreeNode;
@@ -50,23 +49,23 @@ class CppuType
 {
 public:
     CppuType(typereg::Reader& typeReader,
-             const ::rtl::OString& typeName,
+             const OString& typeName,
              rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~CppuType();
 
     virtual sal_Bool dump(CppuOptions* pOptions) throw( CannotDumpException );
     sal_Bool dumpFile(CppuOptions* pOptions,
-                      const ::rtl::OString& sExtension,
-                      const ::rtl::OString& sName,
-                      const ::rtl::OString& sOutPath )
+                      const OString& sExtension,
+                      const OString& sName,
+                      const OString& sOutPath )
         throw( CannotDumpException );
     void dumpDependedTypes(
         codemaker::GeneratedTypeSet & generated, CppuOptions * options);
     virtual sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0;
     virtual sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ) = 0;
 
-    ::rtl::OString dumpHeaderDefine(
+    OString dumpHeaderDefine(
         FileStream& o, char const * prefix, sal_Bool bExtended=sal_False);
 
     void dumpGetCppuType(FileStream & out);
@@ -74,13 +73,13 @@ public:
     virtual void dumpNormalGetCppuType(FileStream& o);
     virtual void dumpComprehensiveGetCppuType(FileStream& o);
 
-    virtual void dumpType(FileStream& o, const ::rtl::OString& type, bool bConst=false,
+    virtual void dumpType(FileStream& o, const OString& type, bool bConst=false,
                           bool bRef=false, bool bNative=false, bool cppuUnoType=false)
         const throw( CannotDumpException );
-    ::rtl::OString  getTypeClass(const ::rtl::OString& type="", sal_Bool bCStyle=sal_False);
-    void    dumpCppuGetType(FileStream& o, const ::rtl::OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
+    OString  getTypeClass(const OString& type="", sal_Bool bCStyle=sal_False);
+    void    dumpCppuGetType(FileStream& o, const OString& type, sal_Bool bDecl=sal_False, CppuTypeDecl eDeclFlag=CPPUTYPEDECL_ALLTYPES);
 
-    ::rtl::OString typeToIdentifier(const ::rtl::OString& type);
+    OString typeToIdentifier(const OString& type);
 
     void    dumpConstantValue(FileStream& o, sal_uInt16 index);
 
@@ -89,15 +88,15 @@ public:
 
     void            inc(sal_Int32 num=4);
     void            dec(sal_Int32 num=4);
-    ::rtl::OString  indent() const;
+    OString  indent() const;
 protected:
     virtual sal_uInt32 checkInheritedMemberCount(
         const typereg::Reader* pReader);
 
-    bool passByReference(rtl::OString const & unoType);
+    bool passByReference(OString const & unoType);
 
-    ::rtl::OString  resolveTypedefs(const ::rtl::OString& type) const;
-    ::rtl::OString  checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const;
+    OString  resolveTypedefs(const OString& type) const;
+    OString  checkRealBaseType(const OString& type, sal_Bool bResolveTypeOnly = sal_False) const;
     void    dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag);
 
     codemaker::cpp::IdentifierTranslationMode isGlobal() const;
@@ -106,7 +105,7 @@ protected:
 
     virtual void addSpecialDependencies() {}
 
-    virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath);
+    virtual bool dumpFiles(CppuOptions * options, OString const & outPath);
 
     virtual void addLightGetCppuTypeIncludes(
         codemaker::cppumaker::Includes & includes) const;
@@ -131,7 +130,7 @@ protected:
     void addDefaultHxxIncludes(codemaker::cppumaker::Includes & includes) const;
 
     void dumpInitializer(
-        FileStream & out, bool parameterized, rtl::OUString const & type) const;
+        FileStream & out, bool parameterized, OUString const & type) const;
 
     void dumpHFileContent(
         FileStream & out, codemaker::cppumaker::Includes & includes);
@@ -142,8 +141,8 @@ protected:
     bool                m_cppuTypeLeak;
     bool                m_cppuTypeDynamic;
     sal_Int32           m_indentLength;
-    ::rtl::OString      m_typeName;
-    ::rtl::OString      m_name;
+    OString      m_typeName;
+    OString      m_name;
     typereg::Reader     m_reader;
     rtl::Reference< TypeManager > m_typeMgr;
     codemaker::Dependencies m_dependencies;
@@ -157,7 +156,7 @@ class InterfaceType : public CppuType
 {
 public:
     InterfaceType(typereg::Reader& typeReader,
-                 const ::rtl::OString& typeName,
+                 const OString& typeName,
                   rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~InterfaceType();
@@ -199,18 +198,18 @@ private:
         FileStream & out, sal_uInt32 methodIndex, bool runtimeException);
 
     void dumpAttributeExceptionSpecification(
-        FileStream & out, rtl::OUString const & name, RTMethodMode sort);
+        FileStream & out, OUString const & name, RTMethodMode sort);
 
     void dumpExceptionTypeName(
         FileStream & out, char const * prefix, sal_uInt32 index,
-        rtl::OUString name);
+        OUString name);
 
     sal_Int32 dumpExceptionTypeNames(
         FileStream & out, char const * prefix, sal_uInt16 methodIndex,
         bool runtimeException);
 
     sal_Int32 dumpAttributeExceptionTypeNames(
-        FileStream & out, char const * prefix, rtl::OUString const & name,
+        FileStream & out, char const * prefix, OUString const & name,
         RTMethodMode sort);
 };
 
@@ -218,7 +217,7 @@ class ConstantsType : public CppuType
 {
 public:
     ConstantsType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
+                  const OString& typeName,
                   rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~ConstantsType();
@@ -235,20 +234,20 @@ class ModuleType : public ConstantsType
 {
 public:
     ModuleType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
+                  const OString& typeName,
                rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~ModuleType();
 
 protected:
-    virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath);
+    virtual bool dumpFiles(CppuOptions * options, OString const & outPath);
 };
 
 class StructureType : public CppuType
 {
 public:
     StructureType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
+                  const OString& typeName,
                   rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~StructureType();
@@ -263,7 +262,7 @@ public:
 
     virtual void dumpComprehensiveGetCppuType(FileStream & out);
 
-    sal_Bool    dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
+    sal_Bool    dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType);
 
 protected:
     virtual void addLightGetCppuTypeIncludes(
@@ -286,7 +285,7 @@ class ExceptionType : public CppuType
 {
 public:
     ExceptionType(typereg::Reader& typeReader,
-                  const ::rtl::OString& typeName,
+                  const OString& typeName,
                   rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~ExceptionType();
@@ -295,14 +294,14 @@ public:
     sal_Bool    dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
     sal_Bool    dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException );
 
-    sal_Bool    dumpSuperMember(FileStream& o, const ::rtl::OString& super, sal_Bool bWithType);
+    sal_Bool    dumpSuperMember(FileStream& o, const OString& super, sal_Bool bWithType);
 };
 
 class EnumType : public CppuType
 {
 public:
     EnumType(typereg::Reader& typeReader,
-              const ::rtl::OString& typeName,
+              const OString& typeName,
              rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~EnumType();
@@ -319,7 +318,7 @@ class TypeDefType : public CppuType
 {
 public:
     TypeDefType(typereg::Reader& typeReader,
-              const ::rtl::OString& typeName,
+              const OString& typeName,
                 rtl::Reference< TypeManager > const & typeMgr);
 
     virtual ~TypeDefType();
@@ -332,7 +331,7 @@ public:
 class ConstructiveType: public CppuType {
 public:
     ConstructiveType(
-        typereg::Reader & reader, rtl::OString const & name,
+        typereg::Reader & reader, OString const & name,
         rtl::Reference< TypeManager > const & manager):
         CppuType(reader, name, manager) {}
 
@@ -341,13 +340,13 @@ public:
         throw (CannotDumpException);
 
 protected:
-    virtual bool dumpFiles(CppuOptions * options, rtl::OString const & outPath);
+    virtual bool dumpFiles(CppuOptions * options, OString const & outPath);
 };
 
 class ServiceType: public ConstructiveType {
 public:
     ServiceType(
-        typereg::Reader & reader, rtl::OString const & name,
+        typereg::Reader & reader, OString const & name,
         rtl::Reference< TypeManager > const & manager):
         ConstructiveType(reader, name, manager) {}
 
@@ -371,7 +370,7 @@ private:
 class SingletonType: public ConstructiveType {
 public:
     SingletonType(
-        typereg::Reader & reader, rtl::OString const & name,
+        typereg::Reader & reader, OString const & name,
         rtl::Reference< TypeManager > const & manager):
         ConstructiveType(reader, name, manager) {}
 
@@ -382,7 +381,7 @@ public:
         throw (CannotDumpException);
 };
 
-bool produceType(const ::rtl::OString& typeName,
+bool produceType(const OString& typeName,
                  rtl::Reference< TypeManager > const & typeMgr,
                      codemaker::GeneratedTypeSet & generated,
                      CppuOptions* pOptions)
diff --git a/codemaker/source/cppumaker/dumputils.cxx b/codemaker/source/cppumaker/dumputils.cxx
index a92aaf5ecc5e..bc1781314789 100644
--- a/codemaker/source/cppumaker/dumputils.cxx
+++ b/codemaker/source/cppumaker/dumputils.cxx
@@ -30,13 +30,13 @@
 namespace codemaker { namespace cppumaker {
 
 bool dumpNamespaceOpen(
-    FileStream & out, rtl::OString const & registryType, bool fullModuleType)
+    FileStream & out, OString const & registryType, bool fullModuleType)
 {
     bool output = false;
     if (registryType != "/") {
         bool first = true;
         for (sal_Int32 i = 0; i >= 0;) {
-            rtl::OString id(registryType.getToken(0, '/', i));
+            OString id(registryType.getToken(0, '/', i));
             if (fullModuleType || i >= 0) {
                 if (!first) {
                     out << " ";
@@ -51,7 +51,7 @@ bool dumpNamespaceOpen(
 }
 
 bool dumpNamespaceClose(
-    FileStream & out, rtl::OString const & registryType, bool fullModuleType)
+    FileStream & out, OString const & registryType, bool fullModuleType)
 {
     bool output = false;
     if (registryType != "/") {
@@ -74,7 +74,7 @@ bool dumpNamespaceClose(
     return output;
 }
 
-void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType) {
+void dumpTypeIdentifier(FileStream & out, OString const & registryType) {
     out << registryType.copy(registryType.lastIndexOf('/') + 1);
 }
 
diff --git a/codemaker/source/cppumaker/dumputils.hxx b/codemaker/source/cppumaker/dumputils.hxx
index 5705d6a1abea..855e412534de 100644
--- a/codemaker/source/cppumaker/dumputils.hxx
+++ b/codemaker/source/cppumaker/dumputils.hxx
@@ -20,18 +20,19 @@
 #ifndef INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX
 #define INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_DUMPUTILS_HXX
 
-namespace rtl { class OString; }
+#include <rtl/ustring.hxx>
+
 class FileStream;
 
 namespace codemaker { namespace cppumaker {
 
 bool dumpNamespaceOpen(
-    FileStream & out, rtl::OString const & registryType, bool fullModuleType);
+    FileStream & out, OString const & registryType, bool fullModuleType);
 
 bool dumpNamespaceClose(
-    FileStream & out, rtl::OString const & registryType, bool fullModuleType);
+    FileStream & out, OString const & registryType, bool fullModuleType);
 
-void dumpTypeIdentifier(FileStream & out, rtl::OString const & registryType);
+void dumpTypeIdentifier(FileStream & out, OString const & registryType);
 
 } }
 
diff --git a/codemaker/source/cppumaker/includes.cxx b/codemaker/source/cppumaker/includes.cxx
index 0b0f83b869b7..34f23e954bf1 100644
--- a/codemaker/source/cppumaker/includes.cxx
+++ b/codemaker/source/cppumaker/includes.cxx
@@ -68,10 +68,10 @@ Includes::Includes(
 Includes::~Includes()
 {}
 
-void Includes::add(rtl::OString const & registryType) {
+void Includes::add(OString const & registryType) {
     sal_Int32 rank;
-    std::vector< rtl::OString > args;
-    rtl::OString type(
+    std::vector< OString > args;
+    OString type(
         codemaker::UnoType::decompose(registryType, &rank, &args));
     if (rank > 0) {
         m_includeSequence = true;
@@ -119,7 +119,7 @@ void Includes::add(rtl::OString const & registryType) {
         m_map.insert(
             codemaker::Dependencies::Map::value_type(
                 type, codemaker::Dependencies::KIND_NO_BASE));
-        for (std::vector< rtl::OString >::iterator i(args.begin());
+        for (std::vector< OString >::iterator i(args.begin());
              i != args.end(); ++i)
         {
             add(*i);
@@ -144,7 +144,7 @@ void dumpEmptyLineBeforeFirst(FileStream & out, bool * first) {
 
 }
 
-void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
+void Includes::dump(FileStream & out, OString const * companionHdl) {
     OSL_ASSERT(companionHdl == 0 || m_hpp);
     if (!m_includeReference) {
         for (codemaker::Dependencies::Map::iterator i(m_map.begin());
@@ -264,8 +264,8 @@ void Includes::dump(FileStream & out, rtl::OString const * companionHdl) {
 }
 
 void Includes::dumpInclude(
-    FileStream & out, rtl::OString const & registryType, bool hpp,
-    rtl::OString const & suffix)
+    FileStream & out, OString const & registryType, bool hpp,
+    OString const & suffix)
 {
     static char const * extension[2] = { "hdl", "hpp" };
     out << "#include \"" << registryType;
@@ -275,7 +275,7 @@ void Includes::dumpInclude(
     out << "." << extension[hpp] << "\"\n";
 }
 
-bool Includes::isInterfaceType(rtl::OString const & registryType) const {
+bool Includes::isInterfaceType(OString const & registryType) const {
     return m_manager->getTypeClass(registryType) == RT_TYPE_INTERFACE;
 }
 
diff --git a/codemaker/source/cppumaker/includes.hxx b/codemaker/source/cppumaker/includes.hxx
index 8fdf44589844..80b842cd09d9 100644
--- a/codemaker/source/cppumaker/includes.hxx
+++ b/codemaker/source/cppumaker/includes.hxx
@@ -37,7 +37,7 @@ public:
 
     ~Includes();
 
-    void add(rtl::OString const & registryType);
+    void add(OString const & registryType);
     void addCassert() { m_includeCassert = true; }
     void addAny() { m_includeAny = true; }
     void addReference() { m_includeReference = true; }
@@ -59,17 +59,17 @@ public:
     void addTypelibTypeclassH() { m_includeTypelibTypeclassH = true; }
     void addTypelibTypedescriptionH()
         { m_includeTypelibTypedescriptionH = true; }
-    void dump(FileStream & out, rtl::OString const * companionHdl);
+    void dump(FileStream & out, OString const * companionHdl);
 
     static void dumpInclude(
-        FileStream & out, rtl::OString const & registryType, bool hpp,
-        rtl::OString const & suffix = rtl::OString());
+        FileStream & out, OString const & registryType, bool hpp,
+        OString const & suffix = OString());
 
 private:
     Includes(Includes &); // not implemented
     void operator =(Includes); // not implemented;
 
-    bool isInterfaceType(rtl::OString const & registryType) const;
+    bool isInterfaceType(OString const & registryType) const;
 
     rtl::Reference< TypeManager > m_manager;
     codemaker::Dependencies::Map m_map;
diff --git a/codemaker/source/javamaker/classfile.cxx b/codemaker/source/javamaker/classfile.cxx
index 0f115b20b4bf..c427e96952ae 100644
--- a/codemaker/source/javamaker/classfile.cxx
+++ b/codemaker/source/javamaker/classfile.cxx
@@ -121,7 +121,7 @@ void ClassFile::Code::instrAconstNull() {
     appendU1(m_code, 0x01);
 }
 
-void ClassFile::Code::instrAnewarray(rtl::OString const & type) {
+void ClassFile::Code::instrAnewarray(OString const & type) {
     // anewarray <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xBD);
     appendU2(m_code, m_classFile.addClassInfo(type));
@@ -137,7 +137,7 @@ void ClassFile::Code::instrAthrow() {
     appendU1(m_code, 0xBF);
 }
 
-void ClassFile::Code::instrCheckcast(rtl::OString const & type) {
+void ClassFile::Code::instrCheckcast(OString const & type) {
     // checkcast <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xC0);
     appendU2(m_code, m_classFile.addClassInfo(type));
@@ -149,8 +149,8 @@ void ClassFile::Code::instrDup() {
 }
 
 void ClassFile::Code::instrGetstatic(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // getstatic <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB2);
@@ -181,15 +181,15 @@ ClassFile::Code::Branch ClassFile::Code::instrIfnull() {
     return branch;
 }
 
-void ClassFile::Code::instrInstanceof(rtl::OString const & type) {
+void ClassFile::Code::instrInstanceof(OString const & type) {
     // instanceof <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xC1);
     appendU2(m_code, m_classFile.addClassInfo(type));
 }
 
 void ClassFile::Code::instrInvokeinterface(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor, sal_uInt8 args)
+    OString const & type, OString const & name,
+    OString const & descriptor, sal_uInt8 args)
 {
     // invokeinterface <indexbyte1> <indexbyte2> <nargs> 0:
     appendU1(m_code, 0xB9);
@@ -200,8 +200,8 @@ void ClassFile::Code::instrInvokeinterface(
 }
 
 void ClassFile::Code::instrInvokespecial(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // invokespecial <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB7);
@@ -209,8 +209,8 @@ void ClassFile::Code::instrInvokespecial(
 }
 
 void ClassFile::Code::instrInvokestatic(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // invokestatic <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB8);
@@ -218,8 +218,8 @@ void ClassFile::Code::instrInvokestatic(
 }
 
 void ClassFile::Code::instrInvokevirtual(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // invokevirtual <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB6);
@@ -265,7 +265,7 @@ void ClassFile::Code::instrLookupswitch(
     }
 }
 
-void ClassFile::Code::instrNew(rtl::OString const & type) {
+void ClassFile::Code::instrNew(OString const & type) {
     // new <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xBB);
     appendU2(m_code, m_classFile.addClassInfo(type));
@@ -288,8 +288,8 @@ void ClassFile::Code::instrPop() {
 }
 
 void ClassFile::Code::instrPutfield(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // putfield <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB5);
@@ -297,8 +297,8 @@ void ClassFile::Code::instrPutfield(
 }
 
 void ClassFile::Code::instrPutstatic(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     // putstatic <indexbyte1> <indexbyte2>:
     appendU1(m_code, 0xB3);
@@ -374,7 +374,7 @@ void ClassFile::Code::loadIntegerConstant(sal_Int32 value) {
     }
 }
 
-void ClassFile::Code::loadStringConstant(rtl::OString const & value) {
+void ClassFile::Code::loadStringConstant(OString const & value) {
     ldc(m_classFile.addStringInfo(value));
 }
 
@@ -411,7 +411,7 @@ void ClassFile::Code::branchHere(Branch branch) {
 }
 
 void ClassFile::Code::addException(
-    Position start, Position end, Position handler, rtl::OString const & type)
+    Position start, Position end, Position handler, OString const & type)
 {
     OSL_ASSERT(start < end && end <= m_code.size() && handler <= m_code.size());
     if (m_exceptionTableLength == SAL_MAX_UINT16) {
@@ -466,8 +466,8 @@ void ClassFile::Code::accessLocal(
 }
 
 ClassFile::ClassFile(
-    AccessFlags accessFlags, rtl::OString const & thisClass,
-    rtl::OString const & superClass, rtl::OString const & signature):
+    AccessFlags accessFlags, OString const & thisClass,
+    OString const & superClass, OString const & signature):
     m_constantPoolCount(1), m_accessFlags(accessFlags), m_interfacesCount(0),
     m_fieldsCount(0), m_methodsCount(0), m_attributesCount(0)
 {
@@ -555,7 +555,7 @@ sal_uInt16 ClassFile::addDoubleInfo(double value) {
     return index;
 }
 
-void ClassFile::addInterface(rtl::OString const & interface) {
+void ClassFile::addInterface(OString const & interface) {
     if (m_interfacesCount == SAL_MAX_UINT16) {
         throw CannotDumpException("Too many interfaces for Java class file format");
     }
@@ -564,9 +564,9 @@ void ClassFile::addInterface(rtl::OString const & interface) {
 }
 
 void ClassFile::addField(
-    AccessFlags accessFlags, rtl::OString const & name,
-    rtl::OString const & descriptor, sal_uInt16 constantValueIndex,
-    rtl::OString const & signature)
+    AccessFlags accessFlags, OString const & name,
+    OString const & descriptor, sal_uInt16 constantValueIndex,
+    OString const & signature)
 {
     if (m_fieldsCount == SAL_MAX_UINT16) {
         throw CannotDumpException("Too many fields for Java class file format");
@@ -588,10 +588,10 @@ void ClassFile::addField(
 }
 
 void ClassFile::addMethod(
-    AccessFlags accessFlags, rtl::OString const & name,
-    rtl::OString const & descriptor, Code const * code,
-    std::vector< rtl::OString > const & exceptions,
-    rtl::OString const & signature)
+    AccessFlags accessFlags, OString const & name,
+    OString const & descriptor, Code const * code,
+    std::vector< OString > const & exceptions,
+    OString const & signature)
 {
     if (m_methodsCount == SAL_MAX_UINT16) {
         throw CannotDumpException("Too many methods for Java class file format");
@@ -600,7 +600,7 @@ void ClassFile::addMethod(
     appendU2(m_methods, static_cast< sal_uInt16 >(accessFlags));
     appendU2(m_methods, addUtf8Info(name));
     appendU2(m_methods, addUtf8Info(descriptor));
-    std::vector< rtl::OString >::size_type excs = exceptions.size();
+    std::vector< OString >::size_type excs = exceptions.size();
     if (excs > SAL_MAX_UINT16) {
         throw CannotDumpException("Too many exception specifications for Java class file format");
     }
@@ -638,7 +638,7 @@ void ClassFile::addMethod(
             m_methods,
             static_cast< sal_uInt32 >(2 + 2 * static_cast< sal_uInt32 >(excs)));
         appendU2(m_methods, static_cast< sal_uInt16 >(excs));
-        for (std::vector< rtl::OString >::const_iterator i(exceptions.begin());
+        for (std::vector< OString >::const_iterator i(exceptions.begin());
              i != exceptions.end(); ++i)
         {
             appendU2(m_methods, addClassInfo(*i));
@@ -676,8 +676,8 @@ sal_uInt16 ClassFile::nextConstantPoolIndex(sal_uInt16 width) {
     return index;
 }
 
-sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) {
-    std::map< rtl::OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value));
+sal_uInt16 ClassFile::addUtf8Info(OString const & value) {
+    std::map< OString, sal_uInt16 >::iterator i(m_utf8Infos.find(value));
     if (i != m_utf8Infos.end()) {
         return i->second;
     }
@@ -691,7 +691,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) {
         appendU1(m_constantPool, static_cast< sal_uInt8 >(value[j]));
     }
     if (!m_utf8Infos.insert(
-            std::map< rtl::OString, sal_uInt16 >::value_type(value, index)).
+            std::map< OString, sal_uInt16 >::value_type(value, index)).
         second)
     {
         OSL_ASSERT(false);
@@ -699,7 +699,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) {
     return index;
 }
 
-sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) {
+sal_uInt16 ClassFile::addClassInfo(OString const & type) {
     sal_uInt16 nameIndex = addUtf8Info(type);
     std::map< sal_uInt16, sal_uInt16 >::iterator i(
         m_classInfos.find(nameIndex));
@@ -718,7 +718,7 @@ sal_uInt16 ClassFile::addClassInfo(rtl::OString const & type) {
     return index;
 }
 
-sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) {
+sal_uInt16 ClassFile::addStringInfo(OString const & value) {
     sal_uInt16 stringIndex = addUtf8Info(value);
     std::map< sal_uInt16, sal_uInt16 >::iterator i(
         m_stringInfos.find(stringIndex));
@@ -738,8 +738,8 @@ sal_uInt16 ClassFile::addStringInfo(rtl::OString const & value) {
 }
 
 sal_uInt16 ClassFile::addFieldrefInfo(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     sal_uInt16 classIndex = addClassInfo(type);
     sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor);
@@ -762,8 +762,8 @@ sal_uInt16 ClassFile::addFieldrefInfo(
 }
 
 sal_uInt16 ClassFile::addMethodrefInfo(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     sal_uInt16 classIndex = addClassInfo(type);
     sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor);
@@ -786,8 +786,8 @@ sal_uInt16 ClassFile::addMethodrefInfo(
 }
 
 sal_uInt16 ClassFile::addInterfaceMethodrefInfo(
-    rtl::OString const & type, rtl::OString const & name,
-    rtl::OString const & descriptor)
+    OString const & type, OString const & name,
+    OString const & descriptor)
 {
     sal_uInt16 classIndex = addClassInfo(type);
     sal_uInt16 nameAndTypeIndex = addNameAndTypeInfo(name, descriptor);
@@ -811,7 +811,7 @@ sal_uInt16 ClassFile::addInterfaceMethodrefInfo(
 }
 
 sal_uInt16 ClassFile::addNameAndTypeInfo(
-    rtl::OString const & name, rtl::OString const & descriptor)
+    OString const & name, OString const & descriptor)
 {
     sal_uInt16 nameIndex = addUtf8Info(name);
     sal_uInt16 descriptorIndex = addUtf8Info(descriptor);
@@ -835,7 +835,7 @@ sal_uInt16 ClassFile::addNameAndTypeInfo(
 }
 
 void ClassFile::appendSignatureAttribute(
-    std::vector< unsigned char > & stream, rtl::OString const & signature)
+    std::vector< unsigned char > & stream, OString const & signature)
 {
     if (!signature.isEmpty()) {
         appendU2(stream, addUtf8Info("Signature"));
diff --git a/codemaker/source/javamaker/classfile.hxx b/codemaker/source/javamaker/classfile.hxx
index 18913c22ebb2..488660b7a175 100644
--- a/codemaker/source/javamaker/classfile.hxx
+++ b/codemaker/source/javamaker/classfile.hxx
@@ -29,7 +29,6 @@
 #include <vector>
 
 class FileStream;
-namespace rtl { class OString; }
 
 namespace codemaker { namespace javamaker {
 
@@ -56,53 +55,53 @@ public:
 
         void instrAastore();
         void instrAconstNull();
-        void instrAnewarray(rtl::OString const & type);
+        void instrAnewarray(OString const & type);
         void instrAreturn();
         void instrAthrow();
-        void instrCheckcast(rtl::OString const & type);
+        void instrCheckcast(OString const & type);
         void instrDup();
 
         void instrGetstatic(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         Branch instrIfAcmpne();
         Branch instrIfeq();
         Branch instrIfnull();
 
-        void instrInstanceof(rtl::OString const & type);
+        void instrInstanceof(OString const & type);
 
         void instrInvokeinterface(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor, sal_uInt8 args);
+            OString const & type, OString const & name,
+            OString const & descriptor, sal_uInt8 args);
 
         void instrInvokespecial(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         void instrInvokestatic(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         void instrInvokevirtual(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         void instrLookupswitch(
             Code const * defaultBlock,
             std::list< std::pair< sal_Int32, Code * > > const & blocks);
 
-        void instrNew(rtl::OString const & type);
+        void instrNew(OString const & type);
         void instrNewarray(codemaker::UnoType::Sort sort);
         void instrPop();
 
         void instrPutfield(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         void instrPutstatic(
-            rtl::OString const & type, rtl::OString const & name,
-            rtl::OString const & descriptor);
+            OString const & type, OString const & name,
+            OString const & descriptor);
 
         void instrReturn();
         void instrSwap();
@@ -112,7 +111,7 @@ public:
             std::list< Code * > const & blocks);
 
         void loadIntegerConstant(sal_Int32 value);
-        void loadStringConstant(rtl::OString const & value);
+        void loadStringConstant(OString const & value);
         void loadLocalInteger(sal_uInt16 index);
         void loadLocalLong(sal_uInt16 index);
         void loadLocalFloat(sal_uInt16 index);
@@ -123,7 +122,7 @@ public:
 
         void addException(
             Position start, Position end, Position handler,
-            rtl::OString const & type);
+            OString const & type);
 
         void setMaxStackAndLocals(sal_uInt16 maxStack, sal_uInt16 maxLocals)
         { m_maxStack = maxStack; m_maxLocals = maxLocals; }
@@ -152,8 +151,8 @@ public:
     };
 
     ClassFile(
-        AccessFlags accessFlags, rtl::OString const & thisClass,
-        rtl::OString const & superClass, rtl::OString const & signature);
+        AccessFlags accessFlags, OString const & thisClass,
+        OString const & superClass, OString const & signature);
 
     ~ClassFile();
 
@@ -164,53 +163,53 @@ public:
     sal_uInt16 addLongInfo(sal_Int64 value);
     sal_uInt16 addDoubleInfo(double value);
 
-    void addInterface(rtl::OString const & interface);
+    void addInterface(OString const & interface);
 
     void addField(
-        AccessFlags accessFlags, rtl::OString const & name,
-        rtl::OString const & descriptor, sal_uInt16 constantValueIndex,
-        rtl::OString const & signature);
+        AccessFlags accessFlags, OString const & name,
+        OString const & descriptor, sal_uInt16 constantValueIndex,
+        OString const & signature);
 
     void addMethod(
-        AccessFlags accessFlags, rtl::OString const & name,
-        rtl::OString const & descriptor, Code const * code,
-        std::vector< rtl::OString > const & exceptions,
-        rtl::OString const & signature);
+        AccessFlags accessFlags, OString const & name,
+        OString const & descriptor, Code const * code,
+        std::vector< OString > const & exceptions,
+        OString const & signature);
 
     void write(FileStream & file) const; //TODO
 
 private:
-    typedef std::map< rtl::OString, sal_uInt16 > Map;
+    typedef std::map< OString, sal_uInt16 > Map;
 
     ClassFile(ClassFile &); // not implemented
     void operator =(ClassFile); // not implemented
 
     sal_uInt16 nextConstantPoolIndex(sal_uInt16 width);
-    sal_uInt16 addUtf8Info(rtl::OString const & value);
-    sal_uInt16 addClassInfo(rtl::OString const & type);
-    sal_uInt16 addStringInfo(rtl::OString const & value);
+    sal_uInt16 addUtf8Info(OString const & value);
+    sal_uInt16 addClassInfo(OString const & type);
+    sal_uInt16 addStringInfo(OString const & value);
 
     sal_uInt16 addFieldrefInfo(
-        rtl::OString const & type, rtl::OString const & name,
-        rtl::OString const & descriptor);
+        OString const & type, OString const & name,
+        OString const & descriptor);
 
     sal_uInt16 addMethodrefInfo(
-        rtl::OString const & type, rtl::OString const & name,
-        rtl::OString const & descriptor);
+        OString const & type, OString const & name,
+        OString const & descriptor);
 
     sal_uInt16 addInterfaceMethodrefInfo(
-        rtl::OString const & type, rtl::OString const & name,
-        rtl::OString const & descriptor);
+        OString const & type, OString const & name,
+        OString const & descriptor);
 
     sal_uInt16 addNameAndTypeInfo(
-        rtl::OString const & name, rtl::OString const & descriptor);
+        OString const & name, OString const & descriptor);
 
     void appendSignatureAttribute(
-        std::vector< unsigned char > & stream, rtl::OString const & signature);
+        std::vector< unsigned char > & stream, OString const & signature);
 
     sal_uInt16 m_constantPoolCount;
     std::vector< unsigned char > m_constantPool;
-    std::map< rtl::OString, sal_uInt16 > m_utf8Infos;
+    std::map< OString, sal_uInt16 > m_utf8Infos;
     std::map< sal_Int32, sal_uInt16 > m_integerInfos;
     std::map< sal_Int64, sal_uInt16 > m_longInfos;
     std::map< float, sal_uInt16 > m_floatInfos;
diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx
index 549913f9177c..912285ab2f6e 100644
--- a/codemaker/source/javamaker/javamaker.cxx
+++ b/codemaker/source/javamaker/javamaker.cxx
@@ -28,8 +28,6 @@
 #include "javaoptions.hxx"
 #include "javatype.hxx"
 
-using ::rtl::OUString;
-using ::rtl::OString;
 sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType,
                          rtl::Reference< TypeManager > const & typeMgr,
                          codemaker::GeneratedTypeSet & generated,
diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx
index addb793a5fa5..fa90256834c3 100644
--- a/codemaker/source/javamaker/javaoptions.cxx
+++ b/codemaker/source/javamaker/javaoptions.cxx
@@ -23,9 +23,6 @@
 #include "osl/process.h"
 #include "osl/thread.h"
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 #ifdef SAL_UNX
 #define SEPARATOR '/'
diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx
index 618e3c2db014..128ebbcd4d6e 100644
--- a/codemaker/source/javamaker/javaoptions.hxx
+++ b/codemaker/source/javamaker/javaoptions.hxx
@@ -33,9 +33,9 @@ public:
     sal_Bool initOptions(int ac, char* av[], sal_Bool bCmdFile=sal_False)
             throw( IllegalArgument );
 
-    ::rtl::OString  prepareHelp();
+    OString  prepareHelp();
 
-    ::rtl::OString  prepareVersion();
+    OString  prepareVersion();
 
 protected:
 };
diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx
index 61366192a04f..77d3042ac8da 100644
--- a/codemaker/source/javamaker/javatype.cxx
+++ b/codemaker/source/javamaker/javatype.cxx
@@ -59,8 +59,8 @@ namespace {
 
 // helper function for createUnoName
 void appendUnoName(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank,
-    std::vector< rtl::OString > const & arguments, rtl::OStringBuffer * buffer)
+    rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank,
+    std::vector< OString > const & arguments, OStringBuffer * buffer)
 {
     OSL_ASSERT(rank >= 0 && buffer != 0);
     for (sal_Int32 i = 0; i < rank; ++i) {
@@ -69,16 +69,16 @@ void appendUnoName(
     buffer->append(nucleus.replace('/', '.'));
     if (!arguments.empty()) {
         buffer->append('<');
-        for (std::vector< rtl::OString >::const_iterator i(arguments.begin());
+        for (std::vector< OString >::const_iterator i(arguments.begin());
              i != arguments.end(); ++i)
         {
             if (i != arguments.begin()) {
                 buffer->append(',');
             }
             RTTypeClass argTypeClass;
-            rtl::OString argNucleus;
+            OString argNucleus;
             sal_Int32 argRank;
-            std::vector< rtl::OString > argArgs;
+            std::vector< OString > argArgs;
             codemaker::decomposeAndResolve(
                 manager, *i, true, false, false, &argTypeClass, &argNucleus,
                 &argRank, &argArgs);
@@ -91,11 +91,11 @@ void appendUnoName(
 // Translate the name of a UNO type registry entity (enum type, plain struct
 // type, polymorphic struct type template, or interface type, decomposed into
 // nucleus, rank, and arguments) into a core UNO type name:
-rtl::OString createUnoName(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & nucleus, sal_Int32 rank,
-    std::vector< rtl::OString > const & arguments)
+OString createUnoName(
+    rtl::Reference< TypeManager > const & manager, OString const & nucleus, sal_Int32 rank,
+    std::vector< OString > const & arguments)
 {
-    rtl::OStringBuffer buf;
+    OStringBuffer buf;
     appendUnoName(manager, nucleus, rank, arguments, &buf);
     return buf.makeStringAndClear();
 }
@@ -109,7 +109,7 @@ rtl::OString createUnoName(
    constant groupds, single-interface--based services, accumulation-based
    services, interface-based singletons, and service-based singletons.
  */
-typedef std::set< rtl::OString > Dependencies;
+typedef std::set< OString > Dependencies;
 
 enum SpecialType {
     SPECIAL_TYPE_NONE,
@@ -122,8 +122,8 @@ bool isSpecialType(SpecialType special) {
     return special >= SPECIAL_TYPE_UNSIGNED;
 }
 
-rtl::OString translateUnoTypeToJavaFullyQualifiedName(
-    rtl::OString const & type, rtl::OString const & prefix)
+OString translateUnoTypeToJavaFullyQualifiedName(
+    OString const & type, OString const & prefix)
 {
     sal_Int32 i = type.lastIndexOf('/') + 1;
     return type.copy(0, i) +
@@ -135,22 +135,22 @@ struct PolymorphicUnoType {
 
     enum Kind { KIND_NONE, KIND_STRUCT, KIND_SEQUENCE };
     Kind kind;
-    rtl::OString name;
+    OString name;
 };
 
 SpecialType translateUnoTypeToDescriptor(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool array, bool classType, Dependencies * dependencies,
-    rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature,
+    OStringBuffer * descriptor, OStringBuffer * signature,
     bool * needsSignature, PolymorphicUnoType * polymorphicUnoType);
 
 SpecialType translateUnoTypeToDescriptor(
     rtl::Reference< TypeManager > const & manager,
     codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-    rtl::OString const & nucleus, sal_Int32 rank,
-    std::vector< rtl::OString > const & arguments, bool array, bool classType,
-    Dependencies * dependencies, rtl::OStringBuffer * descriptor,
-    rtl::OStringBuffer * signature, bool * needsSignature,
+    OString const & nucleus, sal_Int32 rank,
+    std::vector< OString > const & arguments, bool array, bool classType,
+    Dependencies * dependencies, OStringBuffer * descriptor,
+    OStringBuffer * signature, bool * needsSignature,
     PolymorphicUnoType * polymorphicUnoType)
 {
     OSL_ASSERT(rank >= 0 && (signature == 0) == (needsSignature == 0));
@@ -193,7 +193,7 @@ SpecialType translateUnoTypeToDescriptor(
                 signature->append("L" + nucleus);
                 if (!arguments.empty()) {
                     signature->append('<');
-                    for (std::vector< rtl::OString >::const_iterator i(
+                    for (std::vector< OString >::const_iterator i(
                              arguments.begin());
                          i != arguments.end(); ++i)
                     {
@@ -220,7 +220,7 @@ SpecialType translateUnoTypeToDescriptor(
             return SPECIAL_TYPE_NONE;
         }
     } else {
-        static rtl::OString const
+        static OString const
             simpleTypeDescriptors[codemaker::UnoType::SORT_ANY + 1][2] = {
                 { "V", "Ljava/lang/Void;" },
                 { "Z", "Ljava/lang/Boolean;" },
@@ -237,7 +237,7 @@ SpecialType translateUnoTypeToDescriptor(
                 { "Ljava/lang/String;", "Ljava/lang/String;" },
                 { "Lcom/sun/star/uno/Type;", "Lcom/sun/star/uno/Type;" },
                 { "Ljava/lang/Object;", "Ljava/lang/Object;" } };
-        rtl::OString const & s
+        OString const & s
             = simpleTypeDescriptors[sort][rank == 0 && classType];
         if (descriptor != 0) {
             descriptor->append(s);
@@ -260,15 +260,15 @@ SpecialType translateUnoTypeToDescriptor(
 }
 
 SpecialType translateUnoTypeToDescriptor(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool array, bool classType, Dependencies * dependencies,
-    rtl::OStringBuffer * descriptor, rtl::OStringBuffer * signature,
+    OStringBuffer * descriptor, OStringBuffer * signature,
     bool * needsSignature, PolymorphicUnoType * polymorphicUnoType)
 {
     RTTypeClass typeClass;
-    rtl::OString nucleus;
+    OString nucleus;
     sal_Int32 rank;
-    std::vector< rtl::OString > args;
+    std::vector< OString > args;
     codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve(
         manager, type, true, true, false, &typeClass, &nucleus, &rank, &args);
     OSL_ASSERT(rank < SAL_MAX_INT32);
@@ -280,12 +280,12 @@ SpecialType translateUnoTypeToDescriptor(
 
 SpecialType getFieldDescriptor(
     rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
-    rtl::OString const & type, rtl::OString * descriptor,
-    rtl::OString * signature, PolymorphicUnoType * polymorphicUnoType)
+    OString const & type, OString * descriptor,
+    OString * signature, PolymorphicUnoType * polymorphicUnoType)
 {
     OSL_ASSERT(dependencies != 0 && descriptor != 0);
-    rtl::OStringBuffer desc;
-    rtl::OStringBuffer sig;
+    OStringBuffer desc;
+    OStringBuffer sig;
     bool needsSig = false;
     SpecialType specialType = translateUnoTypeToDescriptor(
         manager, type, false, false, dependencies, &desc, &sig, &needsSig,
@@ -295,7 +295,7 @@ SpecialType getFieldDescriptor(
         if (needsSig) {
             *signature = sig.makeStringAndClear();
         } else {
-            *signature = rtl::OString();
+            *signature = OString();
         }
     }
     return specialType;
@@ -305,42 +305,42 @@ class MethodDescriptor {
 public:
     MethodDescriptor(
         rtl::Reference< TypeManager > const & manager,
-        Dependencies * dependencies, rtl::OString const & returnType,
+        Dependencies * dependencies, OString const & returnType,
         SpecialType * specialReturnType,
         PolymorphicUnoType * polymorphicUnoType);
 
     SpecialType addParameter(
-        rtl::OString const & type, bool array, bool dependency,
+        OString const & type, bool array, bool dependency,
         PolymorphicUnoType * polymorphicUnoType);
 
-    void addTypeParameter(rtl::OString const & name);
+    void addTypeParameter(OString const & name);
 
-    rtl::OString getDescriptor() const;
+    OString getDescriptor() const;
 
-    rtl::OString getSignature() const;
+    OString getSignature() const;
 
 private:
     rtl::Reference< TypeManager > m_manager;
     Dependencies * m_dependencies;
-    rtl::OStringBuffer m_descriptorStart;
-    rtl::OString m_descriptorEnd;
-    rtl::OStringBuffer m_signatureStart;
-    rtl::OString m_signatureEnd;
+    OStringBuffer m_descriptorStart;
+    OString m_descriptorEnd;
+    OStringBuffer m_signatureStart;
+    OString m_signatureEnd;
     bool m_needsSignature;
 };
 
 MethodDescriptor::MethodDescriptor(
     rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
-    rtl::OString const & returnType, SpecialType * specialReturnType,
+    OString const & returnType, SpecialType * specialReturnType,
     PolymorphicUnoType * polymorphicUnoType):
     m_manager(manager), m_dependencies(dependencies), m_needsSignature(false)
 {
     OSL_ASSERT(dependencies != 0);
     m_descriptorStart.append('(');
     m_signatureStart.append('(');
-    rtl::OStringBuffer descEnd;
+    OStringBuffer descEnd;
     descEnd.append(')');
-    rtl::OStringBuffer sigEnd;
+    OStringBuffer sigEnd;
     sigEnd.append(')');
     SpecialType special = translateUnoTypeToDescriptor(
         m_manager, returnType, false, false, m_dependencies, &descEnd, &sigEnd,
@@ -353,7 +353,7 @@ MethodDescriptor::MethodDescriptor(
 }
 
 SpecialType MethodDescriptor::addParameter(
-    rtl::OString const & type, bool array, bool dependency,
+    OString const & type, bool array, bool dependency,
     PolymorphicUnoType * polymorphicUnoType)
 {
     return translateUnoTypeToDescriptor(
@@ -368,17 +368,17 @@ void MethodDescriptor::addTypeParameter(OString const & name) {
     m_needsSignature = true;
 }
 
-rtl::OString MethodDescriptor::getDescriptor() const {
-    rtl::OStringBuffer buf(m_descriptorStart);
+OString MethodDescriptor::getDescriptor() const {
+    OStringBuffer buf(m_descriptorStart);
     buf.append(m_descriptorEnd);
     return buf.makeStringAndClear();
 }
 
-rtl::OString MethodDescriptor::getSignature() const {
+OString MethodDescriptor::getSignature() const {
     if (m_needsSignature) {
         return m_signatureStart + m_signatureEnd;
     } else {
-        return rtl::OString();
+        return OString();
     }
 }
 
@@ -393,20 +393,20 @@ public:
 
     // KIND_MEMBER:
     TypeInfo(
-        rtl::OString const & name, SpecialType specialType, sal_Int32 index,
+        OString const & name, SpecialType specialType, sal_Int32 index,
         PolymorphicUnoType const & polymorphicUnoType,
         sal_Int32 typeParameterIndex);
 
     // KIND_ATTRIBUTE/METHOD:
     TypeInfo(
-        Kind kind, rtl::OString const & name, SpecialType specialType,
+        Kind kind, OString const & name, SpecialType specialType,
         Flags flags, sal_Int32 index,
         PolymorphicUnoType const & polymorphicUnoType);
 
     // KIND_PARAMETER:
     TypeInfo(
-        rtl::OString const & parameterName, SpecialType specialType,
-        bool inParameter, bool outParameter, rtl::OString const & methodName,
+        OString const & parameterName, SpecialType specialType,
+        bool inParameter, bool outParameter, OString const & methodName,
         sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType);
 
     sal_uInt16 generateCode(ClassFile::Code & code, Dependencies * dependencies)
@@ -417,10 +417,10 @@ public:
 
 private:
     Kind m_kind;
-    rtl::OString m_name;
+    OString m_name;
     sal_Int32 m_flags;
     sal_Int32 m_index;
-    rtl::OString m_methodName;
+    OString m_methodName;
     PolymorphicUnoType m_polymorphicUnoType;
     sal_Int32 m_typeParameterIndex;
 };
@@ -441,7 +441,7 @@ sal_Int32 translateSpecialTypeFlags(
 }
 
 TypeInfo::TypeInfo(
-    rtl::OString const & name, SpecialType specialType, sal_Int32 index,
+    OString const & name, SpecialType specialType, sal_Int32 index,
     PolymorphicUnoType const & polymorphicUnoType,
     sal_Int32 typeParameterIndex):
     m_kind(KIND_MEMBER), m_name(name),
@@ -455,7 +455,7 @@ TypeInfo::TypeInfo(
 }
 
 TypeInfo::TypeInfo(
-    Kind kind, rtl::OString const & name, SpecialType specialType,
+    Kind kind, OString const & name, SpecialType specialType,
     Flags flags, sal_Int32 index,
     PolymorphicUnoType const & polymorphicUnoType):
     m_kind(kind), m_name(name),
@@ -466,8 +466,8 @@ TypeInfo::TypeInfo(
 }
 
 TypeInfo::TypeInfo(
-    rtl::OString const & parameterName, SpecialType specialType,
-    bool inParameter, bool outParameter, rtl::OString const & methodName,
+    OString const & parameterName, SpecialType specialType,
+    bool inParameter, bool outParameter, OString const & methodName,
     sal_Int32 index, PolymorphicUnoType const & polymorphicUnoType):
     m_kind(KIND_PARAMETER), m_name(parameterName),
     m_flags(translateSpecialTypeFlags(specialType, inParameter, outParameter)),
@@ -602,7 +602,7 @@ void writeClassFile(
     if (!tempfile.isValid()) {
         throw CannotDumpException("Cannot create temporary file for " + filename);
     }
-    rtl::OString tempname(tempfile.getName());
+    OString tempname(tempfile.getName());
     try {
         classFile.write(tempfile);
     } catch (...) {
@@ -621,7 +621,7 @@ void writeClassFile(
 }
 
 void addTypeInfo(
-    rtl::OString const & className, std::vector< TypeInfo > const & typeInfo,
+    OString const & className, std::vector< TypeInfo > const & typeInfo,
     Dependencies * dependencies, ClassFile * classFile)
 {
     OSL_ASSERT(dependencies != 0 && classFile != 0);
@@ -661,7 +661,7 @@ void addTypeInfo(
             static_cast< ClassFile::AccessFlags >(
                 ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC),
             "<clinit>", "()V", code.get(),
-            std::vector< rtl::OString >(), "");
+            std::vector< OString >(), "");
     }
 }
 
@@ -682,7 +682,7 @@ void handleEnumType(
         throw CannotDumpException("Bad type information");
             //TODO
     }
-    rtl::OString className(codemaker::convertString(reader.getTypeName()));
+    OString className(codemaker::convertString(reader.getTypeName()));
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< ClassFile > cf(
         new ClassFile(
@@ -691,7 +691,7 @@ void handleEnumType(
                 | ClassFile::ACC_SUPER),
             className, "com/sun/star/uno/Enum", ""));
     SAL_WNODEPRECATED_DECLARATIONS_POP
-    rtl::OString classDescriptor("L" + className + ";");
+    OString classDescriptor("L" + className + ";");
     for (sal_uInt16 i = 0; i < fields; ++i) {
         RTConstValue fieldValue(reader.getFieldValue(i));
         if (fieldValue.m_type != RT_TYPE_INT32
@@ -700,13 +700,13 @@ void handleEnumType(
         {
             throw CannotDumpException("Bad type information"); //TODO
         }
-        rtl::OString fieldName(
+        OString fieldName(
             codemaker::convertString(reader.getFieldName(i)));
         cf->addField(
             static_cast< ClassFile::AccessFlags >(
                 ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC
                 | ClassFile::ACC_FINAL),
-            fieldName, classDescriptor, 0, rtl::OString());
+            fieldName, classDescriptor, 0, OString());
         cf->addField(
             static_cast< ClassFile::AccessFlags >(
                 ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC
@@ -739,7 +739,7 @@ void handleEnumType(
         code.get(), std::vector< OString >(), "");
     code.reset(cf->newCode());
     code->loadLocalInteger(0);
-    std::map< sal_Int32, rtl::OString > map;
+    std::map< sal_Int32, OString > map;
     sal_Int32 min = SAL_MAX_INT32;
     sal_Int32 max = SAL_MIN_INT32;
     for (sal_uInt16 i = 0; i < fields; ++i) {
@@ -747,7 +747,7 @@ void handleEnumType(
         min = std::min(min, value);
         max = std::max(max, value);
         map.insert(
-            std::map< sal_Int32, rtl::OString >::value_type(
+            std::map< sal_Int32, OString >::value_type(
                 value, codemaker::convertString(reader.getFieldName(i))));
     }
     sal_uInt64 size = static_cast< sal_uInt64 >(map.size());
@@ -763,7 +763,7 @@ void handleEnumType(
         std::list< ClassFile::Code * > blocks;
             //FIXME: pointers contained in blocks may leak
         sal_Int32 last = SAL_MAX_INT32;
-        for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin());
+        for (std::map< sal_Int32, OString >::iterator i(map.begin());
              i != map.end(); ++i)
         {
             sal_Int32 value = i->first;
@@ -795,7 +795,7 @@ void handleEnumType(
         defCode->instrAreturn();
         std::list< std::pair< sal_Int32, ClassFile::Code * > > blocks;
             //FIXME: pointers contained in blocks may leak
-        for (std::map< sal_Int32, rtl::OString >::iterator i(map.begin());
+        for (std::map< sal_Int32, OString >::iterator i(map.begin());
              i != map.end(); ++i)
         {
             SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -819,7 +819,7 @@ void handleEnumType(
         static_cast< ClassFile::AccessFlags >(
             ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC),
         "fromInt", "(I)" + classDescriptor,
-        code.get(), std::vector< rtl::OString >(), "");
+        code.get(), std::vector< OString >(), "");
     code.reset(cf->newCode());
     for (sal_uInt16 i = 0; i < fields; ++i) {
         code->instrNew(className);
@@ -837,19 +837,19 @@ void handleEnumType(
         static_cast< ClassFile::AccessFlags >(
             ClassFile::ACC_PRIVATE | ClassFile::ACC_STATIC),
         "<clinit>", "()V", code.get(),
-        std::vector< rtl::OString >(), "");
+        std::vector< OString >(), "");
     writeClassFile(options, className, *cf.get());
 }
 
 void addField(
     rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
     ClassFile * classFile, std::vector< TypeInfo > * typeInfo,
-    sal_Int32 typeParameterIndex, rtl::OString const & type,
-    rtl::OString const & name, sal_Int32 index)
+    sal_Int32 typeParameterIndex, OString const & type,
+    OString const & name, sal_Int32 index)
 {
     OSL_ASSERT(dependencies != 0 && classFile != 0 && typeInfo != 0);
-    rtl::OString descriptor;
-    rtl::OString signature;
+    OString descriptor;
+    OString signature;
     SpecialType specialType;
     PolymorphicUnoType polymorphicUnoType;
     if (typeParameterIndex >= 0) {
@@ -869,8 +869,8 @@ void addField(
 
 sal_uInt16 addFieldInit(
     rtl::Reference< TypeManager > const & manager,
-    rtl::OString const & className, rtl::OString const & fieldName,
-    bool typeParameter, rtl::OString const & fieldType,
+    OString const & className, OString const & fieldName,
+    bool typeParameter, OString const & fieldType,
     Dependencies * dependencies, ClassFile::Code * code)
 {
     OSL_ASSERT(dependencies != 0 && code != 0);
@@ -878,9 +878,9 @@ sal_uInt16 addFieldInit(
         return 0;
     } else {
         RTTypeClass typeClass;
-        rtl::OString nucleus;
+        OString nucleus;
         sal_Int32 rank;
-        std::vector< rtl::OString > args;
+        std::vector< OString > args;
         codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve(
             manager, fieldType, true, false, false, &typeClass, &nucleus, &rank,
             &args);
@@ -888,7 +888,7 @@ sal_uInt16 addFieldInit(
             switch (sort) {
             case codemaker::UnoType::SORT_STRING:
                 code->loadLocalReference(0);
-                code->loadStringConstant(rtl::OString());
+                code->loadStringConstant(OString());
                 code->instrPutfield(className, fieldName, "Ljava/lang/String;");
                 return 2;
 
@@ -913,12 +913,12 @@ sal_uInt16 addFieldInit(
                         if (reader.getFieldCount() == 0) {
                             throw CannotDumpException("Bad type information"); //TODO
                         }
-                        rtl::OStringBuffer descBuf;
+                        OStringBuffer descBuf;
                         translateUnoTypeToDescriptor(
                             manager, sort, typeClass, nucleus, 0,
-                            std::vector< rtl::OString >(), false, false,
+                            std::vector< OString >(), false, false,
                             dependencies, &descBuf, 0, 0, 0);
-                        rtl::OString desc(descBuf.makeStringAndClear());
+                        OString desc(descBuf.makeStringAndClear());
                         code->instrGetstatic(
                             nucleus,
                             codemaker::convertString(reader.getFieldName(0)),
@@ -933,10 +933,10 @@ sal_uInt16 addFieldInit(
                         code->instrNew(nucleus);
                         code->instrDup();
                         code->instrInvokespecial(nucleus, "<init>", "()V");
-                        rtl::OStringBuffer desc;
+                        OStringBuffer desc;
                         translateUnoTypeToDescriptor(
                             manager, sort, typeClass, nucleus, 0,
-                            std::vector< rtl::OString >(), false, false,
+                            std::vector< OString >(), false, false,
                             dependencies, &desc, 0, 0, 0);
                         code->instrPutfield(
                             className, fieldName, desc.makeStringAndClear());
@@ -965,17 +965,17 @@ sal_uInt16 addFieldInit(
                                                                 nucleus, 0));
                 }
             } else {
-                rtl::OStringBuffer desc;
+                OStringBuffer desc;
                 translateUnoTypeToDescriptor(
                     manager, sort, typeClass, nucleus, rank - 1,
-                    std::vector< rtl::OString >(), false, false, dependencies,
+                    std::vector< OString >(), false, false, dependencies,
                     &desc, 0, 0, 0);
                 code->instrAnewarray(desc.makeStringAndClear());
             }
-            rtl::OStringBuffer desc;
+            OStringBuffer desc;
             translateUnoTypeToDescriptor(
                 manager, sort, typeClass, nucleus, rank,
-                std::vector< rtl::OString >(), false, false, dependencies,
+                std::vector< OString >(), false, false, dependencies,
                 &desc, 0, 0, 0);
             code->instrPutfield(
                 className, fieldName, desc.makeStringAndClear());
@@ -986,7 +986,7 @@ sal_uInt16 addFieldInit(
 
 sal_uInt16 addLoadLocal(
     rtl::Reference< TypeManager > const & manager, ClassFile::Code * code,
-    sal_uInt16 * index, bool typeParameter, rtl::OString const & type, bool any,
+    sal_uInt16 * index, bool typeParameter, OString const & type, bool any,
     Dependencies * dependencies)
 {
     OSL_ASSERT(
@@ -999,9 +999,9 @@ sal_uInt16 addLoadLocal(
         stack = size = 1;
     } else {
         RTTypeClass typeClass;
-        rtl::OString nucleus;
+        OString nucleus;
         sal_Int32 rank;
-        std::vector< rtl::OString > args;
+        std::vector< OString > args;
         codemaker::UnoType::Sort sort = codemaker::decomposeAndResolve(
             manager, type, true, false, false, &typeClass, &nucleus, &rank, &args);
         if (rank == 0) {
@@ -1327,7 +1327,7 @@ sal_uInt16 addLoadLocal(
 void addBaseArguments(
     rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
     MethodDescriptor * methodDescriptor, ClassFile::Code * code,
-    RTTypeClass typeClass, rtl::OString const & type, sal_uInt16 * index)
+    RTTypeClass typeClass, OString const & type, sal_uInt16 * index)
 {
     OSL_ASSERT(
         dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0);
@@ -1368,7 +1368,7 @@ void addBaseArguments(
         {
             throw CannotDumpException("Bad type information"); //TODO
         }
-        rtl::OString fieldType(
+        OString fieldType(
             codemaker::convertString(reader.getFieldTypeName(i)));
         methodDescriptor->addParameter(fieldType, false, true, 0);
         addLoadLocal(
@@ -1379,13 +1379,13 @@ void addBaseArguments(
 sal_uInt16 addDirectArgument(
     rtl::Reference< TypeManager > const & manager, Dependencies * dependencies,
     MethodDescriptor * methodDescriptor, ClassFile::Code * code,
-    sal_uInt16 * index, rtl::OString const & className,
-    rtl::OString const & fieldName, bool typeParameter,
-    rtl::OString const & fieldType)
+    sal_uInt16 * index, OString const & className,
+    OString const & fieldName, bool typeParameter,
+    OString const & fieldType)
 {
     OSL_ASSERT(
         dependencies != 0 && methodDescriptor != 0 && code != 0 && index != 0);
-    rtl::OString desc;
+    OString desc;
     if (typeParameter) {
         methodDescriptor->addTypeParameter(fieldType);
         desc = "Ljava/lang/Object;";
@@ -1412,13 +1412,13 @@ void handleAggregatingType(
             //TODO
     }
     RTTypeClass typeClass = reader.getTypeClass();
-    rtl::OString className(codemaker::convertString(reader.getTypeName()));
+    OString className(codemaker::convertString(reader.getTypeName()));
     sal_uInt16 superTypes = reader.getSuperTypeCount();
     sal_uInt16 fields = reader.getFieldCount();
     sal_uInt16 firstField = 0;
     sal_uInt16 references = reader.getReferenceCount();
     bool runtimeException = false;
-    rtl::OString superClass;
+    OString superClass;
     if (className == "com/sun/star/uno/Exception")
     {
         if (typeClass != RT_TYPE_EXCEPTION || superTypes != 0 || fields != 2
@@ -1459,10 +1459,10 @@ void handleAggregatingType(
             dependencies->insert(superClass);
         }
     }
-    rtl::OString sig;
-    std::map< rtl::OString, sal_Int32 > typeParameters;
+    OString sig;
+    std::map< OString, sal_Int32 > typeParameters;
     if (references != 0) {
-        rtl::OStringBuffer buf;
+        OStringBuffer buf;
         buf.append('<');
         for (sal_uInt16 i = 0; i < references; ++i) {
             if (reader.getReferenceFlags(i) != RT_ACCESS_INVALID
@@ -1471,11 +1471,11 @@ void handleAggregatingType(
                 throw CannotDumpException("Bad type information");
                     //TODO
             }
-            rtl::OString name(
+            OString name(
                 codemaker::convertString(reader.getReferenceTypeName(i)));
             buf.append(name + ":Ljava/lang/Object;");
             if (!typeParameters.insert(
-                    std::map< rtl::OString, sal_Int32 >::value_type(name, i)).
+                    std::map< OString, sal_Int32 >::value_type(name, i)).
                 second)
             {
                 throw CannotDumpException("Bad type information");
@@ -1502,13 +1502,13 @@ void handleAggregatingType(
         {
             throw CannotDumpException("Bad type information"); //TODO
         }
-        rtl::OString type(
+        OString type(
             codemaker::convertString(reader.getFieldTypeName(i)));
         sal_Int32 typeParameterIndex;
         if ((flags & RT_ACCESS_PARAMETERIZED_TYPE) == 0) {
             typeParameterIndex = -1;
         } else {
-            std::map< rtl::OString, sal_Int32 >::iterator it(
+            std::map< OString, sal_Int32 >::iterator it(
                 typeParameters.find(type));
             if (it == typeParameters.end()) {
                 throw CannotDumpException("Bad type information");
@@ -1551,7 +1551,7 @@ void handleAggregatingType(
     cf->addMethod(
         ClassFile::ACC_PUBLIC,
         "<init>", "()V", code.get(),
-        std::vector< rtl::OString >(), "");
+        std::vector< OString >(), "");
     if (typeClass == RT_TYPE_EXCEPTION) {
         code.reset(cf->newCode());
         code->loadLocalReference(0);
@@ -1578,7 +1578,7 @@ void handleAggregatingType(
         code->instrReturn();
         code->setMaxStackAndLocals(stack + 2, 2);
         cf->addMethod(ClassFile::ACC_PUBLIC, "<init>", "(Ljava/lang/String;)V",
-            code.get(), std::vector< rtl::OString >(), "");
+            code.get(), std::vector< OString >(), "");
     }
     MethodDescriptor desc(manager, dependencies, "void", 0, 0);
     code.reset(cf->newCode());
@@ -1613,7 +1613,7 @@ void handleAggregatingType(
     code->instrReturn();
     code->setMaxStackAndLocals(maxSize, index);
     cf->addMethod(ClassFile::ACC_PUBLIC, "<init>",
-        desc.getDescriptor(), code.get(), std::vector< rtl::OString >(),
+        desc.getDescriptor(), code.get(), std::vector< OString >(),
         desc.getSignature());
     addTypeInfo(className, typeInfo, dependencies, cf.get());
     writeClassFile(options, className, *cf.get());
@@ -1622,13 +1622,13 @@ void handleAggregatingType(
 void createExceptionsAttribute(
     rtl::Reference< TypeManager > const & manager,
     typereg::Reader const & reader, sal_uInt16 methodIndex,
-    Dependencies * dependencies, std::vector< rtl::OString > * exceptions,
+    Dependencies * dependencies, std::vector< OString > * exceptions,
     codemaker::ExceptionTree * tree)
 {
     OSL_ASSERT(dependencies != 0 && exceptions != 0);
     sal_uInt16 n = reader.getMethodExceptionCount(methodIndex);
     for (sal_uInt16 i = 0; i < n; ++i) {
-        rtl::OString type(
+        OString type(
             codemaker::convertString(
                 reader.getMethodExceptionTypeName(methodIndex, i)));
         dependencies->insert(type);
@@ -1646,7 +1646,7 @@ void handleInterfaceType(
 {
     OSL_ASSERT(dependencies != 0);
 
-    rtl::OString className(codemaker::convertString(reader.getTypeName()));
+    OString className(codemaker::convertString(reader.getTypeName()));
     sal_uInt16 superTypes = reader.getSuperTypeCount();
     sal_uInt16 fields = reader.getFieldCount();
     sal_uInt16 methods = reader.getMethodCount();
@@ -1669,7 +1669,7 @@ void handleInterfaceType(
             className, "java/lang/Object", ""));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     for (sal_uInt16 i = 0; i < superTypes; ++i) {
-        rtl::OString t(codemaker::convertString(reader.getSuperTypeName(i)));
+        OString t(codemaker::convertString(reader.getSuperTypeName(i)));
         dependencies->insert(t);
         cf->addInterface(t);
     }
@@ -1698,7 +1698,7 @@ void handleInterfaceType(
         }
         //TODO: exploit the fact that attribute getter/setter methods preceed
         // real methods
-        rtl::OUString attrNameUtf16(reader.getFieldName(i));
+        OUString attrNameUtf16(reader.getFieldName(i));
         sal_uInt16 getter = SAL_MAX_UINT16;
         sal_uInt16 setter = SAL_MAX_UINT16;
         for (sal_uInt16 j = 0; j < methods; ++j) {
@@ -1720,19 +1720,19 @@ void handleInterfaceType(
                 (mflags == RT_MODE_ATTRIBUTE_GET ? getter : setter) = j;
             }
         }
-        rtl::OString fieldType(
+        OString fieldType(
             codemaker::convertString(reader.getFieldTypeName(i)));
         SpecialType specialType;
         PolymorphicUnoType polymorphicUnoType;
         MethodDescriptor gdesc(
             manager, dependencies, fieldType, &specialType,
             &polymorphicUnoType);
-        std::vector< rtl::OString > exc;
+        std::vector< OString > exc;
         if (getter != SAL_MAX_UINT16) {
             createExceptionsAttribute(
                 manager, reader, getter, dependencies, &exc, 0);
         }
-        rtl::OString attrName(codemaker::convertString(attrNameUtf16));
+        OString attrName(codemaker::convertString(attrNameUtf16));
         cf->addMethod(
             static_cast< ClassFile::AccessFlags >(
                 ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT),
@@ -1741,7 +1741,7 @@ void handleInterfaceType(
             MethodDescriptor sdesc(
                 manager, dependencies, "void", 0, 0);
             sdesc.addParameter(fieldType, false, true, 0);
-            std::vector< rtl::OString > exc2;
+            std::vector< OString > exc2;
             if (setter != SAL_MAX_UINT16) {
                 createExceptionsAttribute(
                     manager, reader, setter, dependencies, &exc2, 0);
@@ -1768,7 +1768,7 @@ void handleInterfaceType(
         case RT_MODE_ONEWAY:
         case RT_MODE_TWOWAY:
             {
-                rtl::OString methodName(
+                OString methodName(
                     codemaker::convertString(reader.getMethodName(i)));
                 SpecialType specialReturnType;
                 PolymorphicUnoType polymorphicUnoReturnType;
@@ -1825,7 +1825,7 @@ void handleInterfaceType(
                                 polymorphicUnoType));
                     }
                 }
-                std::vector< rtl::OString > exc2;
+                std::vector< OString > exc2;
                 createExceptionsAttribute(
                     manager, reader, i, dependencies, &exc2, 0);
                 cf->addMethod(
@@ -1841,7 +1841,7 @@ void handleInterfaceType(
             {
                 //TODO: exploit the fact that attribute getter/setter methods
                 // are ordered the same way as the attribute fields themselves
-                rtl::OUString methodNameUtf16(reader.getMethodName(i));
+                OUString methodNameUtf16(reader.getMethodName(i));
                 bool found = false;
                 for (sal_uInt16 j = 0; j < fields; ++j) {
                     if (reader.getFieldName(j) == methodNameUtf16) {
@@ -1874,9 +1874,9 @@ void handleTypedef(
             //TODO
     }
     RTTypeClass typeClass;
-    rtl::OString nucleus;
+    OString nucleus;
     sal_Int32 rank;
-    std::vector< rtl::OString > args;
+    std::vector< OString > args;
     if (codemaker::decomposeAndResolve(
             manager, codemaker::convertString(reader.getSuperTypeName(0)),
             false, false, false, &typeClass, &nucleus, &rank, &args)
@@ -1917,9 +1917,9 @@ void addConstant(
     RTConstValue fieldValue(reader.getFieldValue(index));
     sal_uInt16 valueIndex;
     RTTypeClass typeClass;
-    rtl::OString nucleus;
+    OString nucleus;
     sal_Int32 rank;
-    std::vector< rtl::OString > args;
+    std::vector< OString > args;
     switch (codemaker::decomposeAndResolve(
                 manager,
                 codemaker::convertString(reader.getFieldTypeName(index)),
@@ -2002,8 +2002,8 @@ void addConstant(
         throw CannotDumpException("Bad type information");
             //TODO
     }
-    rtl::OString desc;
-    rtl::OString sig;
+    OString desc;
+    OString sig;
     getFieldDescriptor(
         manager, dependencies,
         codemaker::convertString(reader.getFieldTypeName(index)),
@@ -2028,7 +2028,7 @@ void handleConstantGroup(
         throw CannotDumpException("Bad type information");
             //TODO
     }
-    rtl::OString className(codemaker::convertString(reader.getTypeName()));
+    OString className(codemaker::convertString(reader.getTypeName()));
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
     std::auto_ptr< ClassFile > cf(
         new ClassFile(
@@ -2056,10 +2056,10 @@ void handleModule(
         throw CannotDumpException("Bad type information");
             //TODO
     }
-    rtl::OString prefix(codemaker::convertString(reader.getTypeName()) + "/");
+    OString prefix(codemaker::convertString(reader.getTypeName()) + "/");
     sal_uInt16 fields = reader.getFieldCount();
     for (sal_uInt16 i = 0; i < fields; ++i) {
-        rtl::OString className(
+        OString className(
             prefix + codemaker::convertString(reader.getFieldName(i)));
         SAL_WNODEPRECATED_DECLARATIONS_PUSH
         std::auto_ptr< ClassFile > cf(
@@ -2094,10 +2094,10 @@ void addExceptionHandlers(
 
 void addConstructor(
     rtl::Reference< TypeManager > const & manager,
-    rtl::OString const & realJavaBaseName, rtl::OString const & unoName,
-    rtl::OString const & className, typereg::Reader const & reader,
-    sal_uInt16 methodIndex, rtl::OString const & methodName,
-    rtl::OString const & returnType, bool defaultConstructor,
+    OString const & realJavaBaseName, OString const & unoName,
+    OString const & className, typereg::Reader const & reader,
+    sal_uInt16 methodIndex, OString const & methodName,
+    OString const & returnType, bool defaultConstructor,
     Dependencies * dependencies, ClassFile * classFile)
 {
     OSL_ASSERT(dependencies != 0 && classFile != 0);
@@ -2116,7 +2116,7 @@ void addConstructor(
     codemaker::ExceptionTree tree;
     ClassFile::Code::Position tryStart;
     ClassFile::Code::Position tryEnd;
-    std::vector< rtl::OString > exc;
+    std::vector< OString > exc;
     sal_uInt16 stack;
     sal_uInt16 localIndex = 1;
     ClassFile::AccessFlags access = static_cast< ClassFile::AccessFlags >(
@@ -2153,7 +2153,7 @@ void addConstructor(
             for (sal_uInt16 i = 0; i < parameters; ++i) {
                 RTParamMode flags = reader.getMethodParameterFlags(
                     methodIndex, i);
-                rtl::OString paramType(
+                OString paramType(
                     codemaker::convertString(
                         reader.getMethodParameterTypeName(methodIndex, i)));
                 if ((flags != RT_PARAM_IN
@@ -2258,8 +2258,8 @@ void handleService(
     if (superTypes == 0) {
         return;
     }
-    rtl::OString unoName(codemaker::convertString(reader.getTypeName()));
-    rtl::OString className(
+    OString unoName(codemaker::convertString(reader.getTypeName()));
+    OString className(
         translateUnoTypeToJavaFullyQualifiedName(unoName, "service"));
     unoName = unoName.replace('/', '.');
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -2271,16 +2271,16 @@ void handleService(
             className, "java/lang/Object", ""));
     SAL_WNODEPRECATED_DECLARATIONS_POP
     if (methods > 0) {
-        rtl::OString base(codemaker::convertString(
+        OString base(codemaker::convertString(
                               reader.getSuperTypeName(0)));
-        rtl::OString realJavaBaseName(base.replace('/', '.'));
+        OString realJavaBaseName(base.replace('/', '.'));
         dependencies->insert(base);
         dependencies->insert("com/sun/star/lang/XMultiComponentFactory");
         dependencies->insert("com/sun/star/uno/DeploymentException");
         dependencies->insert("com/sun/star/uno/TypeClass");
         dependencies->insert("com/sun/star/uno/XComponentContext");
         for (sal_uInt16 i = 0; i < methods; ++i) {
-            rtl::OString name(codemaker::convertString(
+            OString name(codemaker::convertString(
                                   reader.getMethodName(i)));
             bool defaultCtor = name.isEmpty();
             if (reader.getMethodFlags(i) != RT_MODE_TWOWAY
@@ -2351,7 +2351,7 @@ void handleService(
                     | ClassFile::ACC_SYNTHETIC),
                 "$castInstance", "(Ljava/lang/Object;Lcom/sun/star/uno/"
                                  "XComponentContext;)Ljava/lang/Object;",
-                code.get(), std::vector< rtl::OString >(), "");
+                code.get(), std::vector< OString >(), "");
         }
     }
     writeClassFile(options, className, *cf.get());
@@ -2369,8 +2369,8 @@ void handleSingleton(
         throw CannotDumpException("Bad type information");
             //TODO
     }
-    rtl::OString base(codemaker::convertString(reader.getSuperTypeName(0)));
-    rtl::OString realJavaBaseName(base.replace('/', '.'));
+    OString base(codemaker::convertString(reader.getSuperTypeName(0)));
+    OString realJavaBaseName(base.replace('/', '.'));
     switch (manager->getTypeReader(base).getTypeClass()) {
     case RT_TYPE_INTERFACE:
         break;
@@ -2475,14 +2475,14 @@ void handleSingleton(
         static_cast< ClassFile::AccessFlags >(
             ClassFile::ACC_PUBLIC | ClassFile::ACC_STATIC),
         "get", desc.getDescriptor(),
-        code.get(), std::vector< rtl::OString >(), desc.getSignature());
+        code.get(), std::vector< OString >(), desc.getSignature());
     writeClassFile(options, className, *cf.get());
 }
 
 }
 
 bool produceType(
-    rtl::OString const & type, rtl::Reference< TypeManager > const & manager,
+    OString const & type, rtl::Reference< TypeManager > const & manager,
     codemaker::GeneratedTypeSet & generated, JavaOptions * options)
 {
     OSL_ASSERT(options != 0);
@@ -2556,7 +2556,7 @@ bool produceType(
     rtl::Reference< TypeManager > const & manager,
     codemaker::GeneratedTypeSet & generated, JavaOptions * options)
 {
-    ::rtl::OString typeName = manager->getTypeName(rTypeKey);
+    OString typeName = manager->getTypeName(rTypeKey);
 
     OSL_ASSERT(options != 0);
     if (typeName == "/" || typeName == manager->getBase()
diff --git a/codemaker/source/javamaker/javatype.hxx b/codemaker/source/javamaker/javatype.hxx
index 5161628d8b82..6d53bd747ef3 100644
--- a/codemaker/source/javamaker/javatype.hxx
+++ b/codemaker/source/javamaker/javatype.hxx
@@ -23,15 +23,15 @@
 #include "sal/config.h"
 
 #include "rtl/ref.hxx"
+#include "rtl/string.hxx"
 
 namespace codemaker { class GeneratedTypeSet; }
-namespace rtl { class OString; }
 class JavaOptions;
 class TypeManager;
 class RegistryKey;
 
 bool produceType(
-    rtl::OString const & type, rtl::Reference< TypeManager > const & manager,
+    OString const & type, rtl::Reference< TypeManager > const & manager,
     codemaker::GeneratedTypeSet & generated, JavaOptions * pOptions);
 
 bool produceType(RegistryKey& typeName, bool bIsExtraType, rtl::Reference< TypeManager > const & typeMgr,
diff --git a/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx
index b281151558e6..2dfe5f3ca256 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySet.hxx
@@ -97,39 +97,39 @@ namespace comphelper
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
             throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
 
         // XPropertyState
-        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
index 51cfd9ea433e..ce28803036d5 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
@@ -52,15 +52,15 @@ namespace comphelper
 
         void add( PropertyInfo* pMap, sal_Int32 nCount = -1 )
             throw();
-        void remove( const rtl::OUString& aName )
+        void remove( const OUString& aName )
             throw();
 
         // XPropertySetInfo
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
             throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
             throw(::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx
index 03fdd4a8ccea..266137fdb9b4 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySet.hxx
@@ -102,39 +102,39 @@ namespace comphelper
         // XPropertySet
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
             throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException);
 
         // XPropertyState
-        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName )
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
index 48740daa2ab0..d2c772e2c5d5 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
@@ -48,9 +48,9 @@ namespace comphelper
         // XPropertySetInfo
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties()
             throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName )
+        virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name )
+        virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name )
             throw(::com::sun::star::uno::RuntimeException);
     };
 }
diff --git a/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 41671b71532d..3241560b4a94 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.hxx
@@ -44,21 +44,21 @@ namespace comphelper
     };
     struct eqFunc
     {
-        sal_Bool operator()( const rtl::OUString &r1,
-                             const rtl::OUString &r2) const
+        sal_Bool operator()( const OUString &r1,
+                             const OUString &r2) const
         {
             return r1 == r2;
         }
     };
 }
 
-typedef boost::unordered_map < ::rtl::OUString,
+typedef boost::unordered_map < OUString,
                         ::comphelper::PropertyInfo*,
-                        ::rtl::OUStringHash,
+                        OUStringHash,
                         ::comphelper::eqFunc > PropertyInfoHash;
-typedef boost::unordered_map < ::rtl::OUString,
+typedef boost::unordered_map < OUString,
                         ::comphelper::PropertyData*,
-                        ::rtl::OUStringHash,
+                        OUStringHash,
                         ::comphelper::eqFunc > PropertyDataHash;
 #endif
 
diff --git a/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx
index 661a4a0c8341..d623fa3e5494 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/comphelper/inc/comphelper/SettingsHelper.hxx
@@ -58,39 +58,39 @@ namespace comphelper
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  )
             throw(::com::sun::star::uno::RuntimeException)
         { return ComphelperBase::getPropertySetInfo(); }
-        virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
+        virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::setPropertyValue ( aPropertyName, aValue ); }
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { return ComphelperBase::getPropertyValue ( PropertyName ); }
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::addPropertyChangeListener ( aPropertyName, xListener ); }
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::removePropertyChangeListener ( aPropertyName, aListener ); }
-        virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::addVetoableChangeListener ( PropertyName, aListener ); }
-        virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
+        virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener )
             throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::removeVetoableChangeListener ( PropertyName, aListener ); }
 
         // XMultiPropertySet
-        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
+        virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues )
             throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
         { ComphelperBase::setPropertyValues ( aPropertyNames, aValues ); }
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
             throw(::com::sun::star::uno::RuntimeException)
         { return ComphelperBase::getPropertyValues ( aPropertyNames ); }
-        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException)
         { ComphelperBase::addPropertiesChangeListener ( aPropertyNames, xListener ); }
         virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException)
         { ComphelperBase::removePropertiesChangeListener ( xListener ); }
-        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
+        virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener )
             throw(::com::sun::star::uno::RuntimeException)
         { ComphelperBase::firePropertiesChangeEvent ( aPropertyNames, xListener ); }
     };
diff --git a/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index ae7712126504..5ca27baddabf 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
@@ -160,8 +160,8 @@ namespace comphelper
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) = 0;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
-        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
+        virtual OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException) = 0;
 
diff --git a/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx
index 502b0b178127..ea3f505ee7fe 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/comphelper/inc/comphelper/accessibletexthelper.hxx
@@ -55,7 +55,7 @@ namespace comphelper
         sal_Bool                                implIsValidBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nLength );
         virtual sal_Bool                        implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength );
         virtual sal_Bool                        implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength );
-        virtual ::rtl::OUString                 implGetText() = 0;
+        virtual OUString                 implGetText() = 0;
         virtual ::com::sun::star::lang::Locale  implGetLocale() = 0;
         virtual void                            implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) = 0;
         virtual void                            implGetGlyphBoundary( ::com::sun::star::i18n::Boundary& rBoundary, sal_Int32 nIndex );
@@ -68,11 +68,11 @@ namespace comphelper
         */
         sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
-        ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
         sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
         sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
-        ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
-        ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -90,8 +90,8 @@ namespace comphelper
                  ::com::sun::star::accessibility::TextSegment
         */
         static bool implInitTextChangedEvent(
-            const rtl::OUString& rOldString,
-            const rtl::OUString& rNewString,
+            const OUString& rOldString,
+            const OUString& rNewString,
             /*out*/ ::com::sun::star::uno::Any& rDeleted,
             /*out*/ ::com::sun::star::uno::Any& rInserted); // throw()
     };
@@ -125,11 +125,11 @@ namespace comphelper
         // XAccessibleText
         virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getCharacterCount() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getSelectedText() throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getSelectionStart() throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getSelectionEnd() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getText() throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 0867ab5594e9..fbd65d638899 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.hxx
@@ -280,8 +280,8 @@ namespace comphelper
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getAccessibleIndexInParent(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Int16 SAL_CALL getAccessibleRole(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getAccessibleDescription(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getAccessibleName(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::lang::Locale SAL_CALL getLocale(  ) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/inc/comphelper/anycompare.hxx b/comphelper/inc/comphelper/anycompare.hxx
index 5ae1d938cae8..fb17b7ca67ec 100644
--- a/comphelper/inc/comphelper/anycompare.hxx
+++ b/comphelper/inc/comphelper/anycompare.hxx
@@ -93,7 +93,7 @@ namespace comphelper
     public:
         virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
         {
-            ::rtl::OUString lhs, rhs;
+            OUString lhs, rhs;
             if  (   !( _lhs >>= lhs )
                 ||  !( _rhs >>= rhs )
                 )
@@ -115,7 +115,7 @@ namespace comphelper
 
         virtual bool isLess( ::com::sun::star::uno::Any const & _lhs, ::com::sun::star::uno::Any const & _rhs ) const
         {
-            ::rtl::OUString lhs, rhs;
+            OUString lhs, rhs;
             if  (   !( _lhs >>= lhs )
                 ||  !( _rhs >>= rhs )
                 )
diff --git a/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx
index ff34c02f18f3..e68779854292 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/comphelper/inc/comphelper/anytostring.hxx
@@ -34,7 +34,7 @@ namespace comphelper
     @return
            STRING representation of given ANY value
 */
-COMPHELPER_DLLPUBLIC ::rtl::OUString anyToString( ::com::sun::star::uno::Any const & value );
+COMPHELPER_DLLPUBLIC OUString anyToString( ::com::sun::star::uno::Any const & value );
 
 }
 
diff --git a/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx
index a309264a52e4..dd10e13c70ab 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/comphelper/inc/comphelper/attributelist.hxx
@@ -41,20 +41,20 @@ public:
     virtual ~AttributeList();
 
     // methods that are not contained in any interface
-    void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sType , const ::rtl::OUString &sValue );
+    void AddAttribute( const OUString &sName , const OUString &sType , const OUString &sValue );
 
     // ::com::sun::star::xml::sax::XAttributeList
     virtual sal_Int16 SAL_CALL getLength(void)
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getNameByIndex(sal_Int16 i)
+    virtual OUString SAL_CALL getNameByIndex(sal_Int16 i)
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getTypeByIndex(sal_Int16 i)
+    virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i)
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getTypeByName(const ::rtl::OUString& aName)
+    virtual OUString SAL_CALL getTypeByName(const OUString& aName)
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getValueByIndex(sal_Int16 i)
+    virtual OUString SAL_CALL getValueByIndex(sal_Int16 i)
         throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getValueByName(const ::rtl::OUString& aName)
+    virtual OUString SAL_CALL getValueByName(const OUString& aName)
         throw( ::com::sun::star::uno::RuntimeException );
 
 };
diff --git a/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx
index 626466bceba4..42eea8076e47 100644
--- a/comphelper/inc/comphelper/basicio.hxx
+++ b/comphelper/inc/comphelper/basicio.hxx
@@ -37,9 +37,9 @@ namespace starawt   = ::com::sun::star::awt;
 COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal);
 COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Bool _bVal);
 
-// ::rtl::OUString
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& _rStr);
-COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& _rStr);
+// OUString
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& _rStr);
+COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& _rStr);
 
 // sal_Int16
 COMPHELPER_DLLPUBLIC const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Int16& _rValue);
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index c617f8b1811c..d6461502be54 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.hxx
@@ -80,7 +80,7 @@ namespace comphelper
                 <TRUE/> if and only if the component could be successfully created
         */
         template < typename INTERFACE >
-        bool createComponent( const ::rtl::OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
+        bool createComponent( const OUString& _rServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
         {
             _out_rxComponent.clear();
             _out_rxComponent = _out_rxComponent.query(
@@ -97,7 +97,7 @@ namespace comphelper
         template < typename INTERFACE >
         bool createComponent( const sal_Char* _pAsciiServiceName, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
         {
-            return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent );
+            return createComponent( OUString::createFromAscii( _pAsciiServiceName ), _out_rxComponent );
         }
 
         /** creates a component using our component factory/context, passing creation arguments
@@ -106,7 +106,7 @@ namespace comphelper
                 <TRUE/> if and only if the component could be successfully created
         */
         template < typename INTERFACE >
-        bool createComponentWithArguments( const ::rtl::OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
+        bool createComponentWithArguments( const OUString& _rServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
         {
             _out_rxComponent.clear();
             _out_rxComponent = _out_rxComponent.query(
@@ -123,7 +123,7 @@ namespace comphelper
         template < typename INTERFACE >
         bool createComponentWithArguments( const sal_Char* _pAsciiServiceName, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments, ::com::sun::star::uno::Reference< INTERFACE >& _out_rxComponent ) const
         {
-            return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent );
+            return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments, _out_rxComponent );
         }
 
         /** creates a component using our component factory/context
@@ -135,7 +135,7 @@ namespace comphelper
             @return
                 the newly created component. Is never <NULL/>.
         */
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const ::rtl::OUString& _rServiceName ) const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const OUString& _rServiceName ) const;
 
         /** creates a component using our component factory/context
 
@@ -148,7 +148,7 @@ namespace comphelper
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponent( const sal_Char* _pAsciiServiceName ) const
         {
-            return createComponent( ::rtl::OUString::createFromAscii( _pAsciiServiceName ) );
+            return createComponent( OUString::createFromAscii( _pAsciiServiceName ) );
         }
 
         /** creates a component using our component factory/context, passing creation arguments
@@ -161,7 +161,7 @@ namespace comphelper
                 the newly created component. Is never <NULL/>.
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createComponentWithArguments(
-            const ::rtl::OUString& _rServiceName,
+            const OUString& _rServiceName,
             const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
         ) const;
 
@@ -179,7 +179,7 @@ namespace comphelper
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& _rArguments
             ) const
         {
-            return createComponentWithArguments( ::rtl::OUString::createFromAscii( _pAsciiServiceName ), _rArguments );
+            return createComponentWithArguments( OUString::createFromAscii( _pAsciiServiceName ), _rArguments );
         }
 
         /** retrieves a singleton instance from the context
@@ -187,7 +187,7 @@ namespace comphelper
             Singletons are collected below the <code>/singletons</code> key in a component context,
             so accessing them means retrieving the value under <code>/singletons/&lt;instance_name&gt;</code>.
         */
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const ::rtl::OUString& _rInstanceName ) const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const OUString& _rInstanceName ) const;
 
         /** retrieves a singleton instance from the context
 
@@ -196,7 +196,7 @@ namespace comphelper
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getSingleton( const sal_Char* _pAsciiInstanceName ) const
         {
-            return getSingleton( ::rtl::OUString::createFromAscii( _pAsciiInstanceName ) );
+            return getSingleton( OUString::createFromAscii( _pAsciiInstanceName ) );
         }
 
         /** returns the ->XMultiServiceFactory interface of ->m_xORB, for passing to
@@ -216,7 +216,7 @@ namespace comphelper
             @seealso getContextValueByAsciiName
         */
         ::com::sun::star::uno::Any
-                getContextValueByName( const ::rtl::OUString& _rName ) const;
+                getContextValueByName( const OUString& _rName ) const;
 
         /** retrieves a value from our component context, specified by 8-bit ASCII string
             @param _rName
@@ -229,7 +229,7 @@ namespace comphelper
         inline ::com::sun::star::uno::Any
                 getContextValueByAsciiName( const sal_Char* _pAsciiName ) const
         {
-            return getContextValueByName( ::rtl::OUString::createFromAscii( _pAsciiName ) );
+            return getContextValueByName( OUString::createFromAscii( _pAsciiName ) );
         }
 
     };
diff --git a/comphelper/inc/comphelper/componentguard.hxx b/comphelper/inc/comphelper/componentguard.hxx
index 3fc17f94dfe7..eb1cfbcc24a8 100644
--- a/comphelper/inc/comphelper/componentguard.hxx
+++ b/comphelper/inc/comphelper/componentguard.hxx
@@ -40,7 +40,7 @@ namespace comphelper
             :m_aGuard( i_broadcastHelper.rMutex )
         {
             if ( i_broadcastHelper.bDisposed )
-                throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(), &i_component );
+                throw ::com::sun::star::lang::DisposedException( OUString(), &i_component );
         }
 
         ~ComponentGuard()
diff --git a/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index e01a133f7027..7e577705a805 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.hxx
@@ -41,8 +41,8 @@ namespace comphelper
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleComponentFactory > (SAL_CALL *FactoryInstantiation)
     (
         ::cppu::ComponentFactoryFunc _pFactoryFunc,
-        ::rtl::OUString const& _rComponentName,
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > const & _rServiceNames,
+        OUString const& _rComponentName,
+        ::com::sun::star::uno::Sequence< OUString > const & _rServiceNames,
         rtl_ModuleCount* _pModuleCounter
     ) SAL_THROW(());
 
@@ -52,13 +52,13 @@ namespace comphelper
     struct COMPHELPER_DLLPUBLIC ComponentDescription
     {
         /// the implementation name of the component
-        ::rtl::OUString                                     sImplementationName;
+        OUString                                     sImplementationName;
         /// the services supported by the component implementation
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >  aSupportedServices;
+        ::com::sun::star::uno::Sequence< OUString >  aSupportedServices;
         /** the name under which the component implementation should be registered as singleton,
             or empty if the component does not implement a singleton.
         */
-        ::rtl::OUString                                     sSingletonName;
+        OUString                                     sSingletonName;
         /// the function to create an instance of the component
         ::cppu::ComponentFactoryFunc                        pComponentCreationFunc;
         /// the function to create a factory for the component (usually <code>::cppu::createSingleComponentFactory</code>)
@@ -74,9 +74,9 @@ namespace comphelper
         }
 
         ComponentDescription(
-                const ::rtl::OUString& _rImplementationName,
-                const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSupportedServices,
-                const ::rtl::OUString& _rSingletonName,
+                const OUString& _rImplementationName,
+                const ::com::sun::star::uno::Sequence< OUString >& _rSupportedServices,
+                const OUString& _rSingletonName,
                 ::cppu::ComponentFactoryFunc _pComponentCreationFunc,
                 FactoryInstantiation _pFactoryCreationFunc
             )
@@ -118,8 +118,8 @@ namespace comphelper
                 a function for creating a factory for that component
         */
         void registerImplementation(
-            const ::rtl::OUString& _rImplementationName,
-            const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames,
+            const OUString& _rImplementationName,
+            const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
             ::cppu::ComponentFactoryFunc _pCreateFunction,
             FactoryInstantiation _pFactoryFunction = ::cppu::createSingleComponentFactory );
 
@@ -135,7 +135,7 @@ namespace comphelper
                 the XInterface access to a factory for the component
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
-            const ::rtl::OUString& _rImplementationName );
+            const OUString& _rImplementationName );
 
         /** version of getComponentFactory which directly takes the char argument you got in your component_getFactory call
         */
@@ -191,8 +191,8 @@ namespace comphelper
         /** automatically provides all component information to an OModule instance
             <p>Assumed that the template argument has the three methods
                 <ul>
-                    <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
-                    <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
+                    <li><code>static OUString getImplementationName_static()</code><li/>
+                    <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
                     <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
                         </li>
@@ -226,9 +226,9 @@ namespace comphelper
 
             <p>Assumed that the template argument has the three methods
                 <ul>
-                    <li><code>static ::rtl::OUString getImplementationName_static()</code><li/>
-                    <li><code>static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static()</code><li/>
-                    <li><code>static ::rtl::OUString getSingletonName_static()</code></li>
+                    <li><code>static OUString getImplementationName_static()</code><li/>
+                    <li><code>static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static()</code><li/>
+                    <li><code>static OUString getSingletonName_static()</code></li>
                     <li><code>static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                         Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&)</code>
                         </li>
diff --git a/comphelper/inc/comphelper/configuration.hxx b/comphelper/inc/comphelper/configuration.hxx
index d70b3901b550..92d5e1d1bd83 100644
--- a/comphelper/inc/comphelper/configuration.hxx
+++ b/comphelper/inc/comphelper/configuration.hxx
@@ -80,16 +80,16 @@ private:
             const & context);
 
     SAL_DLLPRIVATE void setPropertyValue(
-        rtl::OUString const & path, com::sun::star::uno::Any const & value)
+        OUString const & path, com::sun::star::uno::Any const & value)
         const;
 
     SAL_DLLPRIVATE com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameReplace >
-    getGroup(rtl::OUString const & path) const;
+    getGroup(OUString const & path) const;
 
     SAL_DLLPRIVATE
     com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
-    getSet(rtl::OUString const & path) const;
+    getSet(OUString const & path) const;
 
     com::sun::star::uno::Reference<
         com::sun::star::configuration::XReadWriteAccess > access_;
@@ -112,38 +112,38 @@ public:
 
     SAL_DLLPRIVATE ~ConfigurationWrapper();
 
-    com::sun::star::uno::Any getPropertyValue(rtl::OUString const & path) const;
+    com::sun::star::uno::Any getPropertyValue(OUString const & path) const;
 
     void setPropertyValue(
         boost::shared_ptr< ConfigurationChanges > const & batch,
-        rtl::OUString const & path, com::sun::star::uno::Any const & value)
+        OUString const & path, com::sun::star::uno::Any const & value)
         const;
 
     com::sun::star::uno::Any getLocalizedPropertyValue(
-        rtl::OUString const & path) const;
+        OUString const & path) const;
 
     void setLocalizedPropertyValue(
         boost::shared_ptr< ConfigurationChanges > const & batch,
-        rtl::OUString const & path, com::sun::star::uno::Any const & value)
+        OUString const & path, com::sun::star::uno::Any const & value)
         const;
 
     com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameAccess >
-    getGroupReadOnly(rtl::OUString const & path) const;
+    getGroupReadOnly(OUString const & path) const;
 
     com::sun::star::uno::Reference<
         com::sun::star::container::XHierarchicalNameReplace >
     getGroupReadWrite(
         boost::shared_ptr< ConfigurationChanges > const & batch,
-        rtl::OUString const & path) const;
+        OUString const & path) const;
 
     com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >
-    getSetReadOnly(rtl::OUString const & path) const;
+    getSetReadOnly(OUString const & path) const;
 
     com::sun::star::uno::Reference< com::sun::star::container::XNameContainer >
     getSetReadWrite(
         boost::shared_ptr< ConfigurationChanges > const & batch,
-        rtl::OUString const & path) const;
+        OUString const & path) const;
 
     boost::shared_ptr< ConfigurationChanges > createChanges() const;
 
diff --git a/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index 3ad6b44398dd..b267e4c0c564 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.hxx
@@ -88,7 +88,7 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      *          E.g. css::uno::Exception if the configuration could not be opened.
      */
     static css::uno::Reference< css::uno::XInterface > openConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
-                                                                  const ::rtl::OUString&                                    sPackage,
+                                                                  const OUString&                                    sPackage,
                                                                         sal_Int32                                           eMode   );
 
     //-----------------------------------------------
@@ -117,8 +117,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      *          key does not exists.
      */
     static css::uno::Any readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
-                                         const ::rtl::OUString&                            sRelPath,
-                                         const ::rtl::OUString&                            sKey    );
+                                         const OUString&                            sRelPath,
+                                         const OUString&                            sKey    );
 
     //-----------------------------------------------
     /** writes a new value for an existing(!) configuration key,
@@ -147,8 +147,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      *          access does not allow writing for this key.
      */
     static void writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
-                                 const ::rtl::OUString&                            sRelPath,
-                                 const ::rtl::OUString&                            sKey    ,
+                                 const OUString&                            sRelPath,
+                                 const OUString&                            sKey    ,
                                  const css::uno::Any&                              aValue  );
 
     //-----------------------------------------------
@@ -181,8 +181,8 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      *          access does not allow writing for this set.
      */
     static css::uno::Reference< css::uno::XInterface > makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG         ,
-                                                                             const ::rtl::OUString&                            sRelPathToSet,
-                                                                             const ::rtl::OUString&                            sSetNode     );
+                                                                             const OUString&                            sRelPathToSet,
+                                                                             const OUString&                            sSetNode     );
 
     //-----------------------------------------------
     /** commit all changes made on the specified configuration access.
@@ -210,9 +210,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      * (Excepting these keys exists inside different configuration packages ...))
      */
     static css::uno::Any readDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
-                                       const ::rtl::OUString&                                       sPackage,
-                                       const ::rtl::OUString&                                       sRelPath,
-                                       const ::rtl::OUString&                                       sKey    ,
+                                       const OUString&                                       sPackage,
+                                       const OUString&                                       sRelPath,
+                                       const OUString&                                       sKey    ,
                                              sal_Int32                                              eMode   );
 
     //-----------------------------------------------
@@ -226,9 +226,9 @@ class COMPHELPER_DLLPUBLIC ConfigurationHelper
      * (Excepting these keys exists inside different configuration packages ...))
      */
     static void writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
-                               const ::rtl::OUString&                                       sPackage,
-                               const ::rtl::OUString&                                       sRelPath,
-                               const ::rtl::OUString&                                       sKey    ,
+                               const OUString&                                       sPackage,
+                               const OUString&                                       sRelPath,
+                               const OUString&                                       sKey    ,
                                const css::uno::Any&                                         aValue  ,
                                      sal_Int32                                              eMode   );
 };
diff --git a/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx
index 62903dd7fdbe..d6c5be927873 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.hxx
@@ -47,7 +47,7 @@ protected:
         // so I have to remember where each child is in relation to its parent.
         // That is the path from the root node to m_xCurrentObject
 
-    ::rtl::OUString     m_ustrProperty;
+    OUString     m_ustrProperty;
         // The Name of the requested property
 
 public:
diff --git a/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index f44838ee37a8..24fd868c0735 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.hxx
@@ -73,7 +73,7 @@ public:
               occurred while password verification. The password request loop
               will be aborted.
      */
-    virtual DocPasswordVerifierResult verifyPassword( const ::rtl::OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
+    virtual DocPasswordVerifierResult verifyPassword( const OUString& rPassword, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& o_rEncryptionData ) = 0;
 
     /** Will be called everytime an encryption data needs to be verified.
 
@@ -115,7 +115,7 @@ public:
       */
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
-        GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword );
+        GenerateNewModifyPasswordInfo( const OUString& aPassword );
 
     // ------------------------------------------------------------------------
 
@@ -134,7 +134,7 @@ public:
       */
 
     static sal_Bool IsModifyPasswordCorrect(
-                const ::rtl::OUString& aPassword,
+                const OUString& aPassword,
                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aInfo );
 
 
@@ -151,7 +151,7 @@ public:
       */
 
     static sal_uInt32 GetWordHashAsUINT32(
-                const ::rtl::OUString& aString );
+                const OUString& aString );
 
     // ------------------------------------------------------------------------
 
@@ -171,7 +171,7 @@ public:
       */
 
     static sal_uInt16 GetXLHashAsUINT16(
-                const ::rtl::OUString& aString,
+                const OUString& aString,
                 rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
 
     // ------------------------------------------------------------------------
@@ -192,7 +192,7 @@ public:
       */
 
     static ::com::sun::star::uno::Sequence< sal_Int8 > GetXLHashAsSequence(
-                const ::rtl::OUString& aString,
+                const OUString& aString,
                 rtl_TextEncoding nEnc = RTL_TEXTENCODING_UTF8 );
 
     // ------------------------------------------------------------------------
@@ -211,7 +211,7 @@ public:
       */
 
     static ::com::sun::star::uno::Sequence< sal_Int8 > GenerateStd97Key(
-                const ::rtl::OUString& aPassword,
+                const OUString& aPassword,
                 const ::com::sun::star::uno::Sequence< sal_Int8 >& aDocId );
 
     // ------------------------------------------------------------------------
@@ -282,12 +282,12 @@ public:
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > requestAndVerifyDocPassword(
                             IDocPasswordVerifier& rVerifier,
                             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rMediaEncData,
-                            const ::rtl::OUString& rMediaPassword,
+                            const OUString& rMediaPassword,
                             const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::task::XInteractionHandler >& rxInteractHandler,
-                            const ::rtl::OUString& rDocumentName,
+                            const OUString& rDocumentName,
                             DocPasswordRequestType eRequestType,
-                            const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0,
+                            const ::std::vector< OUString >* pDefaultPasswords = 0,
                             bool* pbIsDefaultPassword = 0 );
 
     // ------------------------------------------------------------------------
@@ -336,7 +336,7 @@ public:
                             IDocPasswordVerifier& rVerifier,
                             MediaDescriptor& rMediaDesc,
                             DocPasswordRequestType eRequestType,
-                            const ::std::vector< ::rtl::OUString >* pDefaultPasswords = 0 );
+                            const ::std::vector< OUString >* pDefaultPasswords = 0 );
 
     // ------------------------------------------------------------------------
 
diff --git a/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index fd3232279867..54a32f522ae6 100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.hxx
@@ -58,7 +58,7 @@ public:
 
     sal_Bool            isPassword() const;
 
-    ::rtl::OUString     getPassword() const;
+    OUString     getPassword() const;
 
 private:
     // XInteractionRequest
@@ -85,7 +85,7 @@ public:
     explicit            DocPasswordRequest(
                             DocPasswordRequestType eType,
                             ::com::sun::star::task::PasswordRequestMode eMode,
-                            const ::rtl::OUString& rDocumentName,
+                            const OUString& rDocumentName,
                             sal_Bool bPasswordToModify = sal_False );
     virtual             ~DocPasswordRequest();
 
@@ -96,9 +96,9 @@ public:
 
     sal_Bool            isPassword() const;
 
-    ::rtl::OUString     getPassword() const;
+    OUString     getPassword() const;
 
-    ::rtl::OUString     getPasswordToModify() const;
+    OUString     getPasswordToModify() const;
     sal_Bool            getRecommendReadOnly() const;
 
 private:
diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index 1f8dbd2f14ef..2bc00220995f 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -32,15 +32,15 @@
 #define MIMETYPE_VND_SUN_XML_MATH_ASCII                 "application/vnd.sun.xml.math"
 #define MIMETYPE_VND_SUN_XML_BASE_ASCII                 "application/vnd.sun.xml.base"
 
-#define MIMETYPE_VND_SUN_XML_WRITER                     ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_WEB                 ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
-#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL              ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
-#define MIMETYPE_VND_SUN_XML_DRAW                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
-#define MIMETYPE_VND_SUN_XML_IMPRESS                    ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
-#define MIMETYPE_VND_SUN_XML_CALC                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
-#define MIMETYPE_VND_SUN_XML_CHART                      ::rtl::OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
-#define MIMETYPE_VND_SUN_XML_MATH                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
-#define MIMETYPE_VND_SUN_XML_BASE                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER                     OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_WEB                 OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL              OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW                       OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS                    OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC                       OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
+#define MIMETYPE_VND_SUN_XML_CHART                      OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
+#define MIMETYPE_VND_SUN_XML_MATH                       OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
+#define MIMETYPE_VND_SUN_XML_BASE                       OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
 
 // template formats of SO6/7
 #define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII      "application/vnd.sun.xml.writer.template"
@@ -48,10 +48,10 @@
 #define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII     "application/vnd.sun.xml.impress.template"
 #define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII        "application/vnd.sun.xml.calc.template"
 
-#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE            ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
-#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE              ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
-#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE           ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
-#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE              ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE            OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE              OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE           OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE              OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
 
 // formats of SO8
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII          "application/vnd.oasis.opendocument.text"
@@ -66,17 +66,17 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII        "application/vnd.sun.xml.report"
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII  "application/vnd.sun.xml.report.chart"
 
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT                ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB            ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL         ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING             ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION        ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET         ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART               ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT              ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT                OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB            OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL         OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING             OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION        OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET         OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_CHART               OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT              OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
 
 // template formats of SO8
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII          "application/vnd.oasis.opendocument.text-template"
@@ -98,9 +98,9 @@
 #define ODFVER_011_TEXT_ASCII   "1.1"
 #define ODFVER_012_TEXT_ASCII   "1.2"
 
-#define ODFVER_010_TEXT ::rtl::OUString( ODFVER_010_TEXT_ASCII )
-#define ODFVER_011_TEXT ::rtl::OUString( ODFVER_011_TEXT_ASCII )
-#define ODFVER_012_TEXT ::rtl::OUString( ODFVER_012_TEXT_ASCII )
+#define ODFVER_010_TEXT OUString( ODFVER_010_TEXT_ASCII )
+#define ODFVER_011_TEXT OUString( ODFVER_011_TEXT_ASCII )
+#define ODFVER_012_TEXT OUString( ODFVER_012_TEXT_ASCII )
 #endif
 
 // filter flags
diff --git a/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index e97b749443b2..48bc39a8cc00 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.hxx
@@ -36,7 +36,7 @@ namespace comphelper {
     public:
         /** retrieves the UI title of the given document
         */
-        static ::rtl::OUString  getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
+        static OUString  getDocumentTitle( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxDocument );
 
     private:
         DocumentInfo(); // never implemented
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index 2312b2d072fa..0347e12ba2c2 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -53,15 +53,15 @@ class COMPHELPER_DLLPUBLIC EmbeddedObjectContainer
 {
     EmbedImpl*  pImpl;
 
-    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const ::rtl::OUString&,
+    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const OUString&,
             const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy);
 
 public:
     // add an embedded object to the container storage
-    sal_Bool            StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString&, sal_Bool );
+    sal_Bool            StoreEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString&, sal_Bool );
 
     // add an embedded object that has been imported from the container storage - should only be called by filters!
-    void                AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const ::rtl::OUString& );
+    void                AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, const OUString& );
 
                         EmbeddedObjectContainer();
                         EmbeddedObjectContainer( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& );
@@ -73,86 +73,86 @@ public:
     sal_Bool            CommitImageSubStorage();
     void                ReleaseImageSubStorage();
 
-    ::rtl::OUString     CreateUniqueObjectName();
+    OUString     CreateUniqueObjectName();
 
     // get a list of object names that have been added so far
-    com::sun::star::uno::Sequence < ::rtl::OUString > GetObjectNames();
+    com::sun::star::uno::Sequence < OUString > GetObjectNames();
 
     // check for existence of objects at all
     sal_Bool            HasEmbeddedObjects();
 
     // check existence of an object - either by identity or by name
-    sal_Bool            HasEmbeddedObject( const ::rtl::OUString& );
+    sal_Bool            HasEmbeddedObject( const OUString& );
     sal_Bool            HasEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
-    sal_Bool            HasInstantiatedEmbeddedObject( const ::rtl::OUString& );
+    sal_Bool            HasInstantiatedEmbeddedObject( const OUString& );
 
     // get the object name of an object - this is the persist name if the object has persistence
-    ::rtl::OUString     GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
+    OUString     GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
 
     // retrieve an embedded object by name that either has been added already or is available in the container storage
-    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const ::rtl::OUString& );
+    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& );
 
     // create an object from a ClassId
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
-                        CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, ::rtl::OUString& );
+                        CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&, OUString& );
 
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
                         CreateEmbeddedObject( const com::sun::star::uno::Sequence < sal_Int8 >&,
-                        const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+                        const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >&, OUString& );
 
     // insert an embedded object into the container - objects persistent representation will be added to the storage
-    sal_Bool            InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
+    sal_Bool            InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
 
     // load an embedded object from a MediaDescriptor and insert it into the container
     // a new object will be created from the new content and returned
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
-                        InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+                        InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& );
 
     // create an embedded link based on a MediaDescriptor and insert it into the container
     // a new object will be created from the new content and returned
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
-                        InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, ::rtl::OUString& );
+                        InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >&, OUString& );
 
     // create an object from a stream that contains its persistent representation and insert it as usual (usually called from clipboard)
     // a new object will be created from the new content and returned
     ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
-                        InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, ::rtl::OUString& );
+                        InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, OUString& );
 
     // copy an embedded object into the storage, open the new copy and return it
-    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const ::rtl::OUString& aOrigName,*/ ::rtl::OUString& rName );
+    ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const OUString& aOrigName,*/ OUString& rName );
 
     // move an embedded object from one container to another one
-    sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
+    sal_Bool MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString& );
 
     // remove an embedded object from the container and from the storage; if object can't be closed
-    sal_Bool            RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose=sal_True );
+    sal_Bool            RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose=sal_True );
     sal_Bool            RemoveEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, sal_Bool bClose=sal_True );
 
     // close and remove an embedded object from the container without removing it from the storage
     sal_Bool            CloseEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& );
 
     // move an embedded object to another container (keep the persistent name)
-    sal_Bool            MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& );
+    sal_Bool            MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& );
 
     // get the stored graphical representation for the object
-    com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString* pMediaType=0 );
+    com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, OUString* pMediaType=0 );
 
     // get the stored graphical representation by the object name
-    com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const ::rtl::OUString& aName, ::rtl::OUString* pMediaType=0 );
+    com::sun::star::uno::Reference < com::sun::star::io::XInputStream > GetGraphicStream( const OUString& aName, OUString* pMediaType=0 );
 
     // add a graphical representation for an object
-    sal_Bool            InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const ::rtl::OUString& rMediaType );
+    sal_Bool            InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
 
     // try to add a graphical representation for an object in optimized way ( might fail )
-    sal_Bool            InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType );
+    sal_Bool            InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType );
 
     // remove a graphical representation for an object
-    sal_Bool            RemoveGraphicStream( const ::rtl::OUString& rObjectName );
+    sal_Bool            RemoveGraphicStream( const OUString& rObjectName );
 
     // copy the graphical representation from different container
     sal_Bool            TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
-                                                    const ::rtl::OUString& aOrigName,
-                                                    const ::rtl::OUString& aTargetName );
+                                                    const OUString& aOrigName,
+                                                    const OUString& aTargetName );
 
     void                CloseEmbeddedObjects();
     sal_Bool            StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly);
@@ -163,7 +163,7 @@ public:
     static com::sun::star::uno::Reference< com::sun::star::io::XInputStream > GetGraphicReplacementStream(
                                             sal_Int64 nViewAspect,
                                             const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >&,
-                                            ::rtl::OUString* pMediaType );
+                                            OUString* pMediaType );
 
     /** call setPersistentEntry for each embedded object in the container
     *
diff --git a/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx
index f8ff700f60a1..9870291b22f5 100644
--- a/comphelper/inc/comphelper/enumhelper.hxx
+++ b/comphelper/inc/comphelper/enumhelper.hxx
@@ -58,7 +58,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
                          , public ::cppu::WeakImplHelper2< starcontainer::XEnumeration ,
                                                            starlang::XEventListener    >
 {
-    staruno::Sequence< ::rtl::OUString >                m_aNames;
+    staruno::Sequence< OUString >                m_aNames;
     sal_Int32                                           m_nPos;
     staruno::Reference< starcontainer::XNameAccess >    m_xAccess;
     sal_Bool                                            m_bListening;
@@ -66,7 +66,7 @@ class COMPHELPER_DLLPUBLIC OEnumerationByName : private OEnumerationLock
 public:
     OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess);
     OEnumerationByName(const staruno::Reference< starcontainer::XNameAccess >& _rxAccess,
-                       const staruno::Sequence< ::rtl::OUString >&             _aNames  );
+                       const staruno::Sequence< OUString >&             _aNames  );
     virtual ~OEnumerationByName();
 
     virtual sal_Bool SAL_CALL hasMoreElements(  ) throw(staruno::RuntimeException);
diff --git a/comphelper/inc/comphelper/evtmethodhelper.hxx b/comphelper/inc/comphelper/evtmethodhelper.hxx
index f2aec5cdfef0..7ecf08a0fc57 100644
--- a/comphelper/inc/comphelper/evtmethodhelper.hxx
+++ b/comphelper/inc/comphelper/evtmethodhelper.hxx
@@ -22,7 +22,7 @@
 //........................................................................
 namespace comphelper
 {
-    COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
+    COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
 //........................................................................
 
 }   // namespace comphelper
diff --git a/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx
index 2ac1ac93d761..eb0b13957874 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/comphelper/inc/comphelper/ihwrapnofilter.hxx
@@ -52,8 +52,8 @@ namespace comphelper {
         OIHWrapNoFilterDialog( com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler > xInteraction );
         ~OIHWrapNoFilterDialog();
 
-        static ::rtl::OUString SAL_CALL impl_staticGetImplementationName();
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL impl_staticGetSupportedServiceNames();
+        static OUString SAL_CALL impl_staticGetImplementationName();
+        static ::com::sun::star::uno::Sequence< OUString > SAL_CALL impl_staticGetSupportedServiceNames();
 
 
         //____________________________________________________________________________________________________
@@ -83,13 +83,13 @@ namespace comphelper {
         // XServiceInfo
         //____________________________________________________________________________________________________
 
-        virtual ::rtl::OUString SAL_CALL getImplementationName()
+        virtual OUString SAL_CALL getImplementationName()
             throw ( ::com::sun::star::uno::RuntimeException );
 
-        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
             throw ( ::com::sun::star::uno::RuntimeException );
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
             throw ( ::com::sun::star::uno::RuntimeException );
 
     };
diff --git a/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx
index 230604ef87c9..bbd925efd3fa 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/comphelper/inc/comphelper/interaction.hxx
@@ -113,17 +113,17 @@ namespace comphelper
         {
         }
 
-        OInteractionPassword( const ::rtl::OUString& _rInitialPassword )
+        OInteractionPassword( const OUString& _rInitialPassword )
             :m_sPassword( _rInitialPassword )
         {
         }
 
         // XInteractionPassword
-        virtual void SAL_CALL setPassword( const ::rtl::OUString& _Password ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getPassword(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setPassword( const OUString& _Password ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getPassword(  ) throw (::com::sun::star::uno::RuntimeException);
 
     private:
-        ::rtl::OUString m_sPassword;
+        OUString m_sPassword;
     };
 
     //=========================================================================
diff --git a/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 56bebab74145..b6356384af3d 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.hxx
@@ -41,23 +41,23 @@ namespace comphelper
 
     namespace log { namespace convert
     {
-        inline const ::rtl::OUString& convertLogArgToString( const ::rtl::OUString& _rValue )
+        inline const OUString& convertLogArgToString( const OUString& _rValue )
         {
             return _rValue;
         }
 
-        inline ::rtl::OUString convertLogArgToString( const sal_Char* _pAsciiValue )
+        inline OUString convertLogArgToString( const sal_Char* _pAsciiValue )
         {
-            return ::rtl::OUString::createFromAscii( _pAsciiValue );
+            return OUString::createFromAscii( _pAsciiValue );
         }
 
-        inline ::rtl::OUString convertLogArgToString( double      _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
-        inline ::rtl::OUString convertLogArgToString( float       _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
-        inline ::rtl::OUString convertLogArgToString( sal_Int64   _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
-        inline ::rtl::OUString convertLogArgToString( sal_Int32   _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
-        inline ::rtl::OUString convertLogArgToString( sal_Int16   _nValue ) { return ::rtl::OUString::valueOf( (sal_Int32)_nValue ); }
-        inline ::rtl::OUString convertLogArgToString( sal_Unicode _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
-        inline ::rtl::OUString convertLogArgToString( sal_Bool    _nValue ) { return ::rtl::OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( double      _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( float       _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int64   _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int32   _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( sal_Int16   _nValue ) { return OUString::valueOf( (sal_Int32)_nValue ); }
+        inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString::valueOf( _nValue ); }
+        inline OUString convertLogArgToString( sal_Bool    _nValue ) { return OUString::valueOf( _nValue ); }
 
     } } // namespace log::convert
 
@@ -65,7 +65,7 @@ namespace comphelper
     //= EventLogger
     //====================================================================
     class EventLogger_Impl;
-    typedef ::boost::optional< ::rtl::OUString >    OptionalString;
+    typedef ::boost::optional< OUString >    OptionalString;
 
     /** encapsulates an <type scope="com::sun::star::logging">XLogger</type>
 
@@ -120,7 +120,7 @@ namespace comphelper
         //- string messages
 
         /// logs a given message, without any arguments, or source class/method names
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage );
@@ -135,7 +135,7 @@ namespace comphelper
             is searched in the message string, and replaced with the argument string.
         */
         template< typename ARGTYPE1 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -145,7 +145,7 @@ namespace comphelper
 
         /// logs a given message, replacing 2 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -156,7 +156,7 @@ namespace comphelper
 
         /// logs a given message, replacing 3 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -168,7 +168,7 @@ namespace comphelper
 
         /// logs a given message, replacing 4 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -181,7 +181,7 @@ namespace comphelper
 
         /// logs a given message, replacing 5 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -195,7 +195,7 @@ namespace comphelper
 
         /// logs a given message, replacing 6 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
-        bool        log( const sal_Int32 _nLogLevel, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+        bool        log( const sal_Int32 _nLogLevel, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, NULL, NULL, _rMessage,
@@ -216,7 +216,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ) );
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ) );
             return false;
         }
 
@@ -231,7 +231,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
             return false;
         }
@@ -241,7 +241,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
             return false;
@@ -252,7 +252,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -264,7 +264,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -277,7 +277,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -291,7 +291,7 @@ namespace comphelper
         bool        log( const sal_Int32 _nLogLevel, const sal_Char* _pMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, NULL, NULL, ::rtl::OUString::createFromAscii( _pMessage ),
+                return impl_log( _nLogLevel, NULL, NULL, OUString::createFromAscii( _pMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -306,7 +306,7 @@ namespace comphelper
         //- string messages
 
         /// logs a given message, without any arguments, or source class/method names
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage );
@@ -321,7 +321,7 @@ namespace comphelper
             is searched in the message string, and replaced with the argument string.
         */
         template< typename ARGTYPE1 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -331,7 +331,7 @@ namespace comphelper
 
         /// logs a given message, replacing 2 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -342,7 +342,7 @@ namespace comphelper
 
         /// logs a given message, replacing 3 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -354,7 +354,7 @@ namespace comphelper
 
         /// logs a given message, replacing 4 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -367,7 +367,7 @@ namespace comphelper
 
         /// logs a given message, replacing 5 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -381,7 +381,7 @@ namespace comphelper
 
         /// logs a given message, replacing 6 placeholders in the message with respective values
         template< typename ARGTYPE1, typename ARGTYPE2, typename ARGTYPE3, typename ARGTYPE4, typename ARGTYPE5, typename ARGTYPE6 >
-        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
+        bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
                 return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, _rMessage,
@@ -402,7 +402,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ) );
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ) );
             return false;
         }
 
@@ -417,7 +417,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ) );
             return false;
         }
@@ -427,7 +427,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ) );
             return false;
@@ -438,7 +438,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ) );
@@ -450,7 +450,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -463,7 +463,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -477,7 +477,7 @@ namespace comphelper
         bool        logp( const sal_Int32 _nLogLevel, const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const sal_Char* _pAsciiMessage, ARGTYPE1 _argument1, ARGTYPE2 _argument2, ARGTYPE3 _argument3, ARGTYPE4 _argument4, ARGTYPE5 _argument5, ARGTYPE6 _argument6 ) const
         {
             if ( isLoggable( _nLogLevel ) )
-                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+                return impl_log( _nLogLevel, _pSourceClass, _pSourceMethod, OUString::createFromAscii( _pAsciiMessage ),
                     OptionalString( log::convert::convertLogArgToString( _argument1 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument2 ) ),
                     OptionalString( log::convert::convertLogArgToString( _argument3 ) ),
@@ -492,7 +492,7 @@ namespace comphelper
                         const sal_Int32 _nLogLevel,
                         const sal_Char* _pSourceClass,
                         const sal_Char* _pSourceMethod,
-                        const ::rtl::OUString& _rMessage,
+                        const OUString& _rMessage,
                         const OptionalString& _rArgument1 = OptionalString(),
                         const OptionalString& _rArgument2 = OptionalString(),
                         const OptionalString& _rArgument3 = OptionalString(),
@@ -714,7 +714,7 @@ namespace comphelper
         }
 
     private:
-        ::rtl::OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const;
+        OUString impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const;
     };
 
 //........................................................................
diff --git a/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index ac045dc2c4a0..7c7174644292 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.hxx
@@ -52,47 +52,47 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                     does not work as expected under windows (under unix it works as well)
                     these way must be used :-(
           */
-        static const ::rtl::OUString& PROP_ABORTED();
-        static const ::rtl::OUString& PROP_ASTEMPLATE();
-        static const ::rtl::OUString& PROP_COMPONENTDATA();
-        static const ::rtl::OUString& PROP_DOCUMENTSERVICE();
-        static const ::rtl::OUString& PROP_ENCRYPTIONDATA();
-        static const ::rtl::OUString& PROP_FILENAME();
-        static const ::rtl::OUString& PROP_FILTERNAME();
-        static const ::rtl::OUString& PROP_FILTERPROVIDER();
-        static const ::rtl::OUString& PROP_FILTEROPTIONS();
-        static const ::rtl::OUString& PROP_FRAME();
-        static const ::rtl::OUString& PROP_FRAMENAME();
-        static const ::rtl::OUString& PROP_HIDDEN();
-        static const ::rtl::OUString& PROP_INPUTSTREAM();
-        static const ::rtl::OUString& PROP_INTERACTIONHANDLER();
-        static const ::rtl::OUString& PROP_JUMPMARK();
-        static const ::rtl::OUString& PROP_MACROEXECUTIONMODE();
-        static const ::rtl::OUString& PROP_MEDIATYPE();
-        static const ::rtl::OUString& PROP_MINIMIZED();
-        static const ::rtl::OUString& PROP_NOAUTOSAVE();
-        static const ::rtl::OUString& PROP_OPENNEWVIEW();
-        static const ::rtl::OUString& PROP_OUTPUTSTREAM();
-        static const ::rtl::OUString& PROP_PASSWORD();
-        static const ::rtl::OUString& PROP_POSTDATA();
-        static const ::rtl::OUString& PROP_PREVIEW();
-        static const ::rtl::OUString& PROP_READONLY();
-        static const ::rtl::OUString& PROP_REFERRER();
-        static const ::rtl::OUString& PROP_SALVAGEDFILE();
-        static const ::rtl::OUString& PROP_STATUSINDICATOR();
-        static const ::rtl::OUString& PROP_STREAM();
-        static const ::rtl::OUString& PROP_STREAMFOROUTPUT();
-        static const ::rtl::OUString& PROP_TEMPLATENAME();
-        static const ::rtl::OUString& PROP_TITLE();
-        static const ::rtl::OUString& PROP_TYPENAME();
-        static const ::rtl::OUString& PROP_UCBCONTENT();
-        static const ::rtl::OUString& PROP_UPDATEDOCMODE();
-        static const ::rtl::OUString& PROP_URL();
-        static const ::rtl::OUString& PROP_VERSION();
-        static const ::rtl::OUString& PROP_DOCUMENTTITLE();
-        static const ::rtl::OUString& PROP_MODEL();
-        static const ::rtl::OUString& PROP_VIEWONLY();
-        static const ::rtl::OUString& PROP_DOCUMENTBASEURL();
+        static const OUString& PROP_ABORTED();
+        static const OUString& PROP_ASTEMPLATE();
+        static const OUString& PROP_COMPONENTDATA();
+        static const OUString& PROP_DOCUMENTSERVICE();
+        static const OUString& PROP_ENCRYPTIONDATA();
+        static const OUString& PROP_FILENAME();
+        static const OUString& PROP_FILTERNAME();
+        static const OUString& PROP_FILTERPROVIDER();
+        static const OUString& PROP_FILTEROPTIONS();
+        static const OUString& PROP_FRAME();
+        static const OUString& PROP_FRAMENAME();
+        static const OUString& PROP_HIDDEN();
+        static const OUString& PROP_INPUTSTREAM();
+        static const OUString& PROP_INTERACTIONHANDLER();
+        static const OUString& PROP_JUMPMARK();
+        static const OUString& PROP_MACROEXECUTIONMODE();
+        static const OUString& PROP_MEDIATYPE();
+        static const OUString& PROP_MINIMIZED();
+        static const OUString& PROP_NOAUTOSAVE();
+        static const OUString& PROP_OPENNEWVIEW();
+        static const OUString& PROP_OUTPUTSTREAM();
+        static const OUString& PROP_PASSWORD();
+        static const OUString& PROP_POSTDATA();
+        static const OUString& PROP_PREVIEW();
+        static const OUString& PROP_READONLY();
+        static const OUString& PROP_REFERRER();
+        static const OUString& PROP_SALVAGEDFILE();
+        static const OUString& PROP_STATUSINDICATOR();
+        static const OUString& PROP_STREAM();
+        static const OUString& PROP_STREAMFOROUTPUT();
+        static const OUString& PROP_TEMPLATENAME();
+        static const OUString& PROP_TITLE();
+        static const OUString& PROP_TYPENAME();
+        static const OUString& PROP_UCBCONTENT();
+        static const OUString& PROP_UPDATEDOCMODE();
+        static const OUString& PROP_URL();
+        static const OUString& PROP_VERSION();
+        static const OUString& PROP_DOCUMENTTITLE();
+        static const OUString& PROP_MODEL();
+        static const OUString& PROP_VIEWONLY();
+        static const OUString& PROP_DOCUMENTBASEURL();
 
         static const OUString& PROP_DEEPDETECTION();
 
@@ -179,7 +179,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                 Any.
          */
         ::com::sun::star::uno::Any getComponentDataEntry(
-            const ::rtl::OUString& rName ) const;
+            const OUString& rName ) const;
 
         //---------------------------------------
         /** Inserts a value into the sequence contained in the property
@@ -198,7 +198,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                 'ComponentData' property.
          */
         void setComponentDataEntry(
-            const ::rtl::OUString& rName,
+            const OUString& rName,
             const ::com::sun::star::uno::Any& rValue );
 
         //---------------------------------------
@@ -214,7 +214,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                 of the 'ComponentData' property.
          */
         void clearComponentDataEntry(
-            const ::rtl::OUString& rName );
+            const OUString& rName );
 
     //-------------------------------------------
     // helper
@@ -267,7 +267,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
                     if the MediaDescriptor seems to be invalid!
          */
         COMPHELPER_DLLPRIVATE sal_Bool impl_openStreamWithURL(
-            const ::rtl::OUString& sURL,
+            const OUString& sURL,
             sal_Bool bLockFile
             ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -281,7 +281,7 @@ class COMPHELPER_DLLPUBLIC MediaDescriptor : public SequenceAsHashMap
             @return [string]
                     the "normalized" URL (e.g. without jumpmark)
          */
-        COMPHELPER_DLLPRIVATE ::rtl::OUString impl_normalizeURL(const ::rtl::OUString& sURL);
+        COMPHELPER_DLLPRIVATE OUString impl_normalizeURL(const OUString& sURL);
 
         //---------------------------------------
         /** @short  it checks if the descriptor already has a valid
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 8cf7953394e7..6e2b128d5a23 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -51,13 +51,13 @@ public:
     MimeConfigurationHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
 
-    static ::rtl::OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
+    static OUString GetStringClassIDRepresentation( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
 
-    static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID );
+    static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassIDRepresentation( const OUString& aClassID );
 
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
-                                            GetConfigurationByPath( const ::rtl::OUString& aPath );
+                                            GetConfigurationByPath( const OUString& aPath );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetObjConfiguration();
 
@@ -65,61 +65,61 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetMediaTypeConfiguration();
 
 
-    ::rtl::OUString GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName );
+    OUString GetDocServiceNameFromFilter( const OUString& aFilterName );
 
-    ::rtl::OUString GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType );
+    OUString GetDocServiceNameFromMediaType( const OUString& aMediaType );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjPropsFromConfigEntry(
                         const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xObjectProps );
 
-    sal_Bool GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut,
+    sal_Bool GetVerbByShortcut( const OUString& aVerbShortcut,
                                 ::com::sun::star::embed::VerbDescriptor& aDescriptor );
 
-    ::rtl::OUString GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType );
+    OUString GetExplicitlyRegisteredObjClassID( const OUString& aMediaType );
 
 
     // retrieving object description from configuration
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByStringClassID(
-                                                                const ::rtl::OUString& aStringClassID );
+                                                                const OUString& aStringClassID );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByClassID(
                                                 const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByMediaType(
-                                                const ::rtl::OUString& aMediaType );
+                                                const OUString& aMediaType );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByFilter(
-                                                const ::rtl::OUString& aFilterName );
+                                                const OUString& aFilterName );
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetObjectPropsByDocumentName(
-                                                const ::rtl::OUString& aDocumentName );
+                                                const OUString& aDocumentName );
 
     // retrieving object factory from configuration
-    ::rtl::OUString GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID );
-    ::rtl::OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
-    ::rtl::OUString GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName );
-    ::rtl::OUString GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType );
+    OUString GetFactoryNameByStringClassID( const OUString& aStringClassID );
+    OUString GetFactoryNameByClassID( const ::com::sun::star::uno::Sequence< sal_Int8 >& aClassID );
+    OUString GetFactoryNameByDocumentName( const OUString& aDocName );
+    OUString GetFactoryNameByMediaType( const OUString& aMediaType );
 
     // typedetection related
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > GetFilterFactory();
 
-    ::rtl::OUString UpdateMediaDescriptorWithFilterName(
+    OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         sal_Bool bIgnoreType );
-    ::rtl::OUString UpdateMediaDescriptorWithFilterName(
+    OUString UpdateMediaDescriptorWithFilterName(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr,
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aObject );
 #ifdef WNT
-    sal_Int32 GetFilterFlags( const ::rtl::OUString& aFilterName );
+    sal_Int32 GetFilterFlags( const OUString& aFilterName );
 
     sal_Bool AddFilterNameCheckOwnFile(
                         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aMediaDescr );
 #endif
 
-    ::rtl::OUString GetDefaultFilterFromServiceName( const ::rtl::OUString& aServName, sal_Int32 nVersion );
+    OUString GetDefaultFilterFromServiceName( const OUString& aServName, sal_Int32 nVersion );
 
-    ::rtl::OUString GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName );
+    OUString GetExportFilterFromImportFilter( const OUString& aImportFilterName );
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SearchForFilter(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerQuery >& xFilterQuery,
diff --git a/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index f42602bfccb4..93b53dd14c6c 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.hxx
@@ -132,7 +132,7 @@ namespace comphelper
 
         /** returns the names of all elements in the collection
         */
-        ::std::vector< ::rtl::OUString >
+        ::std::vector< OUString >
                 getNames() const;
 
         /** merges the content of another collection into |this|
@@ -171,11 +171,11 @@ namespace comphelper
         template < typename VALUE_TYPE >
         bool get_ensureType( const sal_Char* _pAsciiValueName, VALUE_TYPE& _out_rValue ) const
         {
-            return get_ensureType( ::rtl::OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
+            return get_ensureType( OUString::createFromAscii( _pAsciiValueName ), &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
         }
 
         template < typename VALUE_TYPE >
-        bool    get_ensureType( const ::rtl::OUString& _rValueName, VALUE_TYPE& _out_rValue ) const
+        bool    get_ensureType( const OUString& _rValueName, VALUE_TYPE& _out_rValue ) const
         {
             return get_ensureType( _rValueName, &_out_rValue, ::cppu::UnoType< VALUE_TYPE >::get() );
         }
@@ -186,11 +186,11 @@ namespace comphelper
         template < typename VALUE_TYPE >
         VALUE_TYPE  getOrDefault( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rDefault ) const
         {
-            return getOrDefault( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rDefault );
+            return getOrDefault( OUString::createFromAscii( _pAsciiValueName ), _rDefault );
         }
 
         template < typename VALUE_TYPE >
-        VALUE_TYPE  getOrDefault( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rDefault ) const
+        VALUE_TYPE  getOrDefault( const OUString& _rValueName, const VALUE_TYPE& _rDefault ) const
         {
             VALUE_TYPE retVal( _rDefault );
             get_ensureType( _rValueName, retVal );
@@ -204,7 +204,7 @@ namespace comphelper
         */
         const ::com::sun::star::uno::Any& get( const sal_Char* _pAsciiValueName ) const
         {
-            return get( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+            return get( OUString::createFromAscii( _pAsciiValueName ) );
         }
 
         /** retrieves a (untyped) value with a given name
@@ -212,7 +212,7 @@ namespace comphelper
             If the collection does not contain a value with the given name, an empty
             Any is returned.
         */
-        const ::com::sun::star::uno::Any& get( const ::rtl::OUString& _rValueName ) const
+        const ::com::sun::star::uno::Any& get( const OUString& _rValueName ) const
         {
             return impl_get( _rValueName );
         }
@@ -220,11 +220,11 @@ namespace comphelper
         /// determines whether a value with a given name is present in the collection
         inline bool has( const sal_Char* _pAsciiValueName ) const
         {
-            return impl_has( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+            return impl_has( OUString::createFromAscii( _pAsciiValueName ) );
         }
 
         /// determines whether a value with a given name is present in the collection
-        inline bool has( const ::rtl::OUString& _rValueName ) const
+        inline bool has( const OUString& _rValueName ) const
         {
             return impl_has( _rValueName );
         }
@@ -237,7 +237,7 @@ namespace comphelper
         template < typename VALUE_TYPE >
         inline bool put( const sal_Char* _pAsciiValueName, const VALUE_TYPE& _rValue )
         {
-            return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) );
+            return impl_put( OUString::createFromAscii( _pAsciiValueName ), ::com::sun::star::uno::makeAny( _rValue ) );
         }
 
         /** puts a value into the collection
@@ -246,17 +246,17 @@ namespace comphelper
                 which case it has been overwritten.
         */
         template < typename VALUE_TYPE >
-        inline bool put( const ::rtl::OUString& _rValueName, const VALUE_TYPE& _rValue )
+        inline bool put( const OUString& _rValueName, const VALUE_TYPE& _rValue )
         {
             return impl_put( _rValueName, ::com::sun::star::uno::makeAny( _rValue ) );
         }
 
         inline bool put( const sal_Char* _pAsciiValueName, const ::com::sun::star::uno::Any& _rValue )
         {
-            return impl_put( ::rtl::OUString::createFromAscii( _pAsciiValueName ), _rValue );
+            return impl_put( OUString::createFromAscii( _pAsciiValueName ), _rValue );
         }
 
-        inline bool put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue )
+        inline bool put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue )
         {
             return impl_put( _rValueName, _rValue );
         }
@@ -267,14 +267,14 @@ namespace comphelper
         */
         inline bool remove( const sal_Char* _pAsciiValueName )
         {
-            return impl_remove( ::rtl::OUString::createFromAscii( _pAsciiValueName ) );
+            return impl_remove( OUString::createFromAscii( _pAsciiValueName ) );
         }
 
         /** removes the value with the given name from the collection
 
             @return <TRUE/> if and only if a value with the given name existed in the collection.
         */
-        inline bool remove( const ::rtl::OUString& _rValueName )
+        inline bool remove( const OUString& _rValueName )
         {
             return impl_remove( _rValueName );
         }
@@ -336,19 +336,19 @@ namespace comphelper
         void    impl_assign( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _rArguments );
 
         bool    get_ensureType(
-                    const ::rtl::OUString& _rValueName,
+                    const OUString& _rValueName,
                     void* _pValueLocation,
                     const ::com::sun::star::uno::Type& _rExpectedValueType
                 ) const;
 
         const ::com::sun::star::uno::Any&
-                impl_get( const ::rtl::OUString& _rValueName ) const;
+                impl_get( const OUString& _rValueName ) const;
 
-        bool    impl_has( const ::rtl::OUString& _rValueName ) const;
+        bool    impl_has( const OUString& _rValueName ) const;
 
-        bool    impl_put( const ::rtl::OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue );
+        bool    impl_put( const OUString& _rValueName, const ::com::sun::star::uno::Any& _rValue );
 
-        bool    impl_remove( const ::rtl::OUString& _rValueName );
+        bool    impl_remove( const OUString& _rValueName );
 
         template< class VALUE_TYPE >
         ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > impl_wrap() const
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 59183e460b9e..6a311767658d 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.hxx
@@ -104,7 +104,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
             @param  sPrefix
                     the new prefix for untitled components.
          */
-        void setUntitledPrefix(const ::rtl::OUString& sPrefix);
+        void setUntitledPrefix(const OUString& sPrefix);
 
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
@@ -126,7 +126,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
 
         //---------------------------------------
         /** @see css.frame.XUntitledNumbers */
-        virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
+        virtual OUString SAL_CALL getUntitledPrefix()
             throw (css::uno::RuntimeException);
 
     //-------------------------------------------
@@ -160,7 +160,7 @@ class COMPHELPER_DLLPUBLIC NumberedCollection : private ::cppu::BaseMutex
     private:
 
         /// localized string to be used for untitled components
-        ::rtl::OUString m_sUntitledPrefix;
+        OUString m_sUntitledPrefix;
 
         /// cache of all "leased numbers" and its bound components
         TNumberedItemHash m_lComponents;
diff --git a/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx
index 87ae613a1084..b64fe341da4f 100644
--- a/comphelper/inc/comphelper/numbers.hxx
+++ b/comphelper/inc/comphelper/numbers.hxx
@@ -55,7 +55,7 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Any getNumberFormatProperty(
         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
         sal_Int32 _nKey,
-        const rtl::OUString& _rPropertyName
+        const OUString& _rPropertyName
     );
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index 8bec9326524b..5e6d9e1bccc5 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.hxx
@@ -73,7 +73,7 @@ namespace comphelper
                 an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
                 then.
         */
-        ::rtl::OUString loadString( sal_Int32 _resourceId ) const;
+        OUString loadString( sal_Int32 _resourceId ) const;
 
         /** determines whether the resource bundle has a string with the given id
             @param  _resourceId
diff --git a/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx
index c263022166cd..e054d0dbc909 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/comphelper/inc/comphelper/ofopxmlhelper.hxx
@@ -37,28 +37,28 @@ class COMPHELPER_DLLPUBLIC OFOPXMLHelper : public cppu::WeakImplHelper1 < com::s
     sal_uInt16 m_nFormat; // which format to parse
 
     // Relations info related strings
-    ::rtl::OUString m_aRelListElement;
-    ::rtl::OUString m_aRelElement;
-    ::rtl::OUString m_aIDAttr;
-    ::rtl::OUString m_aTypeAttr;
-    ::rtl::OUString m_aTargetModeAttr;
-    ::rtl::OUString m_aTargetAttr;
+    OUString m_aRelListElement;
+    OUString m_aRelElement;
+    OUString m_aIDAttr;
+    OUString m_aTypeAttr;
+    OUString m_aTargetModeAttr;
+    OUString m_aTargetAttr;
 
     // ContentType related strings
-    ::rtl::OUString m_aTypesElement;
-    ::rtl::OUString m_aDefaultElement;
-    ::rtl::OUString m_aOverrideElement;
-    ::rtl::OUString m_aExtensionAttr;
-    ::rtl::OUString m_aPartNameAttr;
-    ::rtl::OUString m_aContentTypeAttr;
+    OUString m_aTypesElement;
+    OUString m_aDefaultElement;
+    OUString m_aOverrideElement;
+    OUString m_aExtensionAttr;
+    OUString m_aPartNameAttr;
+    OUString m_aContentTypeAttr;
 
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > m_aResultSeq;
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aElementsSeq; // stack of elements being parsed
+    ::com::sun::star::uno::Sequence< OUString > m_aElementsSeq; // stack of elements being parsed
 
     OFOPXMLHelper( sal_uInt16 nFormat ); // must not be created directly
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > GetParsingResult();
 
-    static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
+    static COMPHELPER_DLLPRIVATE ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > > SAL_CALL ReadSequence_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
     throw( ::com::sun::star::uno::Exception );
 
 public:
@@ -72,7 +72,7 @@ public:
     SAL_CALL
     ReadRelationsInfoSequence(
         const ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >& xInStream,
-        const ::rtl::OUString aStreamName,
+        const OUString aStreamName,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext )
             throw( ::com::sun::star::uno::Exception );
 
@@ -115,11 +115,11 @@ public:
     // XDocumentHandler
     virtual void SAL_CALL startDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL endDocument() throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL startElement( const OUString& aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttribs ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL endElement( const OUString& aName ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL characters( const OUString& aChars ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDocumentLocator( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator >& xLocator ) throw (::com::sun::star::xml::sax::SAXException, ::com::sun::star::uno::RuntimeException);
 };
 
diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx
index f499b2091a33..e49f589990e7 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/comphelper/inc/comphelper/propagg.hxx
@@ -73,7 +73,7 @@ public:
         @return                 the handle the property should be refered by, or -1 if there are no
                                 preferences for the given property
     */
-    virtual sal_Int32           getPreferedPropertyId(const ::rtl::OUString& _rName) = 0;
+    virtual sal_Int32           getPreferedPropertyId(const OUString& _rName) = 0;
 
 protected:
     ~IPropertyInfoService() {}
@@ -125,21 +125,21 @@ public:
 
 
     /// inherited from IPropertyArrayHelper
-    virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( ::rtl::OUString* _pPropName, sal_Int16* _pAttributes,
+    virtual sal_Bool SAL_CALL fillPropertyMembersByHandle( OUString* _pPropName, sal_Int16* _pAttributes,
                                             sal_Int32 _nHandle) ;
 
     /// inherited from IPropertyArrayHelper
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> SAL_CALL getProperties();
     /// inherited from IPropertyArrayHelper
-    virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const ::rtl::OUString& _rPropertyName)
+    virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName(const OUString& _rPropertyName)
                                 throw(::com::sun::star::beans::UnknownPropertyException);
 
     /// inherited from IPropertyArrayHelper
-    virtual sal_Bool  SAL_CALL hasPropertyByName(const ::rtl::OUString& _rPropertyName) ;
+    virtual sal_Bool  SAL_CALL hasPropertyByName(const OUString& _rPropertyName) ;
     /// inherited from IPropertyArrayHelper
-    virtual sal_Int32 SAL_CALL getHandleByName(const ::rtl::OUString & _rPropertyName);
+    virtual sal_Int32 SAL_CALL getHandleByName(const OUString & _rPropertyName);
     /// inherited from IPropertyArrayHelper
-    virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames );
+    virtual sal_Int32 SAL_CALL fillHandles( /*out*/sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames );
 
     /** returns information about a property of the aggregate.
         @param  _pPropName          points to a string to recieve the property name. No name is returned if this is NULL.
@@ -149,7 +149,7 @@ public:
 
         @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False
     */
-    virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle,
+    virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(OUString* _pPropName, sal_Int32* _pOriginalHandle,
                                                    sal_Int32 _nHandle) const;
 
     /** returns information about a property given by handle
@@ -175,10 +175,10 @@ public:
         When using the XPropertySetInfo of the aggregate set to determine the existence of a property, then this
         would return false positives.</p>
     */
-    PropertyOrigin  classifyProperty( const ::rtl::OUString& _rName );
+    PropertyOrigin  classifyProperty( const OUString& _rName );
 
 protected:
-    const ::com::sun::star::beans::Property* findPropertyByName(const ::rtl::OUString& _rName) const;
+    const ::com::sun::star::beans::Property* findPropertyByName(const OUString& _rName) const;
 };
 
 //==================================================================
@@ -221,8 +221,8 @@ public:
     virtual ::com::sun::star::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // XPropertySet
-    virtual void SAL_CALL           addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL           addVetoableChangeListener(const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL           addPropertyChangeListener(const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL           addVetoableChangeListener(const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // XPropertiesChangeListener
     virtual void SAL_CALL propertiesChange(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyChangeEvent >& evt) throw(::com::sun::star::uno::RuntimeException);
@@ -231,13 +231,13 @@ public:
     virtual void SAL_CALL vetoableChange(const ::com::sun::star::beans::PropertyChangeEvent& aEvent) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
 
 // XMultiPropertySet
-    virtual void SAL_CALL   setPropertyValues(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL   addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   setPropertyValues(const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL   addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener) throw(::com::sun::star::uno::RuntimeException);
 
 // XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL                                   setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL             getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL                                   setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL             getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
 // OPropertySetHelper
     /** still waiting to be overwritten ...
@@ -262,7 +262,7 @@ protected:
     virtual void SAL_CALL disposing();
 
     sal_Int32       getOriginalHandle( sal_Int32 _nHandle ) const;
-    ::rtl::OUString getPropertyName( sal_Int32 _nHandle ) const;
+    OUString getPropertyName( sal_Int32 _nHandle ) const;
 
     /** declares the property with the given (public) handle as one to be forwarded to the aggregate
 
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index 29ff7b2b9eca..e8d75c7ed3d6 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.hxx
@@ -55,15 +55,15 @@ namespace comphelper
     //--------------------------------------------------------------------------
     /** compare two properties by name
      */
-    struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, ::rtl::OUString, bool >
+    struct PropertyStringEqualFunctor : ::std::binary_function< ::com::sun::star::beans::Property, OUString, bool >
     {
         // ................................................................
-        inline bool operator()( const ::com::sun::star::beans::Property& lhs, const ::rtl::OUString& rhs ) const
+        inline bool operator()( const ::com::sun::star::beans::Property& lhs, const OUString& rhs ) const
         {
             return lhs.Name == rhs ;
         }
         // ................................................................
-        inline bool operator()( const ::rtl::OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const
+        inline bool operator()( const OUString& lhs, const ::com::sun::star::beans::Property& rhs ) const
         {
             return lhs == rhs.Name ;
         }
@@ -80,7 +80,7 @@ namespace comphelper
 
 //------------------------------------------------------------------
 /// remove the property with the given name from the given sequence
-COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const ::rtl::OUString& _rPropName);
+COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>& seqProps, const OUString& _rPropName);
 
 //------------------------------------------------------------------
 /** within the given property sequence, modify attributes of a special property
@@ -89,12 +89,12 @@ COMPHELPER_DLLPUBLIC void RemoveProperty(staruno::Sequence<starbeans::Property>&
     @param  _nAddAttrib     the attributes which should be added
     @param  _nRemoveAttrib  the attributes which should be removed
 */
-COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const ::rtl::OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
+COMPHELPER_DLLPUBLIC void ModifyPropertyAttributes(staruno::Sequence<starbeans::Property>& _rProps, const OUString& _sPropName, sal_Int16 _nAddAttrib, sal_Int16 _nRemoveAttrib);
 
 //------------------------------------------------------------------
 /** check if the given set has the given property.
 */
-COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const rtl::OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
+COMPHELPER_DLLPUBLIC sal_Bool hasProperty(const OUString& _rName, const staruno::Reference<starbeans::XPropertySet>& _rxSet);
 
 //------------------------------------------------------------------
 /** copy properties between property sets, in compliance with the property
diff --git a/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index 997b9e37015a..92c0026ba845 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.hxx
@@ -78,7 +78,7 @@ namespace comphelper
                 if the name is empty
         */
         void    addProperty(
-                    const ::rtl::OUString& _rName,
+                    const OUString& _rName,
                     sal_Int32 _nHandle,
                     sal_Int32 _nAttributes,
                     const ::com::sun::star::uno::Any& _rInitialValue
@@ -106,7 +106,7 @@ namespace comphelper
                 if the name is empty
         */
         void    addVoidProperty(
-                    const ::rtl::OUString& _rName,
+                    const OUString& _rName,
                     const ::com::sun::star::uno::Type& _rType,
                     sal_Int32 _nHandle,
                     sal_Int32 _nAttributes
@@ -123,7 +123,7 @@ namespace comphelper
                 call.
         */
         void    removeProperty(
-                    const ::rtl::OUString& _rName
+                    const OUString& _rName
                 );
 
         /** describes all properties in the bag
@@ -202,7 +202,7 @@ namespace comphelper
 
         /** determines whether a property with a given name is part of the bag
         */
-        inline  bool    hasPropertyByName( const ::rtl::OUString& _rName ) const
+        inline  bool    hasPropertyByName( const OUString& _rName ) const
         {
             return isRegisteredProperty( _rName );
         }
diff --git a/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 97e581a3d5c2..dacefd8737a6 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.hxx
@@ -54,7 +54,7 @@ struct COMPHELPER_DLLPUBLIC PropertyDescription
     LocationAccess      aLocation;      // access to the property value
 
     PropertyDescription()
-        :aProperty( ::rtl::OUString(), -1, ::com::sun::star::uno::Type(), 0 )
+        :aProperty( OUString(), -1, ::com::sun::star::uno::Type(), 0 )
         ,eLocated( ltHoldMyself )
     {
         aLocation.nOwnClassVectorIndex = -1;
@@ -101,7 +101,7 @@ protected:
         @param      _rMemberType        the cppu type of the property represented by the object
                                         to which _pPointerToMember points.
     */
-    void    registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void    registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType);
 
 
@@ -115,7 +115,7 @@ protected:
         @param      _rExpectedType      the expected type of the property. NOT the type of the object to which
                                         _pPointerToMember points (this is always an Any).
     */
-    void    registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void    registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType);
 
     /** register a property. The repository will create an own object holding this property, so there is no
@@ -128,7 +128,7 @@ protected:
                                         the ::com::sun::star::beans::PropertyAttribute::MAYBEVOID flag.
                                         Else it must be a pointer to an object of the type described by _rType.
     */
-    void    registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+    void    registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue);
 
     /** revokes a previously registered property
@@ -142,7 +142,7 @@ protected:
     sal_Bool    isRegisteredProperty( sal_Int32 _nHandle ) const;
 
     /// checkes whether a property with the given name has been registered
-    sal_Bool    isRegisteredProperty( const ::rtl::OUString& _rName ) const;
+    sal_Bool    isRegisteredProperty( const OUString& _rName ) const;
 
 
     // helper for implementing OPropertySetHelper overridables
@@ -180,7 +180,7 @@ protected:
             if no property with the given name is registered
     */
     const ::com::sun::star::beans::Property&
-            getProperty( const ::rtl::OUString& _rName ) const;
+            getProperty( const OUString& _rName ) const;
 
 private:
     /// insertion of _rProp into m_aProperties, keeping the sort order
diff --git a/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx
index c9f1b4da5f78..ecc600c37d3c 100644
--- a/comphelper/inc/comphelper/propertysethelper.hxx
+++ b/comphelper/inc/comphelper/propertysethelper.hxx
@@ -60,26 +60,26 @@ public:
 
     // XPropertySet
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XMultiPropertySet
 //  virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
 
     // XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 };
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx
index a9056fb270a2..e0b863e8f2ca 100644
--- a/comphelper/inc/comphelper/propertysetinfo.hxx
+++ b/comphelper/inc/comphelper/propertysetinfo.hxx
@@ -71,11 +71,11 @@ public:
     void add( PropertyMapEntry* pMap ) throw();
 
     /** removes an already added PropertyMapEntry which string in mpName equals to aName */
-    void remove( const rtl::OUString& aName ) throw();
+    void remove( const OUString& aName ) throw();
 
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > SAL_CALL getProperties() throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::beans::Property SAL_CALL getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException);
 };
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx
index e21b3a372827..acd368646628 100644
--- a/comphelper/inc/comphelper/propertystatecontainer.hxx
+++ b/comphelper/inc/comphelper/propertystatecontainer.hxx
@@ -59,10 +59,10 @@ namespace comphelper
 
         // ................................................................
         // XPropertyState
-        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // ................................................................
         // own overridables
@@ -102,7 +102,7 @@ namespace comphelper
 
             @throw UnknownPropertyException if the given name is not a registered property
         */
-        sal_Int32   getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
+        sal_Int32   getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( ::com::sun::star::beans::UnknownPropertyException ) );
     };
 
 //.........................................................................
diff --git a/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx
index 51484ce04e16..28795e57ce8a 100644
--- a/comphelper/inc/comphelper/propmultiplex.hxx
+++ b/comphelper/inc/comphelper/propmultiplex.hxx
@@ -71,7 +71,7 @@ namespace comphelper
     class COMPHELPER_DLLPUBLIC OPropertyChangeMultiplexer   :public cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
     {
         friend class OPropertyChangeListener;
-         ::com::sun::star::uno::Sequence< ::rtl::OUString >     m_aProperties;
+         ::com::sun::star::uno::Sequence< OUString >     m_aProperties;
          ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>   m_xSet;
         OPropertyChangeListener*                    m_pListener;
         sal_Int32                                   m_nLockCount;
@@ -96,7 +96,7 @@ namespace comphelper
         /// get the lock count
         sal_Int32   locked() const { return m_nLockCount; }
 
-        void addProperty(const ::rtl::OUString& aPropertyName);
+        void addProperty(const OUString& aPropertyName);
         void dispose();
     };
 
diff --git a/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx
index b0e14c517f09..727f40d96824 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/comphelper/inc/comphelper/propstate.hxx
@@ -57,13 +57,13 @@ namespace comphelper
 
     // XPropertyState
         virtual ::com::sun::star::beans::PropertyState SAL_CALL
-            getPropertyState(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+            getPropertyState(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL
-            getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+            getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL
-            setPropertyToDefault(const ::rtl::OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+            setPropertyToDefault(const OUString& PropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Any SAL_CALL
-            getPropertyDefault(const ::rtl::OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+            getPropertyDefault(const OUString& aPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // access via handle
         virtual ::com::sun::star::beans::PropertyState  getPropertyStateByHandle(sal_Int32 nHandle);
diff --git a/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index 9dc41b7cc68a..ad1e8943b952 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.hxx
@@ -38,7 +38,7 @@ namespace comphelper
     /** search the given string within the given sequence, return the positions where it was found.
         if _bOnlyFirst is sal_True, only the first occurrence will be returned.
     */
-    COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
+    COMPHELPER_DLLPUBLIC staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst = sal_False);
 
     /** Checks if the name exists
      *
@@ -46,7 +46,7 @@ namespace comphelper
      * \param _aList  The list in which to search for the value.
      * \return <TRUE/> if the value can be found, otherwise <FALSE/>.
      */
-    COMPHELPER_DLLPUBLIC sal_Bool existsValue(const ::rtl::OUString& Value,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _aList);
+    COMPHELPER_DLLPUBLIC sal_Bool existsValue(const OUString& Value,const ::com::sun::star::uno::Sequence< OUString >& _aList);
 
 
     //-------------------------------------------------------------------------
diff --git a/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index acf61f1a9031..0c8353776931 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.hxx
@@ -43,10 +43,10 @@ namespace comphelper{
  */
 
 struct SequenceAsHashMapBase : public ::boost::unordered_map<
-    ::rtl::OUString                    ,
+    OUString                    ,
     ::com::sun::star::uno::Any         ,
-    ::rtl::OUStringHash                ,
-    ::std::equal_to< ::rtl::OUString > >
+    OUStringHash                ,
+    ::std::equal_to< OUString > >
 {
 };
 
@@ -226,7 +226,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
             @attention  "unpacked" means the Any content of every iterator->second!
          */
         template< class TValueType >
-        TValueType getUnpackedValueOrDefault(const ::rtl::OUString& sKey    ,
+        TValueType getUnpackedValueOrDefault(const OUString& sKey    ,
                                              const TValueType&      aDefault) const
         {
             const_iterator pIt = find(sKey);
@@ -262,7 +262,7 @@ class COMPHELPER_DLLPUBLIC SequenceAsHashMap : public SequenceAsHashMapBase
                     FALSE if it already exists.
          */
         template< class TValueType >
-        sal_Bool createItemIfMissing(const ::rtl::OUString& sKey  ,
+        sal_Bool createItemIfMissing(const OUString& sKey  ,
                                      const TValueType&      aValue)
         {
             if (find(sKey) == end())
diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index d02e47fba612..be3b275cf215 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -120,14 +120,14 @@ public:
     void * getFactory( sal_Char const* pImplName ) const;
 
     /// @return supported service names
-    ::com::sun::star::uno::Sequence< ::rtl::OUString>
+    ::com::sun::star::uno::Sequence< OUString>
     getSupportedServiceNames() const;
 
     /// @return whether name is in set of supported service names
-    bool supportsService( ::rtl::OUString const& name ) const;
+    bool supportsService( OUString const& name ) const;
 
     /// @return implementation name
-    ::rtl::OUString getImplementationName() const;
+    OUString getImplementationName() const;
 
 private:
     class Factory;
@@ -165,15 +165,15 @@ public:
         : BaseT(xContext), m_rServiceDecl(rServiceDecl) {}
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (css::uno::RuntimeException) {
         return m_rServiceDecl.getImplementationName();
     }
-    virtual sal_Bool SAL_CALL supportsService( ::rtl::OUString const& name )
+    virtual sal_Bool SAL_CALL supportsService( OUString const& name )
         throw (css::uno::RuntimeException) {
         return m_rServiceDecl.supportsService(name);
     }
-    virtual css::uno::Sequence< ::rtl::OUString>
+    virtual css::uno::Sequence< OUString>
     SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException) {
         return m_rServiceDecl.getSupportedServiceNames();
     }
diff --git a/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx
index 5c78f69e37a6..25169d1043a0 100644
--- a/comphelper/inc/comphelper/serviceinfohelper.hxx
+++ b/comphelper/inc/comphelper/serviceinfohelper.hxx
@@ -35,13 +35,13 @@ class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XS
 {
 public:
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
 
     // helper
-    static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
-    static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
+    static void addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
+    static sal_Bool SAL_CALL supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw();
 
 protected:
     ~ServiceInfoHelper() {}
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 1292f698a54a..cef5afdff3f2 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.hxx
@@ -46,17 +46,17 @@ namespace comphelper
 // comparisation functions
 
 //------------------------------------------------------------------------
-    struct UStringLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+    struct UStringLess : public ::std::binary_function< OUString, OUString, bool>
 {
-    bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const { return x < y ? true : false;}      // construct prevents a MSVC6 warning
+    bool operator() (const OUString& x, const OUString& y) const { return x < y ? true : false;}      // construct prevents a MSVC6 warning
 };
 //------------------------------------------------------------------------
-struct UStringMixLess : public ::std::binary_function< ::rtl::OUString, ::rtl::OUString, bool>
+struct UStringMixLess : public ::std::binary_function< OUString, OUString, bool>
 {
     bool m_bCaseSensitive;
 public:
     UStringMixLess(bool bCaseSensitive = true):m_bCaseSensitive(bCaseSensitive){}
-    bool operator() (const ::rtl::OUString& x, const ::rtl::OUString& y) const
+    bool operator() (const OUString& x, const OUString& y) const
     {
         if (m_bCaseSensitive)
             return rtl_ustr_compare(x.getStr(), y.getStr()) < 0 ? true : false;
@@ -69,13 +69,13 @@ public:
 //------------------------------------------------------------------------
 struct UStringEqual
 {
-    sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equals( rhs );}
+    sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equals( rhs );}
 };
 
 //------------------------------------------------------------------------
 struct UStringIEqual
 {
-    sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );}
+    sal_Bool operator() (const OUString& lhs, const OUString& rhs) const { return lhs.equalsIgnoreAsciiCase( rhs );}
 };
 
 //------------------------------------------------------------------------
@@ -85,14 +85,14 @@ class UStringMixEqual
 
 public:
     UStringMixEqual(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){}
-    sal_Bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const
+    sal_Bool operator() (const OUString& lhs, const OUString& rhs) const
     {
         return m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs );
     }
     sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
 //------------------------------------------------------------------------
-class TStringMixEqualFunctor : public ::std::binary_function< ::rtl::OUString,::rtl::OUString,bool>
+class TStringMixEqualFunctor : public ::std::binary_function< OUString,OUString,bool>
 {
     sal_Bool m_bCaseSensitive;
 
@@ -100,30 +100,30 @@ public:
     TStringMixEqualFunctor(sal_Bool bCaseSensitive = sal_True)
         :m_bCaseSensitive(bCaseSensitive)
     {}
-    bool operator() (const ::rtl::OUString& lhs, const ::rtl::OUString& rhs) const
+    bool operator() (const OUString& lhs, const OUString& rhs) const
     {
         return !!(m_bCaseSensitive ? lhs.equals( rhs ) : lhs.equalsIgnoreAsciiCase( rhs ));
     }
     sal_Bool isCaseSensitive() const {return m_bCaseSensitive;}
 };
 //------------------------------------------------------------------------
-class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,::rtl::OUString,bool>
+class TPropertyValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::PropertyValue,OUString,bool>
 {
 public:
     TPropertyValueEqualFunctor()
     {}
-    bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const ::rtl::OUString& rhs) const
+    bool operator() (const ::com::sun::star::beans::PropertyValue& lhs, const OUString& rhs) const
     {
         return !!(lhs.Name == rhs);
     }
 };
 //------------------------------------------------------------------------
-class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,::rtl::OUString,bool>
+class TNamedValueEqualFunctor : public ::std::binary_function< ::com::sun::star::beans::NamedValue,OUString,bool>
 {
 public:
     TNamedValueEqualFunctor()
     {}
-    bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const ::rtl::OUString& rhs) const
+    bool operator() (const ::com::sun::star::beans::NamedValue& lhs, const OUString& rhs) const
     {
         return !!(lhs.Name == rhs);
     }
@@ -135,7 +135,7 @@ class UStringMixHash
 
 public:
     UStringMixHash(sal_Bool bCaseSensitive = sal_True):m_bCaseSensitive(bCaseSensitive){}
-    size_t operator() (const ::rtl::OUString& rStr) const
+    size_t operator() (const OUString& rStr) const
     {
         return m_bCaseSensitive ? rStr.hashCode() : rStr.toAsciiUpperCase().hashCode();
     }
@@ -195,9 +195,9 @@ public:
     typedef void pointer;
     typedef size_t difference_type;
 
-    OUStringBufferAppender(::rtl::OUStringBuffer & i_rBuffer)
+    OUStringBufferAppender(OUStringBuffer & i_rBuffer)
         : m_rBuffer(i_rBuffer) { }
-    Self & operator=(::rtl::OUString const & i_rStr)
+    Self & operator=(OUString const & i_rStr)
     {
         m_rBuffer.append( i_rStr );
         return *this;
@@ -207,7 +207,7 @@ public:
     Self & operator++(int) { return *this; }
 
 private:
-    ::rtl::OUStringBuffer & m_rBuffer;
+    OUStringBuffer & m_rBuffer;
 };
 
 //.........................................................................
@@ -258,7 +258,7 @@ OutputIter intersperse(
     DECLARE_STL_ITERATORS(classname)                \
 
 #define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname)                 \
-    DECLARE_STL_MAP(::rtl::OUString, valuetype, ::comphelper::UStringLess, classname)   \
+    DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname)   \
 
 #define DECLARE_STL_STDKEY_SET(valuetype, classname)    \
     typedef ::std::set< valuetype > classname;          \
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index b3351aa2b553..093038e6e5ed 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -27,13 +27,13 @@
 #include "comphelper/comphelperdllapi.h"
 
 
-#define PACKAGE_STORAGE_FORMAT_STRING   ::rtl::OUString( "PackageFormat" )
-#define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( "ZipFormat" )
-#define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( "OFOPXMLFormat" )
+#define PACKAGE_STORAGE_FORMAT_STRING   OUString( "PackageFormat" )
+#define ZIP_STORAGE_FORMAT_STRING       OUString( "ZipFormat" )
+#define OFOPXML_STORAGE_FORMAT_STRING   OUString( "OFOPXMLFormat" )
 
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( "PackageSHA256UTF8EncryptionKey" )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( "PackageSHA1UTF8EncryptionKey" )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( "PackageSHA1MS1252EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 OUString( "PackageSHA256UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   OUString( "PackageSHA1UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 OUString( "PackageSHA1MS1252EncryptionKey" )
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct NamedValue; }
@@ -89,7 +89,7 @@ public:
     /// this one will only return Storage
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
         GetStorageFromURL(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
@@ -98,7 +98,7 @@ public:
     /// this one will return either Storage or FileSystemStorage
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
         GetStorageFromURL2(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >() )
@@ -127,7 +127,7 @@ public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
         GetInputStreamFromURL(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& context )
         throw ( ::com::sun::star::uno::Exception );
 
@@ -143,8 +143,8 @@ public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
         GetStorageOfFormatFromURL(
-            const ::rtl::OUString& aFormat,
-            const ::rtl::OUString& aURL,
+            const OUString& aFormat,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
@@ -153,7 +153,7 @@ public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
         GetStorageOfFormatFromInputStream(
-            const ::rtl::OUString& aFormat,
+            const OUString& aFormat,
             const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >& xStream,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
                             = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >(),
@@ -162,7 +162,7 @@ public:
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
         GetStorageOfFormatFromStream(
-            const ::rtl::OUString& aFormat,
+            const OUString& aFormat,
             const ::com::sun::star::uno::Reference < ::com::sun::star::io::XStream >& xStream,
             sal_Int32 nStorageMode = ::com::sun::star::embed::ElementModes::READWRITE,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext
@@ -172,24 +172,24 @@ public:
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
         CreatePackageEncryptionData(
-            const ::rtl::OUString& aPassword );
+            const OUString& aPassword );
 
-    static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
+    static sal_Bool IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
 
-    static sal_Bool PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment );
+    static sal_Bool PathHasSegment( const OUString& aPath, const OUString& aSegment );
 
     // Methods to allow easy use of hierachical names inside storages
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetStorageAtPath(
         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
-        const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
+        const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPath(
         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
-        const ::rtl::OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
+        const OUString& aPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness );
     static ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > GetStreamAtPackageURL(
         const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > &xStorage,
-        const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode,
+        const OUString& rURL, sal_uInt32 const nOpenMode,
         LifecycleProxy & rNastiness );
 };
 
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index 6e28895f7d90..85b0816b895e 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 
-// rtl::OUString helper functions that are not widespread or mature enough to
+// OUString helper functions that are not widespread or mature enough to
 // go into the stable URE API:
 namespace comphelper { namespace string {
 
@@ -44,7 +44,7 @@ namespace comphelper { namespace string {
 
     @return         true if rIn has one char and its equal to c
  */
-inline bool equals(const rtl::OString& rIn, sal_Char c)
+inline bool equals(const OString& rIn, sal_Char c)
 { return rIn.getLength() == 1 && rIn[0] == c; }
 
 /** Compare an OUString to a single char
@@ -54,12 +54,12 @@ inline bool equals(const rtl::OString& rIn, sal_Char c)
 
     @return         true if rIn has one char and its equal to c
  */
-inline bool equals(const rtl::OUString& rIn, sal_Unicode c)
+inline bool equals(const OUString& rIn, sal_Unicode c)
 { return rIn.getLength() == 1 && rIn[0] == c; }
 
 /** Removes all occurrences of a character from within the source string
 
-    @deprecated  Use rtl::OString::replaceAll(rtl::OString(c), rtl::OString())
+    @deprecated  Use OString::replaceAll(OString(c), OString())
     instead.
 
     @param rIn      The input OString
@@ -67,23 +67,23 @@ inline bool equals(const rtl::OUString& rIn, sal_Unicode c)
 
     @return         The resulting OString
  */
-inline rtl::OString remove(const rtl::OString &rIn,
+inline OString remove(const OString &rIn,
     sal_Char c)
-{ return rIn.replaceAll(rtl::OString(c), rtl::OString()); }
+{ return rIn.replaceAll(OString(c), OString()); }
 
 /** Removes all occurrences of a character from within the source string
 
     @deprecated  Use
-    rtl::OUString::replaceAll(rtl::OUString(c), rtl::OUString()) instead.
+    OUString::replaceAll(OUString(c), OUString()) instead.
 
     @param rIn      The input OUString
     @param c        The character to be removed
 
     @return         The resulting OUString
  */
-inline rtl::OUString remove(const rtl::OUString &rIn,
+inline OUString remove(const OUString &rIn,
     sal_Unicode c)
-{ return rIn.replaceAll(rtl::OUString(c), rtl::OUString()); }
+{ return rIn.replaceAll(OUString(c), OUString()); }
 
 /** Strips occurrences of a character from the start of the source string
 
@@ -92,7 +92,7 @@ inline rtl::OUString remove(const rtl::OUString &rIn,
 
     @return         The resulting OString
  */
-COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString stripStart(const OString &rIn,
     sal_Char c);
 
 /** Strips occurrences of a character from the start of the source string
@@ -102,7 +102,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripStart(const rtl::OString &rIn,
 
     @return         The resulting OUString
  */
-COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString stripStart(const OUString &rIn,
     sal_Unicode c);
 
 /** Strips occurrences of a character from the end of the source string
@@ -112,7 +112,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripStart(const rtl::OUString &rIn,
 
     @return         The resulting OString
  */
-COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString stripEnd(const OString &rIn,
     sal_Char c);
 
 /** Strips occurrences of a character from the end of the source string
@@ -122,7 +122,7 @@ COMPHELPER_DLLPUBLIC rtl::OString stripEnd(const rtl::OString &rIn,
 
     @return         The resulting OUString
  */
-COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString stripEnd(const OUString &rIn,
     sal_Unicode c);
 
 /** Strips occurrences of a character from the start and end of the source string
@@ -132,7 +132,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString stripEnd(const rtl::OUString &rIn,
 
     @return         The resulting OString
  */
-COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn,
+COMPHELPER_DLLPUBLIC OString strip(const OString &rIn,
     sal_Char c);
 
 /** Strips occurrences of a character from the start and end of the source string
@@ -142,12 +142,12 @@ COMPHELPER_DLLPUBLIC rtl::OString strip(const rtl::OString &rIn,
 
     @return         The resulting OUString
  */
-COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn,
+COMPHELPER_DLLPUBLIC OUString strip(const OUString &rIn,
     sal_Unicode c);
 
 /** Returns a token in an OString
 
-    @deprecated  Use rtl::OString::getToken(nToken, cTok) instead.
+    @deprecated  Use OString::getToken(nToken, cTok) instead.
 
   @param    rIn         the input OString
   @param    nToken      the number of the token to return
@@ -155,7 +155,7 @@ COMPHELPER_DLLPUBLIC rtl::OUString strip(const rtl::OUString &rIn,
   @return   the token   if token is negative or doesn't exist an empty token
                         is returned
 */
-inline rtl::OString getToken(const rtl::OString &rIn,
+inline OString getToken(const OString &rIn,
     sal_Int32 nToken, sal_Char cTok) SAL_THROW(())
 {
     return rIn.getToken(nToken, cTok);
@@ -163,7 +163,7 @@ inline rtl::OString getToken(const rtl::OString &rIn,
 
 /** Returns a token in an OUString
 
-    @deprecated  Use rtl::OUString::getToken(nToken, cTok) instead.
+    @deprecated  Use OUString::getToken(nToken, cTok) instead.
 
   @param    rIn         the input OUString
   @param    nToken      the number of the token to return
@@ -171,7 +171,7 @@ inline rtl::OString getToken(const rtl::OString &rIn,
   @return   the token   if token is negative or doesn't exist an empty token
                         is returned
 */
-inline rtl::OUString getToken(const rtl::OUString &rIn,
+inline OUString getToken(const OUString &rIn,
     sal_Int32 nToken, sal_Unicode cTok) SAL_THROW(())
 {
     return rIn.getToken(nToken, cTok);
@@ -183,7 +183,7 @@ inline rtl::OUString getToken(const rtl::OUString &rIn,
   @param    cTok    the character which seperate the tokens.
   @return   the number of tokens
 */
-COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok);
+COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok);
 
 /** Returns number of tokens in an OUString
 
@@ -191,21 +191,21 @@ COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char c
   @param    cTok    the character which seperate the tokens.
   @return   the number of tokens
 */
-COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok);
+COMPHELPER_DLLPUBLIC sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok);
 
 /** Reverse an OUString
 
   @param    rIn     the input OUString
   @return   the reversed input
 */
-COMPHELPER_DLLPUBLIC rtl::OUString reverseString(const rtl::OUString &rStr);
+COMPHELPER_DLLPUBLIC OUString reverseString(const OUString &rStr);
 
 /** Reverse an OString
 
   @param    rIn     the input OString
   @return   the reversed input
 */
-COMPHELPER_DLLPUBLIC rtl::OString reverseString(const rtl::OString &rStr);
+COMPHELPER_DLLPUBLIC OString reverseString(const OString &rStr);
 
 
 namespace detail
@@ -230,14 +230,14 @@ namespace detail
 
     @return         rBuf;
  */
-COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& truncateToLength(
-    rtl::OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+COMPHELPER_DLLPUBLIC inline OStringBuffer& truncateToLength(
+    OStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
 {
     return detail::truncateToLength(rBuffer, nLength);
 }
 
-COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& truncateToLength(
-    rtl::OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
+COMPHELPER_DLLPUBLIC inline OUStringBuffer& truncateToLength(
+    OUStringBuffer& rBuffer, sal_Int32 nLength) SAL_THROW(())
 {
     return detail::truncateToLength(rBuffer, nLength);
 }
@@ -271,15 +271,15 @@ namespace detail
 
     @return         rBuf;
  */
-COMPHELPER_DLLPUBLIC inline rtl::OStringBuffer& padToLength(
-    rtl::OStringBuffer& rBuffer, sal_Int32 nLength,
+COMPHELPER_DLLPUBLIC inline OStringBuffer& padToLength(
+    OStringBuffer& rBuffer, sal_Int32 nLength,
     sal_Char cFill = '\0') SAL_THROW(())
 {
     return detail::padToLength(rBuffer, nLength, cFill);
 }
 
-COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength(
-    rtl::OUStringBuffer& rBuffer, sal_Int32 nLength,
+COMPHELPER_DLLPUBLIC inline OUStringBuffer& padToLength(
+    OUStringBuffer& rBuffer, sal_Int32 nLength,
     sal_Unicode cFill = '\0') SAL_THROW(())
 {
     return detail::padToLength(rBuffer, nLength, cFill);
@@ -293,7 +293,7 @@ COMPHELPER_DLLPUBLIC inline rtl::OUStringBuffer& padToLength(
     @return position of first occurrence of any of the elements of pChars
             or -1 if none of the code units occur in the string
  */
-COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn,
+COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(OUString const& rIn,
         sal_Unicode const*const pChars, sal_Int32 const nPos = 0);
 
 /** Convert a sequence of strings to a single comma separated string.
@@ -305,8 +305,8 @@ COMPHELPER_DLLPUBLIC sal_Int32 indexOfAny(rtl::OUString const& rIn,
     @return         A single string containing the concatenation of the given
                     list, interspersed with the string ", ".
  */
-COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > const & i_rSeq);
+COMPHELPER_DLLPUBLIC OUString convertCommaSeparated(
+    ::com::sun::star::uno::Sequence< OUString > const & i_rSeq);
 
 /** Convert a decimal string to a number.
 
@@ -319,7 +319,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
     gives unspecified results
 
     If your string is guaranteed to contain only ASCII digit
-    use rtl::OUString::toInt32 instead.
+    use OUString::toInt32 instead.
 
     @param str  The string to convert containing only decimal
                 digit codepoints.
@@ -327,7 +327,7 @@ COMPHELPER_DLLPUBLIC ::rtl::OUString convertCommaSeparated(
     @return     The value of the string as an int32.
  */
 COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber(
-    ::rtl::OUString const & str );
+    OUString const & str );
 
 /** Convert a single comma separated string to a sequence of strings.
 
@@ -338,8 +338,8 @@ COMPHELPER_DLLPUBLIC sal_uInt32 decimalStringToNumber(
     @return         A sequence of strings resulting from splitting the given
                     string at ',' tokens and stripping whitespace.
  */
-COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString >
-    convertCommaSeparated( ::rtl::OUString const & i_rString );
+COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< OUString >
+    convertCommaSeparated( OUString const & i_rString );
 
 /**
   Compares two strings using natural order.
@@ -357,7 +357,7 @@ COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString >
             < 0 - if this string is less than the string argument
             > 0 - if this string is greater than the string argument
 */
-COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const ::rtl::OUString &rLHS, const ::rtl::OUString &rRHS,
+COMPHELPER_DLLPUBLIC sal_Int32 compareNatural( const OUString &rLHS, const OUString &rRHS,
     const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator > &rCollator,
     const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > &rBI,
     const ::com::sun::star::lang::Locale &rLocale );
@@ -372,7 +372,7 @@ public:
     NaturalStringSorter(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &rContext,
         const ::com::sun::star::lang::Locale &rLocale);
-    sal_Int32 compare(const rtl::OUString &rLHS, const rtl::OUString &rRHS) const
+    sal_Int32 compare(const OUString &rLHS, const OUString &rRHS) const
     {
         return compareNatural(rLHS, rRHS, m_xCollator, m_xBI, m_aLocale);
     }
@@ -387,7 +387,7 @@ public:
                     the ASCII '0'-'9' range
                     true otherwise, including for empty string
  */
-COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString);
+COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OString &rString);
 
 /** Determine if an OUString contains solely ASCII numeric digits
 
@@ -397,7 +397,7 @@ COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OString &rString);
                     the ASCII '0'-'9' range
                     true otherwise, including for empty string
  */
-COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const rtl::OUString &rString);
+COMPHELPER_DLLPUBLIC bool isdigitAsciiString(const OUString &rString);
 
 COMPHELPER_DLLPUBLIC inline bool isdigitAscii(sal_Unicode c)
 {
@@ -437,9 +437,9 @@ struct COMPHELPER_DLLPUBLIC ConstAsciiString
     const sal_Char* ascii;
     sal_Int32       length;
 
-    operator rtl::OUString() const
+    operator OUString() const
     {
-        return rtl::OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
+        return OUString(ascii, length, RTL_TEXTENCODING_ASCII_US);
     }
 };
 
diff --git a/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx
index 3b3f4a6e4482..fc5c5fe59f4b 100644
--- a/comphelper/inc/comphelper/synchronousdispatch.hxx
+++ b/comphelper/inc/comphelper/synchronousdispatch.hxx
@@ -52,8 +52,8 @@ namespace comphelper
     public:
         static COMPHELPER_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::lang::XComponent > dispatch(
             const com::sun::star::uno::Reference< com::sun::star::uno::XInterface > &xStartPoint,
-            const rtl::OUString &sURL,
-            const rtl::OUString &sTarget,
+            const OUString &sURL,
+            const OUString &sTarget,
             const sal_Int32 nFlags,
             const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > &lArguments );
     };
diff --git a/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx
index 2f5ad6d353a1..66c6a9e0bcfb 100644
--- a/comphelper/inc/comphelper/types.hxx
+++ b/comphelper/inc/comphelper/types.hxx
@@ -44,7 +44,7 @@ namespace comphelper
     namespace starlang      = ::com::sun::star::lang;
 
     typedef staruno::Reference< staruno::XInterface >           InterfaceRef;
-    typedef staruno::Sequence< ::rtl::OUString >                StringSequence;
+    typedef staruno::Sequence< OUString >                StringSequence;
 
     //-------------------------------------------------------------------------
     /** compare the two given Anys
@@ -152,7 +152,7 @@ namespace comphelper
     COMPHELPER_DLLPUBLIC sal_Int16      getINT16(const staruno::Any& _rAny);
     COMPHELPER_DLLPUBLIC double         getDouble(const staruno::Any& _rAny);
     COMPHELPER_DLLPUBLIC float          getFloat(const staruno::Any& _rAny);
-    COMPHELPER_DLLPUBLIC ::rtl::OUString    getString(const staruno::Any& _rAny);
+    COMPHELPER_DLLPUBLIC OUString    getString(const staruno::Any& _rAny);
     COMPHELPER_DLLPUBLIC sal_Bool       getBOOL(const staruno::Any& _rAny);
 
     COMPHELPER_DLLPUBLIC sal_Int32      getEnumAsINT32(const staruno::Any& _rAny) throw(starlang::IllegalArgumentException);
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index ca4681b8992c..c4885f3883d9 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.hxx
@@ -51,7 +51,7 @@ inline void extract(
             xErrorContext, static_cast<sal_Int16>(nArg) );
     }
     if (! (seq[nArg] >>= v)) {
-        ::rtl::OUStringBuffer buf;
+        OUStringBuffer buf;
         buf.append( "Cannot extract ANY { " );
         buf.append( seq[nArg].getValueType().getTypeName() );
         buf.append( " } to " );
diff --git a/comphelper/inc/comphelper/xmltools.hxx b/comphelper/inc/comphelper/xmltools.hxx
index c333ecf6acf3..988e8558542c 100644
--- a/comphelper/inc/comphelper/xmltools.hxx
+++ b/comphelper/inc/comphelper/xmltools.hxx
@@ -39,7 +39,7 @@ namespace comphelper
 {
     namespace xml
     {
-        COMPHELPER_DLLPUBLIC rtl::OString makeXMLChaff();
+        COMPHELPER_DLLPUBLIC OString makeXMLChaff();
     }
 }
 
diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx
index dd22c4b64875..f89db16f16ca 100644
--- a/comphelper/qa/string/test_string.cxx
+++ b/comphelper/qa/string/test_string.cxx
@@ -62,25 +62,25 @@ public:
 
 void TestString::testDecimalStringToNumber()
 {
-    rtl::OUString s1("1234");
+    OUString s1("1234");
     CPPUNIT_ASSERT_EQUAL((sal_uInt32)1234, comphelper::string::decimalStringToNumber(s1));
-    s1 += rtl::OUString(static_cast<sal_Unicode>(0x07C6));
+    s1 += OUString(static_cast<sal_Unicode>(0x07C6));
     CPPUNIT_ASSERT_EQUAL((sal_uInt32)12346, comphelper::string::decimalStringToNumber(s1));
     // Codepoints on 2 16bits words
     sal_uInt32 utf16String[] = { 0x1D7FE /* 8 */, 0x1D7F7 /* 1 */};
-    s1 = rtl::OUString(utf16String, 2);
+    s1 = OUString(utf16String, 2);
     CPPUNIT_ASSERT_EQUAL((sal_uInt32)81, comphelper::string::decimalStringToNumber(s1));
 }
 
 void TestString::testIsdigitAsciiString()
 {
-    rtl::OString s1("1234");
+    OString s1("1234");
     CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s1), true);
 
-    rtl::OString s2("1A34");
+    OString s2("1A34");
     CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s2), false);
 
-    rtl::OString s3;
+    OString s3;
     CPPUNIT_ASSERT_EQUAL(comphelper::string::isdigitAsciiString(s3), true);
 }
 
@@ -90,29 +90,29 @@ class testCollator : public cppu::WeakImplHelper1< i18n::XCollator >
 {
 public:
     virtual sal_Int32 SAL_CALL compareSubstring(
-        const rtl::OUString& str1, sal_Int32 off1, sal_Int32 len1,
-        const rtl::OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
+        const OUString& str1, sal_Int32 off1, sal_Int32 len1,
+        const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException)
     {
         return str1.copy(off1, len1).compareTo(str2.copy(off2, len2));
     }
     virtual sal_Int32 SAL_CALL compareString(
-        const rtl::OUString& str1,
-        const rtl::OUString& str2) throw(uno::RuntimeException)
+        const OUString& str1,
+        const OUString& str2) throw(uno::RuntimeException)
     {
         return str1.compareTo(str2);
     }
     virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32)
         throw(uno::RuntimeException) {return 0;}
-    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const rtl::OUString&,
+    virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&,
         const lang::Locale&, sal_Int32) throw(uno::RuntimeException) {return 0;}
-    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const rtl::OUString&,
+    virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&,
         const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException) {}
-    virtual uno::Sequence< rtl::OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
+    virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&)
         throw(uno::RuntimeException)
     {
-        return uno::Sequence< rtl::OUString >();
+        return uno::Sequence< OUString >();
     }
-    virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const rtl::OUString&)
+    virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&)
         throw(uno::RuntimeException)
     {
         return uno::Sequence< sal_Int32 >();
@@ -124,42 +124,42 @@ public:
 class testBreakIterator : public cppu::WeakImplHelper1< i18n::XBreakIterator >
 {
 public:
-    virtual sal_Int32 SAL_CALL nextCharacters( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
             throw(uno::RuntimeException) {return -1;}
-    virtual sal_Int32 SAL_CALL previousCharacters( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& )
             throw(uno::RuntimeException) {return -1;}
 
-    virtual i18n::Boundary SAL_CALL previousWord( const rtl::OUString&, sal_Int32,
+    virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
         { return i18n::Boundary(); }
-    virtual i18n::Boundary SAL_CALL nextWord( const rtl::OUString&, sal_Int32,
+    virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16) throw(uno::RuntimeException)
         { return i18n::Boundary(); }
-    virtual i18n::Boundary SAL_CALL getWordBoundary( const rtl::OUString&, sal_Int32,
+    virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16, sal_Bool )
         throw(uno::RuntimeException)
         { return i18n::Boundary(); }
 
-    virtual sal_Bool SAL_CALL isBeginWord( const rtl::OUString&, sal_Int32,
+    virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException)
         { return false; }
-    virtual sal_Bool SAL_CALL isEndWord( const rtl::OUString&, sal_Int32,
+    virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32,
         const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException)
         { return false; }
-    virtual sal_Int16 SAL_CALL getWordType( const rtl::OUString&, sal_Int32,
+    virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32,
         const lang::Locale& ) throw(uno::RuntimeException)
         { return 0; }
 
-    virtual sal_Int32 SAL_CALL beginOfSentence( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32,
         const lang::Locale& ) throw(uno::RuntimeException)
         { return 0; }
-    virtual sal_Int32 SAL_CALL endOfSentence( const rtl::OUString& rText, sal_Int32,
+    virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32,
         const lang::Locale& ) throw(uno::RuntimeException)
         { return rText.getLength(); }
 
-    virtual i18n::LineBreakResults SAL_CALL getLineBreak( const rtl::OUString&, sal_Int32,
+    virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int32,
         const i18n::LineBreakHyphenationOptions&,
         const i18n::LineBreakUserOptions&)
@@ -168,20 +168,20 @@ public:
         return i18n::LineBreakResults();
     }
 
-    virtual sal_Int16 SAL_CALL getScriptType( const rtl::OUString&, sal_Int32 )
+    virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 )
         throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL beginOfScript( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32,
         sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL endOfScript( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32,
         sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL previousScript( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32,
         sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL nextScript( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32,
         sal_Int16 ) throw(uno::RuntimeException) { return -1; }
 
-    virtual sal_Int32 SAL_CALL beginOfCharBlock( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL endOfCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos,
         const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
     {
         const sal_Unicode *pStr = rText.getStr()+nStartPos;
@@ -195,9 +195,9 @@ public:
         }
         return -1;
     }
-    virtual sal_Int32 SAL_CALL previousCharBlock( const rtl::OUString&, sal_Int32,
+    virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32,
         const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException) { return -1; }
-    virtual sal_Int32 SAL_CALL nextCharBlock( const rtl::OUString& rText, sal_Int32 nStartPos,
+    virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos,
         const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException)
     {
         const sal_Unicode *pStr = rText.getStr()+nStartPos;
@@ -280,8 +280,8 @@ void TestString::testNatural()
 
 void TestString::testRemove()
 {
-    ::rtl::OString aIn("abc");
-    ::rtl::OString aOut;
+    OString aIn("abc");
+    OString aOut;
 
     aOut = ::comphelper::string::remove(aIn, 'b');
     CPPUNIT_ASSERT(aOut == "ac");
@@ -294,8 +294,8 @@ void TestString::testRemove()
 
 void TestString::testStripStart()
 {
-    ::rtl::OString aIn("abc");
-    ::rtl::OString aOut;
+    OString aIn("abc");
+    OString aOut;
 
     aOut = ::comphelper::string::stripStart(aIn, 'b');
     CPPUNIT_ASSERT(aOut == "abc");
@@ -314,8 +314,8 @@ void TestString::testStripStart()
 
 void TestString::testStripEnd()
 {
-    ::rtl::OString aIn("abc");
-    ::rtl::OString aOut;
+    OString aIn("abc");
+    OString aOut;
 
     aOut = ::comphelper::string::stripEnd(aIn, 'b');
     CPPUNIT_ASSERT(aOut == "abc");
@@ -334,8 +334,8 @@ void TestString::testStripEnd()
 
 void TestString::testStrip()
 {
-    ::rtl::OString aIn("abc");
-    ::rtl::OString aOut;
+    OString aIn("abc");
+    OString aOut;
 
     aOut = ::comphelper::string::strip(aIn, 'b');
     CPPUNIT_ASSERT(aOut == "abc");
@@ -354,8 +354,8 @@ void TestString::testStrip()
 
 void TestString::testToken()
 {
-    ::rtl::OString aIn("10.11.12");
-    ::rtl::OString aOut;
+    OString aIn("10.11.12");
+    OString aOut;
 
     aOut = ::comphelper::string::getToken(aIn, -1, '.');
     CPPUNIT_ASSERT(aOut.isEmpty());
@@ -375,7 +375,7 @@ void TestString::testToken()
 
 void TestString::testTokenCount()
 {
-    ::rtl::OString aIn("10.11.12");
+    OString aIn("10.11.12");
     sal_Int32 nOut;
 
     nOut = ::comphelper::string::getTokenCount(aIn, '.');
@@ -384,26 +384,26 @@ void TestString::testTokenCount()
     nOut = ::comphelper::string::getTokenCount(aIn, 'X');
     CPPUNIT_ASSERT(nOut == 1);
 
-    nOut = ::comphelper::string::getTokenCount(rtl::OString(), 'X');
+    nOut = ::comphelper::string::getTokenCount(OString(), 'X');
     CPPUNIT_ASSERT(nOut == 0);
 }
 
 void TestString::testReverseString()
 {
-    ::rtl::OString aIn("ABC");
-    ::rtl::OString aOut = ::comphelper::string::reverseString(aIn);
+    OString aIn("ABC");
+    OString aOut = ::comphelper::string::reverseString(aIn);
 
     CPPUNIT_ASSERT(aOut == "CBA");
 }
 
 void TestString::testEqualsString()
 {
-    ::rtl::OString aIn("A");
+    OString aIn("A");
     CPPUNIT_ASSERT(::comphelper::string::equals(aIn, 'A'));
     CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'B'));
-    aIn = ::rtl::OString("AA");
+    aIn = OString("AA");
     CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
-    aIn = ::rtl::OString();
+    aIn = OString();
     CPPUNIT_ASSERT(!::comphelper::string::equals(aIn, 'A'));
 }
 
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index f9653e5d6008..31d7d798da1e 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.cxx
@@ -40,7 +40,6 @@ using namespace com::sun::star::ucb;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::i18n;
 
-using ::rtl::OUString;
 
 //=============================================================================
 
@@ -84,8 +83,8 @@ public:
     virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(RuntimeException);
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& );
 };
 
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index 6e2062598f7f..38dca1d9ff62 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
@@ -65,13 +65,13 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& );
 
 private:
@@ -214,7 +214,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements(  )
 }
 
 //XServiceInfo
-::rtl::OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return getImplementationName_static();
 }
@@ -224,19 +224,19 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static(
     return OUString( "IndexedPropertyValuesContainer" );
 }
 
-sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
     OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" );
     return aServiceName == ServiceName;
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static(  )
 {
     const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" );
     const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 83c1a395cfa6..61ff126ee849 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx
@@ -42,25 +42,25 @@ public:
     virtual ~NamedPropertyValuesContainer() throw();
 
     // XNameContainer
-    virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException,
         ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+    virtual void SAL_CALL removeByName( const OUString& Name )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
             ::com::sun::star::uno::RuntimeException);
 
     // XNameReplace
-    virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+    virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException,
             ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
     // XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
         throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
             ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  )
         throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+    virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
         throw(::com::sun::star::uno::RuntimeException);
 
     // XElementAccess
@@ -70,13 +70,13 @@ public:
         throw(::com::sun::star::uno::RuntimeException);
 
     //XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& );
 
 private:
@@ -92,7 +92,7 @@ NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw()
 }
 
 // XNameContainer
-void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& aName, const uno::Any& aElement )
+void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException,
         ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -106,7 +106,7 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& a
     maProperties.insert(  NamedPropertyValues::value_type(aName ,aProps) );
 }
 
-void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString& Name )
+void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name )
     throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
         ::com::sun::star::uno::RuntimeException)
 {
@@ -118,7 +118,7 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString&
 }
 
 // XNameReplace
-void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException,
         ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
 {
@@ -134,7 +134,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString
 }
 
 // XNameAccess
-::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const ::rtl::OUString& aName )
+::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName )
     throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
         ::com::sun::star::uno::RuntimeException)
 {
@@ -149,14 +149,14 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString
     return aElement;
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames(  )
     throw(::com::sun::star::uno::RuntimeException)
 {
     NamedPropertyValues::iterator aIter = maProperties.begin();
     const NamedPropertyValues::iterator aEnd = maProperties.end();
 
-    uno::Sequence< rtl::OUString > aNames( maProperties.size() );
-    rtl::OUString* pNames = aNames.getArray();
+    uno::Sequence< OUString > aNames( maProperties.size() );
+    OUString* pNames = aNames.getArray();
 
     while( aIter != aEnd )
     {
@@ -166,7 +166,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString
     return aNames;
 }
 
-sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName )
     throw(::com::sun::star::uno::RuntimeException)
 {
     NamedPropertyValues::iterator aIter = maProperties.find( aName );
@@ -187,7 +187,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements(  )
 }
 
 //XServiceInfo
-::rtl::OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return getImplementationName_static();
 }
@@ -203,13 +203,13 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString&
     return aServiceName == ServiceName;
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static(  )
 {
     const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" );
     const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index ad55865f6982..87b214e03cbc 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -53,7 +53,7 @@ namespace comphelper
 
 struct hashObjectName_Impl
 {
-    size_t operator()(const ::rtl::OUString Str) const
+    size_t operator()(const OUString Str) const
     {
         return (size_t)Str.hashCode();
     }
@@ -61,7 +61,7 @@ struct hashObjectName_Impl
 
 struct eqObjectName_Impl
 {
-    sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const
+    sal_Bool operator()(const OUString Str1, const OUString Str2) const
     {
         return ( Str1 == Str2 );
     }
@@ -69,7 +69,7 @@ struct eqObjectName_Impl
 
 typedef boost::unordered_map
 <
-    ::rtl::OUString,
+    OUString,
     ::com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >,
     hashObjectName_Impl,
     eqObjectName_Impl
@@ -246,9 +246,9 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName()
     return aStr;
 }
 
-uno::Sequence < ::rtl::OUString > EmbeddedObjectContainer::GetObjectNames()
+uno::Sequence < OUString > EmbeddedObjectContainer::GetObjectNames()
 {
-    uno::Sequence < ::rtl::OUString > aSeq( pImpl->maObjectContainer.size() );
+    uno::Sequence < OUString > aSeq( pImpl->maObjectContainer.size() );
     EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin();
     sal_Int32 nIdx=0;
     while ( aIt != pImpl->maObjectContainer.end() )
@@ -261,7 +261,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObjects()
     return pImpl->maObjectContainer.size() != 0;
 }
 
-sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const ::rtl::OUString& rName )
+sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName )
 {
     EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName );
     if ( aIt == pImpl->maObjectContainer.end() )
@@ -287,7 +287,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe
     return sal_False;
 }
 
-sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OUString& rName )
+sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rName )
 {
     // allows to detect whether the object was already instantiated
     // currently the filter instantiate it on loading, so this method allows
@@ -296,7 +296,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU
     return ( aIt != pImpl->maObjectContainer.end() );
 }
 
-::rtl::OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj )
+OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj )
 {
     EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin();
     while ( aIt != pImpl->maObjectContainer.end() )
@@ -308,10 +308,10 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU
     }
 
     OSL_FAIL( "Unknown object!" );
-    return ::rtl::OUString();
+    return OUString();
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const ::rtl::OUString& rName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const OUString& rName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetEmbeddedObject" );
 
@@ -322,9 +322,9 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb
 
 #if OSL_DEBUG_LEVEL > 1
     uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY );
-    uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames();
-    const ::rtl::OUString* pIter = aSeq.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aSeq.getLength();
+    uno::Sequence< OUString> aSeq = xAccess->getElementNames();
+    const OUString* pIter = aSeq.getConstArray();
+    const OUString* pEnd   = pIter + aSeq.getLength();
     for(;pIter != pEnd;++pIter)
     {
         (void)*pIter;
@@ -341,7 +341,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb
     return xObj;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const ::rtl::OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy )
 {
     uno::Reference < embed::XEmbeddedObject > xObj;
     try
@@ -390,7 +390,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con
 }
 
 uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId,
-            const uno::Sequence < beans::PropertyValue >& rArgs, ::rtl::OUString& rNewName )
+            const uno::Sequence < beans::PropertyValue >& rArgs, OUString& rNewName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" );
 
@@ -410,7 +410,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
         aObjDescr[0].Value <<= pImpl->m_xModel.get();
         ::std::copy( rArgs.getConstArray(), rArgs.getConstArray() + rArgs.getLength(), aObjDescr.getArray() + 1 );
         xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew(
-                    rClassId, ::rtl::OUString(), pImpl->mxStorage, rNewName,
+                    rClassId, OUString(), pImpl->mxStorage, rNewName,
                     aObjDescr ), uno::UNO_QUERY );
 
         AddEmbeddedObject( xObj, rNewName );
@@ -427,12 +427,12 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
     return xObj;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, ::rtl::OUString& rNewName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, OUString& rNewName )
 {
     return CreateEmbeddedObject( rClassId, uno::Sequence < beans::PropertyValue >(), rNewName );
 }
 
-void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const ::rtl::OUString& rName )
+void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const OUString& rName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::AddEmbeddedObject" );
 
@@ -463,8 +463,8 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re
             if ( (*aIt).second == xObj )
             {
                 // copy replacement image from temporary container (if there is any)
-                ::rtl::OUString aTempName = (*aIt).first;
-                ::rtl::OUString aMediaType;
+                OUString aTempName = (*aIt).first;
+                OUString aMediaType;
                 uno::Reference < io::XInputStream > xStream = pImpl->mpTempObjectContainer->GetGraphicStream( xObj, &aMediaType );
                 if ( xStream.is() )
                 {
@@ -496,7 +496,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re
     }
 }
 
-sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName, sal_Bool bCopy )
+sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName, sal_Bool bCopy )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" );
 
@@ -538,7 +538,7 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em
     return sal_True;
 }
 
-sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName )
+sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" );
     // store it into the container storage
@@ -552,7 +552,7 @@ sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < e
         return sal_False;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, ::rtl::OUString& rNewName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, OUString& rNewName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream )" );
 
@@ -616,7 +616,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
     return xRet;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor )" );
 
@@ -650,7 +650,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
     return xObj;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedLink" );
 
@@ -688,8 +688,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde
 }
 
 sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc,
-                                                            const ::rtl::OUString& aOrigName,
-                                                            const ::rtl::OUString& aTargetName )
+                                                            const OUString& aOrigName,
+                                                            const OUString& aTargetName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" );
 
@@ -697,7 +697,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta
 
     if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() )
     {
-        ::rtl::OUString aMediaType;
+        OUString aMediaType;
         uno::Reference < io::XInputStream > xGrStream = rSrc.GetGraphicStream( aOrigName, &aMediaType );
         if ( xGrStream.is() )
             bResult = InsertGraphicStream( xGrStream, aTargetName, aMediaType );
@@ -706,7 +706,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta
     return bResult;
 }
 
-uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName )
+uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" );
 
@@ -714,7 +714,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
 
     // TODO/LATER: For now only objects that implement XEmbedPersist have a replacement image, it might change in future
     // do an incompatible change so that object name is provided in all the move and copy methods
-    ::rtl::OUString aOrigName;
+    OUString aOrigName;
     try
     {
         uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY_THROW );
@@ -741,7 +741,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
                 if ( xOrigLinkage.is() && xOrigLinkage->isLink() )
                 {
                     // this is a OOo link, it has no persistence
-                    ::rtl::OUString aURL = xOrigLinkage->getLinkURL();
+                    OUString aURL = xOrigLinkage->getLinkURL();
                     if ( aURL.isEmpty() )
                         throw uno::RuntimeException();
 
@@ -859,13 +859,13 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb
     return xResult;
 }
 
-sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName )
+sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" );
 
     // get the object name before(!) it is assigned to a new storage
     uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
-    ::rtl::OUString aName;
+    OUString aName;
     if ( xPersist.is() )
         aName = xPersist->getEntryName();
 
@@ -923,7 +923,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r
     return bRet;
 }
 
-sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose )
+sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" );
 
@@ -934,7 +934,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& r
         return sal_False;
 }
 
-sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& rCnt )
+sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" );
 
@@ -955,7 +955,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rNa
             if ( xObj.is() )
             {
                 // move object
-                ::rtl::OUString aName( rName );
+                OUString aName( rName );
                 rCnt.InsertEmbeddedObject( xObj, aName );
                 pImpl->maObjectContainer.erase( aIt );
                 uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
@@ -992,7 +992,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" );
 
     uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
-    ::rtl::OUString aName;
+    OUString aName;
     if ( xPersist.is() )
         aName = xPersist->getEntryName();
 
@@ -1033,7 +1033,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
                 uno::Sequence < beans::PropertyValue > aSeq;
 
                 OUString aTmpPersistName = "Object ";
-                aTmpPersistName += ::rtl::OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() );
+                aTmpPersistName += OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() );
 
                 xPersist->storeAsEntry( pImpl->mxTempStorage, aTmpPersistName, aSeq, aSeq );
                 xPersist->saveCompleted( sal_True );
@@ -1048,7 +1048,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
                     {
                         // TODO/LATER: in future probably the temporary container will have two storages ( of two formats )
                         //             the media type will be provided with object insertion
-                        ::rtl::OUString aOrigStorMediaType;
+                        OUString aOrigStorMediaType;
                         uno::Reference< beans::XPropertySet > xStorProps( pImpl->mxStorage, uno::UNO_QUERY_THROW );
                         static const OUString s_sMediaType("MediaType");
                         xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType;
@@ -1066,7 +1066,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e
                     }
                 }
 
-                ::rtl::OUString aTempName, aMediaType;
+                OUString aTempName, aMediaType;
                 pImpl->mpTempObjectContainer->InsertEmbeddedObject( xObj, aTempName );
 
                 uno::Reference < io::XInputStream > xStream = GetGraphicStream( xObj, &aMediaType );
@@ -1167,7 +1167,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em
     return bFound;
 }
 
-uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::rtl::OUString& aName, rtl::OUString* pMediaType )
+uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Name )" );
 
@@ -1199,12 +1199,12 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
     return xStream;
 }
 
-uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, rtl::OUString* pMediaType )
+uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, OUString* pMediaType )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Object )" );
 
     // get the object name
-    ::rtl::OUString aName;
+    OUString aName;
     EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin();
     while ( aIt != pImpl->maObjectContainer.end() )
     {
@@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c
     return GetGraphicStream( aName, pMediaType );
 }
 
-sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType )
+sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStream" );
 
@@ -1258,7 +1258,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno
     return sal_True;
 }
 
-sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType )
+sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" );
 
@@ -1290,7 +1290,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::s
 }
 
 
-sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rObjectName )
+sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName )
 {
     RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveGraphicStream" );
 
@@ -1309,7 +1309,7 @@ sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rO
 namespace {
     void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor,
                                             const uno::Reference< io::XInputStream >& xInStream,
-                                            const ::rtl::OUString& aStreamName )
+                                            const OUString& aStreamName )
     {
         OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!\n" );
 
@@ -1345,9 +1345,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
     try
     {
         comphelper::EmbeddedObjectContainer aCnt( _xStorage );
-        const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
-        const ::rtl::OUString* pIter = aNames.getConstArray();
-        const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+        const uno::Sequence < OUString > aNames = GetObjectNames();
+        const OUString* pIter = aNames.getConstArray();
+        const OUString* pEnd   = pIter + aNames.getLength();
         for(;pIter != pEnd;++pIter)
         {
             uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
@@ -1358,7 +1358,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
                 uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY );
 
                 uno::Reference < io::XInputStream > xStream;
-                ::rtl::OUString aMediaType;
+                OUString aMediaType;
 
                 sal_Int32 nCurState = xObj->getCurrentState();
                 if ( nCurState == embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING )
@@ -1460,9 +1460,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo
 sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly)
 {
     sal_Bool bResult = sal_True;
-    const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
-    const ::rtl::OUString* pIter = aNames.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+    const uno::Sequence < OUString > aNames = GetObjectNames();
+    const OUString* pIter = aNames.getConstArray();
+    const OUString* pEnd   = pIter + aNames.getLength();
     for(;pIter != pEnd;++pIter)
     {
         uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
@@ -1474,7 +1474,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool
             {
                 // means that the object is active
                 // the image must be regenerated
-                ::rtl::OUString aMediaType;
+                OUString aMediaType;
 
                 // TODO/LATER: another aspect could be used
                 uno::Reference < io::XInputStream > xStream =
@@ -1521,7 +1521,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool
                     uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY );
                     if ( xLink.is() && xLink->isLink() )
                     {
-                        ::rtl::OUString aMediaType;
+                        OUString aMediaType;
                         uno::Reference < io::XInputStream > xInStream = GetGraphicStream( xObj, &aMediaType );
                         if ( xInStream.is() )
                             InsertStreamIntoPicturesStorage_Impl( pImpl->mxStorage, xInStream, *pIter );
@@ -1558,7 +1558,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool
 uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacementStream(
                                                                 sal_Int64 nViewAspect,
                                                                 const uno::Reference< embed::XEmbeddedObject >& xObj,
-                                                                ::rtl::OUString* pMediaType )
+                                                                OUString* pMediaType )
 {
     uno::Reference< io::XInputStream > xInStream;
     if ( xObj.is() )
@@ -1585,9 +1585,9 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen
 sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag)
 {
     sal_Bool bError = sal_False;
-    const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames();
-    const ::rtl::OUString* pIter = aNames.getConstArray();
-    const ::rtl::OUString* pEnd   = pIter + aNames.getLength();
+    const uno::Sequence < OUString > aNames = GetObjectNames();
+    const OUString* pIter = aNames.getConstArray();
+    const OUString* pEnd   = pIter + aNames.getLength();
     for(;pIter != pEnd;++pIter)
     {
         uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter );
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index ad2b9c9888c4..e79f2a0875c7 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -214,14 +214,14 @@ namespace comphelper
         virtual ::sal_Bool SAL_CALL hasElements() throw (RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
-        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
-        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException);
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (RuntimeException);
 
     public:
         // XServiceInfo, static version (used for component registration)
-        static ::rtl::OUString SAL_CALL getImplementationName_static(  );
-        static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(  );
+        static OUString SAL_CALL getImplementationName_static(  );
+        static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(  );
         static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& );
 
     private:
@@ -491,7 +491,7 @@ namespace comphelper
 
         if ( !bValid )
         {
-            ::rtl::OUStringBuffer aMessage;
+            OUStringBuffer aMessage;
             aMessage.appendAscii( "Incompatible value type. Found '" );
             aMessage.append( _value.getValueTypeName() );
             aMessage.appendAscii( "', where '" );
@@ -688,15 +688,15 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL EnumerableMap::getImplementationName(  ) throw (RuntimeException)
+    OUString SAL_CALL EnumerableMap::getImplementationName(  ) throw (RuntimeException)
     {
         return getImplementationName_static();
     }
 
     //--------------------------------------------------------------------
-    ::sal_Bool SAL_CALL EnumerableMap::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException)
+    ::sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() );
+        Sequence< OUString > aServices( getSupportedServiceNames() );
         for ( sal_Int32 i=0; i<aServices.getLength(); ++i )
             if ( _serviceName == aServices[i] )
                 return sal_True;
@@ -704,7 +704,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL EnumerableMap::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
@@ -736,7 +736,7 @@ namespace comphelper
     ::sal_Bool MapEnumerator::hasMoreElements()
     {
         if ( m_disposed )
-            throw DisposedException( ::rtl::OUString(), m_rParent );
+            throw DisposedException( OUString(), m_rParent );
         return m_mapPos != m_rMapData.m_pValues->end();
     }
 
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 2dd9ec940e73..b48e67eae2ed 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.cxx
@@ -40,7 +40,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X
 
 //------------------------------------------------------------------------------
 OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess,
-                                       const staruno::Sequence< ::rtl::OUString >&           _aNames  )
+                                       const staruno::Sequence< OUString >&           _aNames  )
     :m_aNames(_aNames)
     ,m_nPos(0)
     ,m_xAccess(_rxAccess)
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index 28bd6a5be7c6..f1ee4150e391 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.cxx
@@ -41,25 +41,25 @@ namespace comphelper
         virtual ~NameContainer();
 
         // XNameContainer
-        virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+        virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
             throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException,
             ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeByName( const ::rtl::OUString& Name )
+        virtual void SAL_CALL removeByName( const OUString& Name )
             throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
 
         // XNameReplace
-        virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement )
+        virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement )
             throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException,
                 ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
         // XNameAccess
-        virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName )
+        virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName )
             throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException,
                 ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  )
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  )
             throw(::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName )
+        virtual sal_Bool SAL_CALL hasByName( const OUString& aName )
             throw(::com::sun::star::uno::RuntimeException);
 
         // XElementAccess
@@ -92,7 +92,7 @@ NameContainer::~NameContainer()
 }
 
 // XNameContainer
-void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any& aElement )
+void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement )
     throw(IllegalArgumentException, ElementExistException,
         WrappedTargetException, RuntimeException)
 {
@@ -107,7 +107,7 @@ void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any
     maProperties.insert( SvGenericNameContainerMapImpl::value_type(aName,aElement));
 }
 
-void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name )
+void SAL_CALL NameContainer::removeByName( const OUString& Name )
     throw(NoSuchElementException, WrappedTargetException,
         RuntimeException)
 {
@@ -122,7 +122,7 @@ void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name )
 
 // XNameReplace
 
-void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const Any& aElement )
+void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement )
     throw(IllegalArgumentException, NoSuchElementException,
         WrappedTargetException, RuntimeException)
 {
@@ -140,7 +140,7 @@ void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const
 
 // XNameAccess
 
-Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName )
+Any SAL_CALL NameContainer::getByName( const OUString& aName )
     throw(NoSuchElementException, WrappedTargetException,
         RuntimeException)
 {
@@ -153,7 +153,7 @@ Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName )
     return (*aIter).second;
 }
 
-Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames(  )
+Sequence< OUString > SAL_CALL NameContainer::getElementNames(  )
     throw(RuntimeException)
 {
     MutexGuard aGuard( maMutex );
@@ -161,8 +161,8 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames(  )
     SvGenericNameContainerMapImpl::iterator aIter = maProperties.begin();
     const SvGenericNameContainerMapImpl::iterator aEnd = maProperties.end();
 
-    Sequence< rtl::OUString > aNames( maProperties.size() );
-    rtl::OUString* pNames = aNames.getArray();
+    Sequence< OUString > aNames( maProperties.size() );
+    OUString* pNames = aNames.getArray();
 
     while( aIter != aEnd )
     {
@@ -172,7 +172,7 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames(  )
     return aNames;
 }
 
-sal_Bool SAL_CALL NameContainer::hasByName( const ::rtl::OUString& aName )
+sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName )
     throw(RuntimeException)
 {
     MutexGuard aGuard( maMutex );
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 0fea4be3a072..512e6fb786f3 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -59,7 +59,6 @@ using namespace com::sun::star::reflection;
 using namespace cppu;
 using namespace osl;
 
-using ::rtl::OUString;
 
 namespace comphelper
 {
diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index c355d50c53f6..b3169fd77be0 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.cxx
@@ -292,7 +292,7 @@ namespace comphelper
             xParentContext = xParent->getAccessibleContext();
 
         if ( !xParentContext.is() )
-            throw IllegalAccessibleComponentStateException( ::rtl::OUString(), *this );
+            throw IllegalAccessibleComponentStateException( OUString(), *this );
 
         return xParentContext->getLocale();
     }
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index ab77650a7710..a724fdfe185e 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -104,7 +104,7 @@ namespace comphelper
 
     void OCommonAccessibleText::implGetGlyphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( implIsValidIndex( nIndex, sText.getLength() ) )
         {
@@ -136,7 +136,7 @@ namespace comphelper
     sal_Bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
         sal_Bool bWord = sal_False;
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( implIsValidIndex( nIndex, sText.getLength() ) )
         {
@@ -168,7 +168,7 @@ namespace comphelper
 
     void OCommonAccessibleText::implGetSentenceBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( implIsValidIndex( nIndex, sText.getLength() ) )
         {
@@ -191,7 +191,7 @@ namespace comphelper
 
     void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( implIsValidIndex( nIndex, sText.getLength() ) )
         {
@@ -217,7 +217,7 @@ namespace comphelper
 
     void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex )
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
 
         if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength )
@@ -236,7 +236,7 @@ namespace comphelper
 
     sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( !implIsValidIndex( nIndex, sText.getLength() ) )
             throw IndexOutOfBoundsException();
@@ -253,9 +253,9 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException)
+    OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException)
     {
-        ::rtl::OUString sText;
+        OUString sText;
         sal_Int32 nStartIndex;
         sal_Int32 nEndIndex;
 
@@ -298,16 +298,16 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OCommonAccessibleText::getText() throw (RuntimeException)
+    OUString OCommonAccessibleText::getText() throw (RuntimeException)
     {
         return implGetText();
     }
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
 
         if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
             throw IndexOutOfBoundsException();
@@ -322,7 +322,7 @@ namespace comphelper
 
     TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
 
         if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength )
@@ -427,7 +427,7 @@ namespace comphelper
 
     TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
 
         if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength )
@@ -552,7 +552,7 @@ namespace comphelper
 
     TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException)
     {
-        ::rtl::OUString sText( implGetText() );
+        OUString sText( implGetText() );
         sal_Int32 nLength = sText.getLength();
 
         if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength )
@@ -679,8 +679,8 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
     bool OCommonAccessibleText::implInitTextChangedEvent(
-        const rtl::OUString& rOldString,
-        const rtl::OUString& rNewString,
+        const OUString& rOldString,
+        const OUString& rNewString,
         ::com::sun::star::uno::Any& rDeleted,
         ::com::sun::star::uno::Any& rInserted) // throw()
     {
@@ -811,7 +811,7 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException)
+    OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -838,7 +838,7 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException)
+    OUString OAccessibleTextHelper::getText() throw (RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
@@ -847,7 +847,7 @@ namespace comphelper
 
     // -----------------------------------------------------------------------------
 
-    ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
+    OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException)
     {
         OExternalLockGuard aGuard( this );
 
diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 4996cb2d5d84..7f47f62f246a 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.cxx
@@ -278,8 +278,8 @@ namespace comphelper
                 if ( xContext.is() )
                 {
                     //TODO: do something
-                    //::rtl::OUString sName = xContext->getAccessibleName();
-                    //::rtl::OUString sDescription = xContext->getAccessibleDescription();
+                    //OUString sName = xContext->getAccessibleName();
+                    //OUString sDescription = xContext->getAccessibleDescription();
                     //sal_Int32 nPlaceYourBreakpointHere = 0;
                 }
             }
@@ -573,13 +573,13 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription(  ) throw (RuntimeException)
+    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleDescription();
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName(  ) throw (RuntimeException)
+    OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName(  ) throw (RuntimeException)
     {
         return m_xInnerContext->getAccessibleName();
     }
diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index 030ca27eaa01..c9ddbeea5487 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -30,14 +30,14 @@ namespace comphelper {
 namespace {
 
 void appendTypeError(
-    rtl::OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef )
+    OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef )
 {
     buf.append( "<cannot get type description of type " );
     buf.append( OUString::unacquired( &typeRef->pTypeName ) );
     buf.append( static_cast< sal_Unicode >('>') );
 }
 
-inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c )
+inline void appendChar( OUStringBuffer & buf, sal_Unicode c )
 {
     if (c < ' ' || c > '~') {
         buf.append( "\\X" );
@@ -53,7 +53,7 @@ inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c )
 }
 
 //------------------------------------------------------------------------------
-void appendValue( rtl::OUStringBuffer & buf,
+void appendValue( OUStringBuffer & buf,
                   void const * val, typelib_TypeDescriptionReference * typeRef,
                   bool prependType )
 {
@@ -202,7 +202,7 @@ void appendValue( rtl::OUStringBuffer & buf,
         break;
     case typelib_TypeClass_STRING: {
         buf.append( static_cast< sal_Unicode >('\"') );
-        rtl::OUString const & str = rtl::OUString::unacquired(
+        OUString const & str = OUString::unacquired(
             static_cast< rtl_uString * const * >(val) );
         sal_Int32 len = str.getLength();
         for ( sal_Int32 pos = 0; pos < len; ++pos )
@@ -311,9 +311,9 @@ void appendValue( rtl::OUStringBuffer & buf,
 } // anon namespace
 
 //==============================================================================
-rtl::OUString anyToString( uno::Any const & value )
+OUString anyToString( uno::Any const & value )
 {
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     appendValue( buf, value.getValue(), value.getValueTypeRef(), true );
     return buf.makeStringAndClear();
 }
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index 23318ba1bde1..d5066fbbbf65 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.cxx
@@ -40,14 +40,14 @@ namespace comphelper
     void ComponentBase::impl_checkDisposed_throw() const
     {
         if ( m_rBHelper.bDisposed )
-            throw DisposedException( ::rtl::OUString(), getComponent() );
+            throw DisposedException( OUString(), getComponent() );
     }
 
     //--------------------------------------------------------------------
     void ComponentBase::impl_checkInitialized_throw() const
     {
         if ( !m_bInitialized )
-            throw NotInitializedException( ::rtl::OUString(), getComponent() );
+            throw NotInitializedException( OUString(), getComponent() );
     }
 
     //--------------------------------------------------------------------
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index 4a5abe05859f..dded964ed549 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.cxx
@@ -64,7 +64,7 @@ namespace comphelper
     }
 
     //------------------------------------------------------------------------
-    Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const
+    Any ComponentContext::getContextValueByName( const OUString& _rName ) const
     {
         Any aReturn;
         try
@@ -79,7 +79,7 @@ namespace comphelper
     }
 
     //------------------------------------------------------------------------
-    Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const
+    Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const
     {
         Reference< XInterface > xComponent(
             m_xORB->createInstanceWithContext( _rServiceName, m_xContext )
@@ -90,7 +90,7 @@ namespace comphelper
     }
 
     //------------------------------------------------------------------------
-    Reference< XInterface > ComponentContext::createComponentWithArguments( const ::rtl::OUString& _rServiceName, const Sequence< Any >& _rArguments ) const
+    Reference< XInterface > ComponentContext::createComponentWithArguments( const OUString& _rServiceName, const Sequence< Any >& _rArguments ) const
     {
         Reference< XInterface > xComponent(
             m_xORB->createInstanceWithArgumentsAndContext( _rServiceName, _rArguments, m_xContext )
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 0f686b21e9ef..a35a6779cb9d 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -116,10 +116,10 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------------
-    void OModule::registerImplementation( const ::rtl::OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames,
+    void OModule::registerImplementation( const OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames,
         ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction )
     {
-        ComponentDescription aComponent( _rImplementationName, _rServiceNames, ::rtl::OUString(), _pCreateFunction, _pFactoryFunction );
+        ComponentDescription aComponent( _rImplementationName, _rServiceNames, OUString(), _pCreateFunction, _pFactoryFunction );
         registerImplementation( aComponent );
     }
 
@@ -127,12 +127,12 @@ namespace comphelper
     void* OModule::getComponentFactory( const sal_Char* _pImplementationName )
     {
         Reference< XInterface > xFactory( getComponentFactory(
-            ::rtl::OUString::createFromAscii( _pImplementationName ) ) );
+            OUString::createFromAscii( _pImplementationName ) ) );
         return xFactory.get();
     }
 
     //--------------------------------------------------------------------------
-    Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName )
+    Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName )
     {
         Reference< XInterface > xReturn;
 
diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx
index 2935c4b0ce80..ea7643d36df9 100644
--- a/comphelper/source/misc/configuration.cxx
+++ b/comphelper/source/misc/configuration.cxx
@@ -71,7 +71,7 @@ OUString getDefaultLocale(
 }
 
 OUString extendLocalizedPath(OUString const & path, OUString const & locale) {
-    rtl::OUStringBuffer buf(path);
+    OUStringBuffer buf(path);
     buf.append("/['*");
     SAL_WARN_IF(
         locale.match("*"), "comphelper",
@@ -108,20 +108,20 @@ comphelper::ConfigurationChanges::ConfigurationChanges(
 {}
 
 void comphelper::ConfigurationChanges::setPropertyValue(
-    rtl::OUString const & path, css::uno::Any const & value) const
+    OUString const & path, css::uno::Any const & value) const
 {
     access_->replaceByHierarchicalName(path, value);
 }
 
 css::uno::Reference< css::container::XHierarchicalNameReplace >
-comphelper::ConfigurationChanges::getGroup(rtl::OUString const & path) const
+comphelper::ConfigurationChanges::getGroup(OUString const & path) const
 {
     return css::uno::Reference< css::container::XHierarchicalNameReplace >(
         access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW);
 }
 
 css::uno::Reference< css::container::XNameContainer >
-comphelper::ConfigurationChanges::getSet(rtl::OUString const & path) const
+comphelper::ConfigurationChanges::getSet(OUString const & path) const
 {
     return css::uno::Reference< css::container::XNameContainer >(
         access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW);
@@ -143,14 +143,14 @@ comphelper::detail::ConfigurationWrapper::ConfigurationWrapper(
 comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {}
 
 css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     return access_->getByHierarchicalName(path);
 }
 
 void comphelper::detail::ConfigurationWrapper::setPropertyValue(
     boost::shared_ptr< ConfigurationChanges > const & batch,
-    rtl::OUString const & path, com::sun::star::uno::Any const & value) const
+    OUString const & path, com::sun::star::uno::Any const & value) const
 {
     assert(batch.get() != 0);
     batch->setPropertyValue(path, value);
@@ -158,7 +158,7 @@ void comphelper::detail::ConfigurationWrapper::setPropertyValue(
 
 css::uno::Any
 comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     return access_->getByHierarchicalName(
         extendLocalizedPath(path, getDefaultLocale(context_)));
@@ -166,7 +166,7 @@ comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(
 
 void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(
     boost::shared_ptr< ConfigurationChanges > const & batch,
-    rtl::OUString const & path, com::sun::star::uno::Any const & value) const
+    OUString const & path, com::sun::star::uno::Any const & value) const
 {
     assert(batch.get() != 0);
     batch->setPropertyValue(path, value);
@@ -174,7 +174,7 @@ void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(
 
 css::uno::Reference< css::container::XHierarchicalNameAccess >
 comphelper::detail::ConfigurationWrapper::getGroupReadOnly(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     return css::uno::Reference< css::container::XHierarchicalNameAccess >(
         (css::configuration::ReadOnlyAccess::create(
@@ -186,7 +186,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadOnly(
 css::uno::Reference< css::container::XHierarchicalNameReplace >
 comphelper::detail::ConfigurationWrapper::getGroupReadWrite(
     boost::shared_ptr< ConfigurationChanges > const & batch,
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     assert(batch.get() != 0);
     return batch->getGroup(path);
@@ -194,7 +194,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite(
 
 css::uno::Reference< css::container::XNameAccess >
 comphelper::detail::ConfigurationWrapper::getSetReadOnly(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     return css::uno::Reference< css::container::XNameAccess >(
         (css::configuration::ReadOnlyAccess::create(
@@ -206,7 +206,7 @@ comphelper::detail::ConfigurationWrapper::getSetReadOnly(
 css::uno::Reference< css::container::XNameContainer >
 comphelper::detail::ConfigurationWrapper::getSetReadWrite(
     boost::shared_ptr< ConfigurationChanges > const & batch,
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     assert(batch.get() != 0);
     return batch->getSet(path);
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index e42a324eb58f..14b82de407ff 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -76,8 +76,8 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
 
 //-----------------------------------------------
 css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
-                                                   const ::rtl::OUString&                            sRelPath,
-                                                   const ::rtl::OUString&                            sKey    )
+                                                   const OUString&                            sRelPath,
+                                                   const OUString&                            sKey    )
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW);
 
@@ -85,7 +85,7 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs
     xAccess->getByHierarchicalName(sRelPath) >>= xProps;
     if (!xProps.is())
     {
-        ::rtl::OUStringBuffer sMsg(256);
+        OUStringBuffer sMsg(256);
         sMsg.appendAscii("The requested path \"");
         sMsg.append     (sRelPath               );
         sMsg.appendAscii("\" does not exists."  );
@@ -99,8 +99,8 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs
 
 //-----------------------------------------------
 void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG    ,
-                                           const ::rtl::OUString&                            sRelPath,
-                                           const ::rtl::OUString&                            sKey    ,
+                                           const OUString&                            sRelPath,
+                                           const OUString&                            sKey    ,
                                            const css::uno::Any&                              aValue  )
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW);
@@ -109,7 +109,7 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::
     xAccess->getByHierarchicalName(sRelPath) >>= xProps;
     if (!xProps.is())
     {
-        ::rtl::OUStringBuffer sMsg(256);
+        OUStringBuffer sMsg(256);
         sMsg.appendAscii("The requested path \"");
         sMsg.append     (sRelPath               );
         sMsg.appendAscii("\" does not exists."  );
@@ -123,15 +123,15 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::
 
 //-----------------------------------------------
 css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG         ,
-                                                                                       const ::rtl::OUString&                            sRelPathToSet,
-                                                                                       const ::rtl::OUString&                            sSetNode     )
+                                                                                       const OUString&                            sRelPathToSet,
+                                                                                       const OUString&                            sSetNode     )
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNameAccess > xSet;
     xAccess->getByHierarchicalName(sRelPathToSet) >>= xSet;
     if (!xSet.is())
     {
-        ::rtl::OUStringBuffer sMsg(256);
+        OUStringBuffer sMsg(256);
         sMsg.appendAscii("The requested path \"");
         sMsg.append     (sRelPathToSet          );
         sMsg.appendAscii("\" does not exists."  );
@@ -157,9 +157,9 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode
 
 //-----------------------------------------------
 css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
-                                                 const ::rtl::OUString&                                       sPackage,
-                                                 const ::rtl::OUString&                                       sRelPath,
-                                                 const ::rtl::OUString&                                       sKey    ,
+                                                 const OUString&                                       sPackage,
+                                                 const OUString&                                       sRelPath,
+                                                 const OUString&                                       sKey    ,
                                                        sal_Int32                                              eMode   )
 {
     css::uno::Reference< css::uno::XInterface > xCFG = ConfigurationHelper::openConfig(rxContext, sPackage, eMode);
@@ -168,9 +168,9 @@ css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css:
 
 //-----------------------------------------------
 void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >&    rxContext,
-                                         const ::rtl::OUString&                                       sPackage,
-                                         const ::rtl::OUString&                                       sRelPath,
-                                         const ::rtl::OUString&                                       sKey    ,
+                                         const OUString&                                       sPackage,
+                                         const OUString&                                       sRelPath,
+                                         const OUString&                                       sKey    ,
                                          const css::uno::Any&                                         aValue  ,
                                                sal_Int32                                              eMode   )
 {
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 7ab4865e1bdb..b941cbd15049 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -27,7 +27,6 @@
 #include <rtl/random.h>
 #include <string.h>
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::uno::Exception;
 using ::com::sun::star::uno::Reference;
@@ -44,13 +43,13 @@ namespace comphelper {
 
 // ============================================================================
 
-static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength )
+static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength )
 {
     uno::Sequence< sal_Int8 > aResult;
 
     if ( !aPassword.isEmpty() && aSalt.getLength() && nCount && nHashLength )
     {
-        ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 );
+        OString aBytePass = OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 );
         aResult.realloc( 16 );
         rtl_digest_PBKDF2( reinterpret_cast < sal_uInt8 * > ( aResult.getArray() ),
                            aResult.getLength(),
@@ -71,7 +70,7 @@ IDocPasswordVerifier::~IDocPasswordVerifier()
 }
 
 // ============================================================================
-uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword )
+uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const OUString& aPassword )
 {
     uno::Sequence< beans::PropertyValue > aResult;
 
@@ -96,12 +95,12 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo
 }
 
 // ============================================================================
-sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo )
+sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo )
 {
     sal_Bool bResult = sal_False;
     if ( !aPassword.isEmpty() && aInfo.getLength() )
     {
-        ::rtl::OUString sAlgorithm;
+        OUString sAlgorithm;
         uno::Sequence< sal_Int8 > aSalt;
         uno::Sequence< sal_Int8 > aHash;
         sal_Int32 nCount = 0;
@@ -134,7 +133,7 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas
 
 // ============================================================================
 sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
-                const ::rtl::OUString& aUString )
+                const OUString& aUString )
 {
     static sal_uInt16 pInitialCode[] = {
         0xE1F0, // 1
@@ -211,12 +210,12 @@ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32(
 
 // ============================================================================
 sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
-                const ::rtl::OUString& aUString,
+                const OUString& aUString,
                 rtl_TextEncoding nEnc )
 {
     sal_uInt16 nResult = 0;
 
-    ::rtl::OString aString = ::rtl::OUStringToOString( aUString, nEnc );
+    OString aString = OUStringToOString( aUString, nEnc );
 
     if ( !aString.isEmpty() && aString.getLength() <= SAL_MAX_UINT16 )
     {
@@ -236,7 +235,7 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16(
 
 // ============================================================================
 Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
-                const ::rtl::OUString& aUString,
+                const OUString& aUString,
                 rtl_TextEncoding nEnc )
 {
     sal_uInt16 nHash = GetXLHashAsUINT16( aUString, nEnc );
@@ -264,7 +263,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
 
 
 // ============================================================================
-/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId )
+/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId )
 {
     uno::Sequence< sal_Int8 > aResultKey;
     if ( !aPassword.isEmpty() && aDocId.getLength() == 16 )
diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index fbfc42ad3fbe..a674f7246026 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionPassword2.hpp>
 
-using ::rtl::OUString;
 using ::com::sun::star::uno::Any;
 using ::com::sun::star::uno::Type;
 using ::com::sun::star::uno::Reference;
diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 5039c2d9d805..a436575fda7a 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.cxx
@@ -59,12 +59,12 @@ namespace comphelper {
     //====================================================================
     namespace
     {
-        ::rtl::OUString lcl_getTitle( const Reference< XInterface >& _rxComponent )
+        OUString lcl_getTitle( const Reference< XInterface >& _rxComponent )
         {
             Reference< XTitle > xTitle( _rxComponent, UNO_QUERY );
             if ( xTitle.is() )
                 return xTitle->getTitle();
-            return ::rtl::OUString();
+            return OUString();
         }
     }
 
@@ -72,14 +72,14 @@ namespace comphelper {
     //= DocumentInfo
     //====================================================================
     //--------------------------------------------------------------------
-    ::rtl::OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument )
+    OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument )
     {
-        ::rtl::OUString sTitle;
+        OUString sTitle;
 
         if ( !_rxDocument.is() )
             return sTitle;
 
-        ::rtl::OUString sDocURL;
+        OUString sDocURL;
         try
         {
             // 1. ask the model and the controller for their XTitle::getTitle
@@ -96,7 +96,7 @@ namespace comphelper {
             // private:object as URL
             sDocURL = _rxDocument->getURL();
             if ( sDocURL.matchAsciiL( "private:", 8 ) )
-                sDocURL = ::rtl::OUString();
+                sDocURL = OUString();
 
             // 2. if the document is not saved, yet, check the frame title
             if ( sDocURL.isEmpty() )
@@ -161,13 +161,13 @@ namespace comphelper {
         catch ( const Exception& )
         {
             ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() );
-            ::rtl::OString sMessage( "caught an exception!" );
+            OString sMessage( "caught an exception!" );
             sMessage += "\ntype   : ";
-            sMessage += ::rtl::OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() );
+            sMessage += OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() );
             sMessage += "\nmessage: ";
             ::com::sun::star::uno::Exception exception;
             caught >>= exception;
-            sMessage += ::rtl::OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() );
+            sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() );
             sMessage += "\nin function:\n";
             sMessage += BOOST_CURRENT_FUNCTION;
             sMessage += "\n";
diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index e9429b4a62bd..28df327710d9 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -45,9 +45,9 @@ OSimpleLogRing::~OSimpleLogRing()
 }
 
 // ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
+uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
 {
-    uno::Sequence< rtl::OUString > aResult( 1 );
+    uno::Sequence< OUString > aResult( 1 );
     aResult[0] = getServiceName_static();
     return aResult;
 }
@@ -78,7 +78,7 @@ uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PA
 
 // XSimpleLogRing
 // ----------------------------------------------------------
-void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw (uno::RuntimeException)
+void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -94,13 +94,13 @@ void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw
 }
 
 // ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_Int32 nResLen = m_bFull ? m_aMessages.getLength() : m_nPos;
     sal_Int32 nStart = m_bFull ? m_nPos : 0;
-    uno::Sequence< ::rtl::OUString > aResult( nResLen );
+    uno::Sequence< OUString > aResult( nResLen );
 
     for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ )
         aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ];
@@ -136,15 +136,15 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
 
 // XServiceInfo
 // ----------------------------------------------------------
-::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)
+OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)
 {
     return getImplementationName_static();
 }
 
 // ----------------------------------------------------------
-::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)
+::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException)
 {
-    const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();
+    const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static();
     for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )
     {
         if ( aSupportedNames[ nInd ].equals( aServiceName ) )
@@ -155,7 +155,7 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu
 }
 
 // ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index 467d864b6709..99915c6dfc3d 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.hxx
@@ -37,7 +37,7 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging
                                                            ::com::sun::star::lang::XServiceInfo >
 {
     ::osl::Mutex m_aMutex;
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMessages;
+    ::com::sun::star::uno::Sequence< OUString > m_aMessages;
 
     sal_Bool m_bInitialized;
     sal_Bool m_bFull;
@@ -47,29 +47,29 @@ public:
     OSimpleLogRing();
     virtual ~OSimpleLogRing();
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
             getSupportedServiceNames_static();
 
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
+    static OUString SAL_CALL getImplementationName_static();
 
-    static ::rtl::OUString SAL_CALL getSingletonName_static();
+    static OUString SAL_CALL getSingletonName_static();
 
-    static ::rtl::OUString SAL_CALL getServiceName_static();
+    static OUString SAL_CALL getServiceName_static();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
 
 // XSimpleLogRing
-    virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException);
 
 // XInitialization
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
 };
 
diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx
index 4a18372e8834..d69bdfd7c944 100644
--- a/comphelper/source/misc/evtmethodhelper.cxx
+++ b/comphelper/source/misc/evtmethodhelper.cxx
@@ -26,16 +26,16 @@ using ::com::sun::star::uno::Type;
 namespace comphelper
 {
 
-    Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type)
+    Sequence< OUString> getEventMethodsForType(const Type& type)
     {
         typelib_InterfaceTypeDescription *pType=0;
         type.getDescription( (typelib_TypeDescription**)&pType);
 
         if(!pType)
-            return Sequence< ::rtl::OUString>();
+            return Sequence< OUString>();
 
-        Sequence< ::rtl::OUString> aNames(pType->nMembers);
-        ::rtl::OUString* pNames = aNames.getArray();
+        Sequence< OUString> aNames(pType->nMembers);
+        OUString* pNames = aNames.getArray();
         for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
         {
             // the decription reference
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index c6b6697eeb47..7999bbdcc835 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.cxx
@@ -102,16 +102,16 @@ namespace comphelper
     // XServiceInfo
     //----------------------------------------------------------------------------------------------------
 
-    ::rtl::OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName()
+    OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName()
         throw ( uno::RuntimeException )
     {
         return impl_staticGetImplementationName();
     }
 
-    ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const ::rtl::OUString& ServiceName )
+    ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const OUString& ServiceName )
         throw ( uno::RuntimeException )
     {
-        uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames();
+        uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames();
 
         for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
             if ( ServiceName == aSeq[nInd] )
@@ -120,7 +120,7 @@ namespace comphelper
         return sal_False;
     }
 
-    uno::Sequence< ::rtl::OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames()
+    uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames()
         throw ( uno::RuntimeException )
     {
         return impl_staticGetSupportedServiceNames();
diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index a42852fa2b0c..f14be18a0ba1 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.cxx
@@ -190,17 +190,17 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
 
 // XServiceInfo
 // --------------------------------------------------------
-::rtl::OUString SAL_CALL OInstanceLocker::getImplementationName(  )
+OUString SAL_CALL OInstanceLocker::getImplementationName(  )
     throw (uno::RuntimeException)
 {
     return getImplementationName_static();
 }
 
 // --------------------------------------------------------
-::sal_Bool SAL_CALL OInstanceLocker::supportsService( const ::rtl::OUString& ServiceName )
+::sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName )
     throw (uno::RuntimeException)
 {
-    uno::Sequence< ::rtl::OUString > aSeq = getSupportedServiceNames();
+    uno::Sequence< OUString > aSeq = getSupportedServiceNames();
 
     for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ )
         if ( ServiceName == aSeq[nInd] )
@@ -210,7 +210,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg
 }
 
 // --------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames()
     throw (uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index 7e5fd1430b01..ba80ce39ee8d 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.hxx
@@ -58,10 +58,10 @@ public:
     OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
     ~OInstanceLocker();
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
             getSupportedServiceNames_static();
 
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
+    static OUString SAL_CALL getImplementationName_static();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         Create(
@@ -76,9 +76,9 @@ public:
     virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
 };
 
diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index 4f922b3e8d7d..916858317bab 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.cxx
@@ -32,13 +32,13 @@ namespace comphelper
     //= OInteractionPassword
     //=========================================================================
     //--------------------------------------------------------------------
-    void SAL_CALL OInteractionPassword::setPassword( const ::rtl::OUString& _Password ) throw (RuntimeException)
+    void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException)
     {
         m_sPassword = _Password;
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL OInteractionPassword::getPassword(  ) throw (RuntimeException)
+    OUString SAL_CALL OInteractionPassword::getPassword(  ) throw (RuntimeException)
     {
         return m_sPassword;
     }
diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index bd3a09251880..98f38d878a9b 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.cxx
@@ -53,11 +53,11 @@ namespace comphelper
     {
     private:
         Reference< XComponentContext >  m_aContext;
-        ::rtl::OUString                 m_sLoggerName;
+        OUString                 m_sLoggerName;
         Reference< XLogger >            m_xLogger;
 
     public:
-        EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rLoggerName )
+        EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName )
             :m_aContext( _rxContext )
             ,m_sLoggerName( _rLoggerName )
         {
@@ -65,7 +65,7 @@ namespace comphelper
         }
 
         inline bool isValid() const { return m_xLogger.is(); }
-        inline const ::rtl::OUString&  getName() const { return m_sLoggerName; }
+        inline const OUString&  getName() const { return m_sLoggerName; }
         inline const Reference< XLogger >& getLogger() const { return m_xLogger; }
         inline Reference< XComponentContext > getContext() const { return m_aContext; }
 
@@ -99,7 +99,7 @@ namespace comphelper
     //====================================================================
     //--------------------------------------------------------------------
     EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName )
-        :m_pImpl( new EventLogger_Impl( _rxContext, ::rtl::OUString::createFromAscii( _pAsciiLoggerName ) ) )
+        :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) )
     {
     }
 
@@ -130,7 +130,7 @@ namespace comphelper
     //--------------------------------------------------------------------
     namespace
     {
-        void    lcl_replaceParameter( ::rtl::OUString& _inout_Message, const ::rtl::OUString& _rPlaceHolder, const ::rtl::OUString& _rReplacement )
+        void    lcl_replaceParameter( OUString& _inout_Message, const OUString& _rPlaceHolder, const OUString& _rReplacement )
         {
             sal_Int32 nPlaceholderPosition = _inout_Message.indexOf( _rPlaceHolder );
             OSL_ENSURE( nPlaceholderPosition >= 0, "lcl_replaceParameter: placeholder not found!" );
@@ -143,20 +143,20 @@ namespace comphelper
 
     //--------------------------------------------------------------------
     bool EventLogger::impl_log( const sal_Int32 _nLogLevel,
-        const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage,
+        const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage,
         const OptionalString& _rArgument1, const OptionalString& _rArgument2,
         const OptionalString& _rArgument3, const OptionalString& _rArgument4,
         const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const
     {
-        // (if ::rtl::OUString had an indexOfAscii, we could save those ugly statics ...)
-        static ::rtl::OUString sPH1( "$1$" );
-        static ::rtl::OUString sPH2( "$2$" );
-        static ::rtl::OUString sPH3( "$3$" );
-        static ::rtl::OUString sPH4( "$4$" );
-        static ::rtl::OUString sPH5( "$5$" );
-        static ::rtl::OUString sPH6( "$6$" );
-
-        ::rtl::OUString sMessage( _rMessage );
+        // (if OUString had an indexOfAscii, we could save those ugly statics ...)
+        static OUString sPH1( "$1$" );
+        static OUString sPH2( "$2$" );
+        static OUString sPH3( "$3$" );
+        static OUString sPH4( "$4$" );
+        static OUString sPH5( "$5$" );
+        static OUString sPH6( "$6$" );
+
+        OUString sMessage( _rMessage );
         if ( !!_rArgument1 )
             lcl_replaceParameter( sMessage, sPH1, *_rArgument1 );
 
@@ -183,8 +183,8 @@ namespace comphelper
             {
                 xLogger->logp(
                     _nLogLevel,
-                    ::rtl::OUString::createFromAscii( _pSourceClass ),
-                    ::rtl::OUString::createFromAscii( _pSourceMethod ),
+                    OUString::createFromAscii( _pSourceClass ),
+                    OUString::createFromAscii( _pSourceMethod ),
                     sMessage
                 );
             }
@@ -208,7 +208,7 @@ namespace comphelper
     struct ResourceBasedEventLogger_Data
     {
         /// the base name of the resource bundle
-        ::rtl::OUString                 sBundleBaseName;
+        OUString                 sBundleBaseName;
         /// did we already attempt to load the bundle?
         bool                            bBundleLoaded;
         /// the lazily loaded bundle
@@ -248,13 +248,13 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID )
+    OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID )
     {
         OSL_PRECOND( _rxBundle.is(), "lcl_loadString_nothrow: this will crash!" );
-        ::rtl::OUString sMessage;
+        OUString sMessage;
         try
         {
-            ::rtl::OUStringBuffer aBuffer;
+            OUStringBuffer aBuffer;
             aBuffer.appendAscii( "string:" );
             aBuffer.append( _nMessageResID );
             OSL_VERIFY( _rxBundle->getDirectElement( aBuffer.makeStringAndClear() ) >>= sMessage );
@@ -276,18 +276,18 @@ namespace comphelper
         :EventLogger( _rxContext, _pAsciiLoggerName )
         ,m_pData( new ResourceBasedEventLogger_Data )
     {
-        m_pData->sBundleBaseName = ::rtl::OUString::createFromAscii( _pResourceBundleBaseName );
+        m_pData->sBundleBaseName = OUString::createFromAscii( _pResourceBundleBaseName );
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const
+    OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const
     {
-        ::rtl::OUString sMessage;
+        OUString sMessage;
         if ( lcl_loadBundle_nothrow( m_pImpl->getContext(), *m_pData ) )
             sMessage = lcl_loadString_nothrow( m_pData->xBundle, _nMessageResID );
         if ( sMessage.isEmpty() )
         {
-            ::rtl::OUStringBuffer aBuffer;
+            OUStringBuffer aBuffer;
             aBuffer.appendAscii( "<invalid event resource: '" );
             aBuffer.append( m_pData->sBundleBaseName );
             aBuffer.appendAscii( ":" );
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 9cd4a15956a9..586f6fcb1675 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -50,45 +50,45 @@
 
 namespace comphelper{
 
-const ::rtl::OUString& MediaDescriptor::PROP_ABORTED()
+const OUString& MediaDescriptor::PROP_ABORTED()
 {
-    static const ::rtl::OUString sProp("Aborted");
+    static const OUString sProp("Aborted");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE()
+const OUString& MediaDescriptor::PROP_ASTEMPLATE()
 {
-    static const ::rtl::OUString sProp("AsTemplate");
+    static const OUString sProp("AsTemplate");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA()
+const OUString& MediaDescriptor::PROP_COMPONENTDATA()
 {
-    static const ::rtl::OUString sProp("ComponentData");
+    static const OUString sProp("ComponentData");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE()
+const OUString& MediaDescriptor::PROP_DOCUMENTSERVICE()
 {
-    static const ::rtl::OUString sProp("DocumentService");
+    static const OUString sProp("DocumentService");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA()
+const OUString& MediaDescriptor::PROP_ENCRYPTIONDATA()
 {
-    static const ::rtl::OUString sProp("EncryptionData");
+    static const OUString sProp("EncryptionData");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_FILENAME()
+const OUString& MediaDescriptor::PROP_FILENAME()
 {
-    static const ::rtl::OUString sProp("FileName");
+    static const OUString sProp("FileName");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_FILTERNAME()
+const OUString& MediaDescriptor::PROP_FILTERNAME()
 {
-    static const ::rtl::OUString sProp("FilterName");
+    static const OUString sProp("FilterName");
     return sProp;
 }
 
@@ -98,57 +98,57 @@ const OUString& MediaDescriptor::PROP_FILTERPROVIDER()
     return aProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_FILTEROPTIONS()
+const OUString& MediaDescriptor::PROP_FILTEROPTIONS()
 {
-    static const ::rtl::OUString sProp("FilterOptions");
+    static const OUString sProp("FilterOptions");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_FRAME()
+const OUString& MediaDescriptor::PROP_FRAME()
 {
-    static const ::rtl::OUString sProp("Frame");
+    static const OUString sProp("Frame");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_FRAMENAME()
+const OUString& MediaDescriptor::PROP_FRAMENAME()
 {
-    static const ::rtl::OUString sProp("FrameName");
+    static const OUString sProp("FrameName");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_HIDDEN()
+const OUString& MediaDescriptor::PROP_HIDDEN()
 {
-    static const ::rtl::OUString sProp("Hidden");
+    static const OUString sProp("Hidden");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_INPUTSTREAM()
+const OUString& MediaDescriptor::PROP_INPUTSTREAM()
 {
-    static const ::rtl::OUString sProp("InputStream");
+    static const OUString sProp("InputStream");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_INTERACTIONHANDLER()
+const OUString& MediaDescriptor::PROP_INTERACTIONHANDLER()
 {
-    static const ::rtl::OUString sProp("InteractionHandler");
+    static const OUString sProp("InteractionHandler");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_JUMPMARK()
+const OUString& MediaDescriptor::PROP_JUMPMARK()
 {
-    static const ::rtl::OUString sProp("JumpMark");
+    static const OUString sProp("JumpMark");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE()
+const OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE()
 {
-    static const ::rtl::OUString sProp("MacroExecutionMode");
+    static const OUString sProp("MacroExecutionMode");
     return sProp;
 }
 
-const ::rtl::OUString& MediaDescriptor::PROP_MEDIATYPE()
+const OUString& MediaDescriptor::PROP_MEDIATYPE()
 {
-    static const ::rtl::OUString sProp("MediaType");
+    static const OUString sProp("MediaType");
     return sProp;
 }
 
@@ -348,7 +348,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
         if (xContent.is())
         {
             css::uno::Reference< css::ucb::XContentIdentifier > xId(xContent->getIdentifier(), css::uno::UNO_QUERY);
-            ::rtl::OUString aScheme;
+            OUString aScheme;
             if (xId.is())
                 aScheme = xId->getContentProviderScheme();
 
@@ -371,7 +371,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const
 
 // ----------------------------------------------------------------------------
 
-css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const
+css::uno::Any MediaDescriptor::getComponentDataEntry( const OUString& rName ) const
 {
     css::uno::Any aEntry;
     SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() );
@@ -380,7 +380,7 @@ css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rNa
     return css::uno::Any();
 }
 
-void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue )
+void MediaDescriptor::setComponentDataEntry( const OUString& rName, const css::uno::Any& rValue )
 {
     if( rValue.hasValue() )
     {
@@ -406,7 +406,7 @@ void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const
     }
 }
 
-void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName )
+void MediaDescriptor::clearComponentDataEntry( const OUString& rName )
 {
     SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() );
     if( aPropertyIter != end() )
@@ -464,22 +464,22 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile )
         }
 
         // b) ... or we must get it from the given URL
-        ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString());
+        OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString());
         if (sURL.isEmpty())
             throw css::uno::Exception( OUString( "Found no URL." ),
                     css::uno::Reference< css::uno::XInterface >());
 
         // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble
-        ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL );
+        OUString sNormalizedURL = impl_normalizeURL( sURL );
         return impl_openStreamWithURL( sNormalizedURL, bLockFile );
     }
 #if OSL_DEBUG_LEVEL > 0
     catch(const css::uno::Exception& ex)
     {
-        ::rtl::OUStringBuffer sMsg(256);
+        OUStringBuffer sMsg(256);
         sMsg.appendAscii("Invalid MediaDescriptor detected:\n");
         sMsg.append     (ex.Message                           );
-        OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
+        OSL_FAIL(OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr());
     }
 #else
     catch(const css::uno::Exception&)
@@ -508,7 +508,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
     css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY);
 
     // media type
-    ::rtl::OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), ::rtl::OUString());
+    OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), OUString());
     if (sMediaType.isEmpty())
     {
         sMediaType = "application/x-www-form-urlencoded";
@@ -535,7 +535,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference
         css::uno::Reference< css::io::XActiveDataSink > xSink( new ucbhelper::ActiveDataSink );
         aPostArgument.Sink = xSink;
         aPostArgument.MediaType = sMediaType;
-        aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), ::rtl::OUString() );
+        aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), OUString() );
 
         OUString sCommandName( "post" );
         aContent.executeCommand( sCommandName, css::uno::makeAny( aPostArgument ) );
@@ -694,7 +694,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool
     return xInputStream.is();
 }
 
-::rtl::OUString MediaDescriptor::impl_normalizeURL(const ::rtl::OUString& sURL)
+OUString MediaDescriptor::impl_normalizeURL(const OUString& sURL)
 {
     /* Remove Jumpmarks (fragments) of an URL only here.
        They are not part of any URL and as a result may be
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index c483c1ea4654..733bf2645873 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -42,7 +42,7 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID )
+OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID )
 {
     OUString aResult;
 
@@ -55,8 +55,8 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo
 
             sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 );
             sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16;
-            aResult += ::rtl::OUString::valueOf( nDigit1, 16 );
-            aResult += ::rtl::OUString::valueOf( nDigit2, 16 );
+            aResult += OUString::valueOf( nDigit1, 16 );
+            aResult += OUString::valueOf( nDigit2, 16 );
         }
     }
 
@@ -77,12 +77,12 @@ sal_uInt8 GetDigit_Impl( sal_Char aChar )
 }
 
 //-----------------------------------------------------------------------
-uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID )
+uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const OUString& aClassID )
 {
     sal_Int32 nLength = aClassID.getLength();
     if ( nLength == 36 )
     {
-        ::rtl::OString aCharClassID = ::rtl::OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US );
+        OString aCharClassID = OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US );
         const sal_Char* pString = aCharClassID.getStr();
         if ( pString )
         {
@@ -113,7 +113,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentat
 }
 
 //-----------------------------------------------------------------------
-uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const ::rtl::OUString& aPath )
+uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const OUString& aPath )
 {
     osl::MutexGuard aGuard( m_aMutex );
 
@@ -173,7 +173,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo
 
     if ( !m_xMediaTypeConfig.is() )
         m_xMediaTypeConfig = GetConfigurationByPath(
-                    ::rtl::OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" ));
+                    OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" ));
 
     return m_xMediaTypeConfig;
 }
@@ -192,9 +192,9 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName )
+OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const OUString& aFilterName )
 {
-    ::rtl::OUString aDocServiceName;
+    OUString aDocServiceName;
 
     try
     {
@@ -218,7 +218,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType )
+OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString& aMediaType )
 {
     uno::Reference< container::XContainerQuery > xTypeCFG(
             m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext),
@@ -257,11 +257,11 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto
         {}
     }
 
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //-------------------------------------------------------------------------
-sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut,
+sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut,
                                                 embed::VerbDescriptor& aDescriptor )
 {
     sal_Bool bResult = sal_False;
@@ -301,7 +301,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
     {
         try
         {
-            uno::Sequence< ::rtl::OUString > aObjPropNames = xObjectProps->getElementNames();
+            uno::Sequence< OUString > aObjPropNames = xObjectProps->getElementNames();
 
             aResult.realloc( aObjPropNames.getLength() + 1 );
             aResult[0].Name = "ClassID";
@@ -313,7 +313,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
 
                 if ( aObjPropNames[nInd] == "ObjectVerbs" )
                 {
-                    uno::Sequence< ::rtl::OUString > aVerbShortcuts;
+                    uno::Sequence< OUString > aVerbShortcuts;
                     if ( xObjectProps->getByName( aObjPropNames[nInd] ) >>= aVerbShortcuts )
                     {
                         uno::Sequence< embed::VerbDescriptor > aVerbDescriptors( aVerbShortcuts.getLength() );
@@ -340,9 +340,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType )
+OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const OUString& aMediaType )
 {
-    ::rtl::OUString aStringClassID;
+    OUString aStringClassID;
 
     uno::Reference< container::XNameAccess > xMediaTypeConfig = GetMediaTypeConfiguration();
     try
@@ -360,7 +360,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi
 
 //-----------------------------------------------------------------------
 uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStringClassID(
-                                                                const ::rtl::OUString& aStringClassID )
+                                                                const OUString& aStringClassID )
 {
     uno::Sequence< beans::NamedValue > aObjProps;
 
@@ -402,12 +402,12 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas
     {
         aObjProps.realloc(2);
         aObjProps[0].Name = "ObjectFactory";
-        aObjProps[0].Value <<= ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" );
+        aObjProps[0].Value <<= OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" );
         aObjProps[1].Name = "ClassID";
         aObjProps[1].Value <<= aClassID;
     }
 
-    ::rtl::OUString aStringClassID = GetStringClassIDRepresentation( aClassID );
+    OUString aStringClassID = GetStringClassIDRepresentation( aClassID );
     if ( !aStringClassID.isEmpty() )
     {
         uno::Reference< container::XNameAccess > xObjConfig = GetObjConfiguration();
@@ -426,14 +426,14 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas
 }
 
 //-----------------------------------------------------------------------
-uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const ::rtl::OUString& aMediaType )
+uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const OUString& aMediaType )
 {
     uno::Sequence< beans::NamedValue > aObject =
                                     GetObjectPropsByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) );
     if ( aObject.getLength() )
         return aObject;
 
-    ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType );
+    OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType );
     if ( !aDocumentName.isEmpty() )
         return GetObjectPropsByDocumentName( aDocumentName );
 
@@ -441,9 +441,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMedi
 }
 
 //-----------------------------------------------------------------------
-uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const ::rtl::OUString& aFilterName )
+uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const OUString& aFilterName )
 {
-    ::rtl::OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName );
+    OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName );
     if ( !aDocumentName.isEmpty() )
         return GetObjectPropsByDocumentName( aDocumentName );
 
@@ -460,7 +460,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         {
             try
             {
-                uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames();
+                uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames();
                 for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ )
                 {
                     uno::Reference< container::XNameAccess > xObjectProps;
@@ -484,15 +484,15 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID )
+OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID )
 {
     return GetFactoryNameByStringClassID( GetStringClassIDRepresentation( aClassID ) );
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID )
+OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString& aStringClassID )
 {
-    ::rtl::OUString aResult;
+    OUString aResult;
 
     if ( !aStringClassID.isEmpty() )
     {
@@ -501,13 +501,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         try
         {
             if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() )
-                xObjectProps->getByName( ::rtl::OUString( "ObjectFactory" ) ) >>= aResult;
+                xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult;
         }
         catch( uno::Exception& )
         {
             uno::Sequence< sal_Int8 > aClassID = GetSequenceClassIDRepresentation( aStringClassID );
             if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) )
-                return ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" );
+                return OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" );
         }
     }
 
@@ -515,9 +515,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName )
+OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& aDocName )
 {
-    ::rtl::OUString aResult;
+    OUString aResult;
 
     if ( !aDocName.isEmpty() )
     {
@@ -526,7 +526,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         {
             try
             {
-                uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames();
+                uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames();
                 for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ )
                 {
                     uno::Reference< container::XNameAccess > xObjectProps;
@@ -552,13 +552,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType )
+OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMediaType )
 {
-    ::rtl::OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) );
+    OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) );
 
     if ( aResult.isEmpty() )
     {
-        ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType );
+        OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType );
         if ( !aDocumentName.isEmpty() )
             aResult = GetFactoryNameByDocumentName( aDocumentName );
     }
@@ -567,11 +567,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 }
 
 //-----------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
+OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
                                         uno::Sequence< beans::PropertyValue >& aMediaDescr,
                                         sal_Bool bIgnoreType )
 {
-    ::rtl::OUString aFilterName;
+    OUString aFilterName;
 
     for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ )
         if ( aMediaDescr[nInd].Name == "FilterName" )
@@ -592,7 +592,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
         uno::Sequence< beans::PropertyValue > aTempMD( aMediaDescr );
 
         // get TypeName
-        ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True );
+        OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True );
 
         // get FilterName
         for ( sal_Int32 nInd = 0; nInd < aTempMD.getLength(); nInd++ )
@@ -632,11 +632,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
     return aFilterName;
 }
 
-::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
+OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName(
                         uno::Sequence< beans::PropertyValue >& aMediaDescr,
                         uno::Sequence< beans::NamedValue >& aObject )
 {
-    ::rtl::OUString aDocName;
+    OUString aDocName;
     for ( sal_Int32 nInd = 0; nInd < aObject.getLength(); nInd++ )
         if ( aObject[nInd].Name == "ObjectDocumentServiceName" )
         {
@@ -669,7 +669,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu
 
 #ifdef WNT
 
-sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName )
+sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName )
 {
     sal_Int32 nFlags = 0;
     try
@@ -699,7 +699,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 {
     sal_Bool bResult = sal_False;
 
-    ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
+    OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False );
     if ( !aFilterName.isEmpty() )
     {
         sal_Int32 nFlags = GetFilterFlags( aFilterName );
@@ -712,9 +712,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 #endif
 
 //-----------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const ::rtl::OUString& aServiceName, sal_Int32 nVersion )
+OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUString& aServiceName, sal_Int32 nVersion )
 {
-    rtl::OUString aResult;
+    OUString aResult;
 
     if ( !aServiceName.isEmpty() && nVersion )
         try
@@ -764,9 +764,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile(
 }
 
 //-------------------------------------------------------------------------
-::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName )
+OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUString& aImportFilterName )
 {
-    ::rtl::OUString aExportFilterName;
+    OUString aExportFilterName;
 
     try
     {
@@ -851,7 +851,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter(
             if ( xFilterEnum->nextElement() >>= aProps )
             {
                 SequenceAsHashMap aPropsHM( aProps );
-                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"),
+                sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( OUString("Flags"),
                                                                         (sal_Int32)0 );
                 if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) )
                 {
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index 8b390d7fdd7a..c0d3d0342889 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -58,7 +58,7 @@ namespace comphelper
     //====================================================================
     //= NamedValueCollection_Impl
     //====================================================================
-    typedef ::boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash >    NamedValueRepository;
+    typedef ::boost::unordered_map< OUString, Any, OUStringHash >    NamedValueRepository;
 
     struct NamedValueCollection_Impl
     {
@@ -162,9 +162,9 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::std::vector< ::rtl::OUString > NamedValueCollection::getNames() const
+    ::std::vector< OUString > NamedValueCollection::getNames() const
     {
-        ::std::vector< ::rtl::OUString > aNames;
+        ::std::vector< OUString > aNames;
         for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it )
         {
             aNames.push_back( it->first );
@@ -251,7 +251,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    bool NamedValueCollection::get_ensureType( const ::rtl::OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const
+    bool NamedValueCollection::get_ensureType( const OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
         if ( pos != m_pImpl->aValues.end() )
@@ -267,7 +267,7 @@ namespace comphelper
                 return true;
 
             // argument exists, but is of wrong type
-            ::rtl::OUStringBuffer aBuffer;
+            OUStringBuffer aBuffer;
             aBuffer.appendAscii( "Invalid value type for '" );
             aBuffer.append     ( _rValueName );
             aBuffer.appendAscii( "'.\nExpected: " );
@@ -287,7 +287,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    const Any& NamedValueCollection::impl_get( const ::rtl::OUString& _rValueName ) const
+    const Any& NamedValueCollection::impl_get( const OUString& _rValueName ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
         if ( pos != m_pImpl->aValues.end() )
@@ -297,14 +297,14 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    bool NamedValueCollection::impl_has( const ::rtl::OUString& _rValueName ) const
+    bool NamedValueCollection::impl_has( const OUString& _rValueName ) const
     {
         NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName );
         return ( pos != m_pImpl->aValues.end() );
     }
 
     //--------------------------------------------------------------------
-    bool NamedValueCollection::impl_put( const ::rtl::OUString& _rValueName, const Any& _rValue )
+    bool NamedValueCollection::impl_put( const OUString& _rValueName, const Any& _rValue )
     {
         bool bHas = impl_has( _rValueName );
         m_pImpl->aValues[ _rValueName ] = _rValue;
@@ -312,7 +312,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    bool NamedValueCollection::impl_remove( const ::rtl::OUString& _rValueName )
+    bool NamedValueCollection::impl_remove( const OUString& _rValueName )
     {
         NamedValueRepository::iterator pos = m_pImpl->aValues.find( _rValueName );
         if ( pos == m_pImpl->aValues.end() )
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index aa9d43578283..f7f4d122c009 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -53,7 +53,7 @@ void NumberedCollection::setOwner(const css::uno::Reference< css::uno::XInterfac
 }
 
 //-----------------------------------------------
-void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix)
+void NumberedCollection::setUntitledPrefix(const OUString& sPrefix)
 {
     // SYNCHRONIZED ->
     ::osl::ResettableMutexGuard aLock(m_aMutex);
@@ -72,7 +72,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix)
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
         if ( ! xComponent.is ())
-            throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
+            throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
 
         long                              pComponent = (long) xComponent.get ();
         TNumberedItemHash::const_iterator pIt        = m_lComponents.find (pComponent);
@@ -148,7 +148,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
     ::osl::ResettableMutexGuard aLock(m_aMutex);
 
         if ( ! xComponent.is ())
-            throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
+            throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1);
 
         long                        pComponent = (long) xComponent.get ();
         TNumberedItemHash::iterator pIt        = m_lComponents.find (pComponent);
@@ -164,7 +164,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe
 }
 
 //-----------------------------------------------
-::rtl::OUString SAL_CALL NumberedCollection::getUntitledPrefix()
+OUString SAL_CALL NumberedCollection::getUntitledPrefix()
     throw (css::uno::RuntimeException)
 {
     // SYNCHRONIZED ->
diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index 48b232ba334f..8bd744f77946 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.cxx
@@ -72,7 +72,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF
             staruno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey));
             if (xFormat.is())
             {
-                static ::rtl::OUString PROPERTY_DECIMALS( "Decimals" );
+                static OUString PROPERTY_DECIMALS( "Decimals" );
                 return xFormat->getPropertyValue(PROPERTY_DECIMALS);
             }
         }
@@ -105,7 +105,7 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::beans;
 
 //------------------------------------------------------------------------------
-Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const rtl::OUString& _rPropertyName )
+Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const OUString& _rPropertyName )
 {
     Any aReturn;
 
diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index 384b809dee99..01b4e98ccf69 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.cxx
@@ -48,13 +48,13 @@ namespace comphelper
     {
     private:
         Reference< XComponentContext >  m_xContext;
-        ::rtl::OUString                 m_sBaseName;
+        OUString                 m_sBaseName;
         Reference< XResourceBundle >    m_xBundle;
         bool                            m_bAttemptedCreate;
         mutable ::osl::Mutex            m_aMutex;
 
     public:
-        ResourceBundle_Impl( const Reference< XComponentContext >& _context, const ::rtl::OUString& _baseName )
+        ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName )
             :m_xContext( _context )
             ,m_sBaseName( _baseName )
             ,m_bAttemptedCreate( false )
@@ -70,7 +70,7 @@ namespace comphelper
                 an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this
                 then.
         */
-        ::rtl::OUString loadString( sal_Int32 _resourceId ) const;
+        OUString loadString( sal_Int32 _resourceId ) const;
 
         /** determines whether the resource bundle has a string with the given id
             @param  _resourceId
@@ -94,25 +94,25 @@ namespace comphelper
 
         /** returns the resource bundle key for a string with a given resource id
         */
-        static ::rtl::OUString
+        static OUString
                 impl_getStringResourceKey( sal_Int32 _resourceId );
     };
 
     //--------------------------------------------------------------------
-    ::rtl::OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
+    OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId )
     {
-        ::rtl::OUStringBuffer key;
+        OUStringBuffer key;
         key.appendAscii( "string:" );
         key.append( _resourceId );
         return key.makeStringAndClear();
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const
+    OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
-        ::rtl::OUString sString;
+        OUString sString;
 
         if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() )
         {
@@ -189,7 +189,7 @@ namespace comphelper
     //====================================================================
     //--------------------------------------------------------------------
     OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName )
-        :m_pImpl( new ResourceBundle_Impl( _context, ::rtl::OUString::createFromAscii( _bundleBaseAsciiName ) ) )
+        :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) )
     {
         if ( !_context.is() )
             throw NullPointerException();
@@ -201,7 +201,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const
+    OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const
     {
         return m_pImpl->loadString( _resourceId );
     }
diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx
index fed0410ab134..8bde58a3b321 100644
--- a/comphelper/source/misc/officerestartmanager.cxx
+++ b/comphelper/source/misc/officerestartmanager.cxx
@@ -32,9 +32,9 @@ namespace comphelper
 {
 
 // ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static()
+uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static()
 {
-    uno::Sequence< rtl::OUString > aResult( 1 );
+    uno::Sequence< OUString > aResult( 1 );
     aResult[0] = getServiceName_static();
     return aResult;
 }
@@ -133,7 +133,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 
             // Turn Quickstarter veto off
             uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW );
-            ::rtl::OUString aVetoPropName( "SuspendQuickstartVeto" );
+            OUString aVetoPropName( "SuspendQuickstartVeto" );
             uno::Any aValue;
             aValue <<= (sal_Bool)sal_True;
             xPropertySet->setPropertyValue( aVetoPropName, aValue );
@@ -163,15 +163,15 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 
 // XServiceInfo
 // ----------------------------------------------------------
-::rtl::OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException)
+OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException)
 {
     return getImplementationName_static();
 }
 
 // ----------------------------------------------------------
-::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)
+::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException)
 {
-    const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();
+    const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static();
     for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )
     {
         if ( aSupportedNames[ nInd ].equals( aServiceName ) )
@@ -182,7 +182,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ )
 }
 
 // ----------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx
index f4594f590aab..536484952b59 100644
--- a/comphelper/source/misc/officerestartmanager.hxx
+++ b/comphelper/source/misc/officerestartmanager.hxx
@@ -51,14 +51,14 @@ public:
     virtual ~OOfficeRestartManager()
     {}
 
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
             getSupportedServiceNames_static();
 
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
+    static OUString SAL_CALL getImplementationName_static();
 
-    static ::rtl::OUString SAL_CALL getSingletonName_static();
+    static OUString SAL_CALL getSingletonName_static();
 
-    static ::rtl::OUString SAL_CALL getServiceName_static();
+    static OUString SAL_CALL getServiceName_static();
 
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext );
@@ -71,9 +71,9 @@ public:
     virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException);
 
 // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
 };
 
diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx
index 3d3bac67e39b..da1eb7f4058c 100644
--- a/comphelper/source/misc/scopeguard.cxx
+++ b/comphelper/source/misc/scopeguard.cxx
@@ -36,7 +36,7 @@ ScopeGuard::~ScopeGuard()
             catch (com::sun::star::uno::Exception & exc) {
                 (void) exc; // avoid warning about unused variable
                 OSL_FAIL(
-                    rtl::OUStringToOString( "UNO exception occurred: " +
+                    OUStringToOString( "UNO exception occurred: " +
                         exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
             }
             catch (...) {
diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index dacba9d62be6..9c412390db12 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.cxx
@@ -25,7 +25,7 @@ namespace comphelper
 //.........................................................................
 
 //------------------------------------------------------------------------------
-staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst)
+staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst)
 {
     sal_Int32 nLength = _rList.getLength();
 
@@ -34,7 +34,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString
         //////////////////////////////////////////////////////////////////////
         // An welcher Position finde ich den Wert?
         sal_Int32 nPos = -1;
-        const ::rtl::OUString* pTArray = _rList.getConstArray();
+        const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
         {
             if( pTArray->equals(_rValue) )
@@ -64,7 +64,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString
 
         //////////////////////////////////////////////////////////////////////
         // Wie oft kommt der Wert vor?
-        const ::rtl::OUString* pTArray = _rList.getConstArray();
+        const OUString* pTArray = _rList.getConstArray();
         for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray)
         {
             if( pTArray->equals(_rValue) )
@@ -80,10 +80,10 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString
     }
 }
 // -----------------------------------------------------------------------------
-sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList)
+sal_Bool existsValue(const OUString& Value,const staruno::Sequence< OUString >& _aList)
 {
-    const ::rtl::OUString * pIter   = _aList.getConstArray();
-    const ::rtl::OUString * pEnd    = pIter + _aList.getLength();
+    const OUString * pIter   = _aList.getConstArray();
+    const OUString * pEnd    = pIter + _aList.getLength();
     return ::std::find(pIter,pEnd,Value) != pEnd;
 }
 
diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 61f39c74a8bc..24dd7edc9637 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.cxx
@@ -211,7 +211,7 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const
            pCheck != rCheck.end()  ;
          ++pCheck                  )
     {
-        const ::rtl::OUString& sCheckName  = pCheck->first;
+        const OUString& sCheckName  = pCheck->first;
         const css::uno::Any&   aCheckValue = pCheck->second;
               const_iterator   pFound      = find(sCheckName);
 
@@ -233,7 +233,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate)
            pUpdate != rUpdate.end()  ;
          ++pUpdate                   )
     {
-        const ::rtl::OUString& sName  = pUpdate->first;
+        const OUString& sName  = pUpdate->first;
         const css::uno::Any&   aValue = pUpdate->second;
 
         (*this)[sName] = aValue;
diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index b5fd79948020..d48fd4c41789 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.cxx
@@ -42,11 +42,11 @@ public:
         : m_rServiceDecl(rServiceDecl) {}
 
     // XServiceInfo:
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( rtl::OUString const& name )
+    virtual sal_Bool SAL_CALL supportsService( OUString const& name )
         throw (uno::RuntimeException);
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames()
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
         throw (uno::RuntimeException);
     // XSingleComponentFactory:
     virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithContext(
@@ -69,19 +69,19 @@ ServiceDecl::Factory::~Factory()
 }
 
 // XServiceInfo:
-rtl::OUString ServiceDecl::Factory::getImplementationName()
+OUString ServiceDecl::Factory::getImplementationName()
     throw (uno::RuntimeException)
 {
     return m_rServiceDecl.getImplementationName();
 }
 
-sal_Bool ServiceDecl::Factory::supportsService( rtl::OUString const& name )
+sal_Bool ServiceDecl::Factory::supportsService( OUString const& name )
     throw (uno::RuntimeException)
 {
     return m_rServiceDecl.supportsService(name);
 }
 
-uno::Sequence<rtl::OUString> ServiceDecl::Factory::getSupportedServiceNames()
+uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames()
     throw (uno::RuntimeException)
 {
     return m_rServiceDecl.getSupportedServiceNames();
@@ -116,15 +116,15 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const
     return 0;
 }
 
-uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const
+uno::Sequence<OUString> ServiceDecl::getSupportedServiceNames() const
 {
-    std::vector<rtl::OUString> vec;
+    std::vector<OUString> vec;
 
-    rtl::OString const str(m_pServiceNames);
+    OString const str(m_pServiceNames);
     sal_Int32 nIndex = 0;
     do {
-        rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) );
-        vec.push_back( rtl::OUString( token.getStr(), token.getLength(),
+        OString const token( str.getToken( 0, m_cDelim, nIndex ) );
+        vec.push_back( OUString( token.getStr(), token.getLength(),
                                       RTL_TEXTENCODING_ASCII_US ) );
     }
     while (nIndex >= 0);
@@ -132,12 +132,12 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const
     return comphelper::containerToSequence(vec);
 }
 
-bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const
+bool ServiceDecl::supportsService( OUString const& name ) const
 {
-    rtl::OString const str(m_pServiceNames);
+    OString const str(m_pServiceNames);
     sal_Int32 nIndex = 0;
     do {
-        rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) );
+        OString const token( str.getToken( 0, m_cDelim, nIndex ) );
         if (name.equalsAsciiL( token.getStr(), token.getLength() ))
             return true;
     }
@@ -145,9 +145,9 @@ bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const
     return false;
 }
 
-rtl::OUString ServiceDecl::getImplementationName() const
+OUString ServiceDecl::getImplementationName() const
 {
-    return rtl::OUString::createFromAscii(m_pImplName);
+    return OUString::createFromAscii(m_pImplName);
 }
 
 } // namespace service_decl
diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx
index 1aef59a036d5..896a9296ac5e 100644
--- a/comphelper/source/misc/serviceinfohelper.cxx
+++ b/comphelper/source/misc/serviceinfohelper.cxx
@@ -27,20 +27,20 @@ namespace comphelper
 {
 
 /** returns an empty UString(). most times sufficient */
-::rtl::OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
+OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
 /** the base implementation iterates over the service names from <code>getSupportedServiceNames</code> */
-sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
     return supportsService( ServiceName, getSupportedServiceNames() );
 }
 
-sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw()
+sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw()
 {
-    const ::rtl::OUString * pArray = SupportedServices.getConstArray();
+    const OUString * pArray = SupportedServices.getConstArray();
     for( sal_Int32 i = 0; i < SupportedServices.getLength(); i++ )
         if( pArray[i] == ServiceName )
             return sal_True;
@@ -48,25 +48,25 @@ sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& Ser
 }
 
 /** the base implementation has no supported services */
-::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
+::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq(0);
+    ::com::sun::star::uno::Sequence< OUString> aSeq(0);
     return aSeq;
 }
 
 /** this method adds a variable number of char pointer to a given Sequence
  */
-void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw()
+void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw()
 {
     sal_uInt32 nCount = rSeq.getLength();
 
     rSeq.realloc( nCount + nServices );
-    rtl::OUString* pStrings = rSeq.getArray();
+    OUString* pStrings = rSeq.getArray();
 
     va_list marker;
     va_start( marker, nServices );
     for( sal_uInt16 i = 0 ; i < nServices; i++ )
-        pStrings[nCount++] = rtl::OUString::createFromAscii(va_arg( marker, char*));
+        pStrings[nCount++] = OUString::createFromAscii(va_arg( marker, char*));
     va_end( marker );
 }
 
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 45f1d79c5d34..d9077ab882f6 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -85,7 +85,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage(
 
 // ----------------------------------------------------------------------
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
     throw ( uno::Exception )
@@ -104,7 +104,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL(
 
 // ----------------------------------------------------------------------
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext )
     throw ( uno::Exception )
@@ -199,7 +199,7 @@ void OStorageHelper::CopyInputToOutput(
 
 // ----------------------------------------------------------------------
 uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL(
-            const ::rtl::OUString& aURL,
+            const OUString& aURL,
             const uno::Reference< uno::XComponentContext >& context )
     throw ( uno::Exception )
 {
@@ -282,8 +282,8 @@ sal_Int32 OStorageHelper::GetXStorageFormat(
 
 // ----------------------------------------------------------------------
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL(
-            const ::rtl::OUString& aFormat,
-            const ::rtl::OUString& aURL,
+            const OUString& aFormat,
+            const OUString& aURL,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext,
             sal_Bool bRepairStorage )
@@ -314,7 +314,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL(
 
 // ----------------------------------------------------------------------
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStream(
-            const ::rtl::OUString& aFormat,
+            const OUString& aFormat,
             const uno::Reference < io::XInputStream >& xStream,
             const uno::Reference< uno::XComponentContext >& rxContext,
             sal_Bool bRepairStorage )
@@ -345,7 +345,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr
 
 // ----------------------------------------------------------------------
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
-            const ::rtl::OUString& aFormat,
+            const OUString& aFormat,
             const uno::Reference < io::XStream >& xStream,
             sal_Int32 nStorageMode,
             const uno::Reference< uno::XComponentContext >& rxContext,
@@ -376,7 +376,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
 }
 
 // ----------------------------------------------------------------------
-uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword )
+uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const OUString& aPassword )
 {
     // TODO/LATER: Should not the method be part of DocPasswordHelper?
     uno::Sequence< beans::NamedValue > aEncryptionData;
@@ -391,7 +391,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
             uno::Reference< xml::crypto::XNSSInitializer > xDigestContextSupplier = xml::crypto::NSSInitializer::create(xContext);
             uno::Reference< xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW );
 
-            ::rtl::OString aUTF8Password( ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) );
+            OString aUTF8Password( OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) );
             xDigestContext->updateDigest( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aUTF8Password.getStr() ), aUTF8Password.getLength() ) );
             uno::Sequence< sal_Int8 > aDigest = xDigestContext->finalizeDigestAndDispose();
 
@@ -415,7 +415,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
 
         for ( sal_Int32 nInd = 0; nInd < 2; nInd++ )
         {
-            ::rtl::OString aByteStrPass = ::rtl::OUStringToOString( aPassword, pEncoding[nInd] );
+            OString aByteStrPass = OUStringToOString( aPassword, pEncoding[nInd] );
 
             sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1];
             rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(),
@@ -437,7 +437,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
 }
 
 // ----------------------------------------------------------------------
-sal_Bool OStorageHelper::IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed )
+sal_Bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed )
 {
     return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed );
 }
@@ -471,7 +471,7 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName(
 }
 
 // ----------------------------------------------------------------------
-sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment )
+sal_Bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment )
 {
     sal_Bool bResult = sal_False;
     const sal_Int32 nPathLen = aPath.getLength();
@@ -521,8 +521,8 @@ void LifecycleProxy::commitStorages()
     }
 }
 
-static void splitPath( std::vector<rtl::OUString> &rElems,
-                       const ::rtl::OUString& rPath )
+static void splitPath( std::vector<OUString> &rElems,
+                       const OUString& rPath )
 {
     for (sal_Int32 i = 0; i >= 0;)
         rElems.push_back( rPath.getToken( 0, '/', i ) );
@@ -530,7 +530,7 @@ static void splitPath( std::vector<rtl::OUString> &rElems,
 
 static uno::Reference< embed::XStorage > LookupStorageAtPath(
         const uno::Reference< embed::XStorage > &xParentStorage,
-        std::vector<rtl::OUString> &rElems, sal_uInt32 nOpenMode,
+        std::vector<OUString> &rElems, sal_uInt32 nOpenMode,
         LifecycleProxy &rNastiness )
 {
     uno::Reference< embed::XStorage > xStorage( xParentStorage );
@@ -545,22 +545,22 @@ static uno::Reference< embed::XStorage > LookupStorageAtPath(
 
 uno::Reference< embed::XStorage > OStorageHelper::GetStorageAtPath(
         const uno::Reference< embed::XStorage > &xStorage,
-        const ::rtl::OUString& rPath, sal_uInt32 nOpenMode,
+        const OUString& rPath, sal_uInt32 nOpenMode,
         LifecycleProxy &rNastiness )
 {
-    std::vector<rtl::OUString> aElems;
+    std::vector<OUString> aElems;
     splitPath( aElems, rPath );
     return LookupStorageAtPath( xStorage, aElems, nOpenMode, rNastiness );
 }
 
 uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath(
         const uno::Reference< embed::XStorage > &xParentStorage,
-        const ::rtl::OUString& rPath, sal_uInt32 nOpenMode,
+        const OUString& rPath, sal_uInt32 nOpenMode,
         LifecycleProxy &rNastiness )
 {
-    std::vector<rtl::OUString> aElems;
+    std::vector<OUString> aElems;
     splitPath( aElems, rPath );
-    rtl::OUString aName( aElems.back() );
+    OUString aName( aElems.back() );
     aElems.pop_back();
     sal_uInt32 nStorageMode = nOpenMode & ~embed::ElementModes::TRUNCATE;
     uno::Reference< embed::XStorage > xStorage(
@@ -571,7 +571,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath(
 
 uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL(
         uno::Reference< embed::XStorage > const& xParentStorage,
-        const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode,
+        const OUString& rURL, sal_uInt32 const nOpenMode,
         LifecycleProxy & rNastiness)
 {
     static char const s_PkgScheme[] = "vnd.sun.star.Package:";
@@ -579,7 +579,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL(
                 rURL.getStr(), rURL.getLength(),
                 s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1))
     {
-        ::rtl::OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1));
+        OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1));
         return GetStreamAtPath(xParentStorage, path, nOpenMode, rNastiness);
     }
     return 0;
diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index 8af97dc75685..fc15b09f17a1 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.cxx
@@ -62,14 +62,14 @@ namespace
     }
 }
 
-rtl::OString stripStart(const rtl::OString &rIn, sal_Char c)
+OString stripStart(const OString &rIn, sal_Char c)
 {
-    return tmpl_stripStart<rtl::OString, sal_Char>(rIn, c);
+    return tmpl_stripStart<OString, sal_Char>(rIn, c);
 }
 
-rtl::OUString stripStart(const rtl::OUString &rIn, sal_Unicode c)
+OUString stripStart(const OUString &rIn, sal_Unicode c)
 {
-    return tmpl_stripStart<rtl::OUString, sal_Unicode>(rIn, c);
+    return tmpl_stripStart<OUString, sal_Unicode>(rIn, c);
 }
 
 namespace
@@ -93,22 +93,22 @@ namespace
     }
 }
 
-rtl::OString stripEnd(const rtl::OString &rIn, sal_Char c)
+OString stripEnd(const OString &rIn, sal_Char c)
 {
-    return tmpl_stripEnd<rtl::OString, sal_Char>(rIn, c);
+    return tmpl_stripEnd<OString, sal_Char>(rIn, c);
 }
 
-rtl::OUString stripEnd(const rtl::OUString &rIn, sal_Unicode c)
+OUString stripEnd(const OUString &rIn, sal_Unicode c)
 {
-    return tmpl_stripEnd<rtl::OUString, sal_Unicode>(rIn, c);
+    return tmpl_stripEnd<OUString, sal_Unicode>(rIn, c);
 }
 
-rtl::OString strip(const rtl::OString &rIn, sal_Char c)
+OString strip(const OString &rIn, sal_Char c)
 {
     return stripEnd(stripStart(rIn, c), c);
 }
 
-rtl::OUString strip(const rtl::OUString &rIn, sal_Unicode c)
+OUString strip(const OUString &rIn, sal_Unicode c)
 {
     return stripEnd(stripStart(rIn, c), c);
 }
@@ -132,18 +132,18 @@ namespace
     }
 }
 
-sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok)
+sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok)
 {
-    return tmpl_getTokenCount<rtl::OString, sal_Char>(rIn, cTok);
+    return tmpl_getTokenCount<OString, sal_Char>(rIn, cTok);
 }
 
-sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok)
+sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok)
 {
-    return tmpl_getTokenCount<rtl::OUString, sal_Unicode>(rIn, cTok);
+    return tmpl_getTokenCount<OUString, sal_Unicode>(rIn, cTok);
 }
 
 sal_uInt32 decimalStringToNumber(
-    ::rtl::OUString const & str )
+    OUString const & str )
 {
     sal_uInt32 result = 0;
     for( sal_Int32 i = 0 ; i < str.getLength() ; )
@@ -243,10 +243,10 @@ using namespace ::com::sun::star;
 
 // convert between sequence of string and comma separated string
 
-::rtl::OUString convertCommaSeparated(
-    uno::Sequence< ::rtl::OUString > const& i_rSeq)
+OUString convertCommaSeparated(
+    uno::Sequence< OUString > const& i_rSeq)
 {
-    ::rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     ::comphelper::intersperse(
         ::comphelper::stl_begin(i_rSeq), ::comphelper::stl_end(i_rSeq),
         ::comphelper::OUStringBufferAppender(buf),
@@ -254,26 +254,26 @@ using namespace ::com::sun::star;
     return buf.makeStringAndClear();
 }
 
-uno::Sequence< ::rtl::OUString >
-    convertCommaSeparated( ::rtl::OUString const& i_rString )
+uno::Sequence< OUString >
+    convertCommaSeparated( OUString const& i_rString )
 {
-    std::vector< ::rtl::OUString > vec;
+    std::vector< OUString > vec;
     sal_Int32 idx = 0;
     do {
-      ::rtl::OUString kw =
+      OUString kw =
         i_rString.getToken(0, static_cast<sal_Unicode> (','), idx);
       kw = kw.trim();
       if (!kw.isEmpty()) {
           vec.push_back(kw);
       }
     } while (idx >= 0);
-    uno::Sequence< ::rtl::OUString > kws(vec.size());
+    uno::Sequence< OUString > kws(vec.size());
     std::copy(vec.begin(), vec.end(), stl_begin(kws));
     return kws;
 }
 
 
-sal_Int32 compareNatural( const ::rtl::OUString & rLHS, const ::rtl::OUString & rRHS,
+sal_Int32 compareNatural( const OUString & rLHS, const OUString & rRHS,
     const uno::Reference< i18n::XCollator > &rCollator,
     const uno::Reference< i18n::XBreakIterator > &rBI,
     const lang::Locale &rLocale )
@@ -365,12 +365,12 @@ namespace
     }
 }
 
-bool isdigitAsciiString(const rtl::OString &rString)
+bool isdigitAsciiString(const OString &rString)
 {
     return tmpl_is_OPER_AsciiString<isdigitAscii>(rString);
 }
 
-bool isdigitAsciiString(const rtl::OUString &rString)
+bool isdigitAsciiString(const OUString &rString)
 {
     return tmpl_is_OPER_AsciiString<isdigitAscii>(rString);
 }
@@ -390,17 +390,17 @@ namespace
     }
 }
 
-rtl::OUString reverseString(const rtl::OUString &rStr)
+OUString reverseString(const OUString &rStr)
 {
-    return tmpl_reverseString<rtl::OUString, rtl::OUStringBuffer>(rStr);
+    return tmpl_reverseString<OUString, OUStringBuffer>(rStr);
 }
 
-rtl::OString reverseString(const rtl::OString &rStr)
+OString reverseString(const OString &rStr)
 {
-    return tmpl_reverseString<rtl::OString, rtl::OStringBuffer>(rStr);
+    return tmpl_reverseString<OString, OStringBuffer>(rStr);
 }
 
-sal_Int32 indexOfAny(rtl::OUString const& rIn,
+sal_Int32 indexOfAny(OUString const& rIn,
         sal_Unicode const*const pChars, sal_Int32 const nPos)
 {
     for (sal_Int32 i = nPos; i < rIn.getLength(); ++i)
diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index d56f78b680b6..265c052b1436 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.cxx
@@ -41,8 +41,8 @@ using namespace ::com::sun::star;
 
 uno::Reference< lang::XComponent > SynchronousDispatch::dispatch(
         const uno::Reference< uno::XInterface > &xStartPoint,
-        const rtl::OUString &sURL,
-        const rtl::OUString &sTarget,
+        const OUString &sURL,
+        const OUString &sTarget,
         const sal_Int32 nFlags,
         const uno::Sequence< beans::PropertyValue > &lArguments )
 {
diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 62d24e9e78e6..e77176fb2351 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.cxx
@@ -111,9 +111,9 @@ float getFloat(const Any& _rAny)
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString getString(const Any& _rAny)
+OUString getString(const Any& _rAny)
 {
-    ::rtl::OUString nReturn;
+    OUString nReturn;
     OSL_VERIFY( _rAny >>= nReturn );
     return nReturn;
 }
@@ -229,7 +229,7 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
             }
             case TypeClass_STRING:
             {
-                ::rtl::OUString aDummy;
+                OUString aDummy;
                 bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy);
                 break;
             }
@@ -393,20 +393,20 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue)
                             memcmp(rLeftSeq.getConstArray(), rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_uInt32)) == 0;
                     }
                 }
-                else if (isA(_rType, static_cast< Sequence< ::rtl::OUString >* >(NULL)))
+                else if (isA(_rType, static_cast< Sequence< OUString >* >(NULL)))
                 {
-                    Sequence< ::rtl::OUString > aTemp;
+                    Sequence< OUString > aTemp;
                     bConversionSuccess = _rValue >>= aTemp;
                     if (bConversionSuccess)
                     {
-                        const Sequence< ::rtl::OUString >& rLeftSeq = *reinterpret_cast<const Sequence< ::rtl::OUString>*>(pData);
-                        const Sequence< ::rtl::OUString >& rRightSeq = aTemp;
+                        const Sequence< OUString >& rLeftSeq = *reinterpret_cast<const Sequence< OUString>*>(pData);
+                        const Sequence< OUString >& rRightSeq = aTemp;
                         sal_Int32 nSeqLen = rLeftSeq.getLength();
                         bRes = ( nSeqLen == rRightSeq.getLength() );
                         for ( sal_Int32 n = 0; bRes && ( n < nSeqLen ); n++ )
                         {
-                            const ::rtl::OUString& rS1 = rLeftSeq.getConstArray()[n];
-                            const ::rtl::OUString& rS2 = rRightSeq.getConstArray()[n];
+                            const OUString& rS1 = rLeftSeq.getConstArray()[n];
+                            const OUString& rS2 = rRightSeq.getConstArray()[n];
                             bRes = ( rS1 == rS2 );
                         }
                     }
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index e04b6801026a..30915a7a0a28 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -41,13 +41,13 @@ using namespace comphelper;
 //=========================================================================
 
 //=========================================================================
-static bool makeCanonicalFileURL( rtl::OUString & rURL )
+static bool makeCanonicalFileURL( OUString & rURL )
 {
     OSL_ENSURE( rURL.matchAsciiL( "file:", sizeof( "file:" ) - 1 , 0 ) ,
                 "File URL expected!" );
 
-    rtl::OUString aNormalizedURL;
-    if ( osl::FileBase::getAbsoluteFileURL( rtl::OUString(),
+    OUString aNormalizedURL;
+    if ( osl::FileBase::getAbsoluteFileURL( OUString(),
                                             rURL,
                                             aNormalizedURL )
             == osl::DirectoryItem::E_None )
@@ -113,42 +113,42 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories()
 //=========================================================================
 
 // virtual
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeInstallationDirectoryURL()
     throw ( uno::RuntimeException )
 {
     initDirs();
-    return rtl::OUString( *m_pOfficeBrandDir );
+    return OUString( *m_pOfficeBrandDir );
 }
 
 //=========================================================================
 // virtual
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 OfficeInstallationDirectories::getOfficeUserDataDirectoryURL()
     throw ( uno::RuntimeException )
 {
     initDirs();
-    return rtl::OUString( *m_pUserDir );
+    return OUString( *m_pUserDir );
 }
 
 
 //=========================================================================
 // virtual
-rtl::OUString SAL_CALL
-OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
+OUString SAL_CALL
+OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL )
     throw ( uno::RuntimeException )
 {
     if ( !URL.isEmpty() )
     {
         initDirs();
 
-        rtl::OUString aCanonicalURL( URL );
+        OUString aCanonicalURL( URL );
         makeCanonicalFileURL( aCanonicalURL );
 
         sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeBrandDir );
         if ( nIndex  != -1 )
         {
-            return rtl::OUString(
+            return OUString(
                 aCanonicalURL.replaceAt( nIndex,
                                          m_pOfficeBrandDir->getLength(),
                                          m_aOfficeBrandDirMacro ) );
@@ -158,20 +158,20 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
             nIndex = aCanonicalURL.indexOf( *m_pUserDir );
             if ( nIndex  != -1 )
             {
-                return rtl::OUString(
+                return OUString(
                     aCanonicalURL.replaceAt( nIndex,
                                              m_pUserDir->getLength(),
                                              m_aUserDirMacro ) );
             }
         }
     }
-    return rtl::OUString( URL );
+    return OUString( URL );
 }
 
 //=========================================================================
 // virtual
-rtl::OUString SAL_CALL
-OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
+OUString SAL_CALL
+OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL )
     throw ( uno::RuntimeException )
 {
     if ( !URL.isEmpty() )
@@ -181,7 +181,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
         {
             initDirs();
 
-            return rtl::OUString(
+            return OUString(
                 URL.replaceAt( nIndex,
                                m_aOfficeBrandDirMacro.getLength(),
                                *m_pOfficeBrandDir ) );
@@ -193,14 +193,14 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
             {
                 initDirs();
 
-                return rtl::OUString(
+                return OUString(
                     URL.replaceAt( nIndex,
                                    m_aUserDirMacro.getLength(),
                                    *m_pUserDir ) );
             }
         }
     }
-    return rtl::OUString( URL );
+    return OUString( URL );
 }
 
 //=========================================================================
@@ -208,7 +208,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
 //=========================================================================
 
 // virtual
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 OfficeInstallationDirectories::getImplementationName()
     throw ( uno::RuntimeException )
 {
@@ -218,12 +218,12 @@ OfficeInstallationDirectories::getImplementationName()
 //=========================================================================
 // virtual
 sal_Bool SAL_CALL
-OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName )
+OfficeInstallationDirectories::supportsService( const OUString& ServiceName )
     throw ( uno::RuntimeException )
 {
-    const uno::Sequence< rtl::OUString > & aNames
+    const uno::Sequence< OUString > & aNames
         = getSupportedServiceNames();
-    const rtl::OUString * p = aNames.getConstArray();
+    const OUString * p = aNames.getConstArray();
     for ( sal_Int32 nPos = 0; nPos < aNames.getLength(); nPos++ )
     {
         if ( p[ nPos ].equals( ServiceName ) )
@@ -235,7 +235,7 @@ OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName
 
 //=========================================================================
 // virtual
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
 OfficeInstallationDirectories::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
@@ -244,7 +244,7 @@ OfficeInstallationDirectories::getSupportedServiceNames()
 
 //=========================================================================
 // static
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 OfficeInstallationDirectories::getImplementationName_static()
 {
     return OUString("com.sun.star.comp.util.OfficeInstallationDirectories");
@@ -287,8 +287,8 @@ void OfficeInstallationDirectories::initDirs()
         osl::MutexGuard aGuard( m_aMutex );
         if ( m_pOfficeBrandDir == 0 )
         {
-            m_pOfficeBrandDir = new rtl::OUString;
-            m_pUserDir        = new rtl::OUString;
+            m_pOfficeBrandDir = new OUString;
+            m_pUserDir        = new OUString;
 
             uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx);
 
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index a9cc4d736463..22517fa0e1ab 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -49,36 +49,36 @@ public:
     virtual ~OfficeInstallationDirectories();
 
     // XOfficeInstallationDirectories
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getOfficeInstallationDirectoryURL()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getOfficeUserDataDirectoryURL()
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL
-    makeRelocatableURL( const ::rtl::OUString& URL )
+    virtual OUString SAL_CALL
+    makeRelocatableURL( const OUString& URL )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL
-    makeAbsoluteURL( const ::rtl::OUString& URL )
+    virtual OUString SAL_CALL
+    makeAbsoluteURL( const OUString& URL )
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL
+    virtual OUString SAL_CALL
     getImplementationName()
         throw (::com::sun::star::uno::RuntimeException);
     virtual sal_Bool SAL_CALL
-    supportsService( const ::rtl::OUString& ServiceName )
+    supportsService( const OUString& ServiceName )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw (::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL
+    static OUString SAL_CALL
         getImplementationName_static();
-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    static ::com::sun::star::uno::Sequence< OUString > SAL_CALL
         getSupportedServiceNames_static();
-    static ::rtl::OUString SAL_CALL
+    static OUString SAL_CALL
         getSingletonName_static();
     static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
         Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& );
@@ -86,13 +86,13 @@ public:
 private:
     void initDirs();
 
-    rtl::OUString                                   m_aOfficeBrandDirMacro;
-    rtl::OUString                                   m_aOfficeBaseDirMacro;
-    rtl::OUString                                   m_aUserDirMacro;
+    OUString                                   m_aOfficeBrandDirMacro;
+    OUString                                   m_aOfficeBaseDirMacro;
+    OUString                                   m_aUserDirMacro;
     com::sun::star::uno::Reference<
         com::sun::star::uno::XComponentContext >    m_xCtx;
-    rtl::OUString *                                 m_pOfficeBrandDir;
-    rtl::OUString *                                 m_pUserDir;
+    OUString *                                 m_pOfficeBrandDir;
+    OUString *                                 m_pUserDir;
 };
 
 } // namespace comphelper
diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index 1fb16b302f6f..cd078a9f59e9 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.cxx
@@ -51,7 +51,7 @@ Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo(
     return mxInfo;
 }
 
-void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue )
+void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -69,7 +69,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr
     _postSetValues();
 }
 
-Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -90,32 +90,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro
     return aAny;
 }
 
-void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
 // XMultiPropertySet
-void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues )
+void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -149,7 +149,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU
     }
 }
 
-Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames )
+Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames )
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -183,7 +183,7 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence
     return aValues;
 }
 
-void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     throw(RuntimeException)
 {
     // todo
@@ -195,14 +195,14 @@ void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Refere
     // todo
 }
 
-void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     throw(RuntimeException)
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName )
+PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName )
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter =  mpInfo->maMap.find( PropertyName );
@@ -218,7 +218,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames )
+Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames )
     throw(UnknownPropertyException, RuntimeException)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
@@ -244,7 +244,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons
     return aStates;
 }
 
-void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -254,7 +254,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString&
     _setPropertyToDefault( *((*aIter).second) );
 }
 
-Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index 413651814157..c645af7c1c15 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.cxx
@@ -20,7 +20,6 @@
 #include <comphelper/ChainablePropertySetInfo.hxx>
 #include <comphelper/TypeGeneration.hxx>
 
-using ::rtl::OUString;
 using ::comphelper::PropertyInfo;
 using ::comphelper::GenerateCppuType;
 using ::comphelper::ChainablePropertySetInfo;
@@ -67,7 +66,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount )
     }
 }
 
-void ChainablePropertySetInfo::remove( const rtl::OUString& aName )
+void ChainablePropertySetInfo::remove( const OUString& aName )
     throw()
 {
     maMap.erase ( aName );
@@ -99,7 +98,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties()
     return maProperties;
 }
 
-Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
+Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName )
     throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     PropertyInfoHash::iterator aIter = maMap.find( rName );
@@ -118,7 +117,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt
     return aProperty;
 }
 
-sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
+sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() );
diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 1cc524b95a88..f996e8b1fc7d 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.cxx
@@ -101,7 +101,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet )
     mpInfo->add ( pNewSet->mpInfo->maMap, mnLastId );
 }
 
-void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue )
+void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -135,7 +135,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope
     }
 }
 
-Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -171,32 +171,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper
     return aAny;
 }
 
-void SAL_CALL MasterPropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& )
+void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& )
+void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
 // XMultiPropertySet
-void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues )
+void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues )
     throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -262,7 +262,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr
     }
 }
 
-Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames )
+Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames )
     throw(RuntimeException)
 {
     // acquire mutex in c-tor and releases it in the d-tor (exception safe!).
@@ -328,7 +328,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< :
     return aValues;
 }
 
-void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     throw(RuntimeException)
 {
     // todo
@@ -340,14 +340,14 @@ void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference
     // todo
 }
 
-void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& )
+void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& )
     throw(RuntimeException)
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUString& PropertyName )
+PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName )
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter =  mpInfo->maMap.find( PropertyName );
@@ -379,7 +379,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames )
+Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames )
     throw(UnknownPropertyException, RuntimeException)
 {
     const sal_Int32 nCount = rPropertyNames.getLength();
@@ -426,7 +426,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S
     return aStates;
 }
 
-void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName )
+void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
@@ -436,7 +436,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rP
     _setPropertyToDefault( *((*aIter).second->mpInfo) );
 }
 
-Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName )
     throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName );
diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index e59d907d163f..e85d7402eb3a 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.cxx
@@ -20,7 +20,6 @@
 #include <comphelper/MasterPropertySetInfo.hxx>
 #include <comphelper/TypeGeneration.hxx>
 
-using ::rtl::OUString;
 using ::comphelper::PropertyInfo;
 using ::comphelper::GenerateCppuType;
 using ::comphelper::MasterPropertySetInfo;
@@ -116,7 +115,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties()
     return maProperties;
 }
 
-Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName )
+Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName )
     throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     PropertyDataHash::iterator aIter = maMap.find( rName );
@@ -136,7 +135,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin
     return aProperty;
 }
 
-sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName )
+sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName )
     throw(::com::sun::star::uno::RuntimeException)
 {
     return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() );
diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx
index 6925c67848ae..a5b27bc66d87 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.cxx
@@ -123,7 +123,6 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 
-using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
@@ -204,7 +203,7 @@ namespace comphelper
             case CPPUTYPE_REFTXTTABLE:  pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break;
             case CPPUTYPE_AWTPOINT:     pType = &::getCppuType( (awt::Point*)0 );    break;
             case CPPUTYPE_REFLIBCONTAINER:  pType = &::getCppuType( (Reference< script::XLibraryContainer >*)0);    break;
-            case CPPUTYPE_OUSTRINGS:    pType = &::getCppuType( (Sequence< ::rtl::OUString >*)0);    break;
+            case CPPUTYPE_OUSTRINGS:    pType = &::getCppuType( (Sequence< OUString >*)0);    break;
             case CPPUTYPE_SEQANY:           pType = &::getCppuType( (Sequence< uno::Any >*)0);    break;
             case CPPUTYPE_REFRESULTSET:     pType = &::getCppuType( (Reference< sdbc::XResultSet >*)0);    break;
             case CPPUTYPE_REFCONNECTION:    pType = &::getCppuType( (Reference< sdbc::XConnection >*)0);    break;
diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 92f220787392..831dc5908e00 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.cxx
@@ -57,7 +57,7 @@ namespace comphelper
     {
     private:
         GenericAnyMapImpl   maAnyMap;
-        ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::rtl::OUStringHash,UStringEqual> m_aListener;
+        ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, OUStringHash,UStringEqual> m_aListener;
 
     protected:
         virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const  Any* pValues ) throw( UnknownPropertyException,  PropertyVetoException,  IllegalArgumentException,  WrappedTargetException );
@@ -78,13 +78,13 @@ namespace comphelper
         virtual  Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw( RuntimeException);
 
         // XServiceInfo
-        virtual rtl::OUString SAL_CALL getImplementationName() throw(  RuntimeException );
-        virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw(  RuntimeException );
-        virtual  Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw(  RuntimeException );
+        virtual OUString SAL_CALL getImplementationName() throw(  RuntimeException );
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(  RuntimeException );
+        virtual  Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(  RuntimeException );
 
         // XPropertySet
-        virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
     };
 
 }
@@ -100,7 +100,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw()
 GenericPropertySet::~GenericPropertySet() throw()
 {
 }
-void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
     if ( xInfo.is() )
@@ -122,7 +122,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUStri
     }
 }
 
-void SAL_CALL GenericPropertySet::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     ResettableMutexGuard aGuard( maMutex );
     Reference < XPropertySetInfo > xInfo = getPropertySetInfo(  );
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index f7418ba148d1..a3d3a64d501e 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -121,22 +121,22 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException)
+    OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException)
     {
         return getImplementationName_static();
     }
 
     //--------------------------------------------------------------------
-    ::sal_Bool SAL_CALL OPropertyBag::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException)
+    ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() );
-        const ::rtl::OUString* pStart = aServices.getConstArray();
-        const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength();
+        Sequence< OUString > aServices( getSupportedServiceNames_static() );
+        const OUString* pStart = aServices.getConstArray();
+        const OUString* pEnd = aServices.getConstArray() + aServices.getLength();
         return ::std::find( pStart, pEnd, rServiceName ) != pEnd;
     }
 
     //--------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL OPropertyBag::getSupportedServiceNames(  ) throw (RuntimeException)
+    Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames(  ) throw (RuntimeException)
     {
         return getSupportedServiceNames_static();
     }
@@ -225,7 +225,7 @@ namespace comphelper
         // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack.
         Property aProperty;
         if ( !( _element >>= aProperty ) )
-            throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+            throw IllegalArgumentException( OUString(), *this, 1 );
 
         ::osl::ClearableMutexGuard g( m_aMutex );
 
@@ -234,7 +234,7 @@ namespace comphelper
         if  (   !m_aAllowedTypes.empty()
             &&  m_aAllowedTypes.find( aProperty.Type ) == m_aAllowedTypes.end()
             )
-            throw IllegalTypeException( ::rtl::OUString(), *this );
+            throw IllegalTypeException( OUString(), *this );
 
         m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes );
 
@@ -250,7 +250,7 @@ namespace comphelper
     {
         // XSet is only a workaround for addProperty not being able to add default-void properties.
         // So, everything of XSet except insert is implemented empty
-        throw NoSuchElementException( ::rtl::OUString(), *this );
+        throw NoSuchElementException( OUString(), *this );
     }
 
 
@@ -332,7 +332,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL OPropertyBag::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
+    void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
 
@@ -343,7 +343,7 @@ namespace comphelper
             &&  !m_aAllowedTypes.empty()
             &&  m_aAllowedTypes.find( aPropertyType ) == m_aAllowedTypes.end()
             )
-            throw IllegalTypeException( ::rtl::OUString(), *this );
+            throw IllegalTypeException( OUString(), *this );
 
         m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue );
 
@@ -355,7 +355,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL OPropertyBag::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
+    void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
     {
         ::osl::ClearableMutexGuard g( m_aMutex );
 
@@ -380,9 +380,9 @@ namespace comphelper
         };
 
         template< typename CLASS >
-        struct TransformPropertyToName : public ::std::unary_function< CLASS, ::rtl::OUString >
+        struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString >
         {
-            const ::rtl::OUString& operator()( const CLASS& _rProp )
+            const OUString& operator()( const CLASS& _rProp )
             {
                 return _rProp.Name;
             }
@@ -407,7 +407,7 @@ namespace comphelper
         m_aDynamicProperties.describeProperties( aProperties );
 
         // their names
-        Sequence< ::rtl::OUString > aNames( aProperties.getLength() );
+        Sequence< OUString > aNames( aProperties.getLength() );
         ::std::transform(
             aProperties.getConstArray(),
             aProperties.getConstArray() + aProperties.getLength(),
@@ -436,8 +436,8 @@ namespace comphelper
         ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper();
 
         Sequence< PropertyValue > aPropertyValues( aNames.getLength() );
-        const ::rtl::OUString* pName = aNames.getConstArray();
-        const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength();
+        const OUString* pName = aNames.getConstArray();
+        const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength();
         const Any* pValue = aValues.getArray();
         PropertyValue* pPropertyValue = aPropertyValues.getArray();
 
@@ -464,7 +464,7 @@ namespace comphelper
         );
 
         // a sequence of names
-        Sequence< ::rtl::OUString > aNames( aProperties.getLength() );
+        Sequence< OUString > aNames( aProperties.getLength() );
         ::std::transform(
             aProperties.getConstArray(),
             aProperties.getConstArray() + aProperties.getLength(),
@@ -485,7 +485,7 @@ namespace comphelper
             Sequence< sal_Int32 > aHandles( nCount );
             sal_Int32* pHandle = aHandles.getArray();
             const PropertyValue* pProperty = aProperties.getConstArray();
-            for (   const ::rtl::OUString* pName = aNames.getConstArray();
+            for (   const OUString* pName = aNames.getConstArray();
                     pName != aNames.getConstArray() + aNames.getLength();
                     ++pName, ++pHandle, ++pProperty
                 )
@@ -526,7 +526,7 @@ namespace comphelper
         catch( const UnknownPropertyException& )    { throw; }
         catch( const Exception& )
         {
-            throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() );
+            throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() );
         }
     }
 
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 2127c6611c94..93fa44510921 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -96,8 +96,8 @@ namespace comphelper
 
     public:
         // XServiceInfo - static versions
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException );
-        static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException );
+        static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException );
+        static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException );
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
                 SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
 
@@ -112,9 +112,9 @@ namespace comphelper
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 
         // XModifiable:
         virtual ::sal_Bool SAL_CALL isModified(  )
@@ -134,8 +134,8 @@ namespace comphelper
             throw (::com::sun::star::uno::RuntimeException);
 
         // XPropertyContainer
-        virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException);
 
         // XPropertyAccess
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues(  ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index bc24d9499527..983b2bba4c91 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -45,7 +45,7 @@ namespace comphelper
     //------------------------------------------------------------------------------
     namespace
     {
-        const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const ::rtl::OUString& _rName )
+        const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const OUString& _rName )
         {
             sal_Int32 nLen = _rProps.getLength();
             const Property* pProperties = _rProps.getConstArray();
@@ -80,7 +80,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
 
     // if properties are present both at the delegatee and the aggregate, then the former are supposed to win.
     // So, we'll need an existence check.
-    ::std::set< ::rtl::OUString > aDelegatorProps;
+    ::std::set< OUString > aDelegatorProps;
 
     // create the map for the delegator properties
     sal_Int32 nMPLoop = 0;
@@ -148,7 +148,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
 }
 
 //------------------------------------------------------------------
-OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const ::rtl::OUString& _rName )
+OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const OUString& _rName )
 {
     PropertyOrigin eOrigin = UNKNOWN_PROPERTY;
     // look up the name
@@ -167,7 +167,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper:
 }
 
 //------------------------------------------------------------------
-Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUString& _rPropertyName ) throw( UnknownPropertyException )
+Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException )
 {
     const Property* pProperty = findPropertyByName( _rPropertyName );
 
@@ -178,19 +178,19 @@ Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUStri
 }
 
 //------------------------------------------------------------------------------
-sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const ::rtl::OUString& _rPropertyName)
+sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const OUString& _rPropertyName)
 {
     return NULL != findPropertyByName( _rPropertyName );
 }
 
 //------------------------------------------------------------------------------
-const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: rtl::OUString& _rName ) const
+const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: OUString& _rName ) const
 {
     return lcl_findPropertyByName( m_aProperties, _rName );
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString& _rPropertyName)
+sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPropertyName)
 {
     const Property* pProperty = findPropertyByName( _rPropertyName );
     return pProperty ? pProperty->Handle : -1;
@@ -198,7 +198,7 @@ sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString
 
 //------------------------------------------------------------------------------
 sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle(
-            ::rtl::OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle)
+            OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle)
 {
     ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle);
     sal_Bool bRet = i != m_aPropertyAccessors.end();
@@ -227,7 +227,7 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl
 
 //------------------------------------------------------------------------------
 bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
-            ::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const
+            OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const
 {
     ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle);
     bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate;
@@ -255,21 +255,21 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle(
 
 //------------------------------------------------------------------------------
 sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
-        sal_Int32* _pHandles, const  ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames )
+        sal_Int32* _pHandles, const  ::com::sun::star::uno::Sequence< OUString >& _rPropNames )
 {
     sal_Int32 nHitCount = 0;
-    const ::rtl::OUString* pReqProps = _rPropNames.getConstArray();
+    const OUString* pReqProps = _rPropNames.getConstArray();
     sal_Int32 nReqLen = _rPropNames.getLength();
 
 #if OSL_DEBUG_LEVEL > 0
     // assure that the sequence is sorted
     {
-        const ::rtl::OUString* pLookup = _rPropNames.getConstArray();
-        const ::rtl::OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1;
+        const OUString* pLookup = _rPropNames.getConstArray();
+        const OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1;
         for (; pLookup < pEnd; ++pLookup)
         {
-            const ::rtl::OUString* pCompare = pLookup + 1;
-            const ::rtl::OUString* pCompareEnd = pEnd + 1;
+            const OUString* pCompare = pLookup + 1;
+            const OUString* pCompareEnd = pEnd + 1;
             for (; pCompare < pCompareEnd; ++pCompare)
             {
                 OSL_ENSURE(pLookup->compareTo(*pCompare) < 0, "OPropertyArrayAggregationHelper::fillHandles : property names are not sorted!");
@@ -477,7 +477,7 @@ void OPropertySetAggregationHelper::disposing()
     {
         // register as a single listener
         m_xAggregateMultiSet->removePropertiesChangeListener(this);
-        m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this);
+        m_xAggregateSet->removeVetoableChangeListener(OUString(), this);
         m_bListening = sal_False;
     }
 
@@ -564,7 +564,7 @@ void OPropertySetAggregationHelper::setAggregation(const  ::com::sun::star::uno:
     if (m_bListening && m_xAggregateSet.is())
     {
         m_xAggregateMultiSet->removePropertiesChangeListener(this);
-        m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this);
+        m_xAggregateSet->removeVetoableChangeListener(OUString(), this);
         m_bListening = sal_False;
     }
 
@@ -586,16 +586,16 @@ void OPropertySetAggregationHelper::startListening()
     if (!m_bListening && m_xAggregateSet.is())
     {
         // register as a single listener
-         ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropertyNames;
+         ::com::sun::star::uno::Sequence< OUString > aPropertyNames;
         m_xAggregateMultiSet->addPropertiesChangeListener(aPropertyNames, this);
-        m_xAggregateSet->addVetoableChangeListener(::rtl::OUString(), this);
+        m_xAggregateSet->addVetoableChangeListener(OUString(), this);
 
         m_bListening = sal_True;
     }
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::rtl::OUString& _rPropertyName,
+void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName,
                                                                        const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener)
                                                                        throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
 {
@@ -605,7 +605,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::r
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::rtl::OUString& _rPropertyName,
+void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName,
                                                                        const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener)
                                                                        throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
 {
@@ -615,7 +615,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::r
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const  ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames,
+void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const  ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames,
                                                                          const  ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener)
                                                                          throw( ::com::sun::star::uno::RuntimeException)
 {
@@ -634,7 +634,7 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co
 }
 
 //--------------------------------------------------------------------------
-::rtl::OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const
+OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper() );
     Property aProperty;
@@ -649,7 +649,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa
                  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
 
     // does the handle belong to the aggregation ?
@@ -666,7 +666,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa
 void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const
 {
     OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper();
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
 
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
@@ -691,7 +691,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
                  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
      ::com::sun::star::uno::Any  aValue;
 
@@ -710,7 +710,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno:
 
 //------------------------------------------------------------------------------
 void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
-        const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
+        const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues )
     throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
 {
     OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !");
@@ -729,9 +729,9 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         {
             // by definition of XMultiPropertySet::setPropertyValues, unknown properties are to be ignored
         #if OSL_DEBUG_LEVEL > 0
-            ::rtl::OStringBuffer aMessage;
+            OStringBuffer aMessage;
             aMessage.append( "OPropertySetAggregationHelper::setPropertyValues: unknown property '" );
-            aMessage.append( ::rtl::OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) );
+            aMessage.append( OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) );
             aMessage.append( "'" );
             aMessage.append( "\n(implementation " );
             aMessage.append( typeid( *this ).name() );
@@ -745,7 +745,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
 
         // determine which properties belong to the aggregate, and which ones to the delegator
-        const ::rtl::OUString* pNames = _rPropertyNames.getConstArray();
+        const OUString* pNames = _rPropertyNames.getConstArray();
         sal_Int32 nAggCount(0);
         sal_Int32 nLen(_rPropertyNames.getLength());
 
@@ -753,7 +753,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         {
             OPropertyArrayAggregationHelper::PropertyOrigin ePropOrg = rPH.classifyProperty( *pNames );
             if ( OPropertyArrayAggregationHelper::UNKNOWN_PROPERTY == ePropOrg )
-                throw WrappedTargetException( ::rtl::OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) );
+                throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) );
                 // due to a flaw in the API design, this method is not allowed to throw an UnknownPropertyException
                 // so we wrap it into a WrappedTargetException
 
@@ -784,15 +784,15 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
                 // dividing the Names and _rValues
 
                 // aggregate's names
-                Sequence< ::rtl::OUString > AggPropertyNames( nAggCount );
-                ::rtl::OUString* pAggNames = AggPropertyNames.getArray();
+                Sequence< OUString > AggPropertyNames( nAggCount );
+                OUString* pAggNames = AggPropertyNames.getArray();
                 // aggregate's values
                 Sequence< Any >  AggValues( nAggCount );
                 Any* pAggValues = AggValues.getArray();
 
                 // delegator names
-                Sequence< ::rtl::OUString > DelPropertyNames( nLen - nAggCount );
-                ::rtl::OUString* pDelNames = DelPropertyNames.getArray();
+                Sequence< OUString > DelPropertyNames( nLen - nAggCount );
+                OUString* pDelNames = DelPropertyNames.getArray();
 
                 // delegator values
                 Sequence< Any > DelValues( nLen - nAggCount );
@@ -896,7 +896,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
 
 // XPropertyState
 //------------------------------------------------------------------------------
- ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const ::rtl::OUString& _rPropertyName)
+ ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName)
             throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
@@ -907,7 +907,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
         throw  ::com::sun::star::beans::UnknownPropertyException();
     }
 
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
@@ -921,7 +921,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues(
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::OUString& _rPropertyName)
+void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName)
         throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
@@ -931,7 +931,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
         throw  ::com::sun::star::beans::UnknownPropertyException();
     }
 
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
@@ -954,7 +954,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
 }
 
 //------------------------------------------------------------------------------
- ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const ::rtl::OUString& aPropertyName)
+ ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName)
         throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
 {
     OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() );
@@ -963,7 +963,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O
     if ( nHandle == -1 )
         throw  ::com::sun::star::beans::UnknownPropertyException();
 
-    ::rtl::OUString aPropName;
+    OUString aPropName;
     sal_Int32   nOriginalHandle = -1;
     if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle))
     {
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index 669a28bf4470..f1c544f3c93b 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -91,15 +91,15 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
             catch (Exception&)
             {
 #if OSL_DEBUG_LEVEL > 0
-                ::rtl::OStringBuffer aBuffer;
+                OStringBuffer aBuffer;
                 aBuffer.append( "::comphelper::copyProperties: could not copy property '" );
-                aBuffer.append( ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) );
+                aBuffer.append( OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) );
                 aBuffer.append( "' to the destination set (a '" );
 
                 Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY );
                 if ( xSI.is() )
                 {
-                    aBuffer.append( ::rtl::OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) );
+                    aBuffer.append( OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) );
                 }
                 else
                 {
@@ -109,15 +109,15 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
 
                 Any aException( ::cppu::getCaughtException() );
                 aBuffer.append( "Caught an exception of type '" );
-                ::rtl::OUString sExceptionType( aException.getValueTypeName() );
-                aBuffer.append( ::rtl::OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) );
+                OUString sExceptionType( aException.getValueTypeName() );
+                aBuffer.append( OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) );
                 aBuffer.append( "'" );
 
                 Exception aBaseException;
                 if ( ( aException >>= aBaseException ) && !aBaseException.Message.isEmpty() )
                 {
                     aBuffer.append( ", saying '" );
-                    aBuffer.append( ::rtl::OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) );
+                    aBuffer.append( OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) );
                     aBuffer.append( "'" );
                 }
                 aBuffer.append( "." );
@@ -130,7 +130,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
 }
 
 //------------------------------------------------------------------
-sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>& _rxSet)
+sal_Bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet)
 {
     if (_rxSet.is())
     {
@@ -141,7 +141,7 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>&
 }
 
 //------------------------------------------------------------------
-void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName)
+void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
 {
     sal_Int32 nLen = _rProps.getLength();
 
@@ -159,7 +159,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName
 }
 
 //------------------------------------------------------------------
-void ModifyPropertyAttributes(Sequence<Property>& seqProps, const ::rtl::OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib)
+void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib)
 {
     sal_Int32 nLen = seqProps.getLength();
 
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index ba612a53db8e..79225fc492e6 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -77,7 +77,7 @@ namespace comphelper
     //--------------------------------------------------------------------
     namespace
     {
-        void    lcl_checkForEmptyName( const bool _allowEmpty, const ::rtl::OUString& _name )
+        void    lcl_checkForEmptyName( const bool _allowEmpty, const OUString& _name )
         {
             if ( !_allowEmpty && _name.isEmpty() )
                 throw IllegalArgumentException(
@@ -88,7 +88,7 @@ namespace comphelper
                       );
         }
 
-        void    lcl_checkNameAndHandle( const ::rtl::OUString& _name, const sal_Int32 _handle, const PropertyBag& _container )
+        void    lcl_checkNameAndHandle( const OUString& _name, const sal_Int32 _handle, const PropertyBag& _container )
         {
             if ( _container.hasPropertyByName( _name ) || _container.hasPropertyByHandle( _handle ) )
                 throw PropertyExistException(
@@ -100,7 +100,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void PropertyBag::addVoidProperty( const ::rtl::OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes )
+    void PropertyBag::addVoidProperty( const OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes )
     {
         if ( _rType.getTypeClass() == TypeClass_VOID )
             throw IllegalArgumentException(
@@ -123,7 +123,7 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void PropertyBag::addProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue )
+    void PropertyBag::addProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue )
     {
         // check type sanity
         Type aPropertyType = _rInitialValue.getValueType();
@@ -146,12 +146,12 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void PropertyBag::removeProperty( const ::rtl::OUString& _rName )
+    void PropertyBag::removeProperty( const OUString& _rName )
     {
         const Property& rProp = getProperty( _rName );
             // will throw an UnknownPropertyException if necessary
         if ( ( rProp.Attributes & PropertyAttribute::REMOVABLE ) == 0 )
-            throw NotRemoveableException( ::rtl::OUString(), NULL );
+            throw NotRemoveableException( OUString(), NULL );
         const sal_Int32 nHandle = rProp.Handle;
 
         revokeProperty( nHandle );
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 9720762c5657..6715567276d0 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -59,8 +59,8 @@ namespace
     // comparing two property descriptions (by name)
     struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool >
     {
-        ::rtl::OUString m_rCompare;
-        PropertyDescriptionNameMatch( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { }
+        OUString m_rCompare;
+        PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { }
 
         bool operator() (const PropertyDescription& x ) const
         {
@@ -84,7 +84,7 @@ OPropertyContainerHelper::~OPropertyContainerHelper()
 }
 
 //--------------------------------------------------------------------------
-void OPropertyContainerHelper::registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle,
+void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int32 _nHandle,
         sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType)
 {
     OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) == 0,
@@ -112,7 +112,7 @@ void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle )
 }
 
 //--------------------------------------------------------------------------
-void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         Any* _pPointerToMember, const Type& _rExpectedType)
 {
     OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) != 0,
@@ -134,7 +134,7 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString&
 
 
 //--------------------------------------------------------------------------
-void OPropertyContainerHelper::registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
+void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes,
         const Type& _rType, const void* _pInitialValue)
 {
     OSL_ENSURE(!_rType.equals(::getCppuType(static_cast< Any* >(NULL))),
@@ -161,7 +161,7 @@ sal_Bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) co
 }
 
 //--------------------------------------------------------------------------
-sal_Bool OPropertyContainerHelper::isRegisteredProperty( const ::rtl::OUString& _rName ) const
+sal_Bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const
 {
     // TODO: the current structure is from a time where properties were
     // static, not dynamic. Since we allow that properties are also dynamic,
@@ -214,7 +214,7 @@ namespace
 {
     void lcl_throwIllegalPropertyValueTypeException( const PropertyDescription& _rProperty, const Any& _rValue )
     {
-        ::rtl::OUStringBuffer aErrorMessage;
+        OUStringBuffer aErrorMessage;
         aErrorMessage.appendAscii( "The given value cannot be converted to the required property type." );
         aErrorMessage.appendAscii( "\n(property name \"" );
         aErrorMessage.append( _rProperty.aProperty.Name );
@@ -464,7 +464,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan
 }
 
 //--------------------------------------------------------------------------
-const Property& OPropertyContainerHelper::getProperty( const ::rtl::OUString& _rName ) const
+const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const
 {
     ConstPropertiesIterator pos = ::std::find_if(
         m_aProperties.begin(),
diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 27b4c0eeb5b7..e1422cf21f3f 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.cxx
@@ -82,7 +82,7 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo(  )
     return mp->mpInfo;
 }
 
-void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     PropertyMapEntry* aEntries[2];
     aEntries[0] = mp->find( aPropertyName );
@@ -95,7 +95,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPrope
     _setPropertyValues( (const PropertyMapEntry**)aEntries, &aValue );
 }
 
-Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyMapEntry* aEntries[2];
     aEntries[0] = mp->find( PropertyName );
@@ -111,28 +111,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& Propert
     return aAny;
 }
 
-void SAL_CALL PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
-void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     // todo
 }
 
 // XMultiPropertySet
-void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
+void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
     const sal_Int32 nCount = aPropertyNames.getLength();
 
@@ -163,7 +163,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr
     }
 }
 
-Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw(RuntimeException)
+Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException)
 {
     const sal_Int32 nCount = aPropertyNames.getLength();
 
@@ -197,7 +197,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< :
     return aValues;
 }
 
-void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException)
+void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException)
 {
     // todo
 }
@@ -207,13 +207,13 @@ void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference
     // todo
 }
 
-void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException)
+void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException)
 {
     // todo
 }
 
 // XPropertyState
-PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
+PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
     PropertyMapEntry* aEntries[2];
 
@@ -229,7 +229,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUStrin
     return aState;
 }
 
-Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< ::rtl::OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
+Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
     const sal_Int32 nCount = aPropertyName.getLength();
 
@@ -264,7 +264,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S
     return aStates;
 }
 
-void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
+void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException)
 {
     PropertyMapEntry *pEntry  = mp->find( PropertyName );
     if( NULL == pEntry )
@@ -273,7 +273,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& Pr
     _setPropertyToDefault( pEntry );
 }
 
-Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
+Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
 {
     PropertyMapEntry* pEntry = mp->find( aPropertyName );
     if( NULL == pEntry )
diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index c38c1f877360..2567a0630109 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.cxx
@@ -173,7 +173,7 @@ void PropertySetInfo::add( PropertyMapEntry* pMap ) throw()
     mpMap->add( pMap );
 }
 
-void PropertySetInfo::remove( const rtl::OUString& aName ) throw()
+void PropertySetInfo::remove( const OUString& aName ) throw()
 {
     mpMap->remove( aName );
 }
@@ -183,12 +183,12 @@ Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getPrope
     return mpMap->getProperties();
 }
 
-Property SAL_CALL PropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
+Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException)
 {
     return mpMap->getPropertyByName( aName );
 }
 
-sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException)
 {
     return mpMap->hasPropertyByName( Name );
 }
diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index 257c3eb821dc..2155d555e180 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.cxx
@@ -31,13 +31,13 @@ namespace comphelper
 
     namespace
     {
-        static ::rtl::OUString lcl_getUnknownPropertyErrorMessage( const ::rtl::OUString& _rPropertyName )
+        static OUString lcl_getUnknownPropertyErrorMessage( const OUString& _rPropertyName )
         {
             // TODO: perhaps it's time to think about resources in the comphelper module?
             // Would be nice to have localized exception strings (a simply resource file containing
             // strings only would suffice, and could be realized with an UNO service, so we do not
             // need the dependency to the Tools project)
-            ::rtl::OUStringBuffer sMessage;
+            OUStringBuffer sMessage;
             sMessage.appendAscii( "The property \"" );
             sMessage.append( _rPropertyName );
             sMessage.appendAscii( "\" is unknown." );
@@ -67,7 +67,7 @@ namespace comphelper
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase )
 
     //--------------------------------------------------------------------
-    sal_Int32 OPropertyStateContainer::getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) )
+    sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) )
     {
         // look up the handle for the name
         ::cppu::IPropertyArrayHelper& rPH = getInfoHelper();
@@ -80,13 +80,13 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
+    PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         return getPropertyStateByHandle( getHandleForName( _rPropertyName ) );
     }
 
     //--------------------------------------------------------------------
-    Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< ::rtl::OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException)
+    Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException)
     {
         sal_Int32 nProperties = _rPropertyNames.getLength();
         Sequence< PropertyState> aStates( nProperties );
@@ -96,17 +96,17 @@ namespace comphelper
 #ifdef _DEBUG
         // precondition: property sequence is sorted (the algorythm below relies on this)
         {
-            const ::rtl::OUString* pNames = _rPropertyNames.getConstArray();
-            const ::rtl::OUString* pNamesCompare = pNames + 1;
-            const ::rtl::OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength();
+            const OUString* pNames = _rPropertyNames.getConstArray();
+            const OUString* pNamesCompare = pNames + 1;
+            const OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength();
             for ( ; pNamesCompare != pNamesEnd; ++pNames, ++pNamesCompare )
                 OSL_PRECOND( pNames->compareTo( *pNamesCompare ) < 0,
                     "OPropertyStateContainer::getPropertyStates: property sequence not sorted!" );
         }
 #endif
 
-        const ::rtl::OUString* pLookup = _rPropertyNames.getConstArray();
-        const ::rtl::OUString* pLookupEnd = pLookup + nProperties;
+        const OUString* pLookup = _rPropertyNames.getConstArray();
+        const OUString* pLookupEnd = pLookup + nProperties;
         PropertyState* pStates = aStates.getArray();
 
         cppu::IPropertyArrayHelper& rHelper = getInfoHelper();
@@ -139,13 +139,13 @@ namespace comphelper
     }
 
     //--------------------------------------------------------------------
-    void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
+    void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
     {
         setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) );
     }
 
     //--------------------------------------------------------------------
-    Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
+    Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException)
     {
         Any aDefault;
         getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault );
diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index 7efee0cf33e5..e6cd40f0f344 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.cxx
@@ -111,7 +111,7 @@ void OPropertyChangeMultiplexer::dispose()
     {
         Reference< XPropertyChangeListener> xPreventDelete(this);
 
-        const ::rtl::OUString* pProperties = m_aProperties.getConstArray();
+        const OUString* pProperties = m_aProperties.getConstArray();
         for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i, ++pProperties)
             m_xSet->removePropertyChangeListener(*pProperties, static_cast< XPropertyChangeListener*>(this));
 
@@ -155,7 +155,7 @@ void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const  PropertyChangeE
 }
 
 //------------------------------------------------------------------
-void OPropertyChangeMultiplexer::addProperty(const ::rtl::OUString& _sPropertyName)
+void OPropertyChangeMultiplexer::addProperty(const OUString& _sPropertyName)
 {
     if (m_xSet.is())
     {
diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index dbc36ce2c41c..1b4e1324936a 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.cxx
@@ -83,7 +83,7 @@ namespace comphelper
 
     // XPropertyState
     //---------------------------------------------------------------------
-    ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
+    ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -95,7 +95,7 @@ namespace comphelper
     }
 
     //---------------------------------------------------------------------
-    void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
+    void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -107,7 +107,7 @@ namespace comphelper
     }
 
     //---------------------------------------------------------------------
-    ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
+    ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::lang::WrappedTargetException,  ::com::sun::star::uno::RuntimeException)
     {
         cppu::IPropertyArrayHelper& rPH = getInfoHelper();
         sal_Int32 nHandle = rPH.getHandleByName(_rsName);
@@ -119,12 +119,12 @@ namespace comphelper
     }
 
     //---------------------------------------------------------------------
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const  ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const  ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException,  ::com::sun::star::uno::RuntimeException)
     {
         sal_Int32 nLen = _rPropertyNames.getLength();
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen);
         ::com::sun::star::beans::PropertyState* pValues = aRet.getArray();
-        const ::rtl::OUString* pNames = _rPropertyNames.getConstArray();
+        const OUString* pNames = _rPropertyNames.getConstArray();
 
         cppu::IPropertyArrayHelper& rHelper = getInfoHelper();
 
diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index 8c39c2902c51..8a683a738570 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.cxx
@@ -89,14 +89,14 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun
 }
 
 //------------------------------------------------------------------------------
-const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& rStr)
+const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr)
 {
     rStr = _rxInStream->readUTF();
     return _rxInStream;
 }
 
 //------------------------------------------------------------------------------
-const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& rStr)
+const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr)
 {
     _rxOutStream->writeUTF(rStr);
     return _rxOutStream;
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index fb654abb4f23..572715e334d1 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.cxx
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <vector>
 
-using ::rtl::OUString;
 using ::cppu::OWeakObject;
 using ::cppu::WeakImplHelper4;
 using namespace ::com::sun::star::io;
@@ -71,8 +70,8 @@ public:
     virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static Reference< XInterface > SAL_CALL Create( const Reference< ::com::sun::star::uno::XComponentContext >& );
 
 private:
@@ -210,12 +209,12 @@ void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException)
     mnCursor = 0;
 }
 
-::rtl::OUString SAL_CALL UNOMemoryStream::getImplementationName_static()
+OUString SAL_CALL UNOMemoryStream::getImplementationName_static()
 {
-    return ::rtl::OUString("com.sun.star.comp.MemoryStream");
+    return OUString("com.sun.star.comp.MemoryStream");
 }
 
-Sequence< ::rtl::OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static()
+Sequence< OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static()
 {
     Sequence< OUString > aSeq(1);
     aSeq[0] = getImplementationName_static();
diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 419362bbab3d..23764161a316 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.cxx
@@ -41,10 +41,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
                 throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     if (nBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
 
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
     sal_uInt64 nRead = 0;
     FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead);
     if (eError != FileBase::E_None)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
 
     // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen
     if (nRead < (sal_uInt32)nBytesToRead)
@@ -66,10 +66,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8
 sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     if (nMaxBytesToRead < 0)
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
 
     return readBytes(aData, nMaxBytesToRead);
 }
@@ -79,7 +79,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     sal_uInt64 nCurrentPos;
     m_pFile->getPos(nCurrentPos);
@@ -88,7 +88,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st
     FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos);
     if (eError != FileBase::E_None)
     {
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
     }
 }
 
@@ -97,27 +97,27 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     sal_uInt64 nPos;
     FileBase::RC eError = m_pFile->getPos(nPos);
     if (eError != FileBase::E_None)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     sal_uInt64 nDummy = 0;
     eError = m_pFile->setPos(osl_Pos_End, nDummy);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
 
     sal_uInt64 nAvailable;
     eError = m_pFile->getPos(nAvailable);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
 
     nAvailable = nAvailable - nPos;
     eError = m_pFile->setPos(osl_Pos_Absolut, nPos);
     if (eError != FileBase::E_None)
-       throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+       throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this));
     return sal::static_int_cast< sal_Int32 >(
         std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32)));
 }
@@ -126,7 +126,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte
 void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException )
 {
     if (!m_pFile)
-        throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this));
+        throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this));
 
     m_pFile->close();
 
@@ -150,7 +150,7 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_In
     if (eError != FileBase::E_None
         || nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength()))
     {
-        throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this));
+        throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this));
     }
 }
 
diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index c26c7bd9bbff..de10a03d686d 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.cxx
@@ -48,13 +48,13 @@ public:
     explicit SequenceInputStreamService();
 
     // ::com::sun::star::lang::XServiceInfo:
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException );
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) throw ( uno::RuntimeException );
-    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException );
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException );
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException );
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& );
 
     // ::com::sun::star::io::XInputStream:
@@ -90,7 +90,7 @@ SequenceInputStreamService::SequenceInputStreamService()
 {}
 
 // com.sun.star.uno.XServiceInfo:
-::rtl::OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException )
+OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException )
 {
     return getImplementationName_static();
 }
@@ -100,9 +100,9 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static()
     return OUString( "com.sun.star.comp.SequenceInputStreamService" );
 }
 
-::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException )
+::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames();
+    uno::Sequence< OUString > serviceNames = getSupportedServiceNames();
     for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) {
         if ( serviceNames[i] == serviceName )
             return sal_True;
@@ -110,7 +110,7 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static()
     return sal_False;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException )
 {
     return getSupportedServiceNames_static();
 }
diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index 9dc868b461e9..1acb945f2e11 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.cxx
@@ -42,13 +42,13 @@ public:
     explicit SequenceOutputStreamService();
 
     // ::com::sun::star::lang::XServiceInfo:
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException );
-    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) throw ( uno::RuntimeException );
-    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException );
+    virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException );
+    virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException );
+    virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException );
 
     // XServiceInfo - static versions (used for component registration)
-    static ::rtl::OUString SAL_CALL getImplementationName_static();
-    static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static();
+    static OUString SAL_CALL getImplementationName_static();
+    static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static();
     static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& );
 
     // ::com::sun::star::io::XOutputStream:
@@ -76,7 +76,7 @@ SequenceOutputStreamService::SequenceOutputStreamService()
 }
 
 // com.sun.star.uno.XServiceInfo:
-::rtl::OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException )
+OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException )
 {
     return getImplementationName_static();
 }
@@ -86,9 +86,9 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static()
     return OUString("com.sun.star.comp.SequenceOutputStreamService");
 }
 
-::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException )
+::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames();
+    uno::Sequence< OUString > serviceNames = getSupportedServiceNames();
     for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) {
         if ( serviceNames[i] == serviceName )
             return sal_True;
@@ -96,7 +96,7 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static()
     return sal_False;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException )
+uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException )
 {
     return getSupportedServiceNames_static();
 }
diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index b2680793febb..242af3a39b4c 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.cxx
@@ -44,7 +44,7 @@ SequenceInputStream::SequenceInputStream(const ByteSequence& rData)
 inline sal_Int32 SequenceInputStream::avail()
 {
     if (m_nPos == -1)
-        throw NotConnectedException(::rtl::OUString(), *this);
+        throw NotConnectedException(OUString(), *this);
 
     return m_aData.getLength() - m_nPos;
 }
@@ -60,7 +60,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sa
     sal_Int32 nAvail = avail();
 
     if (nBytesToRead < 0)
-        throw BufferSizeExceededException(::rtl::OUString(),*this);
+        throw BufferSizeExceededException(OUString(),*this);
 
     if (nAvail < nBytesToRead)
         nBytesToRead = nAvail;
@@ -91,7 +91,7 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip )
     sal_Int32 nAvail = avail();
 
     if (nBytesToSkip < 0)
-        throw BufferSizeExceededException(::rtl::OUString(),*this);
+        throw BufferSizeExceededException(OUString(),*this);
 
     if (nAvail < nBytesToSkip)
         nBytesToSkip = nAvail;
@@ -113,7 +113,7 @@ void SAL_CALL SequenceInputStream::closeInput(  )
     throw(NotConnectedException, IOException, RuntimeException)
 {
     if (m_nPos == -1)
-        throw NotConnectedException(::rtl::OUString(), *this);
+        throw NotConnectedException(OUString(), *this);
 
     m_nPos = -1;
 }
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index b6f95c7bf9bd..33157cf92df0 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -25,7 +25,6 @@
 using namespace osl;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 namespace comphelper {
 
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index 609ae165a8c6..6a98d305cf9b 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star;
 namespace comphelper {
 
 // -----------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
     OUString aStringID = OUString( "_rels/" );
@@ -126,14 +126,14 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu
 
     xWriter->setOutputStream( xOutStream );
 
-    ::rtl::OUString aTypesElement( "Types" );
-    ::rtl::OUString aDefaultElement( "Default" );
-    ::rtl::OUString aOverrideElement( "Override" );
-    ::rtl::OUString aExtensionAttr( "Extension" );
-    ::rtl::OUString aPartNameAttr( "PartName" );
-    ::rtl::OUString aContentTypeAttr( "ContentType" );
-    ::rtl::OUString aCDATAString( "CDATA" );
-    ::rtl::OUString aWhiteSpace( " " );
+    OUString aTypesElement( "Types" );
+    OUString aDefaultElement( "Default" );
+    OUString aOverrideElement( "Override" );
+    OUString aExtensionAttr( "Extension" );
+    OUString aPartNameAttr( "PartName" );
+    OUString aContentTypeAttr( "ContentType" );
+    OUString aCDATAString( "CDATA" );
+    OUString aWhiteSpace( " " );
 
     // write the namespace
     AttributeList* pRootAttrList = new AttributeList;
@@ -179,7 +179,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu
 // ==================================================================================
 
 // -----------------------------------
-uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext )
+uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext )
     throw( uno::Exception )
 {
     if ( !xContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID )
@@ -246,7 +246,7 @@ void SAL_CALL OFOPXMLHelper::endDocument()
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
+void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs )
         throw( xml::sax::SAXException, uno::RuntimeException )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT )
@@ -277,13 +277,13 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u
             sal_Int32 nAttrNum = 0;
             m_aResultSeq[nNewEntryNum-1].realloc( 4 ); // the maximal expected number of arguments is 4
 
-            ::rtl::OUString aIDValue = xAttribs->getValueByName( m_aIDAttr );
+            OUString aIDValue = xAttribs->getValueByName( m_aIDAttr );
             if ( aIDValue.isEmpty() )
                 throw xml::sax::SAXException(); // TODO: the ID value must present
 
-            ::rtl::OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr );
-            ::rtl::OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr );
-            ::rtl::OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr );
+            OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr );
+            OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr );
+            OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr );
 
             m_aResultSeq[nNewEntryNum-1][++nAttrNum - 1].First = m_aIDAttr;
             m_aResultSeq[nNewEntryNum-1][nAttrNum - 1].Second = aIDValue;
@@ -343,11 +343,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u
             if ( m_aResultSeq.getLength() != 2 )
                 throw uno::RuntimeException();
 
-            ::rtl::OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr );
+            OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr );
             if ( aExtensionValue.isEmpty() )
                 throw xml::sax::SAXException(); // TODO: the Extension value must present
 
-            ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
+            OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
             if ( aContentTypeValue.isEmpty() )
                 throw xml::sax::SAXException(); // TODO: the ContentType value must present
 
@@ -372,11 +372,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u
             if ( m_aResultSeq.getLength() != 2 )
                 throw uno::RuntimeException();
 
-            ::rtl::OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr );
+            OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr );
             if ( aPartNameValue.isEmpty() )
                 throw xml::sax::SAXException(); // TODO: the PartName value must present
 
-            ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
+            OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr );
             if ( aContentTypeValue.isEmpty() )
                 throw xml::sax::SAXException(); // TODO: the ContentType value must present
 
@@ -394,7 +394,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName )
+void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName )
     throw( xml::sax::SAXException, uno::RuntimeException )
 {
     if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT )
@@ -411,19 +411,19 @@ void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName )
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ )
+void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ )
+void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
 
 // -----------------------------------
-void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ )
+void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ )
         throw(xml::sax::SAXException, uno::RuntimeException)
 {
 }
diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx
index 1f5f2c3c20d1..a73a4535fee8 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -94,7 +94,7 @@ namespace comphelper
 {
     namespace xml
     {
-        rtl::OString makeXMLChaff()
+        OString makeXMLChaff()
         {
             rtlRandomPool pool = rtl_random_createPool();
 
@@ -110,7 +110,7 @@ namespace comphelper
 
             encodeChaff(aChaff);
 
-            return rtl::OString(reinterpret_cast<const sal_Char*>(&aChaff[0]), nLength);
+            return OString(reinterpret_cast<const sal_Char*>(&aChaff[0]), nLength);
         }
     }
 }
diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx
index 1b6a9e426b5d..1e609a302277 100644
--- a/configmgr/qa/unit/test.cxx
+++ b/configmgr/qa/unit/test.cxx
@@ -58,15 +58,15 @@
 namespace {
 
 void normalize(
-    rtl::OUString const & path, rtl::OUString const & relative,
-    rtl::OUString * normalizedPath, rtl::OUString * name)
+    OUString const & path, OUString const & relative,
+    OUString * normalizedPath, OUString * name)
 {
     sal_Int32 i = relative.lastIndexOf('/');
     if (i == -1) {
         *normalizedPath = path;
         *name = relative;
     } else {
-        rtl::OUStringBuffer buf(path);
+        OUStringBuffer buf(path);
         buf.append(sal_Unicode('/'));
         buf.append(relative.copy(0, i));
         *normalizedPath = buf.makeStringAndClear();
@@ -89,19 +89,19 @@ public:
     void testCrossThreads();
 
     css::uno::Any getKey(
-        rtl::OUString const & path, rtl::OUString const & relative) const;
+        OUString const & path, OUString const & relative) const;
 
     void setKey(
-        rtl::OUString const & path, rtl::OUString const & name,
+        OUString const & path, OUString const & name,
         css::uno::Any const & value) const;
 
-    bool resetKey(rtl::OUString const & path, rtl::OUString const & name) const;
+    bool resetKey(OUString const & path, OUString const & name) const;
 
     css::uno::Reference< css::uno::XInterface > createViewAccess(
-        rtl::OUString const & path) const;
+        OUString const & path) const;
 
     css::uno::Reference< css::uno::XInterface > createUpdateAccess(
-        rtl::OUString const & path) const;
+        OUString const & path) const;
 
     CPPUNIT_TEST_SUITE(Test);
     CPPUNIT_TEST(testKeyFetch);
@@ -159,20 +159,20 @@ void TestThread::run() {
 class ReaderThread: public TestThread {
 public:
     ReaderThread(
-        osl::Condition & stop, Test const & test, rtl::OUString const & path,
-        rtl::OUString const & relative);
+        osl::Condition & stop, Test const & test, OUString const & path,
+        OUString const & relative);
 
 private:
     virtual bool iteration();
 
     Test const & test_;
-    rtl::OUString path_;
-    rtl::OUString relative_;
+    OUString path_;
+    OUString relative_;
 };
 
 ReaderThread::ReaderThread(
-    osl::Condition & stop, Test const & test, rtl::OUString const & path,
-    rtl::OUString const & relative):
+    osl::Condition & stop, Test const & test, OUString const & path,
+    OUString const & relative):
     TestThread(stop), test_(test), path_(path), relative_(relative)
 {
     create();
@@ -185,21 +185,21 @@ bool ReaderThread::iteration() {
 class WriterThread: public TestThread {
 public:
     WriterThread(
-        osl::Condition & stop, Test const & test, rtl::OUString const & path,
-        rtl::OUString const & relative);
+        osl::Condition & stop, Test const & test, OUString const & path,
+        OUString const & relative);
 
 private:
     virtual bool iteration();
 
     Test const & test_;
-    rtl::OUString path_;
-    rtl::OUString name_;
+    OUString path_;
+    OUString name_;
     std::size_t index_;
 };
 
 WriterThread::WriterThread(
-    osl::Condition & stop, Test const & test, rtl::OUString const & path,
-    rtl::OUString const & relative):
+    osl::Condition & stop, Test const & test, OUString const & path,
+    OUString const & relative):
     TestThread(stop), test_(test), index_(0)
 {
     normalize(path, relative, &path_, &name_);
@@ -207,13 +207,13 @@ WriterThread::WriterThread(
 }
 
 bool WriterThread::iteration() {
-    rtl::OUString options[] = {
-        rtl::OUString("fish"),
-        rtl::OUString("chips"),
-        rtl::OUString("kippers"),
-        rtl::OUString("bloaters") };
+    OUString options[] = {
+        OUString("fish"),
+        OUString("chips"),
+        OUString("kippers"),
+        OUString("bloaters") };
     test_.setKey(path_, name_, css::uno::makeAny(options[index_]));
-    index_ = (index_ + 1) % (sizeof options / sizeof (rtl::OUString));
+    index_ = (index_ + 1) % (sizeof options / sizeof (OUString));
     return true;
 }
 
@@ -253,13 +253,13 @@ RecursiveTest::RecursiveTest(
 void RecursiveTest::test() {
     properties_ = css::uno::Reference< css::beans::XPropertySet >(
         test_.createUpdateAccess(
-            rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                     "dotuno:WebHtml"))),
         css::uno::UNO_QUERY_THROW);
     properties_->addPropertyChangeListener(
-        rtl::OUString("Label"), this);
+        OUString("Label"), this);
     step();
     CPPUNIT_ASSERT(count_ == 0);
     css::uno::Reference< css::lang::XComponent >(
@@ -302,12 +302,12 @@ SimpleRecursiveTest::SimpleRecursiveTest(
 
 void SimpleRecursiveTest::step() const {
     test_.setKey(
-        rtl::OUString(
+        OUString(
             RTL_CONSTASCII_USTRINGPARAM(
                 "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                 "dotuno:WebHtml")),
-        rtl::OUString("Label"),
-        css::uno::makeAny(rtl::OUString("step")));
+        OUString("Label"),
+        css::uno::makeAny(OUString("step")));
 }
 
 class CrossThreadTest: public RecursiveTest {
@@ -328,17 +328,17 @@ void CrossThreadTest::step() const {
     stop.set();
     WriterThread(
         stop, test_,
-        rtl::OUString(
+        OUString(
             RTL_CONSTASCII_USTRINGPARAM(
                 "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                 "dotuno:WebHtml")),
-        rtl::OUString("Label")).join();
+        OUString("Label")).join();
     test_.resetKey(
-        rtl::OUString(
+        OUString(
             RTL_CONSTASCII_USTRINGPARAM(
                 "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                 "dotuno:WebHtml")),
-        rtl::OUString("Label"));
+        OUString("Label"));
 }
 
 void Test::setUp() {
@@ -354,9 +354,9 @@ void Test::setUp() {
     context_ = css::uno::Reference< css::uno::XComponentContext >(
         css::uno::Reference< css::beans::XPropertySet >(
             cppu::createRegistryServiceFactory(
-                rtl::OUString(registry, SAL_NO_ACQUIRE)),
+                OUString(registry, SAL_NO_ACQUIRE)),
             css::uno::UNO_QUERY_THROW)->getPropertyValue(
-                rtl::OUString("DefaultContext")),
+                OUString("DefaultContext")),
         css::uno::UNO_QUERY_THROW);
     provider_ = css::configuration::theDefaultProvider::get(context_);
 }
@@ -367,74 +367,74 @@ void Test::tearDown() {
 }
 
 void Test::testKeyFetch() {
-    rtl::OUString s;
+    OUString s;
     CPPUNIT_ASSERT(
         getKey(
-            rtl::OUString("/org.openoffice.Setup"),
-            rtl::OUString("L10N/ooLocale")) >>=
+            OUString("/org.openoffice.Setup"),
+            OUString("L10N/ooLocale")) >>=
         s);
     CPPUNIT_ASSERT(
         getKey(
-            rtl::OUString("/org.openoffice.Setup"),
-            rtl::OUString("Test/AString")) >>=
+            OUString("/org.openoffice.Setup"),
+            OUString("Test/AString")) >>=
         s);
 }
 
 void Test::testKeySet() {
     setKey(
-        rtl::OUString("/org.openoffice.Setup/Test"),
-        rtl::OUString("AString"),
-        css::uno::makeAny(rtl::OUString("baa")));
-    rtl::OUString s;
+        OUString("/org.openoffice.Setup/Test"),
+        OUString("AString"),
+        css::uno::makeAny(OUString("baa")));
+    OUString s;
     CPPUNIT_ASSERT(
         getKey(
-            rtl::OUString("/org.openoffice.Setup/Test"),
-            rtl::OUString("AString")) >>=
+            OUString("/org.openoffice.Setup/Test"),
+            OUString("AString")) >>=
         s);
     CPPUNIT_ASSERT( s == "baa" );
 }
 
 void Test::testKeyReset() {
     if (resetKey(
-            rtl::OUString("/org.openoffice.Setup/Test"),
-            rtl::OUString("AString")))
+            OUString("/org.openoffice.Setup/Test"),
+            OUString("AString")))
     {
-        rtl::OUString s;
+        OUString s;
         CPPUNIT_ASSERT(
             getKey(
-                rtl::OUString("/org.openoffice.Setup/Test"),
-                rtl::OUString("AString")) >>=
+                OUString("/org.openoffice.Setup/Test"),
+                OUString("AString")) >>=
             s);
         CPPUNIT_ASSERT( s == "Foo" );
     }
 }
 
 void Test::testSetSetMemberName() {
-    rtl::OUString s;
+    OUString s;
     CPPUNIT_ASSERT(
         getKey(
-            rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                     ".uno:FontworkShapeType")),
-            rtl::OUString("Label")) >>=
+            OUString("Label")) >>=
         s);
     CPPUNIT_ASSERT( s == "Fontwork Shape" );
 
     css::uno::Reference< css::container::XNameAccess > access(
         createUpdateAccess(
-            rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "/org.openoffice.UI.GenericCommands/UserInterface/"
                     "Commands"))),
         css::uno::UNO_QUERY_THROW);
     css::uno::Reference< css::container::XNamed > member;
     access->getByName(
-        rtl::OUString(".uno:FontworkGalleryFloater")) >>=
+        OUString(".uno:FontworkGalleryFloater")) >>=
         member;
     CPPUNIT_ASSERT(member.is());
     member->setName(
-        rtl::OUString(".uno:FontworkShapeType"));
+        OUString(".uno:FontworkShapeType"));
     css::uno::Reference< css::util::XChangesBatch >(
         access, css::uno::UNO_QUERY_THROW)->commitChanges();
     css::uno::Reference< css::lang::XComponent >(
@@ -442,11 +442,11 @@ void Test::testSetSetMemberName() {
 
     CPPUNIT_ASSERT(
         getKey(
-            rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "/org.openoffice.UI.GenericCommands/UserInterface/Commands/"
                     ".uno:FontworkShapeType")),
-            rtl::OUString("Label")) >>=
+            OUString("Label")) >>=
         s);
     CPPUNIT_ASSERT( s == "Fontwork Gallery" );
 }
@@ -454,12 +454,12 @@ void Test::testSetSetMemberName() {
 void Test::testReadCommands() {
     css::uno::Reference< css::container::XNameAccess > access(
         createViewAccess(
-            rtl::OUString(
+            OUString(
                 RTL_CONSTASCII_USTRINGPARAM(
                     "/org.openoffice.UI.GenericCommands/UserInterface/"
                     "Commands"))),
         css::uno::UNO_QUERY_THROW);
-    css::uno::Sequence< rtl::OUString > names(access->getElementNames());
+    css::uno::Sequence< OUString > names(access->getElementNames());
     CPPUNIT_ASSERT(names.getLength() == 695);
         // testSetSetMemberName() already removed ".uno:FontworkGalleryFloater"
     sal_uInt32 n = osl_getGlobalTimer();
@@ -469,11 +469,11 @@ void Test::testReadCommands() {
             if (access->getByName(names[j]) >>= child) {
                 CPPUNIT_ASSERT(child.is());
                 child->getByName(
-                    rtl::OUString("Label"));
+                    OUString("Label"));
                 child->getByName(
-                    rtl::OUString("ContextLabel"));
+                    OUString("ContextLabel"));
                 child->getByName(
-                    rtl::OUString("Properties"));
+                    OUString("Properties"));
             }
         }
     }
@@ -484,28 +484,28 @@ void Test::testReadCommands() {
 }
 
 void Test::testThreads() {
-    struct Entry { rtl::OUString path; rtl::OUString relative; };
+    struct Entry { OUString path; OUString relative; };
     Entry list[] = {
-        { rtl::OUString("/org.openoffice.Setup"),
-          rtl::OUString("Test/AString") },
-        { rtl::OUString("/org.openoffice.Setup"),
-          rtl::OUString("Test/AString") },
-        { rtl::OUString(
+        { OUString("/org.openoffice.Setup"),
+          OUString("Test/AString") },
+        { OUString("/org.openoffice.Setup"),
+          OUString("Test/AString") },
+        { OUString(
                   "/org.openoffice.UI.GenericCommands"),
-          rtl::OUString(
+          OUString(
                   "UserInterface/Commands/dotuno:WebHtml/Label") },
-        { rtl::OUString(
+        { OUString(
                   "/org.openoffice.UI.GenericCommands"),
-          rtl::OUString(
+          OUString(
                   "UserInterface/Commands/dotuno:NewPresentation/Label") },
-        { rtl::OUString(
+        { OUString(
                   "/org.openoffice.UI.GenericCommands"),
-          rtl::OUString(
+          OUString(
                   "UserInterface/Commands/dotuno:RecentFileList/Label") },
-        { rtl::OUString("/org.openoffice.Setup"),
-          rtl::OUString("L10N/ooLocale") },
-        { rtl::OUString("/org.openoffice.Setup"),
-          rtl::OUString("Test/ABoolean") }
+        { OUString("/org.openoffice.Setup"),
+          OUString("L10N/ooLocale") },
+        { OUString("/org.openoffice.Setup"),
+          OUString("Test/ABoolean") }
     };
     std::size_t const numReaders = sizeof list / sizeof (Entry);
     std::size_t const numWriters = numReaders - 2;
@@ -523,8 +523,8 @@ void Test::testThreads() {
     }
     for (int i = 0; i < 5; ++i) {
         for (std::size_t j = 0; j < numReaders; ++j) {
-            rtl::OUString path;
-            rtl::OUString name;
+            OUString path;
+            OUString name;
             normalize(list[j].path, list[j].relative, &path, &name);
             resetKey(path, name);
             osl::Thread::yield();
@@ -560,7 +560,7 @@ void Test::testCrossThreads() {
 }
 
 css::uno::Any Test::getKey(
-    rtl::OUString const & path, rtl::OUString const & relative) const
+    OUString const & path, OUString const & relative) const
 {
     css::uno::Reference< css::container::XHierarchicalNameAccess > access(
         createViewAccess(path), css::uno::UNO_QUERY_THROW);
@@ -571,7 +571,7 @@ css::uno::Any Test::getKey(
 }
 
 void Test::setKey(
-    rtl::OUString const & path, rtl::OUString const & name,
+    OUString const & path, OUString const & name,
     css::uno::Any const & value) const
 {
     css::uno::Reference< css::container::XNameReplace > access(
@@ -583,7 +583,7 @@ void Test::setKey(
         access, css::uno::UNO_QUERY_THROW)->dispose();
 }
 
-bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name)
+bool Test::resetKey(OUString const & path, OUString const & name)
     const
 {
     //TODO: support setPropertyToDefault
@@ -602,29 +602,29 @@ bool Test::resetKey(rtl::OUString const & path, rtl::OUString const & name)
 }
 
 css::uno::Reference< css::uno::XInterface > Test::createViewAccess(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     css::uno::Any arg(
         css::uno::makeAny(
             css::beans::NamedValue(
-                rtl::OUString("nodepath"),
+                OUString("nodepath"),
                 css::uno::makeAny(path))));
     return provider_->createInstanceWithArguments(
-        rtl::OUString(
+        OUString(
                 "com.sun.star.configuration.ConfigurationAccess"),
         css::uno::Sequence< css::uno::Any >(&arg, 1));
 }
 
 css::uno::Reference< css::uno::XInterface > Test::createUpdateAccess(
-    rtl::OUString const & path) const
+    OUString const & path) const
 {
     css::uno::Any arg(
         css::uno::makeAny(
             css::beans::NamedValue(
-                rtl::OUString("nodepath"),
+                OUString("nodepath"),
                 css::uno::makeAny(path))));
     return provider_->createInstanceWithArguments(
-        rtl::OUString(
+        OUString(
                 "com.sun.star.configuration.ConfigurationUpdateAccess"),
         css::uno::Sequence< css::uno::Any >(&arg, 1));
 }
diff --git a/configmgr/source/valueparser.cxx b/configmgr/source/valueparser.cxx
index 76d4ec088eb8..15b756c30dca 100644
--- a/configmgr/source/valueparser.cxx
+++ b/configmgr/source/valueparser.cxx
@@ -90,10 +90,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int16 * value) {
         rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
             text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
             RTL_CONSTASCII_LENGTH("0X")) == 0 ?
-        rtl::OString(
+        OString(
             text.begin + RTL_CONSTASCII_LENGTH("0X"),
             text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
-        rtl::OString(text.begin, text.length).toInt32();
+        OString(text.begin, text.length).toInt32();
         //TODO: check valid lexical representation
     if (n >= SAL_MIN_INT16 && n <= SAL_MAX_INT16) {
         *value = static_cast< sal_Int16 >(n);
@@ -109,10 +109,10 @@ bool parseValue(xmlreader::Span const & text, sal_Int32 * value) {
         rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
             text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
             RTL_CONSTASCII_LENGTH("0X")) == 0 ?
-        rtl::OString(
+        OString(
             text.begin + RTL_CONSTASCII_LENGTH("0X"),
             text.length - RTL_CONSTASCII_LENGTH("0X")).toInt32(16) :
-        rtl::OString(text.begin, text.length).toInt32();
+        OString(text.begin, text.length).toInt32();
         //TODO: check valid lexical representation
     return true;
 }
@@ -124,17 +124,17 @@ bool parseValue(xmlreader::Span const & text, sal_Int64 * value) {
         rtl_str_shortenedCompareIgnoreAsciiCase_WithLength(
             text.begin, text.length, RTL_CONSTASCII_STRINGPARAM("0X"),
             RTL_CONSTASCII_LENGTH("0X")) == 0 ?
-        rtl::OString(
+        OString(
             text.begin + RTL_CONSTASCII_LENGTH("0X"),
             text.length - RTL_CONSTASCII_LENGTH("0X")).toInt64(16) :
-        rtl::OString(text.begin, text.length).toInt64();
+        OString(text.begin, text.length).toInt64();
         //TODO: check valid lexical representation
     return true;
 }
 
 bool parseValue(xmlreader::Span const & text, double * value) {
     assert(text.is() && value != 0);
-    *value = rtl::OString(text.begin, text.length).toDouble();
+    *value = OString(text.begin, text.length).toDouble();
         //TODO: check valid lexical representation
     return true;
 }
@@ -180,7 +180,7 @@ template< typename T > css::uno::Any parseSingleValue(
 }
 
 template< typename T > css::uno::Any parseListValue(
-    rtl::OString const & separator, xmlreader::Span const & text)
+    OString const & separator, xmlreader::Span const & text)
 {
     comphelper::SequenceAsVector< T > seq;
     xmlreader::Span sep;
@@ -213,7 +213,7 @@ template< typename T > css::uno::Any parseListValue(
 }
 
 css::uno::Any parseValue(
-    rtl::OString const & separator, xmlreader::Span const & text, Type type)
+    OString const & separator, xmlreader::Span const & text, Type type)
 {
     switch (type) {
     case TYPE_ANY:
@@ -418,7 +418,7 @@ bool ValueParser::endElement() {
                 assert(false); // this cannot happen
                 break;
             }
-            separator_ = rtl::OString();
+            separator_ = OString();
             node_.clear();
         }
         break;
@@ -428,7 +428,7 @@ bool ValueParser::endElement() {
         break;
     case STATE_IT:
         items_.push_back(
-            parseValue(rtl::OString(), pad_.get(), elementType(type_)));
+            parseValue(OString(), pad_.get(), elementType(type_)));
         pad_.clear();
         state_ = STATE_TEXT;
         break;
diff --git a/configmgr/source/valueparser.hxx b/configmgr/source/valueparser.hxx
index 3697b136fd80..45db2db9712b 100644
--- a/configmgr/source/valueparser.hxx
+++ b/configmgr/source/valueparser.hxx
@@ -66,7 +66,7 @@ public:
     int getLayer() const;
 
     Type type_;
-    rtl::OString separator_;
+    OString separator_;
 
 private:
     template< typename T > com::sun::star::uno::Any convertItems();
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index 191e45dd9d9e..daae55c2d860 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -57,11 +57,11 @@ class Components;
 
 namespace {
 
-rtl::OString convertToUtf8(
+OString convertToUtf8(
     OUString const & text, sal_Int32 offset, sal_Int32 length)
 {
     assert(offset <= text.getLength() && text.getLength() - offset >= length);
-    rtl::OString s;
+    OString s;
     if (!rtl_convertUStringToString(
             &s.pData, text.pData->buffer + offset, length,
             RTL_TEXTENCODING_UTF8,
@@ -115,7 +115,7 @@ void writeData(oslFileHandle handle, char const * begin, sal_Int32 length) {
     }
 }
 
-void writeData(oslFileHandle handle, rtl::OString const & text) {
+void writeData(oslFileHandle handle, OString const & text) {
     writeData(handle, text.getStr(), text.getLength());
 }
 
@@ -177,15 +177,15 @@ void writeValueContent(oslFileHandle handle, sal_Int16 value) {
 }
 
 void writeValueContent(oslFileHandle handle, sal_Int32 value) {
-    writeData(handle, rtl::OString::valueOf(value));
+    writeData(handle, OString::valueOf(value));
 }
 
 void writeValueContent(oslFileHandle handle, sal_Int64 value) {
-    writeData(handle, rtl::OString::valueOf(value));
+    writeData(handle, OString::valueOf(value));
 }
 
 void writeValueContent(oslFileHandle handle, double value) {
-    writeData(handle, rtl::OString::valueOf(value));
+    writeData(handle, OString::valueOf(value));
 }
 
 void writeValueContent(oslFileHandle handle, OUString const & value) {
diff --git a/configmgr/source/xcsparser.cxx b/configmgr/source/xcsparser.cxx
index aee9fbaa675d..c0b4296d4dda 100644
--- a/configmgr/source/xcsparser.cxx
+++ b/configmgr/source/xcsparser.cxx
@@ -346,7 +346,7 @@ void XcsParser::characters(xmlreader::Span const & text) {
 
 void XcsParser::handleComponentSchema(xmlreader::XmlReader & reader) {
     //TODO: oor:version, xml:lang attributes
-    rtl::OStringBuffer buf;
+    OStringBuffer buf;
     buf.append('.');
     bool hasPackage = false;
     bool hasName = false;
@@ -531,7 +531,7 @@ void XcsParser::handlePropValue(
             }
         }
     }
-    valueParser_.separator_ = rtl::OString(
+    valueParser_.separator_ = OString(
         attrSeparator.begin, attrSeparator.length);
     valueParser_.start(property);
 }
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 5a659d15b980..c8a2acfd1850 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -253,7 +253,7 @@ XcuParser::Operation XcuParser::parseOperation(xmlreader::Span const & text) {
 }
 
 void XcuParser::handleComponentData(xmlreader::XmlReader & reader) {
-    rtl::OStringBuffer buf;
+    OStringBuffer buf;
     buf.append('.');
     bool hasPackage = false;
     bool hasName = false;
@@ -417,7 +417,7 @@ void XcuParser::handlePropValue(
     xmlreader::XmlReader & reader, PropertyNode * prop)
  {
     bool nil = false;
-    rtl::OString separator;
+    OString separator;
     OUString external;
     for (;;) {
         int attrNsId;
@@ -451,7 +451,7 @@ void XcuParser::handlePropValue(
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
-            separator = rtl::OString(s.begin, s.length);
+            separator = OString(s.begin, s.length);
         } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("external")))
         {
@@ -493,7 +493,7 @@ void XcuParser::handleLocpropValue(
 {
     OUString name;
     bool nil = false;
-    rtl::OString separator;
+    OString separator;
     Operation op = OPERATION_FUSE;
     for (;;) {
         int attrNsId;
@@ -531,7 +531,7 @@ void XcuParser::handleLocpropValue(
                      reader.getUrl()),
                     css::uno::Reference< css::uno::XInterface >());
             }
-            separator = rtl::OString(s.begin, s.length);
+            separator = OString(s.begin, s.length);
         } else if (attrNsId == ParseManager::NAMESPACE_OOR &&
             attrLn.equals(RTL_CONSTASCII_STRINGPARAM("op")))
         {
diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx
index a2c4e60f149f..c13b97dc7050 100644
--- a/connectivity/inc/connectivity/CommonTools.hxx
+++ b/connectivity/inc/connectivity/CommonTools.hxx
@@ -49,20 +49,20 @@ namespace connectivity
 {
     //------------------------------------------------------------------------------
     OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape);
-    inline sal_Bool match(const ::rtl::OUString &rWild, const ::rtl::OUString &rStr, const sal_Unicode cEscape)
+    inline sal_Bool match(const OUString &rWild, const OUString &rStr, const sal_Unicode cEscape)
     {
         return match(rWild.getStr(), rStr.getStr(), cEscape);
     }
     //------------------------------------------------------------------------------
-    OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate);
-    OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime);
-    OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime);
+    OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const ::com::sun::star::util::Date& rDate);
+    OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const ::com::sun::star::util::Time& rTime);
+    OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime);
 
     // typedefs
     typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray;
     typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>    OSQLTable;
 
-    DECLARE_STL_MAP(::rtl::OUString,OSQLTable,comphelper::UStringMixLess,  OSQLTables);
+    DECLARE_STL_MAP(OUString,OSQLTable,comphelper::UStringMixLess,  OSQLTables);
 
     // -------------------------------------------------------------------------
     // class ORefVector allows reference counting on a std::vector
@@ -135,7 +135,7 @@ namespace connectivity
     OOO_DLLPUBLIC_DBTOOLS
     OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
                                         OSQLColumns::Vector::const_iterator __last,
-                                        const ::rtl::OUString& _rVal,
+                                        const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase);
     // =======================================================================================
     // search from __first to __last the column with the realname _rVal
@@ -143,7 +143,7 @@ namespace connectivity
     OOO_DLLPUBLIC_DBTOOLS
     OSQLColumns::Vector::const_iterator findRealName(   OSQLColumns::Vector::const_iterator __first,
                                                 OSQLColumns::Vector::const_iterator __last,
-                                                const ::rtl::OUString& _rVal,
+                                                const OUString& _rVal,
                                                 const ::comphelper::UStringMixEqual& _rCase);
 
     // =======================================================================================
@@ -154,8 +154,8 @@ namespace connectivity
     OOO_DLLPUBLIC_DBTOOLS
     OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
                                         OSQLColumns::Vector::const_iterator __last,
-                                        const ::rtl::OUString& _rProp,
-                                        const ::rtl::OUString& _rVal,
+                                        const OUString& _rProp,
+                                        const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase);
 
     OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException );
@@ -175,33 +175,33 @@ namespace connectivity
         @param  _sClassName
             The class name to look for.
     */
-    OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName );
+    OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName );
 #endif
 }
 
 //==================================================================================
 
 #define DECLARE_SERVICE_INFO()  \
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException); \
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException) \
+    virtual OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException); \
+    virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException) \
 
 #define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname)  \
-    ::rtl::OUString SAL_CALL classname::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)   \
+    OUString SAL_CALL classname::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)   \
     {   \
-        return ::rtl::OUString::createFromAscii(implasciiname); \
+        return OUString::createFromAscii(implasciiname); \
     }   \
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)  \
+    ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)  \
     {   \
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1);   \
-        aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+        ::com::sun::star::uno::Sequence< OUString > aSupported(1);   \
+        aSupported[0] = OUString::createFromAscii(serviceasciiname); \
         return aSupported;  \
     }   \
-    sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
+    sal_Bool SAL_CALL classname::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
     {   \
-        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());             \
-        const ::rtl::OUString* pSupported = aSupported.getConstArray();                 \
-        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();              \
+        Sequence< OUString > aSupported(getSupportedServiceNames());             \
+        const OUString* pSupported = aSupported.getConstArray();                 \
+        const OUString* pEnd = pSupported + aSupported.getLength();              \
         for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)   \
             ;                                                                           \
                                                                                         \
diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx
index df89160d5c0d..84a828800a9c 100644
--- a/connectivity/inc/connectivity/ConnectionWrapper.hxx
+++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx
@@ -80,11 +80,11 @@ namespace connectivity
             @param  _rPassword
                 The password.
         */
-        static void createUniqueId( const ::rtl::OUString& _rURL
+        static void createUniqueId( const OUString& _rURL
                     ,::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo
                     ,sal_uInt8* _pBuffer
-                    ,const ::rtl::OUString& _rUserName = ::rtl::OUString()
-                    ,const ::rtl::OUString& _rPassword = ::rtl::OUString());
+                    ,const OUString& _rUserName = OUString()
+                    ,const OUString& _rPassword = OUString());
     };
 }
 #endif // _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_
diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx
index 72b22386e57a..69c28cacbb02 100644
--- a/connectivity/inc/connectivity/DriversConfig.hxx
+++ b/connectivity/inc/connectivity/DriversConfig.hxx
@@ -34,8 +34,8 @@ namespace connectivity
         ::comphelper::NamedValueCollection aProperties;
         ::comphelper::NamedValueCollection aFeatures;
         ::comphelper::NamedValueCollection aMetaData;
-        ::rtl::OUString sDriverFactory;
-        ::rtl::OUString sDriverTypeDisplayName;
+        OUString sDriverFactory;
+        OUString sDriverTypeDisplayName;
     } TInstalledDriver;
     DECLARE_STL_USTRINGACCESS_MAP( TInstalledDriver, TInstalledDrivers);
 
@@ -56,7 +56,7 @@ namespace connectivity
     {
         typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode;
 
-        const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const;
+        const ::comphelper::NamedValueCollection& impl_get(const OUString& _sURL,sal_Int32 _nProps) const;
     public:
         DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB);
         ~DriversConfig();
@@ -64,12 +64,12 @@ namespace connectivity
         DriversConfig( const DriversConfig& );
         DriversConfig& operator=( const DriversConfig& );
 
-        ::rtl::OUString getDriverFactoryName(const ::rtl::OUString& _sUrl) const;
-        ::rtl::OUString getDriverTypeDisplayName(const ::rtl::OUString& _sUrl) const;
-        const ::comphelper::NamedValueCollection& getProperties(const ::rtl::OUString& _sURL) const;
-        const ::comphelper::NamedValueCollection& getFeatures(const ::rtl::OUString& _sURL) const;
-        const ::comphelper::NamedValueCollection& getMetaData(const ::rtl::OUString& _sURL) const;
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > getURLs() const;
+        OUString getDriverFactoryName(const OUString& _sUrl) const;
+        OUString getDriverTypeDisplayName(const OUString& _sUrl) const;
+        const ::comphelper::NamedValueCollection& getProperties(const OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getFeatures(const OUString& _sURL) const;
+        const ::comphelper::NamedValueCollection& getMetaData(const OUString& _sURL) const;
+        ::com::sun::star::uno::Sequence< OUString > getURLs() const;
     private:
         OSharedConfigNode   m_aNode;
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB;
diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx
index b425fe079f3b..34e73612bfa1 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -99,7 +99,7 @@ namespace connectivity
             operator=(_rRH);
         }
 
-        ORowSetValue(const ::rtl::OUString& _rRH)
+        ORowSetValue(const OUString& _rRH)
             :m_eTypeKind(::com::sun::star::sdbc::DataType::VARCHAR)
             ,m_bNull(true)
             ,m_bBound(true)
@@ -308,7 +308,7 @@ namespace connectivity
         ORowSetValue& operator=(const ::com::sun::star::util::Time& _rRH);
         ORowSetValue& operator=(const ::com::sun::star::util::DateTime& _rRH);
 
-        ORowSetValue& operator=(const ::rtl::OUString& _rRH);
+        ORowSetValue& operator=(const OUString& _rRH);
         // the type isn't set it will be set to VARCHAR if the type is different change it
         ORowSetValue& operator=(const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH);
         // we the possiblity to save a any for bookmarks
@@ -330,9 +330,9 @@ namespace connectivity
         operator float() const      {   return isNull() ? (float)0.0: getFloat();   }
         operator double() const     {   return isNull() ? 0.0       : getDouble();  }
 
-        operator ::rtl::OUString() const
+        operator OUString() const
         {
-            return isNull() ? ::rtl::OUString() : getString();
+            return isNull() ? OUString() : getString();
         }
 
         operator ::com::sun::star::util::Date() const
@@ -403,7 +403,7 @@ namespace connectivity
         double          getDouble() const;
         float           getFloat()  const;
 
-        ::rtl::OUString getString() const;      // makes a automatic conversion if type isn't a string
+        OUString getString() const;      // makes a automatic conversion if type isn't a string
         ::com::sun::star::util::Date                getDate()       const;
         ::com::sun::star::util::Time                getTime()       const;
         ::com::sun::star::util::DateTime            getDateTime()   const;
diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx
index 794996b7ad07..0352ed8ec39f 100644
--- a/connectivity/inc/connectivity/IParseContext.hxx
+++ b/connectivity/inc/connectivity/IParseContext.hxx
@@ -81,13 +81,13 @@ namespace connectivity
 
     public:
         // retrieves language specific error messages
-        virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const = 0;
+        virtual OUString getErrorMessage(ErrorCode _eCodes) const = 0;
 
         // retrieves language specific keyword strings (only ASCII allowed)
-        virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0;
+        virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const = 0;
 
         // finds out, if we have an international keyword (only ASCII allowed)
-        virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const = 0;
+        virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const = 0;
 
         /** get's a locale instance which should be used when parsing in the context specified by this instance
             <p>if this is not overridden by derived classes, it returns the static default locale.</p>
diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx
index 7da2c0691769..a54cb809ca29 100644
--- a/connectivity/inc/connectivity/PColumn.hxx
+++ b/connectivity/inc/connectivity/PColumn.hxx
@@ -40,8 +40,8 @@ namespace connectivity
         class OOO_DLLPUBLIC_DBTOOLS OParseColumn :
             public OParseColumn_BASE, public OParseColumn_PROP
         {
-            ::rtl::OUString m_aRealName;
-            ::rtl::OUString m_sLabel;
+            OUString m_aRealName;
+            OUString m_sLabel;
             sal_Bool        m_bFunction;
             sal_Bool        m_bDbasePrecisionChanged;
             sal_Bool        m_bAggregateFunction;
@@ -54,10 +54,10 @@ namespace connectivity
             virtual ~OParseColumn();
         public:
             OParseColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,sal_Bool _bCase);
-            OParseColumn(const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _TypeName,
-                    const ::rtl::OUString& _DefaultValue,
-                    const ::rtl::OUString& _Description,
+            OParseColumn(const OUString& _Name,
+                    const OUString& _TypeName,
+                    const OUString& _DefaultValue,
+                    const OUString& _Description,
                     sal_Int32       _IsNullable,
                     sal_Int32       _Precision,
                     sal_Int32       _Scale,
@@ -65,23 +65,23 @@ namespace connectivity
                     sal_Bool        _IsAutoIncrement,
                     sal_Bool        _IsCurrency,
                     sal_Bool        _bCase,
-                    const ::rtl::OUString& _CatalogName,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _TableName);
+                    const OUString& _CatalogName,
+                    const OUString& _SchemaName,
+                    const OUString& _TableName);
 
             virtual void construct();
 
-            void setRealName(const ::rtl::OUString& _rName)  { m_aRealName  = _rName; }
-            void setLabel(const ::rtl::OUString& i_sLabel)   { m_sLabel  = i_sLabel; }
-            void setTableName(const ::rtl::OUString& _rName) { m_TableName = _rName; }
+            void setRealName(const OUString& _rName)  { m_aRealName  = _rName; }
+            void setLabel(const OUString& i_sLabel)   { m_sLabel  = i_sLabel; }
+            void setTableName(const OUString& _rName) { m_TableName = _rName; }
             void setFunction(sal_Bool _bFunction)            { m_bFunction  = _bFunction; }
             void setAggregateFunction(sal_Bool _bFunction)   { m_bAggregateFunction = _bFunction; }
             void setIsSearchable( sal_Bool _bIsSearchable )  { m_bIsSearchable = _bIsSearchable; }
             void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; }
 
-            const ::rtl::OUString& getRealName()   const { return  m_aRealName; }
-            const ::rtl::OUString& getLabel()      const { return  m_sLabel; }
-            const ::rtl::OUString& getTableName()  const { return  m_TableName; }
+            const OUString& getRealName()   const { return  m_aRealName; }
+            const OUString& getLabel()      const { return  m_sLabel; }
+            const OUString& getTableName()  const { return  m_TableName; }
             sal_Bool        getFunction()   const { return  m_bFunction; }
             sal_Bool        getDbasePrecisionChanged()  const { return  m_bDbasePrecisionChanged; }
 
@@ -129,7 +129,7 @@ namespace connectivity
         public:
             OOrderColumn(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
-                const ::rtl::OUString& i_rOriginatingTableName,
+                const OUString& i_rOriginatingTableName,
                 sal_Bool _bCase,
                 sal_Bool _bAscending
             );
@@ -142,7 +142,7 @@ namespace connectivity
 
             virtual void construct();
 
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
         private:
             using OOrderColumn_BASE::createArrayHelper;
         };
diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx
index eca8b615fa91..a7c358e3adb4 100644
--- a/connectivity/inc/connectivity/SQLStatementHelper.hxx
+++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx
@@ -32,7 +32,7 @@ namespace dbtools
     class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper
     {
     public:
-        virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,::rtl::OUStringBuffer& _rOut) = 0;
+        virtual void addComment(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,OUStringBuffer& _rOut) = 0;
 
     protected:
         ~ISQLStatementHelper() {}
diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx
index d957f225f5df..d6cf10a75d6f 100644
--- a/connectivity/inc/connectivity/StdTypeDefs.hxx
+++ b/connectivity/inc/connectivity/StdTypeDefs.hxx
@@ -29,11 +29,11 @@ namespace rtl { class OUString; }
 
 namespace connectivity
 {
-    typedef ::std::vector< ::rtl::OUString>         TStringVector;
+    typedef ::std::vector< OUString>         TStringVector;
     typedef ::std::vector< sal_Int32>               TIntVector;
     typedef ::std::map<sal_Int32,sal_Int32>         TInt2IntMap;
-    typedef ::std::map< ::rtl::OUString,sal_Int32>  TString2IntMap;
-    typedef ::std::map< sal_Int32,::rtl::OUString>  TInt2StringMap;
+    typedef ::std::map< OUString,sal_Int32>  TString2IntMap;
+    typedef ::std::map< sal_Int32,OUString>  TInt2StringMap;
 }
 
 #endif // CONNECTIVITY_STDTYPEDEFS_HXX
diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx
index 3e874f966fbf..5fe1dd0eb845 100644
--- a/connectivity/inc/connectivity/TColumnsHelper.hxx
+++ b/connectivity/inc/connectivity/TColumnsHelper.hxx
@@ -37,11 +37,11 @@ namespace connectivity
     protected:
         OTableHelper*   m_pTable;
 
-        virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+        virtual sdbcx::ObjectType createObject(const OUString& _rName);
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
-        virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
-        virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
+        virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+        virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName);
     public:
         OColumnsHelper( ::cppu::OWeakObject& _rParent
                         ,sal_Bool _bCase
diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx
index 331a9426f20e..b8502af9c5ec 100644
--- a/connectivity/inc/connectivity/TIndex.hxx
+++ b/connectivity/inc/connectivity/TIndex.hxx
@@ -35,8 +35,8 @@ namespace connectivity
     public:
         OIndexHelper(   OTableHelper* _pTable);
         OIndexHelper(   OTableHelper* _pTable,
-                const ::rtl::OUString& _Name,
-                const ::rtl::OUString& _Catalog,
+                const OUString& _Name,
+                const OUString& _Catalog,
                 sal_Bool _isUnique,
                 sal_Bool _isPrimaryKeyIndex,
                 sal_Bool _isClustered
diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx
index 2bf459dc6920..31b0ecfe3ca5 100644
--- a/connectivity/inc/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/connectivity/TIndexColumns.hxx
@@ -30,13 +30,13 @@ namespace connectivity
     {
         OIndexHelper* m_pIndex;
     protected:
-        virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+        virtual sdbcx::ObjectType createObject(const OUString& _rName);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
     public:
         OIndexColumns(  OIndexHelper* _pIndex,
                         ::osl::Mutex& _rMutex,
-                        const ::std::vector< ::rtl::OUString> &_rVector);
+                        const ::std::vector< OUString> &_rVector);
     };
 }
 #endif // CONNECTIVITY_INDEXCOLUMNSHELPER_HXX
diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx
index 4566a607d397..c558c709c8e8 100644
--- a/connectivity/inc/connectivity/TIndexes.hxx
+++ b/connectivity/inc/connectivity/TIndexes.hxx
@@ -31,15 +31,15 @@ namespace connectivity
     {
         OTableHelper*   m_pTable;
     protected:
-        virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+        virtual sdbcx::ObjectType createObject(const OUString& _rName);
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
-        virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
-        virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
+        virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+        virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName);
     public:
         OIndexesHelper(OTableHelper* _pTable,
                  ::osl::Mutex& _rMutex,
-                 const ::std::vector< ::rtl::OUString> &_rVector
+                 const ::std::vector< OUString> &_rVector
                  );
 
     };
diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx
index 5099245ef06f..9b24e41c3126 100644
--- a/connectivity/inc/connectivity/TKey.hxx
+++ b/connectivity/inc/connectivity/TKey.hxx
@@ -35,7 +35,7 @@ namespace connectivity
     public:
         OTableKeyHelper(    OTableHelper* _pTable);
         OTableKeyHelper(    OTableHelper* _pTable
-                ,const ::rtl::OUString& _Name
+                ,const OUString& _Name
                 ,const sdbcx::TKeyProperties& _rProps
             );
         inline OTableHelper* getTable() const { return m_pTable; }
diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx
index d7a2f8fff47c..6dbb041805b4 100644
--- a/connectivity/inc/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/connectivity/TKeyColumns.hxx
@@ -30,13 +30,13 @@ namespace connectivity
     {
         OTableKeyHelper* m_pKey;
     protected:
-        virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+        virtual sdbcx::ObjectType createObject(const OUString& _rName);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
     public:
         OKeyColumnsHelper(  OTableKeyHelper* _pKey,
                         ::osl::Mutex& _rMutex,
-                        const ::std::vector< ::rtl::OUString> &_rVector);
+                        const ::std::vector< OUString> &_rVector);
     };
 }
 #endif // CONNECTIVITY_TKEYCOLUMNS_HXX
diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx
index 26024e792800..817b24da3a42 100644
--- a/connectivity/inc/connectivity/TKeys.hxx
+++ b/connectivity/inc/connectivity/TKeys.hxx
@@ -32,13 +32,13 @@ namespace connectivity
     {
         OTableHelper*       m_pTable;
     protected:
-        virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+        virtual sdbcx::ObjectType createObject(const OUString& _rName);
         virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
-        virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
-        virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
+        virtual sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+        virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName);
 
-        virtual ::rtl::OUString getDropForeignKey() const;
+        virtual OUString getDropForeignKey() const;
 
     public:
         OKeysHelper(    OTableHelper* _pTable,
diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx
index 2155893601f5..aeb58cb4dd0c 100644
--- a/connectivity/inc/connectivity/TTableHelper.hxx
+++ b/connectivity/inc/connectivity/TTableHelper.hxx
@@ -35,10 +35,10 @@ namespace connectivity
     typedef sal_Int32   OrdinalPosition;
     struct ColumnDesc
     {
-        ::rtl::OUString sName;
-        ::rtl::OUString aField6;
-        ::rtl::OUString sField12; // REMARKS
-        ::rtl::OUString sField13;
+        OUString sName;
+        OUString aField6;
+        OUString sField12; // REMARKS
+        OUString sField13;
         sal_Int32       nField5
                     ,   nField7
                     ,   nField9
@@ -47,14 +47,14 @@ namespace connectivity
         OrdinalPosition nOrdinalPosition;
 
         ColumnDesc() {}
-        ColumnDesc( const ::rtl::OUString& _rName
+        ColumnDesc( const OUString& _rName
             , sal_Int32     _nField5
-            , const ::rtl::OUString& _aField6
+            , const OUString& _aField6
             , sal_Int32     _nField7
             , sal_Int32     _nField9
             , sal_Int32     _nField11
-            , const ::rtl::OUString& _sField12
-            , const ::rtl::OUString& _sField13
+            , const OUString& _sField12
+            , const OUString& _sField13
             ,OrdinalPosition _nPosition )
             :sName( _rName )
             ,aField6(_aField6)
@@ -70,7 +70,7 @@ namespace connectivity
     };
     typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
 
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
+    OOO_DLLPUBLIC_DBTOOLS OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
 
     DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap);
 
@@ -110,7 +110,7 @@ namespace connectivity
         *
         * \return The start of the rename statement.
         */
-        virtual ::rtl::OUString getRenameStart() const;
+        virtual OUString getRenameStart() const;
 
         virtual ~OTableHelper();
 
@@ -119,7 +119,7 @@ namespace connectivity
         virtual void refreshKeys();
         virtual void refreshIndexes();
 
-        const ColumnDesc* getColumnDescription(const ::rtl::OUString& _sName) const;
+        const ColumnDesc* getColumnDescription(const OUString& _sName) const;
 
     public:
         OTableHelper(   sdbcx::OCollection* _pTables,
@@ -128,11 +128,11 @@ namespace connectivity
         OTableHelper(   sdbcx::OCollection* _pTables,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
                         sal_Bool _bCase,
-                        const ::rtl::OUString& _Name,
-                        const ::rtl::OUString& _Type,
-                        const ::rtl::OUString& _Description = ::rtl::OUString(),
-                        const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
-                        const ::rtl::OUString& _CatalogName = ::rtl::OUString()
+                        const OUString& _Name,
+                        const OUString& _Type,
+                        const OUString& _Description = OUString(),
+                        const OUString& _SchemaName = OUString(),
+                        const OUString& _CatalogName = OUString()
             );
 
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const;
@@ -142,18 +142,18 @@ namespace connectivity
         virtual void SAL_CALL release() throw();
 
         // XRename
-        virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
 
         // XAlterTable
         virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
         // XNamed
-        virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
 
         // helper method to get key properties
-        sdbcx::TKeyProperties getKeyProperties(const ::rtl::OUString& _sName) const;
-        void addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties);
+        sdbcx::TKeyProperties getKeyProperties(const OUString& _sName) const;
+        void addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties);
 
-        virtual ::rtl::OUString getTypeCreatePattern() const;
+        virtual OUString getTypeCreatePattern() const;
 
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableRename>      getRenameService() const;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableAlteration>  getAlterService() const;
diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx
index 6ed56b685455..712c44abddb4 100644
--- a/connectivity/inc/connectivity/dbcharset.hxx
+++ b/connectivity/inc/connectivity/dbcharset.hxx
@@ -77,7 +77,7 @@ namespace dbtools
         /** find the given IANA name in the map.
             @return the <em>end</em> iterator if the IANA name could not be found.
         */
-        CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const;
+        CharsetIterator find(const OUString& _rIanaName, const IANA&) const;
 
         std::size_t   size() const { ensureConstructed( ); return m_aEncodings.size(); }
 
@@ -102,16 +102,16 @@ namespace dbtools
         friend class OCharsetMap::CharsetIterator;
 
         rtl_TextEncoding    m_eEncoding;
-        ::rtl::OUString     m_aIanaName;
+        OUString     m_aIanaName;
 
     public:
         CharsetIteratorDerefHelper(const CharsetIteratorDerefHelper& _rSource);
 
         rtl_TextEncoding    getEncoding() const { return m_eEncoding; }
-        ::rtl::OUString     getIanaName() const { return m_aIanaName; }
+        OUString     getIanaName() const { return m_aIanaName; }
 
     protected:
-        CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName );
+        CharsetIteratorDerefHelper( const rtl_TextEncoding _eEncoding, const OUString& _rIanaName );
 
     };
 
diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx
index 78df8d04a0ff..61fa3260c87c 100644
--- a/connectivity/inc/connectivity/dbconversion.hxx
+++ b/connectivity/inc/connectivity/dbconversion.hxx
@@ -80,7 +80,7 @@ namespace dbtools
         static void setValue(const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate>& xVariant,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
                                     const ::com::sun::star::util::Date& rNullDate,
-                                    const ::rtl::OUString& rString,
+                                    const OUString& rString,
                                     sal_Int32 nKey,
                                     sal_Int16 nFieldType,
                                     sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException);
@@ -94,13 +94,13 @@ namespace dbtools
 
         // get the columnvalue as string with a default format given by the column or a default format
         // for the type
-        static ::rtl::OUString getFormattedValue(
+        static OUString getFormattedValue(
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xColumn,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
                                         const ::com::sun::star::lang::Locale& _rLocale,
                                         const ::com::sun::star::util::Date& rNullDate);
 
-        static ::rtl::OUString getFormattedValue(
+        static OUString getFormattedValue(
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _xColumn,
                                         const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& xFormatter,
                                         const ::com::sun::star::util::Date& rNullDate,
@@ -108,11 +108,11 @@ namespace dbtools
                                         sal_Int16 nKeyType);
 
         static ::com::sun::star::util::Date     toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
-        static ::com::sun::star::util::Date     toDate(const ::rtl::OUString& _sSQLDate);
+        static ::com::sun::star::util::Date     toDate(const OUString& _sSQLDate);
         static ::com::sun::star::util::Time     toTime(double dVal);
-        static ::com::sun::star::util::Time     toTime(const ::rtl::OUString& _sSQLDate);
+        static ::com::sun::star::util::Time     toTime(const OUString& _sSQLDate);
         static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate());
-        static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate);
+        static ::com::sun::star::util::DateTime toDateTime(const OUString& _sSQLDate);
 
 
         static sal_Int32 getMsFromTime(const ::com::sun::star::util::Time& rVal);
@@ -142,13 +142,13 @@ namespace dbtools
         static ::com::sun::star::util::Date getNULLDate(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > &xSupplier);
 
         // return the date in the format %04d-%02d-%02d
-        static ::rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate);
+        static OUString toDateString(const ::com::sun::star::util::Date& rDate);
         // return the time in the format %02d:%02d:%02d
-        static ::rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime);
+        static OUString toTimeString(const ::com::sun::star::util::Time& rTime);
         // return the DateTime in the format %04d-%02d-%02d %02d:%02d:%02d
-        static ::rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime);
+        static OUString toDateTimeString(const ::com::sun::star::util::DateTime& _rDateTime);
         // return the any in an sql standard format
-        static ::rtl::OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote,
+        static OUString toSQLString(sal_Int32 eType, const ::com::sun::star::uno::Any& _rVal, sal_Bool bQuote,
             const ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter >&  _rxTypeConverter);
 
         /** converts a Unicode string into a 8-bit string, using the given encoding
@@ -168,8 +168,8 @@ namespace dbtools
                 the length of the converted string
         */
         static sal_Int32 convertUnicodeString(
-            const ::rtl::OUString& _rSource,
-            ::rtl::OString&  _rDest,
+            const OUString& _rSource,
+            OString&  _rDest,
             rtl_TextEncoding _eEncoding
         )
             SAL_THROW((::com::sun::star::sdbc::SQLException));
@@ -198,8 +198,8 @@ namespace dbtools
                 the length of the converted string
         */
         static sal_Int32 convertUnicodeStringToLength(
-            const ::rtl::OUString& _rSource,
-            ::rtl::OString&  _rDest,
+            const OUString& _rSource,
+            OString&  _rDest,
             sal_Int32 _nMaxLen,
             rtl_TextEncoding _eEncoding
        )
diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx
index 90a5e5eb7a9e..a84450b607d8 100644
--- a/connectivity/inc/connectivity/dbexception.hxx
+++ b/connectivity/inc/connectivity/dbexception.hxx
@@ -81,7 +81,7 @@ public:
     In those cases, you can use this constructor, which behaves as if you would have used
     an SQLException containing exactly the given error message.
     */
-    SQLExceptionInfo( const ::rtl::OUString& _rSimpleErrorMessage );
+    SQLExceptionInfo( const OUString& _rSimpleErrorMessage );
 
     SQLExceptionInfo(const SQLExceptionInfo& _rCopySource);
 
@@ -97,7 +97,7 @@ public:
         @param  _nErrorCode
             the ErrorCode of the to-be-constructed SQLException
     */
-    void    prepend( const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 );
+    void    prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 );
 
     /** appends a plain message to the chain of exceptions
         @param  _eType
@@ -110,7 +110,7 @@ public:
         @param  _nErrorCode
             the error code of the exception to append
     */
-    void    append( TYPE _eType, const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 );
+    void    append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState = NULL, const sal_Int32 _nErrorCode = 0 );
 
     /** throws (properly typed) the exception contained in the object
         @precond
@@ -221,7 +221,7 @@ public:
     @raises RuntimeException
         in case of an internal error
 */
-OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getStandardSQLState( StandardSQLState _eState );
+OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState );
 
 //----------------------------------------------------------------------------------
 /** returns a standard ASCII string for a given SQLState
@@ -237,7 +237,7 @@ OOO_DLLPUBLIC_DBTOOLS const sal_Char* getStandardSQLStateAscii( StandardSQLState
 
 //----------------------------------------------------------------------------------
 OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException(
-        const ::rtl::OUString& _rMsg,
+        const OUString& _rMsg,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
         const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any()
     )
@@ -275,7 +275,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException(
 /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
 */
 OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
-        const ::rtl::OUString& _rMsg,
+        const OUString& _rMsg,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource
     )
     throw (::com::sun::star::sdbc::SQLException);
@@ -284,7 +284,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
 /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException
 */
 OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException(
-        const ::rtl::OUString& _rMsg,
+        const OUString& _rMsg,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource,
         const ::com::sun::star::uno::Any& _rNextException
     )
@@ -335,7 +335,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
 /** throws an SQLException
 */
 OOO_DLLPUBLIC_DBTOOLS void throwSQLException(
-        const ::rtl::OUString& _rMessage,
+        const OUString& _rMessage,
         StandardSQLState _eSQLState,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
         const sal_Int32 _nErrorCode = 0,
diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx
index cc4cd02e5216..565854ba7ed8 100644
--- a/connectivity/inc/connectivity/dbmetadata.hxx
+++ b/connectivity/inc/connectivity/dbmetadata.hxx
@@ -95,10 +95,10 @@ namespace dbtools
         }
 
         /// wraps XDatabaseMetaData::getIdentifierQuoteString
-        const ::rtl::OUString&  getIdentifierQuoteString() const;
+        const OUString&  getIdentifierQuoteString() const;
 
         /// wraps XDatabaseMetaData::getCatalogSeparator
-        const ::rtl::OUString&  getCatalogSeparator() const;
+        const OUString&  getCatalogSeparator() const;
 
         /** determines whether the database supports sub queries in the FROM part
             of a SELECT clause are supported.
diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx
index 78734d8abe27..823efaa52db4 100644
--- a/connectivity/inc/connectivity/dbtools.hxx
+++ b/connectivity/inc/connectivity/dbtools.hxx
@@ -192,9 +192,9 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException);
     OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
-            const ::rtl::OUString& _rDataSourceName,
-            const ::rtl::OUString& _rUser,
-            const ::rtl::OUString& _rPwd,
+            const OUString& _rDataSourceName,
+            const OUString& _rUser,
+            const OUString& _rPwd,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext)
         SAL_THROW ( (::com::sun::star::sdbc::SQLException) );
 
@@ -211,7 +211,7 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields(
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
-        const ::rtl::OUString& _rName
+        const OUString& _rName
     );
 
     /** returns the primary key columns of the table
@@ -267,7 +267,7 @@ namespace dbtools
         getFieldsByCommandDescriptor(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const sal_Int32 _nCommandType,
-            const ::rtl::OUString& _rCommand,
+            const OUString& _rCommand,
             ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
             SQLExceptionInfo* _pErrorInfo = NULL
         )   SAL_THROW( ( ) );
@@ -300,11 +300,11 @@ namespace dbtools
         @return
             an array of strings containing the names of the columns (aka fields) of the object
     */
-    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< OUString >
         getFieldNamesByCommandDescriptor(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             const sal_Int32 _nCommandType,
-            const ::rtl::OUString& _rCommand,
+            const OUString& _rCommand,
             SQLExceptionInfo* _pErrorInfo = NULL
         )   SAL_THROW( ( ) );
 
@@ -312,13 +312,13 @@ namespace dbtools
     /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source,
         and <i>append</i> _rException (i.e. put it into the NextException member of the SQLContext).
     */
-    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails );
+    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails );
 
     OOO_DLLPUBLIC_DBTOOLS
     ::com::sun::star::sdbc::SQLException prependErrorInfo(
         const ::com::sun::star::sdbc::SQLException& _rChainedException,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
-        const ::rtl::OUString& _rAdditionalError,
+        const OUString& _rAdditionalError,
         const StandardSQLState _eSQLState = SQL_ERROR_UNSPECIFIED,
         const sal_Int32 _nErrorCode = 0);
 
@@ -345,7 +345,7 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS
     sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp
-                                        ,const ::rtl::OUString& _sProperty,
+                                        ,const OUString& _sProperty,
                                         sal_Bool _bDefault = sal_False);
 
     /** retrieves a particular indirect data source setting
@@ -371,21 +371,21 @@ namespace dbtools
     OOO_DLLPUBLIC_DBTOOLS
     bool    getDataSourceSetting(
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource,
-        const ::rtl::OUString& _sSettingsName,
+        const OUString& _sSettingsName,
         ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue
     );
 
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
+    OOO_DLLPUBLIC_DBTOOLS OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxFactory);
 
     /** quote the given name with the given quote string.
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName);
+    OOO_DLLPUBLIC_DBTOOLS OUString quoteName(const OUString& _rQuote, const OUString& _rName);
 
     /** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta
-                                    , const ::rtl::OUString& _rName
+    OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta
+                                    , const OUString& _rName
                                     ,EComposeRule _eComposeRule);
 
     /** split a fully qualified table name (including catalog and schema, if appliable) into it's component parts.
@@ -397,7 +397,7 @@ namespace dbtools
         @param  _eComposeRule       where do you need the name for
     */
     OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData,
-        const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule);
+        const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule);
 
     /** calculate a NumberFormatsSupplier for use with an given connection
         @param      _rxConn         the connection for which the formatter is requested
@@ -453,10 +453,10 @@ namespace dbtools
     //----------------------------------------------------------------------------------
     /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData,
-                            const ::rtl::OUString& _rCatalog,
-                            const ::rtl::OUString& _rSchema,
-                            const ::rtl::OUString& _rName,
+    OOO_DLLPUBLIC_DBTOOLS OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData,
+                            const OUString& _rCatalog,
+                            const OUString& _rSchema,
+                            const OUString& _rName,
                             sal_Bool _bQuote,
                             EComposeRule _eComposeRule);
 
@@ -466,11 +466,11 @@ namespace dbtools
         the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present
         in the data source which the connection belongs to.
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect(
+    OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                            const ::rtl::OUString& _rCatalog,
-                            const ::rtl::OUString& _rSchema,
-                            const ::rtl::OUString& _rName );
+                            const OUString& _rCatalog,
+                            const OUString& _rSchema,
+                            const OUString& _rName );
 
     /** composes a table name for usage in a SELECT statement
 
@@ -478,7 +478,7 @@ namespace dbtools
         the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present
         in the data source which the connection belongs to.
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect(
+    OOO_DLLPUBLIC_DBTOOLS OUString composeTableNameForSelect(
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable );
     //----------------------------------------------------------------------------------
@@ -488,7 +488,7 @@ namespace dbtools
         @param  _xTable
             The table.
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName(
+    OOO_DLLPUBLIC_DBTOOLS OUString composeTableName(
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData,
         const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable,
         EComposeRule _eComposeRule,
@@ -500,7 +500,7 @@ namespace dbtools
     OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn,
                                     sal_Int32 _nDataType);
     // return the datasource for the given datasource name
-    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName,
+    OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const OUString& _rsDataSourceName,
                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
 
     /** search for a name that is NOT in the NameAcces
@@ -514,15 +514,15 @@ namespace dbtools
             A name which doesn't exist in the collection.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer,
-                                     const ::rtl::OUString& _rBaseName,
+    OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer,
+                                     const OUString& _rBaseName,
                                      sal_Bool _bStartWithNumber = sal_True);
 
     /** creates a unique name which is not already used in the given name array
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createUniqueName(
-        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rNames,
-        const ::rtl::OUString& _rBaseName,
+    OOO_DLLPUBLIC_DBTOOLS OUString createUniqueName(
+        const ::com::sun::star::uno::Sequence< OUString >& _rNames,
+        const OUString& _rBaseName,
         sal_Bool _bStartWithNumber = sal_True
     );
 
@@ -532,7 +532,7 @@ namespace dbtools
 
         @see isValidSQLName
     */
-    OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials);
+    OOO_DLLPUBLIC_DBTOOLS OUString convertName2SQLName(const OUString& _rName,const OUString& _rSpecials);
 
     /** checks whether the given name is a valid SQL name
 
@@ -541,7 +541,7 @@ namespace dbtools
 
         @see convertName2SQLName
     */
-    OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials );
+    OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const OUString& _rName, const OUString& _rSpecials );
 
     OOO_DLLPUBLIC_DBTOOLS
     void showError( const SQLExceptionInfo& _rInfo,
@@ -634,10 +634,10 @@ namespace dbtools
             The scale will also be added when the value is 0.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createStandardCreateStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
+    OUString createStandardCreateStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
                                                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
                                                     ISQLStatementHelper* _pHelper,
-                                                    const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+                                                    const OUString& _sCreatePattern = OUString());
 
     /** creates the standard sql statement for the key part of a create table statement.
         @param  descriptor
@@ -646,7 +646,7 @@ namespace dbtools
             The connection.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
+    OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor,
                                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
 
     /** creates the standard sql statement for the column part of a create table statement.
@@ -660,10 +660,10 @@ namespace dbtools
             Allow to add special SQL constructs.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+    OUString createStandardColumnPart(   const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
                                                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
                                                 ,ISQLStatementHelper* _pHelper = NULL
-                                                ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+                                                ,const OUString& _sCreatePattern = OUString());
 
     /** creates a SQL CREATE TABLE statement
 
@@ -679,10 +679,10 @@ namespace dbtools
             The CREATE TABLE statement.
     */
     OOO_DLLPUBLIC_DBTOOLS
-    ::rtl::OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
+    OUString createSqlCreateTableStatement(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor
                                                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection
                                                     ,ISQLStatementHelper* _pHelper = NULL
-                                                    ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString());
+                                                    ,const OUString& _sCreatePattern = OUString());
 
     /** creates a SDBC column with the help of getColumns.
         @param  _xTable
@@ -704,7 +704,7 @@ namespace dbtools
     ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>
             createSDBCXColumn(  const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable,
                                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                const ::rtl::OUString& _rName,
+                                const OUString& _rName,
                                 sal_Bool _bCase,
                                 sal_Bool _bQueryForInfo = sal_True,
                                 sal_Bool _bIsAutoIncrement = sal_False,
@@ -722,7 +722,7 @@ namespace dbtools
             The datadefintion object.
     */
     OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection(
-            const ::rtl::OUString& _rsUrl,
+            const OUString& _rsUrl,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext);
 
@@ -738,13 +738,13 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS
     sal_Int32 getTablePrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData,
-                                 const ::rtl::OUString& _sCatalog,
-                                 const ::rtl::OUString& _sSchema,
-                                 const ::rtl::OUString& _sTable);
+                                 const OUString& _sCatalog,
+                                 const OUString& _sSchema,
+                                 const OUString& _sTable);
 
     typedef ::std::pair<sal_Bool,sal_Bool> TBoolPair;
     typedef ::std::pair< TBoolPair,sal_Int32 > ColumnInformation;
-    typedef ::std::multimap< ::rtl::OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap;
+    typedef ::std::multimap< OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap;
     /** collects the information about auto increment, currency and data type for the given column name.
         The column must be quoted, * is also valid.
         @param  _xConnection
@@ -758,8 +758,8 @@ namespace dbtools
     */
     OOO_DLLPUBLIC_DBTOOLS
     void collectColumnInformation(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
-                                    const ::rtl::OUString& _sComposedTableName,
-                                    const ::rtl::OUString& _rName,
+                                    const OUString& _sComposedTableName,
+                                    const OUString& _rName,
                                     ColumnInformationMap& _rInfo);
 
 
@@ -776,10 +776,10 @@ namespace dbtools
             the buffer to which the comparison predicate will be appended
     */
     OOO_DLLPUBLIC_DBTOOLS void getBoleanComparisonPredicate(
-            const ::rtl::OUString& _rExpression,
+            const OUString& _rExpression,
             const sal_Bool  _bValue,
             const sal_Int32 _nBooleanComparisonMode,
-            ::rtl::OUStringBuffer& _out_rSQLPredicate
+            OUStringBuffer& _out_rSQLPredicate
         );
 
 //.........................................................................
diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx
index f52d6d6727e1..c489a91e5033 100644
--- a/connectivity/inc/connectivity/filtermanager.hxx
+++ b/connectivity/inc/connectivity/filtermanager.hxx
@@ -74,7 +74,7 @@ namespace dbtools
                                             m_xORB;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                                             m_xComponentAggregate;
-        ::std::vector< ::rtl::OUString >    m_aFilterComponents;
+        ::std::vector< OUString >    m_aFilterComponents;
         sal_Bool                            m_bApplyPublicFilter;
 
     public:
@@ -89,8 +89,8 @@ namespace dbtools
         /// makes the object forgetting the references to the database component
         void    dispose( );
 
-        const ::rtl::OUString&  getFilterComponent( FilterComponent _eWhich ) const;
-        void                    setFilterComponent( FilterComponent _eWhich, const ::rtl::OUString& _rComponent );
+        const OUString&  getFilterComponent( FilterComponent _eWhich ) const;
+        void                    setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent );
 
         inline sal_Bool isApplyPublicFilter( ) const { return m_bApplyPublicFilter; }
                void     setApplyPublicFilter( sal_Bool _bApply );
@@ -98,14 +98,14 @@ namespace dbtools
     private:
         /** retrieves a filter which is a conjunction of all single filter components
         */
-        ::rtl::OUString         getComposedFilter( ) const;
+        OUString         getComposedFilter( ) const;
 
         /** appends one filter component to the statement in our composer
         */
-        void    appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const;
+        void    appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const;
 
         /// checks whether there is only one (or even no) non-empty filter component
-        bool    isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const;
+        bool    isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const;
 
         /// returns the index of the first filter component which should be considered when building the composed filter
         inline  sal_Int32   getFirstApplicableFilterIndex() const
diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
index 11d121fa56a2..fe5c4dbfff52 100644
--- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx
+++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx
@@ -94,8 +94,8 @@ namespace dbtools
         virtual const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumnUpdate >&
                             getColumnUpdate() const;
 
-        virtual bool            setFormattedValue( const ::rtl::OUString& _rFormattedStringValue ) const;
-        virtual ::rtl::OUString getFormattedValue() const;
+        virtual bool            setFormattedValue( const OUString& _rFormattedStringValue ) const;
+        virtual OUString getFormattedValue() const;
 
     private:
         ::std::auto_ptr< FormattedColumnValue_Data >    m_pData;
diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx
index 648f8df361e0..6e99b9392053 100644
--- a/connectivity/inc/connectivity/parameters.hxx
+++ b/connectivity/inc/connectivity/parameters.hxx
@@ -95,7 +95,7 @@ namespace dbtools
             }
         };
 
-        typedef ::std::map< ::rtl::OUString, ParameterMetaData >    ParameterInformation;
+        typedef ::std::map< OUString, ParameterMetaData >    ParameterInformation;
 
     private:
         ::osl::Mutex&                       m_rMutex;
@@ -122,11 +122,11 @@ namespace dbtools
 
         ParameterInformation                m_aParameterInformation;
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aMasterFields;
-        ::com::sun::star::uno::Sequence< ::rtl::OUString >  m_aDetailFields;
+        ::com::sun::star::uno::Sequence< OUString >  m_aMasterFields;
+        ::com::sun::star::uno::Sequence< OUString >  m_aDetailFields;
 
-        ::rtl::OUString                     m_sIdentifierQuoteString;
-        ::rtl::OUString                     m_sSpecialCharacters;
+        OUString                     m_sIdentifierQuoteString;
+        OUString                     m_sSpecialCharacters;
 
         ::std::vector< bool >               m_aParametersVisited;
 
@@ -220,7 +220,7 @@ namespace dbtools
 
         // XParameters equivalents
         void setNull            ( sal_Int32 _nIndex, sal_Int32 sqlType);
-        void setObjectNull      ( sal_Int32 _nIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName);
+        void setObjectNull      ( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName);
         void setBoolean         ( sal_Int32 _nIndex, sal_Bool x);
         void setByte            ( sal_Int32 _nIndex, sal_Int8 x);
         void setShort           ( sal_Int32 _nIndex, sal_Int16 x);
@@ -228,7 +228,7 @@ namespace dbtools
         void setLong            ( sal_Int32 _nIndex, sal_Int64 x);
         void setFloat           ( sal_Int32 _nIndex, float x);
         void setDouble          ( sal_Int32 _nIndex, double x);
-        void setString          ( sal_Int32 _nIndex, const ::rtl::OUString& x);
+        void setString          ( sal_Int32 _nIndex, const OUString& x);
         void setBytes           ( sal_Int32 _nIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x);
         void setDate            ( sal_Int32 _nIndex, const ::com::sun::star::util::Date& x);
         void setTime            ( sal_Int32 _nIndex, const ::com::sun::star::util::Time& x);
@@ -249,11 +249,11 @@ namespace dbtools
 
         /** creates a filter expression from a master-detail link where the detail denotes a column name
         */
-        ::rtl::OUString
+        OUString
                 createFilterConditionFromColumnLink(
-                    const ::rtl::OUString& /* [in]  */ _rMasterColumn,
-                    const ::rtl::OUString& /* [in]  */ _rDetailColumn,
-                          ::rtl::OUString& /* [out] */ _rNewParamName
+                    const OUString& /* [in]  */ _rMasterColumn,
+                    const OUString& /* [in]  */ _rDetailColumn,
+                          OUString& /* [out] */ _rNewParamName
                 );
 
         /** initializes our query composer, and the collection of inner parameter columns
@@ -315,7 +315,7 @@ namespace dbtools
         void    classifyLinks(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxParentColumns,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumns,
-                    ::std::vector< ::rtl::OUString >& _out_rAdditionalFilterComponents
+                    ::std::vector< OUString >& _out_rAdditionalFilterComponents
                 )   SAL_THROW(( ::com::sun::star::uno::Exception ));
 
         /** finalizes our <member>m_pOuterParameters</member> so that it can be used for
diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx
index f2f6354708f7..69347e9c4e6d 100644
--- a/connectivity/inc/connectivity/paramwrapper.hxx
+++ b/connectivity/inc/connectivity/paramwrapper.hxx
@@ -111,7 +111,7 @@ namespace param
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
     private:
-        ::rtl::OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const;
+        OUString impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const;
 
     private:
         ParameterWrapper(); // not implemented
diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx
index 776e357261b2..629419c9719d 100644
--- a/connectivity/inc/connectivity/predicateinput.hxx
+++ b/connectivity/inc/connectivity/predicateinput.hxx
@@ -69,9 +69,9 @@ namespace dbtools
             points to.
         */
         sal_Bool        normalizePredicateString(
-            ::rtl::OUString& _rPredicateValue,
+            OUString& _rPredicateValue,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField,
-            ::rtl::OUString* _pErrorMessage = NULL
+            OUString* _pErrorMessage = NULL
         ) const;
 
         /** get's a value of the predicate which can be used in a WHERE clause.
@@ -87,23 +87,23 @@ namespace dbtools
             points to.
         @see normalizePredicateString
         */
-        ::rtl::OUString getPredicateValue(
-            const ::rtl::OUString& _rPredicateValue,
+        OUString getPredicateValue(
+            const OUString& _rPredicateValue,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField,
             sal_Bool _bForStatementUse,
-            ::rtl::OUString* _pErrorMessage = NULL
+            OUString* _pErrorMessage = NULL
         ) const;
 
-        ::rtl::OUString getPredicateValue(
-            const ::rtl::OUString& _sField
-            , const ::rtl::OUString& _rPredicateValue
+        OUString getPredicateValue(
+            const OUString& _sField
+            , const OUString& _rPredicateValue
             , sal_Bool _bForStatementUse
-            , ::rtl::OUString* _pErrorMessage = NULL) const;
+            , OUString* _pErrorMessage = NULL) const;
 
     private:
         ::connectivity::OSQLParseNode* implPredicateTree(
-            ::rtl::OUString& _rErrorMessage,
-            const ::rtl::OUString& _rStatement,
+            OUString& _rErrorMessage,
+            const OUString& _rStatement,
             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField
         ) const;
 
@@ -113,7 +113,7 @@ namespace dbtools
             sal_Unicode& _rThdSep
         ) const;
 
-        ::rtl::OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const;
+        OUString implParseNode(::connectivity::OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const;
     };
 
 //.........................................................................
diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
index 7004554cc08a..14840400b385 100644
--- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx
@@ -77,7 +77,7 @@ namespace connectivity
                 @param  _xRow
                     The current row from the resultset given to fillNames.
             */
-            virtual ::rtl::OUString buildName(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow);
+            virtual OUString buildName(  const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow);
 
             /** fills a vector with the necessary names which can be used in combination with the collections.
                 For each row buildName will be called.
diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
index 77424f74a3d1..e30075f009e9 100644
--- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx
@@ -66,23 +66,23 @@ namespace connectivity
         public:
             virtual ~IObjectCollection();
             virtual void reserve(size_t nLength) = 0;
-            virtual bool exists(const ::rtl::OUString& _sName ) = 0;
+            virtual bool exists(const OUString& _sName ) = 0;
             virtual bool empty() = 0;
             virtual void swapAll() = 0;
             virtual void swap() = 0;
             virtual void clear() = 0;
             virtual void reFill(const TStringVector &_rVector) = 0;
-            virtual void insert(const ::rtl::OUString& _sName,const ObjectType& _xObject) = 0;
-            virtual bool rename(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName) = 0;
+            virtual void insert(const OUString& _sName,const ObjectType& _xObject) = 0;
+            virtual bool rename(const OUString _sOldName,const OUString _sNewName) = 0;
             virtual sal_Int32 size() = 0;
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getElementNames() = 0;
-            virtual ::rtl::OUString getName(sal_Int32 _nIndex) = 0;
+            virtual ::com::sun::star::uno::Sequence< OUString > getElementNames() = 0;
+            virtual OUString getName(sal_Int32 _nIndex) = 0;
             virtual void disposeAndErase(sal_Int32 _nIndex) = 0;
             virtual void disposeElements() = 0;
-            virtual sal_Int32 findColumn( const ::rtl::OUString& columnName ) = 0;
-            virtual ::rtl::OUString findColumnAtIndex(  sal_Int32 _nIndex) = 0;
+            virtual sal_Int32 findColumn( const OUString& columnName ) = 0;
+            virtual OUString findColumnAtIndex(  sal_Int32 _nIndex) = 0;
             virtual ObjectType getObject(sal_Int32 _nIndex) = 0;
-            virtual ObjectType getObject(const ::rtl::OUString& columnName) = 0;
+            virtual ObjectType getObject(const OUString& columnName) = 0;
             virtual void setObject(sal_Int32 _nIndex,const ObjectType& _xObject) = 0;
             virtual sal_Bool isCaseSensitive() const = 0;
         };
@@ -107,7 +107,7 @@ namespace connectivity
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0;
 
             // will be called when a object was requested by one of the accessing methods like getByIndex
-            virtual ObjectType createObject(const ::rtl::OUString& _rName) = 0;
+            virtual ObjectType createObject(const OUString& _rName) = 0;
 
             // will be called when a new object should be generated by a call of createDataDescriptor
             // the returned object is empty will be filled outside and added to the collection
@@ -124,16 +124,16 @@ namespace connectivity
                     the new object which is to be inserted into the collection. This might be the result
                     of a call of <code>createObject( _rForName )</code>, or a clone of the descriptor.
             */
-            virtual ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
+            virtual ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
 
             // called when XDrop was called
-            virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
+            virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName);
 
             /** returns the name for the object. The default implementation ask for the property NAME. If this doesn't satisfy, it has to be overloaded.
                 @param  _xObject    The object where the name should be extracted.
                 @return The name of the object.
             */
-            virtual ::rtl::OUString getNameForObject(const ObjectType& _xObject);
+            virtual OUString getNameForObject(const ObjectType& _xObject);
 
             /** clones the given descriptor
 
@@ -160,11 +160,11 @@ namespace connectivity
 
             /**  insert a new element into the collection
             */
-            void insertElement(const ::rtl::OUString& _sElementName,const ObjectType& _xElement);
+            void insertElement(const OUString& _sElementName,const ObjectType& _xElement);
 
             /** return the name of element at index _nIndex
             */
-            inline ::rtl::OUString getElementName(sal_Int32 _nIndex)
+            inline OUString getElementName(sal_Int32 _nIndex)
             {
                 return m_pElements->findColumnAtIndex(_nIndex);
             }
@@ -183,7 +183,7 @@ namespace connectivity
 
             void reFill(const TStringVector &_rVector);
             inline sal_Bool isCaseSensitive() const { return m_pElements->isCaseSensitive(); }
-            void renameObject(const ::rtl::OUString _sOldName,const ::rtl::OUString _sNewName);
+            void renameObject(const OUString _sOldName,const OUString _sNewName);
 
             // only the name is identical to ::cppu::OComponentHelper
             virtual void SAL_CALL disposing(void);
@@ -203,9 +203,9 @@ namespace connectivity
             virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
                 // ::com::sun::star::container::XNameAccess
-            virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
             // XEnumerationAccess
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL createEnumeration(  ) throw(::com::sun::star::uno::RuntimeException);
                         // ::com::sun::star::util::XRefreshable
@@ -217,15 +217,15 @@ namespace connectivity
             // XAppend
             virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
             // XDrop
-            virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // ::com::sun::star::container::XContainer
             virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
         private:
-            void notifyElementRemoved(const ::rtl::OUString& _sName);
+            void notifyElementRemoved(const OUString& _sName);
             void disposeElements();
             void dropImpl(sal_Int32 _nIndex,sal_Bool _bReallyDrop = sal_True);
         };
diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
index ca7a0bcc0b1c..42cddc51c041 100644
--- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx
@@ -50,9 +50,9 @@ namespace connectivity
                                     public ODescriptor
         {
         protected:
-            ::rtl::OUString m_TypeName;
-            ::rtl::OUString m_Description;
-            ::rtl::OUString m_DefaultValue;
+            OUString m_TypeName;
+            OUString m_Description;
+            OUString m_DefaultValue;
 
             sal_Int32       m_IsNullable;
             sal_Int32       m_Precision;
@@ -63,9 +63,9 @@ namespace connectivity
             sal_Bool        m_IsRowVersion;
             sal_Bool        m_IsCurrency;
 
-            ::rtl::OUString m_CatalogName;
-            ::rtl::OUString m_SchemaName;
-            ::rtl::OUString m_TableName;
+            OUString m_CatalogName;
+            OUString m_SchemaName;
+            OUString m_TableName;
 
             using OColumnDescriptor_BASE::rBHelper;
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
@@ -77,10 +77,10 @@ namespace connectivity
             virtual void    SAL_CALL release() throw();
 
             OColumn(    sal_Bool _bCase);
-            OColumn(    const ::rtl::OUString& _Name,
-                        const ::rtl::OUString& _TypeName,
-                        const ::rtl::OUString& _DefaultValue,
-                        const ::rtl::OUString& _Description,
+            OColumn(    const OUString& _Name,
+                        const OUString& _TypeName,
+                        const OUString& _DefaultValue,
+                        const OUString& _Description,
                         sal_Int32       _IsNullable,
                         sal_Int32       _Precision,
                         sal_Int32       _Scale,
@@ -89,9 +89,9 @@ namespace connectivity
                         sal_Bool        _IsRowVersion,
                         sal_Bool        _IsCurrency,
                         sal_Bool        _bCase,
-                        const ::rtl::OUString& _CatalogName,
-                        const ::rtl::OUString& _SchemaName,
-                        const ::rtl::OUString& _TableName);
+                        const OUString& _CatalogName,
+                        const OUString& _SchemaName,
+                        const OUString& _TableName);
 
             DECLARE_SERVICE_INFO();
             //XInterface
@@ -105,8 +105,8 @@ namespace connectivity
             // XPropertySet
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
             // XDataDescriptorFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(::com::sun::star::uno::RuntimeException);
         };
diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
index 12f0e4b0cfbd..aa04b5229ac9 100644
--- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx
@@ -41,7 +41,7 @@ namespace connectivity
                     ,public ::com::sun::star::lang::XUnoTunnel
         {
         protected:
-            ::rtl::OUString         m_Name;
+            OUString         m_Name;
 
             /** helper for derived classes to implement OPropertyArrayUsageHelper::createArrayHelper
 
@@ -74,7 +74,7 @@ namespace connectivity
             virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // compare
-            inline sal_Bool operator == ( const ::rtl::OUString & _rRH )
+            inline sal_Bool operator == ( const OUString & _rRH )
             {
                 return m_aCase(m_Name,_rRH);
             }
diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
index 139c6240797d..6e4ba2355d62 100644
--- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx
@@ -65,7 +65,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
         public:
             OGroup(sal_Bool _bCase);
-            OGroup( const ::rtl::OUString& _Name,sal_Bool _bCase);
+            OGroup( const OUString& _Name,sal_Bool _bCase);
             virtual ~OGroup();
             DECLARE_SERVICE_INFO();
 
@@ -85,14 +85,14 @@ namespace connectivity
             // XUsersSupplier
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers(  ) throw(::com::sun::star::uno::RuntimeException);
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
index 6fddc6c374ba..3e50ddf9459c 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx
@@ -52,7 +52,7 @@ namespace connectivity
                                     public OIndex_BASE
         {
         protected:
-            ::rtl::OUString m_Catalog;
+            OUString m_Catalog;
             sal_Bool        m_IsUnique;
             sal_Bool        m_IsPrimaryKeyIndex;
             sal_Bool        m_IsClustered;
@@ -66,8 +66,8 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
         public:
             OIndex(sal_Bool _bCase);
-            OIndex( const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Catalog,
+            OIndex( const OUString& _Name,
+                    const OUString& _Catalog,
                     sal_Bool _isUnique,
                     sal_Bool _isPrimaryKeyIndex,
                     sal_Bool _isClustered,
@@ -93,8 +93,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
             // XDataDescriptorFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(::com::sun::star::uno::RuntimeException);
         };
diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
index bdccd128f172..a4de9e6bf5bd 100644
--- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx
@@ -40,9 +40,9 @@ namespace connectivity
         public:
             OIndexColumn(   sal_Bool _bCase);
             OIndexColumn(   sal_Bool _IsAscending,
-                            const ::rtl::OUString& _Name,
-                            const ::rtl::OUString& _TypeName,
-                            const ::rtl::OUString& _DefaultValue,
+                            const OUString& _Name,
+                            const OUString& _TypeName,
+                            const OUString& _DefaultValue,
                             sal_Int32       _IsNullable,
                             sal_Int32       _Precision,
                             sal_Int32       _Scale,
@@ -51,9 +51,9 @@ namespace connectivity
                             sal_Bool        _IsRowVersion,
                             sal_Bool        _IsCurrency,
                             sal_Bool        _bCase,
-                            const ::rtl::OUString& _CatalogName,
-                            const ::rtl::OUString& _SchemaName,
-                            const ::rtl::OUString& _TableName);
+                            const OUString& _CatalogName,
+                            const OUString& _SchemaName,
+                            const OUString& _TableName);
 
             virtual void construct();
             DECLARE_SERVICE_INFO();
diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx
index eb95420e35f0..24d85dfb2614 100644
--- a/connectivity/inc/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx
@@ -40,12 +40,12 @@ namespace connectivity
 
         struct OOO_DLLPUBLIC_DBTOOLS KeyProperties
         {
-            ::std::vector< ::rtl::OUString> m_aKeyColumnNames;
-            ::rtl::OUString m_ReferencedTable;
+            ::std::vector< OUString> m_aKeyColumnNames;
+            OUString m_ReferencedTable;
             sal_Int32       m_Type;
             sal_Int32       m_UpdateRule;
             sal_Int32       m_DeleteRule;
-            KeyProperties(const ::rtl::OUString& _ReferencedTable,
+            KeyProperties(const OUString& _ReferencedTable,
                           sal_Int32     _Type,
                           sal_Int32     _UpdateRule,
                           sal_Int32     _DeleteRule)
@@ -79,9 +79,9 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
         public:
             OKey(sal_Bool _bCase);
-            OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
-            /*OKey( const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _ReferencedTable,
+            OKey(const OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase);
+            /*OKey( const OUString& _Name,
+                    const OUString& _ReferencedTable,
                     sal_Int32       _Type,
                     sal_Int32       _UpdateRule,
                     sal_Int32       _DeleteRule,
@@ -107,8 +107,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
             // XDataDescriptorFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor(  ) throw(::com::sun::star::uno::RuntimeException);
         };
diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
index b3624bd69a3a..b22ea3247941 100644
--- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx
@@ -34,15 +34,15 @@ namespace connectivity
             public OColumn, public OKeyColumn_PROP
         {
         protected:
-            ::rtl::OUString m_ReferencedColumn;
+            OUString m_ReferencedColumn;
             virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
             virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
         public:
             OKeyColumn(sal_Bool _bCase);
-            OKeyColumn( const ::rtl::OUString& _ReferencedColumn,
-                            const ::rtl::OUString& _Name,
-                            const ::rtl::OUString& _TypeName,
-                            const ::rtl::OUString& _DefaultValue,
+            OKeyColumn( const OUString& _ReferencedColumn,
+                            const OUString& _Name,
+                            const OUString& _TypeName,
+                            const OUString& _DefaultValue,
                             sal_Int32       _IsNullable,
                             sal_Int32       _Precision,
                             sal_Int32       _Scale,
@@ -51,9 +51,9 @@ namespace connectivity
                             sal_Bool        _IsRowVersion,
                             sal_Bool        _IsCurrency,
                             sal_Bool        _bCase,
-                            const ::rtl::OUString& _CatalogName,
-                            const ::rtl::OUString& _SchemaName,
-                            const ::rtl::OUString& _TableName);
+                            const OUString& _CatalogName,
+                            const OUString& _SchemaName,
+                            const OUString& _TableName);
             // just to make it not inline
             virtual ~OKeyColumn();
 
diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx
index 47d589578e68..0be41a9cd22f 100644
--- a/connectivity/inc/connectivity/sdbcx/VTable.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx
@@ -67,10 +67,10 @@ namespace connectivity
                                  public ODescriptor
         {
         protected:
-            ::rtl::OUString m_CatalogName;
-            ::rtl::OUString m_SchemaName;
-            ::rtl::OUString m_Description;
-            ::rtl::OUString m_Type;
+            OUString m_CatalogName;
+            OUString m_SchemaName;
+            OUString m_Description;
+            OUString m_Type;
 
             OCollection*    m_pKeys;
             OCollection*    m_pColumns;
@@ -88,11 +88,11 @@ namespace connectivity
                     sal_Bool _bCase);
             OTable( OCollection*    _pTables,
                     sal_Bool _bCase,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description = ::rtl::OUString(),
-                    const ::rtl::OUString& _SchemaName  = ::rtl::OUString(),
-                    const ::rtl::OUString& _CatalogName = ::rtl::OUString());
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description = OUString(),
+                    const OUString& _SchemaName  = OUString(),
+                    const OUString& _CatalogName = OUString());
 
             virtual ~OTable();
 
@@ -118,16 +118,16 @@ namespace connectivity
             // XKeysSupplier
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getKeys(  ) throw(::com::sun::star::uno::RuntimeException);
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
             // XDataDescriptorFactory
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL createDataDescriptor( void ) throw(::com::sun::star::uno::RuntimeException);
             // XIndexesSupplier
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getIndexes(  ) throw(::com::sun::star::uno::RuntimeException);
             // XRename
-            virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
             // XAlterTable
-            virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL alterColumnByName( const OUString& colName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL alterColumnByIndex( sal_Int32 index, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
 
             // helper method
diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx
index d953d6a2b714..01bafc0d177c 100644
--- a/connectivity/inc/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx
@@ -62,7 +62,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper();
         public:
             OUser(sal_Bool _bCase);
-            OUser(const ::rtl::OUString& _Name,sal_Bool _bCase);
+            OUser(const OUString& _Name,sal_Bool _bCase);
 
             virtual ~OUser( );
 
@@ -79,18 +79,18 @@ namespace connectivity
             // XPropertySet
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
             // XUser
-            virtual void SAL_CALL changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL changePassword( const OUString& objPassword, const OUString& newPassword ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // XAuthorizable
-            virtual sal_Int32 SAL_CALL getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // XGroupsSupplier
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx
index 1772ac3acf1b..6134ddc4bb69 100644
--- a/connectivity/inc/connectivity/sdbcx/VView.hxx
+++ b/connectivity/inc/connectivity/sdbcx/VView.hxx
@@ -50,9 +50,9 @@ namespace connectivity
                         public ODescriptor
         {
         protected:
-            ::rtl::OUString m_CatalogName;
-            ::rtl::OUString m_SchemaName;
-            ::rtl::OUString m_Command;
+            OUString m_CatalogName;
+            OUString m_SchemaName;
+            OUString m_Command;
             sal_Int32       m_CheckOption;
             // need for the getName method
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >       m_xMetaData;
@@ -67,12 +67,12 @@ namespace connectivity
 
             OView(sal_Bool _bCase,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
             OView(  sal_Bool _bCase,
-                    const ::rtl::OUString& _rName,
+                    const OUString& _rName,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData,
                     sal_Int32 _nCheckOption = 0,
-                    const ::rtl::OUString& _rCommand = ::rtl::OUString(),
-                    const ::rtl::OUString& _rSchemaName = ::rtl::OUString(),
-                    const ::rtl::OUString& _rCatalogName = ::rtl::OUString());
+                    const OUString& _rCommand = OUString(),
+                    const OUString& _rSchemaName = OUString(),
+                    const OUString& _rCatalogName = OUString());
             virtual ~OView();
 
             // ODescriptor
@@ -90,8 +90,8 @@ namespace connectivity
             // XPropertySet
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
             // XNamed
-            virtual ::rtl::OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setName( const ::rtl::OUString& ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setName( const OUString& ) throw(::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx
index fae9b2a05870..ccad18a88d0f 100644
--- a/connectivity/inc/connectivity/sqlerror.hxx
+++ b/connectivity/inc/connectivity/sqlerror.hxx
@@ -67,13 +67,13 @@ namespace connectivity
         // --------------------------------------------------------------------
         /** convenience wrapper around boost::optional, allowing implicit construction
         */
-        class ParamValue : public ::boost::optional< ::rtl::OUString >
+        class ParamValue : public ::boost::optional< OUString >
         {
-            typedef ::boost::optional< ::rtl::OUString >  base_type;
+            typedef ::boost::optional< OUString >  base_type;
 
         public:
             ParamValue( ) : base_type( ) { }
-            ParamValue( ::rtl::OUString const& val ) : base_type( val ) { }
+            ParamValue( OUString const& val ) : base_type( val ) { }
             ParamValue( ParamValue const& rhs ) : base_type( (base_type const&)rhs ) { }
 
             bool    is() const { return !base_type::operator!(); }
@@ -118,7 +118,7 @@ namespace connectivity
 
             @see ::com::sun::star::sdb::ErrorCondition
         */
-        ::rtl::OUString getErrorMessage(
+        OUString getErrorMessage(
                             const ErrorCondition _eCondition,
                             const ParamValue& _rParamValue1 = ParamValue(),
                             const ParamValue& _rParamValue2 = ParamValue(),
@@ -143,7 +143,7 @@ namespace connectivity
             prefix before presenting the message to the user, or use it to determine
             whether a concrete error has been raised by a OpenOffice.org core component.
         */
-        static const ::rtl::OUString&
+        static const OUString&
                         getMessagePrefix();
 
 
diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx
index 261607030685..ee967dd7d7a3 100644
--- a/connectivity/inc/connectivity/sqliterator.hxx
+++ b/connectivity/inc/connectivity/sqliterator.hxx
@@ -69,21 +69,21 @@ namespace connectivity
 
         ::std::auto_ptr< OSQLParseTreeIteratorImpl >    m_pImpl;
 
-        void                traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName, ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias);
+        void                traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const OUString& _aColumnName, OUString& _aTableRange, const OUString& _rColumnAlias);
         // inserts a table into the map
-        void                traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange );
+        void                traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const OUString & rTableRange );
         void                traverseSearchCondition(OSQLParseNode * pSearchCondition);
         void                traverseOnePredicate(
                                                 OSQLParseNode * pColumnRef,
-                                                ::rtl::OUString& aValue,
+                                                OUString& aValue,
                                                 OSQLParseNode * pParameter);
         void traverseByColumnNames(const OSQLParseNode* pSelectNode,sal_Bool _bOrder);
         void                traverseParameters(const OSQLParseNode* pSelectNode);
 
-        const OSQLParseNode*    getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, ::rtl::OUString& aTableRange );
-        void                    getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange );
+        const OSQLParseNode*    getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, OUString& aTableRange );
+        void                    getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, OUString& aTableRange );
         void                    getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect);
-        ::rtl::OUString         getUniqueColumnName(const ::rtl::OUString & rColumnName)    const;
+        OUString         getUniqueColumnName(const OUString & rColumnName)    const;
 
         /** finds the column with a given name, belonging to a given table, in a given tables collection
             @param  _rTables
@@ -96,7 +96,7 @@ namespace connectivity
                 the desired column object, or <NULL/> if no such column could be found
         */
         static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn(
-            const OSQLTables& _rTables, const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange );
+            const OSQLTables& _rTables, const OUString & rColumnName, OUString & rTableRange );
 
         /** finds a column with a given name, belonging to a given table
             @param  rColumnName
@@ -109,11 +109,11 @@ namespace connectivity
             @return
         */
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > findColumn(
-            const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, bool _bLookInSubTables );
+            const OUString & rColumnName, OUString & rTableRange, bool _bLookInSubTables );
 
       protected:
-        void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
-        void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable);
+        void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const OUString & rColumnName,const OUString & rColumnAlias, const OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False);
+        void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const OUString& _rTableAlias,const OSQLTable& _rTable);
         // Other member variables that should be available in the "set" functions
         // can be defined in the derived class. They can be initialized
         // in its constructor and, after the "traverse" routines have been used,
@@ -219,8 +219,8 @@ namespace connectivity
                 The table range to be set.
         */
         void getColumnRange(    const OSQLParseNode* _pColumnRef,
-                                ::rtl::OUString &_rColumnName,
-                                ::rtl::OUString& _rTableRange) const;
+                                OUString &_rColumnName,
+                                OUString& _rTableRange) const;
 
         /** retrieves a column's name, table range, and alias
 
@@ -235,9 +235,9 @@ namespace connectivity
                 this alias is returned here.
         */
         void getColumnRange(    const OSQLParseNode* _pColumnRef,
-                                ::rtl::OUString& _out_rColumnName,
-                                ::rtl::OUString& _out_rTableRange,
-                                ::rtl::OUString& _out_rColumnAliasIfPresent
+                                OUString& _out_rColumnName,
+                                OUString& _out_rTableRange,
+                                OUString& _out_rColumnAliasIfPresent
                                 ) const;
 
         /** return the alias name of a column
@@ -246,7 +246,7 @@ namespace connectivity
             @return
                 The alias name of the column or an empty string.
         */
-        static ::rtl::OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
+        static OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn);
 
         /** return the columname and the table range
             @param  _pColumnRef
@@ -260,11 +260,11 @@ namespace connectivity
         */
         static void getColumnRange( const OSQLParseNode* _pColumnRef,
                                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                                    ::rtl::OUString &_rColumnName,
-                                    ::rtl::OUString& _rTableRange);
+                                    OUString &_rColumnName,
+                                    OUString& _rTableRange);
 
         // empty if ambiguous
-        sal_Bool getColumnTableRange(const OSQLParseNode* pNode, ::rtl::OUString &rTableRange) const;
+        sal_Bool getColumnTableRange(const OSQLParseNode* pNode, OUString &rTableRange) const;
 
         // return true when the tableNode is a rule like catalog_name, schema_name or table_name
         sal_Bool isTableNode(const OSQLParseNode* _pTableNode) const;
@@ -303,12 +303,12 @@ namespace connectivity
             only used when we're iterating through a CREATE TABLE statement
         */
         OSQLTable   impl_createTableObject(
-            const ::rtl::OUString& rTableName, const ::rtl::OUString& rCatalogName, const ::rtl::OUString& rSchemaName );
+            const OUString& rTableName, const OUString& rCatalogName, const OUString& rSchemaName );
 
         /** locates a record source (a table or query) with the given name
         */
         OSQLTable   impl_locateRecordSource(
-            const ::rtl::OUString& _rComposedName
+            const OUString& _rComposedName
         );
 
         /** implementation for both traverseAll and traverseSome
@@ -319,8 +319,8 @@ namespace connectivity
         */
         void    impl_getQueryParameterColumns( const OSQLTable& _rQuery );
 
-        void setOrderByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange, sal_Bool bAscending);
-        void setGroupByColumnName(const ::rtl::OUString & rColumnName, ::rtl::OUString & rTableRange);
+        void setOrderByColumnName(const OUString & rColumnName, OUString & rTableRange, sal_Bool bAscending);
+        void setGroupByColumnName(const OUString & rColumnName, OUString & rTableRange);
 
     private:
         /** appends an SQLException corresponding to the given error code to our error collection
@@ -335,7 +335,7 @@ namespace connectivity
                 in the error message will be replaced with _rReplaceToken2
         */
         void impl_appendError( IParseContext::ErrorCode _eError,
-            const ::rtl::OUString* _pReplaceToken1 = NULL, const ::rtl::OUString* _pReplaceToken2 = NULL );
+            const OUString* _pReplaceToken1 = NULL, const OUString* _pReplaceToken2 = NULL );
 
         /** appends an SQLException corresponding to the given error code to our error collection
         */
diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx
index a74c8abe84e7..45a46997d194 100644
--- a/connectivity/inc/connectivity/sqlnode.hxx
+++ b/connectivity/inc/connectivity/sqlnode.hxx
@@ -74,7 +74,7 @@ namespace connectivity
                          SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL,
                          SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT};
 
-    typedef ::std::set< ::rtl::OUString >   QueryNameSet;
+    typedef ::std::set< OUString >   QueryNameSet;
     //==================================================================
     //= SQLParseNodeParameter
     //==================================================================
@@ -118,9 +118,9 @@ namespace connectivity
 
         OSQLParseNodes                  m_aChildren;
         OSQLParseNode*                  m_pParent;      // pParent for reverse linkage in the tree
-        ::rtl::OUString                 m_aNodeValue;   // token name, or empty in case of rules,
-                                                        // or ::rtl::OUString in case of
-                                                        // ::rtl::OUString, INT, etc.
+        OUString                 m_aNodeValue;   // token name, or empty in case of rules,
+                                                        // or OUString in case of
+                                                        // OUString, INT, etc.
         SQLNodeType                     m_eNodeType;    // see above
         sal_uInt32                      m_nNodeID;      // ::com::sun::star::chaos::Rule ID (if IsRule())
                                                         // or Token ID (if !IsRule())
@@ -241,11 +241,11 @@ namespace connectivity
                       SQLNodeType _eNodeType,
                       sal_uInt32 _nNodeID = 0);
 
-        OSQLParseNode(const ::rtl::OString& _rValue,
+        OSQLParseNode(const OString& _rValue,
                       SQLNodeType eNewNodeType,
                       sal_uInt32 nNewNodeID=0);
 
-        OSQLParseNode(const ::rtl::OUString& _rValue,
+        OSQLParseNode(const OUString& _rValue,
                       SQLNodeType _eNodeType,
                       sal_uInt32 _nNodeID = 0);
 
@@ -272,7 +272,7 @@ namespace connectivity
 
         OSQLParseNode* removeAt(sal_uInt32 nPos);
 
-        void replaceNodeValue(const ::rtl::OUString& rTableAlias,const ::rtl::OUString& rColumnName);
+        void replaceNodeValue(const OUString& rTableAlias,const OUString& rColumnName);
 
         /** parses the node to a string which can be passed to a driver's connection for execution
 
@@ -310,26 +310,26 @@ namespace connectivity
                 If this method returns <FALSE/>, you're encouraged to check and handle the error in
                 <arg>_pErrorHolder</arg>.
         */
-        bool parseNodeToExecutableStatement( ::rtl::OUString& _out_rString,
+        bool parseNodeToExecutableStatement( OUString& _out_rString,
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
             OSQLParser& _rParser,
             ::com::sun::star::sdbc::SQLException* _pErrorHolder ) const;
 
-        void parseNodeToStr(::rtl::OUString& rString,
+        void parseNodeToStr(OUString& rString,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                             const IParseContext* pContext = NULL,
                             sal_Bool _bIntl = sal_False,
                             sal_Bool _bQuote= sal_True) const;
 
         // quoted and internationalised
-        void parseNodeToPredicateStr(::rtl::OUString& rString,
+        void parseNodeToPredicateStr(OUString& rString,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                                      const ::com::sun::star::lang::Locale& rIntl,
                                      sal_Char _cDec,
                                      const IParseContext* pContext = NULL ) const;
 
-        void parseNodeToPredicateStr(::rtl::OUString& rString,
+        void parseNodeToPredicateStr(OUString& rString,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField,
@@ -341,8 +341,8 @@ namespace connectivity
 
 #if OSL_DEBUG_LEVEL > 1
         // shows the ParseTree with tabs and linefeeds
-        void showParseTree( ::rtl::OUString& rString ) const;
-        void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const;
+        void showParseTree( OUString& rString ) const;
+        void showParseTree( OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const;
 #endif
 
         SQLNodeType getNodeType() const {return m_eNodeType;};
@@ -367,9 +367,9 @@ namespace connectivity
             // IsToken tests whether a Node is a Token (Terminal but not a rule)
         sal_Bool isToken() const {return !isRule();}
 
-        const ::rtl::OUString& getTokenValue() const {return m_aNodeValue;}
+        const OUString& getTokenValue() const {return m_aNodeValue;}
 
-        void setTokenValue(const ::rtl::OUString& rString) {    if (isToken()) m_aNodeValue = rString;}
+        void setTokenValue(const OUString& rString) {    if (isToken()) m_aNodeValue = rString;}
 
         sal_Bool isLeaf() const {return m_aChildren.empty();}
 
@@ -396,8 +396,8 @@ namespace connectivity
         // _pTableNode must be a rule of that above or a SQL_TOKEN_NAME
         static sal_Bool getTableComponents(const OSQLParseNode* _pTableNode,
                                             ::com::sun::star::uno::Any &_rCatalog,
-                                            ::rtl::OUString &_rSchema,
-                                            ::rtl::OUString &_rTable
+                                            OUString &_rSchema,
+                                            OUString &_rTable
                                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData);
 
         // substitute all occurrences of :var or [name] into the dynamic parameter ?
@@ -406,11 +406,11 @@ namespace connectivity
 
         /** return a table range when it exists.
         */
-        static ::rtl::OUString getTableRange(const OSQLParseNode* _pTableRef);
+        static OUString getTableRange(const OSQLParseNode* _pTableRef);
 
     protected:
         // ParseNodeToStr concatenates all Tokens (leaves) of the ParseNodes.
-        void parseNodeToStr(::rtl::OUString& rString,
+        void parseNodeToStr(OUString& rString,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                             const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xField,
@@ -423,22 +423,22 @@ namespace connectivity
                             bool _bSubstitute) const;
 
     private:
-        void impl_parseNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
-        void impl_parseLikeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
-        void impl_parseTableRangeNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
+        void impl_parseNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
+        void impl_parseLikeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
+        void impl_parseTableRangeNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
 
         /** parses a table_name node into a SQL statement particle.
             @return
                 <TRUE/> if and only if parsing was successful, <FALSE/> if default handling should
                 be applied.
         */
-        bool impl_parseTableNameNodeToString_throw( ::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
+        bool impl_parseTableNameNodeToString_throw( OUStringBuffer& rString, const SQLParseNodeParameter& rParam ) const;
 
-        sal_Bool addDateValue(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
-        ::rtl::OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const;
-        ::rtl::OUString convertDateString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const;
-        ::rtl::OUString convertTimeString(const SQLParseNodeParameter& rParam, const ::rtl::OUString& rString) const;
-        void parseLeaf(::rtl::OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
+        sal_Bool addDateValue(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
+        OUString convertDateTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
+        OUString convertDateString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
+        OUString convertTimeString(const SQLParseNodeParameter& rParam, const OUString& rString) const;
+        void parseLeaf(OUStringBuffer& rString, const SQLParseNodeParameter& rParam) const;
     };
 
     //-----------------------------------------------------------------------------
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index 173c669c3f0b..892d3ecb8db5 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -76,13 +76,13 @@ namespace connectivity
 
         virtual ~OParseContext();
         // retrieves language specific error messages
-        virtual ::rtl::OUString getErrorMessage(ErrorCode _eCodes) const;
+        virtual OUString getErrorMessage(ErrorCode _eCodes) const;
 
         // retrieves language specific keyword strings (only ASCII allowed)
-        virtual ::rtl::OString getIntlKeywordAscii(InternationalKeyCode _eKey) const;
+        virtual OString getIntlKeywordAscii(InternationalKeyCode _eKey) const;
 
         // finds out, if we have an international keyword (only ASCII allowed)
-        virtual InternationalKeyCode getIntlKeyCode(const ::rtl::OString& rToken) const;
+        virtual InternationalKeyCode getIntlKeyCode(const OString& rToken) const;
 
         // determines the default international setting
         static const ::com::sun::star::lang::Locale& getDefaultLocale();
@@ -151,8 +151,8 @@ namespace connectivity
         OSQLParseNode*              m_pParseTree;   // result from parsing
         ::std::auto_ptr< OSQLParser_Data >
                                     m_pData;
-        ::rtl::OUString                     m_sFieldName;   // current field name for a predicate
-        ::rtl::OUString                     m_sErrorMessage;// current error msg
+        OUString                     m_sFieldName;   // current field name for a predicate
+        OUString                     m_sErrorMessage;// current error msg
 
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
                                     m_xField;       // current field
@@ -166,7 +166,7 @@ namespace connectivity
         ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData>      xDummy; // can be deleted after 627
 
         // convert a string into double trim it to scale of _nscale and than transform it back to string
-        ::rtl::OUString stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale);
+        OUString stringToDouble(const OUString& _rValue,sal_Int16 _nScale);
         OSQLParseNode*  buildDate(sal_Int32 _nType,OSQLParseNode*& pLiteral);
         bool            extractDate(OSQLParseNode* pLiteral,double& _rfValue);
         void            killThousandSeparator(OSQLParseNode* pLiteral);
@@ -184,12 +184,12 @@ namespace connectivity
         ~OSQLParser();
 
         // Parsing an SQLStatement
-        OSQLParseNode* parseTree(::rtl::OUString& rErrorMessage,
-                       const ::rtl::OUString& rStatement,
+        OSQLParseNode* parseTree(OUString& rErrorMessage,
+                       const OUString& rStatement,
                        sal_Bool bInternational = sal_False);
 
         // Check a Predicate
-        OSQLParseNode* predicateTree(::rtl::OUString& rErrorMessage, const ::rtl::OUString& rStatement,
+        OSQLParseNode* predicateTree(OUString& rErrorMessage, const OUString& rStatement,
                        const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter,
                        const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xField);
 
@@ -200,24 +200,24 @@ namespace connectivity
         const SQLError& getErrorHelper() const;
 
         // TokenIDToStr: token name belonging to a token number.
-        static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL);
+        static OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL);
 
 #if OSL_DEBUG_LEVEL > 1
         // (empty string if not found)
-        static ::rtl::OUString RuleIDToStr(sal_uInt32 nRuleID);
+        static OUString RuleIDToStr(sal_uInt32 nRuleID);
 #endif
 
-        // StrToRuleID calculates the RuleID for a ::rtl::OUString (that is, ::com::sun::star::sdbcx::Index in yytname)
+        // StrToRuleID calculates the RuleID for a OUString (that is, ::com::sun::star::sdbcx::Index in yytname)
         // (0 if not found). The search for an ID based on a String is
-        // extremely inefficient (sequential search for ::rtl::OUString)!
-        static sal_uInt32 StrToRuleID(const ::rtl::OString & rValue);
+        // extremely inefficient (sequential search for OUString)!
+        static sal_uInt32 StrToRuleID(const OString & rValue);
 
         static OSQLParseNode::Rule RuleIDToRule( sal_uInt32 _nRule );
 
         // RuleId with enum, far more efficient
         static sal_uInt32 RuleID(OSQLParseNode::Rule eRule);
         // compares the _sFunctionName with all known function names and return the DataType of the return value
-        static sal_Int32 getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext = NULL);
+        static sal_Int32 getFunctionReturnType(const OUString& _sFunctionName, const IParseContext* pContext = NULL);
 
         // returns the type for a parameter in a given function name
         static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
@@ -230,7 +230,7 @@ namespace connectivity
         // Is the parse in a special mode?
         // Predicate chack is used to check a condition for a field
         sal_Bool inPredicateCheck() const {return m_xField.is();}
-        const ::rtl::OUString& getFieldName() const {return m_sFieldName;}
+        const OUString& getFieldName() const {return m_sFieldName;}
 
         void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank);
          // does not change the pLiteral argument
diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx
index f2ba862821ad..56b10ebd0d11 100644
--- a/connectivity/inc/connectivity/statementcomposer.hxx
+++ b/connectivity/inc/connectivity/statementcomposer.hxx
@@ -51,7 +51,7 @@ namespace dbtools
         */
         StatementComposer(
             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-            const ::rtl::OUString&  _rCommand,
+            const OUString&  _rCommand,
             const sal_Int32         _nCommandType,
             const sal_Bool          _bEscapeProcessing
         );
@@ -67,8 +67,8 @@ namespace dbtools
         */
         void    setDisposeComposer( bool _bDoDispose );
 
-        void    setFilter( const ::rtl::OUString& _rFilter );
-        void    setOrder( const ::rtl::OUString& _rOrder );
+        void    setFilter( const OUString& _rFilter );
+        void    setOrder( const OUString& _rOrder );
 
         /** returns the composer which has been fed with the current settings
 
@@ -86,7 +86,7 @@ namespace dbtools
             @throws ::com::sun::star::sdbc::SQLException
                 if such an exception occurs while creating the composer
         */
-        ::rtl::OUString
+        OUString
                 getQuery();
 
     private:
diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx
index 1e12e9a60fd9..352c98d7a8c4 100644
--- a/connectivity/inc/connectivity/virtualdbtools.hxx
+++ b/connectivity/inc/connectivity/virtualdbtools.hxx
@@ -117,9 +117,9 @@ namespace connectivity
         {
         public:
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback(
-                const ::rtl::OUString& _rDataSourceName,
-                const ::rtl::OUString& _rUser,
-                const ::rtl::OUString& _rPwd,
+                const OUString& _rDataSourceName,
+                const OUString& _rUser,
+                const OUString& _rPwd,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
             ) const SAL_THROW ( (::com::sun::star::sdbc::SQLException) ) = 0;
 
@@ -152,19 +152,19 @@ namespace connectivity
                 const ::com::sun::star::lang::Locale& _rLocale
             ) const = 0;
 
-            virtual ::rtl::OUString quoteName(
-                const ::rtl::OUString& _rQuote,
-                const ::rtl::OUString& _rName
+            virtual OUString quoteName(
+                const OUString& _rQuote,
+                const OUString& _rName
             ) const = 0;
 
-            virtual ::rtl::OUString composeTableNameForSelect(
+            virtual OUString composeTableNameForSelect(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
-                const ::rtl::OUString& _rCatalog,
-                const ::rtl::OUString& _rSchema,
-                const ::rtl::OUString& _rName
+                const OUString& _rCatalog,
+                const OUString& _rSchema,
+                const OUString& _rName
             ) const = 0;
 
-            virtual ::rtl::OUString composeTableNameForSelect(
+            virtual OUString composeTableNameForSelect(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable
             ) const = 0;
@@ -172,12 +172,12 @@ namespace connectivity
             virtual ::com::sun::star::sdb::SQLContext prependContextInfo(
                 ::com::sun::star::sdbc::SQLException& _rException,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext,
-                const ::rtl::OUString& _rContextDescription,
-                const ::rtl::OUString& _rContextDetails
+                const OUString& _rContextDescription,
+                const OUString& _rContextDetails
             ) const = 0;
 
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > getDataSource(
-                const ::rtl::OUString& _rsRegisteredName,
+                const OUString& _rsRegisteredName,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& _rxContext
             ) const = 0;
 
@@ -185,16 +185,16 @@ namespace connectivity
                 getFieldsByCommandDescriptor(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                     const sal_Int32 _nCommandType,
-                    const ::rtl::OUString& _rCommand,
+                    const OUString& _rCommand,
                     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive,
                     ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
                 )   SAL_THROW( ( ) ) = 0;
 
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+            virtual ::com::sun::star::uno::Sequence< OUString >
                 getFieldNamesByCommandDescriptor(
                     const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                     const sal_Int32 _nCommandType,
-                    const ::rtl::OUString& _rCommand,
+                    const OUString& _rCommand,
                     ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL
                 )   SAL_THROW( ( ) ) = 0;
 
@@ -259,14 +259,14 @@ namespace connectivity
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant,
                 const ::com::sun::star::util::Date& rNullDate ) const = 0;
 
-            virtual ::rtl::OUString getFormattedValue(
+            virtual OUString getFormattedValue(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
                 const ::com::sun::star::util::Date& _rNullDate,
                 sal_Int32 _nKey,
                 sal_Int16 _nKeyType) const = 0;
 
-            virtual ::rtl::OUString getFormattedValue(
+            virtual OUString getFormattedValue(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter,
                 const ::com::sun::star::lang::Locale& _rLocale,
@@ -285,12 +285,12 @@ namespace connectivity
         class OOO_DLLPUBLIC_DBTOOLS ISQLParseNode : public ::rtl::IReference
         {
         public:
-            virtual void parseNodeToStr(::rtl::OUString& _rString,
+            virtual void parseNodeToStr(OUString& _rString,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                 const IParseContext* _pContext
             ) const = 0;
 
-            virtual void parseNodeToPredicateStr(::rtl::OUString& _rString,
+            virtual void parseNodeToPredicateStr(OUString& _rString,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField,
@@ -312,8 +312,8 @@ namespace connectivity
         {
         public:
             virtual ::rtl::Reference< ISQLParseNode > predicateTree(
-                ::rtl::OUString& rErrorMessage,
-                const ::rtl::OUString& rStatement,
+                OUString& rErrorMessage,
+                const OUString& rStatement,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField
             ) const = 0;
diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx
index 63ebc4106a7e..5a013f9a5145 100644
--- a/connectivity/inc/connectivity/warningscontainer.hxx
+++ b/connectivity/inc/connectivity/warningscontainer.hxx
@@ -79,7 +79,7 @@ namespace dbtools
                 the context of the warning
         */
         void appendWarning(
-            const ::rtl::OUString& _rWarning,
+            const OUString& _rWarning,
             const sal_Char* _pAsciiSQLState,
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext );
 
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index ffbb348dcd60..78b5f729761e 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -21,16 +21,16 @@
 
 namespace connectivity
 {
-    ::rtl::OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const ::rtl::OUString& _sInsertStatement) const
+    OUString OAutoRetrievingBase::getTransformedGeneratedStatement(const OUString& _sInsertStatement) const
     {
         OSL_ENSURE( m_bAutoRetrievingEnabled,"Illegal call here. isAutoRetrievingEnabled is false!");
-        ::rtl::OUString sStmt = _sInsertStatement.toAsciiUpperCase();
-        ::rtl::OUString sStatement;
+        OUString sStmt = _sInsertStatement.toAsciiUpperCase();
+        OUString sStatement;
         if ( sStmt.startsWith("INSERT") )
         {
             sStatement = m_sGeneratedValueStatement;
-            static const ::rtl::OUString sColumn("$column");
-            static const ::rtl::OUString sTable("$table");
+            static const OUString sColumn("$column");
+            static const OUString sTable("$table");
             sal_Int32 nIndex = 0;
             nIndex = sStatement.indexOf(sColumn,nIndex);
             if ( -1 != nIndex )
@@ -50,7 +50,7 @@ namespace connectivity
                 while (sStmt.indexOf(' ') == 0 );
 
                 nIntoIndex = 0;
-                ::rtl::OUString sTableName = sStmt.getToken(0,' ',nIntoIndex);
+                OUString sTableName = sStmt.getToken(0,' ',nIntoIndex);
                 sStatement = sStatement.replaceAt(nIndex,sTable.getLength(),sTableName);
             }
         }
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 909e411a8d76..48357f28999f 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -111,7 +111,7 @@ namespace connectivity
         return ( *pStr == 0 ) && ( *pWild == 0 );
     }
     //------------------------------------------------------------------
-    rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate)
+    OUString toDateString(const ::com::sun::star::util::Date& rDate)
     {
         sal_Char s[11];
         snprintf(s,
@@ -121,11 +121,11 @@ namespace connectivity
                 (int)rDate.Month,
                 (int)rDate.Day);
         s[10] = 0;
-        return rtl::OUString::createFromAscii(s);
+        return OUString::createFromAscii(s);
     }
 
     //------------------------------------------------------------------
-    rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime)
+    OUString toTimeString(const ::com::sun::star::util::Time& rTime)
     {
         sal_Char s[9];
         snprintf(s,
@@ -135,11 +135,11 @@ namespace connectivity
                 (int)rTime.Minutes,
                 (int)rTime.Seconds);
         s[8] = 0;
-        return rtl::OUString::createFromAscii(s);
+        return OUString::createFromAscii(s);
     }
 
     //------------------------------------------------------------------
-    rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime)
+    OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime)
     {
         sal_Char s[20];
         snprintf(s,
@@ -152,7 +152,7 @@ namespace connectivity
                 (int)rDateTime.Minutes,
                 (int)rDateTime.Seconds);
         s[19] = 0;
-        return rtl::OUString::createFromAscii(s);
+        return OUString::createFromAscii(s);
     }
 
 #ifdef SOLAR_JAVA
@@ -198,7 +198,7 @@ namespace connectivity
         return aRet;
     }
     //------------------------------------------------------------------------------
-    sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName )
+    sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const OUString& _sClassName )
     {
         sal_Bool bRet = sal_False;
         if ( _pJVM.is() )
@@ -207,7 +207,7 @@ namespace connectivity
             JNIEnv* pEnv = aGuard.getEnvironment();
             if( pEnv )
             {
-                ::rtl::OString sClassName = ::rtl::OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US);
+                OString sClassName = OUStringToOString(_sClassName, RTL_TEXTENCODING_ASCII_US);
                 sClassName = sClassName.replace('.','/');
                 jobject out = pEnv->FindClass(sClassName.getStr());
                 bRet = out != NULL;
@@ -223,7 +223,7 @@ namespace connectivity
 namespace dbtools
 {
 //------------------------------------------------------------------
-sal_Bool isCharOk(sal_Unicode c,const ::rtl::OUString& _rSpecials)
+sal_Bool isCharOk(sal_Unicode c,const OUString& _rSpecials)
 {
 
     return ( ((c >= 97) && (c <= 122)) || ((c >= 65) && (c <=  90)) || ((c >= 48) && (c <=  57)) ||
@@ -231,7 +231,7 @@ sal_Bool isCharOk(sal_Unicode c,const ::rtl::OUString& _rSpecials)
 }
 
 //------------------------------------------------------------------------------
-sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSpecials)
+sal_Bool isValidSQLName(const OUString& rName,const OUString& _rSpecials)
 {
     // Test for correct naming (in SQL sense)
     // This is important for table names for example
@@ -260,11 +260,11 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp
 }
 //------------------------------------------------------------------
 // Creates a new name if necessary
-::rtl::OUString convertName2SQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSpecials)
+OUString convertName2SQLName(const OUString& rName,const OUString& _rSpecials)
 {
     if(isValidSQLName(rName,_rSpecials))
         return rName;
-    ::rtl::OUString aNewName(rName);
+    OUString aNewName(rName);
     const sal_Unicode* pStr = rName.getStr();
     sal_Int32 nLength = rName.getLength();
     sal_Bool bValid(*pStr < 128 && !isdigit(*pStr));
@@ -276,14 +276,14 @@ sal_Bool isValidSQLName(const ::rtl::OUString& rName,const ::rtl::OUString& _rSp
         }
 
     if ( !bValid )
-        aNewName = ::rtl::OUString();
+        aNewName = OUString();
 
     return aNewName;
 }
 //------------------------------------------------------------------------------
-::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName)
+OUString quoteName(const OUString& _rQuote, const OUString& _rName)
 {
-    ::rtl::OUString sName = _rName;
+    OUString sName = _rName;
     if( !_rQuote.isEmpty() && _rQuote.toChar() != ' ')
         sName = _rQuote + _rName + _rQuote;
     return sName;
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index a8408fe83cb6..8506fef0b7dd 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -104,21 +104,21 @@ OConnectionWrapper::~OConnectionWrapper()
 
 // XServiceInfo
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnectionWrapper::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OConnectionWrapper::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
+    return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" );
 }
 
 // --------------------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     // first collect the services which are supported by our aggregate
-    Sequence< ::rtl::OUString > aSupported;
+    Sequence< OUString > aSupported;
     if ( m_xServiceInfo.is() )
         aSupported = m_xServiceInfo->getSupportedServiceNames();
 
     // append our own service, if necessary
-    ::rtl::OUString sConnectionService( "com.sun.star.sdbc.Connection" );
+    OUString sConnectionService( "com.sun.star.sdbc.Connection" );
     if ( 0 == ::comphelper::findValue( aSupported, sConnectionService, sal_True ).getLength() )
     {
         sal_Int32 nLen = aSupported.getLength();
@@ -131,7 +131,7 @@ OConnectionWrapper::~OConnectionWrapper()
 }
 
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OConnectionWrapper::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
     return ::comphelper::findValue( getSupportedServiceNames(), _rServiceName, sal_True ).getLength() != 0;
 }
@@ -195,11 +195,11 @@ namespace
 
 // -----------------------------------------------------------------------------
 // creates a unique id out of the url and sequence of properties
-void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL
+void OConnectionWrapper::createUniqueId( const OUString& _rURL
                     ,Sequence< PropertyValue >& _rInfo
                     ,sal_uInt8* _pBuffer
-                    ,const ::rtl::OUString& _rUserName
-                    ,const ::rtl::OUString& _rPassword)
+                    ,const OUString& _rUserName
+                    ,const OUString& _rPassword)
 {
     // first we create the digest we want to have
     rtlDigest aDigest = rtl_digest_create( rtl_Digest_AlgorithmSHA1 );
@@ -218,21 +218,21 @@ void OConnectionWrapper::createUniqueId( const ::rtl::OUString& _rURL
     for (; pBegin != pEnd; ++pBegin)
     {
         // we only include strings an integer values
-        ::rtl::OUString sValue;
+        OUString sValue;
         if ( pBegin->Value >>= sValue )
             ;
         else
         {
             sal_Int32 nValue = 0;
             if ( pBegin->Value >>= nValue )
-                sValue = ::rtl::OUString::valueOf(nValue);
+                sValue = OUString::valueOf(nValue);
             else
             {
-                Sequence< ::rtl::OUString> aSeq;
+                Sequence< OUString> aSeq;
                 if ( pBegin->Value >>= aSeq )
                 {
-                    const ::rtl::OUString* pSBegin = aSeq.getConstArray();
-                    const ::rtl::OUString* pSEnd   = pSBegin + aSeq.getLength();
+                    const OUString* pSBegin = aSeq.getConstArray();
+                    const OUString* pSEnd   = pSBegin + aSeq.getLength();
                     for(;pSBegin != pSEnd;++pSBegin)
                         rtl_digest_update(aDigest,pSBegin->getStr(),pSBegin->getLength()*sizeof(sal_Unicode));
                 }
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index b9c0b3d98f04..9746196d0336 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -45,10 +45,10 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::uno;
 // -----------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote,
+OUString DBTypeConversion::toSQLString(sal_Int32 eType, const Any& _rVal, sal_Bool bQuote,
                                               const Reference< XTypeConverter >&  _rxTypeConverter)
 {
-    ::rtl::OUStringBuffer aRet;
+    OUStringBuffer aRet;
     if (_rVal.hasValue())
     {
         try
@@ -69,7 +69,7 @@ using namespace ::com::sun::star::uno;
                     }
                     else
                     {
-                        ::rtl::OUString sTemp;
+                        OUString sTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp;
                         aRet.append(sTemp);
                     }
@@ -80,11 +80,11 @@ using namespace ::com::sun::star::uno;
                     if (bQuote)
                         aRet.appendAscii("'");
                     {
-                        ::rtl::OUString aTemp;
+                        OUString aTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= aTemp;
                         sal_Int32 nIndex = (sal_Int32)-1;
-                        const ::rtl::OUString sQuot("\'");
-                        const ::rtl::OUString sQuotToReplace("\'\'");
+                        const OUString sQuot("\'");
+                        const OUString sQuotToReplace("\'\'");
                         do
                         {
                             nIndex += 2;
@@ -105,7 +105,7 @@ using namespace ::com::sun::star::uno;
                 case DataType::BIGINT:
                 default:
                     {
-                        ::rtl::OUString sTemp;
+                        OUString sTemp;
                         _rxTypeConverter->convertToSimpleType(_rVal, TypeClass_STRING) >>= sTemp;
                         aRet.append(sTemp);
                     }
@@ -123,7 +123,7 @@ using namespace ::com::sun::star::uno;
                     }
                     else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
                     {
-                        ::rtl::OUString sValue;
+                        OUString sValue;
                        _rVal >>= sValue;
                        aDateTime = DBTypeConversion::toDateTime(sValue);
                        bOk = true;
@@ -157,7 +157,7 @@ using namespace ::com::sun::star::uno;
                     }
                     else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
                     {
-                        ::rtl::OUString sValue;
+                        OUString sValue;
                        _rVal >>= sValue;
                        aDate = DBTypeConversion::toDate(sValue);
                        bOk = true;
@@ -184,7 +184,7 @@ using namespace ::com::sun::star::uno;
                     }
                     else if (_rVal.getValueType().getTypeClass() == ::com::sun::star::uno::TypeClass_STRING)
                     {
-                        ::rtl::OUString sValue;
+                        OUString sValue;
                        _rVal >>= sValue;
                        aTime = DBTypeConversion::toTime(sValue);
                        bOk = true;
@@ -219,7 +219,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
         {
             // get the null date
             Date aDate;
-            xSupplier->getNumberFormatSettings()->getPropertyValue(::rtl::OUString("NullDate")) >>= aDate;
+            xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= aDate;
             return aDate;
         }
         catch ( const Exception&  )
@@ -233,7 +233,7 @@ Date DBTypeConversion::getNULLDate(const Reference< XNumberFormatsSupplier > &xS
 void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
                                 const Reference<XNumberFormatter>& xFormatter,
                                 const Date& rNullDate,
-                                const ::rtl::OUString& rString,
+                                const OUString& rString,
                                 sal_Int32 nKey,
                                 sal_Int16 nFieldType,
                                 sal_Int16 nKeyType) throw(::com::sun::star::lang::IllegalArgumentException)
@@ -257,8 +257,8 @@ void DBTypeConversion::setValue(const Reference<XColumnUpdate>& xVariant,
             // and again a special treatment, this time for percent formats
             if ((NumberFormat::NUMBER == nRealUsedTypeClass) && (NumberFormat::PERCENT == nTypeClass))
             {   // formatting should be "percent", but the String provides just a simple number -> adjust
-                ::rtl::OUString sExpanded(rString);
-                static ::rtl::OUString s_sPercentSymbol( "%" );
+                OUString sExpanded(rString);
+                static OUString s_sPercentSymbol( "%" );
                     // need a method to add a sal_Unicode to a string, 'til then we use a static string
                 sExpanded += s_sPercentSymbol;
                 fValue = xFormatter->convertStringToNumber(nKeyToUse, sExpanded);
@@ -397,14 +397,14 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
     }
 }
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
+OUString DBTypeConversion::getFormattedValue(const Reference< XPropertySet>& _xColumn,
                                            const Reference<XNumberFormatter>& _xFormatter,
                                            const ::com::sun::star::lang::Locale& _rLocale,
                                            const Date& _rNullDate)
 {
     OSL_ENSURE(_xColumn.is() && _xFormatter.is(), "DBTypeConversion::getFormattedValue: invalid arg !");
     if (!_xColumn.is() || !_xFormatter.is())
-        return ::rtl::OUString();
+        return OUString();
 
     sal_Int32 nKey(0);
     try
@@ -433,13 +433,13 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
+OUString DBTypeConversion::getFormattedValue(const Reference<XColumn>& xVariant,
                                    const Reference<XNumberFormatter>& xFormatter,
                                    const Date& rNullDate,
                                    sal_Int32 nKey,
                                    sal_Int16 nKeyType)
 {
-    ::rtl::OUString aString;
+    OUString aString;
     if (xVariant.is())
     {
         try
@@ -459,7 +459,7 @@ double DBTypeConversion::getValue( const Reference< XColumn >& i_column, const D
                          {
                              Reference< XNumberFormatsSupplier > xSupplier( xFormatter->getNumberFormatsSupplier(), UNO_SET_THROW );
                              Reference< XPropertySet > xFormatterSettings( xSupplier->getNumberFormatSettings(), UNO_SET_THROW );
-                             OSL_VERIFY( xFormatterSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= aFormatterNullDate );
+                             OSL_VERIFY( xFormatterSettings->getPropertyValue( OUString( "NullDate" ) ) >>= aFormatterNullDate );
                          }
                          catch( const Exception& )
                          {
diff --git a/connectivity/source/commontools/DriversConfig.cxx b/connectivity/source/commontools/DriversConfig.cxx
index 1bdf05ee6fce..7d0f5768540f 100644
--- a/connectivity/source/commontools/DriversConfig.cxx
+++ b/connectivity/source/commontools/DriversConfig.cxx
@@ -25,28 +25,28 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    void lcl_convert(const uno::Sequence< ::rtl::OUString >& _aSource,uno::Any& _rDest)
+    void lcl_convert(const uno::Sequence< OUString >& _aSource,uno::Any& _rDest)
     {
         uno::Sequence<uno::Any> aRet(_aSource.getLength());
         uno::Any* pAny = aRet.getArray();
-        const ::rtl::OUString* pIter = _aSource.getConstArray();
-        const ::rtl::OUString* pEnd  = pIter + _aSource.getLength();
+        const OUString* pIter = _aSource.getConstArray();
+        const OUString* pEnd  = pIter + _aSource.getLength();
         for (;pIter != pEnd ; ++pIter,++pAny)
         {
             *pAny <<= *pIter;
         }
         _rDest <<= aRet;
     }
-    void lcl_fillValues(const ::utl::OConfigurationNode& _aURLPatternNode,const ::rtl::OUString& _sNode,::comphelper::NamedValueCollection& _rValues)
+    void lcl_fillValues(const ::utl::OConfigurationNode& _aURLPatternNode,const OUString& _sNode,::comphelper::NamedValueCollection& _rValues)
     {
         const ::utl::OConfigurationNode aPropertiesNode = _aURLPatternNode.openNode(_sNode);
         if ( aPropertiesNode.isValid() )
         {
-            uno::Sequence< ::rtl::OUString > aStringSeq;
-            static const ::rtl::OUString s_sValue("/Value");
-            const uno::Sequence< ::rtl::OUString > aProperties = aPropertiesNode.getNodeNames();
-            const ::rtl::OUString* pPropertiesIter = aProperties.getConstArray();
-            const ::rtl::OUString* pPropertiesEnd  = pPropertiesIter + aProperties.getLength();
+            uno::Sequence< OUString > aStringSeq;
+            static const OUString s_sValue("/Value");
+            const uno::Sequence< OUString > aProperties = aPropertiesNode.getNodeNames();
+            const OUString* pPropertiesIter = aProperties.getConstArray();
+            const OUString* pPropertiesEnd  = pPropertiesIter + aProperties.getLength();
             for (;pPropertiesIter != pPropertiesEnd ; ++pPropertiesIter)
             {
                 uno::Any aValue = aPropertiesNode.getNodeValue(*pPropertiesIter + s_sValue);
@@ -58,22 +58,22 @@ namespace
             } // for (;pPropertiesIter != pPropertiesEnd ; ++pPropertiesIter,++pNamedIter)
         } // if ( aPropertiesNode.isValid() )
     }
-    void lcl_readURLPatternNode(const ::utl::OConfigurationTreeRoot& _aInstalled,const ::rtl::OUString& _sEntry,TInstalledDriver& _rInstalledDriver)
+    void lcl_readURLPatternNode(const ::utl::OConfigurationTreeRoot& _aInstalled,const OUString& _sEntry,TInstalledDriver& _rInstalledDriver)
     {
         const ::utl::OConfigurationNode aURLPatternNode = _aInstalled.openNode(_sEntry);
         if ( aURLPatternNode.isValid() )
         {
-            ::rtl::OUString sParentURLPattern;
+            OUString sParentURLPattern;
             aURLPatternNode.getNodeValue("ParentURLPattern") >>= sParentURLPattern;
             if ( !sParentURLPattern.isEmpty() )
                 lcl_readURLPatternNode(_aInstalled,sParentURLPattern,_rInstalledDriver);
 
-            ::rtl::OUString sDriverFactory;
+            OUString sDriverFactory;
             aURLPatternNode.getNodeValue("Driver") >>= sDriverFactory;
             if ( !sDriverFactory.isEmpty() )
                 _rInstalledDriver.sDriverFactory = sDriverFactory;
 
-            ::rtl::OUString sDriverTypeDisplayName;
+            OUString sDriverTypeDisplayName;
             aURLPatternNode.getNodeValue("DriverTypeDisplayName") >>= sDriverTypeDisplayName;
             OSL_ENSURE(!sDriverTypeDisplayName.isEmpty(),"No valid DriverTypeDisplayName property!");
             if ( !sDriverTypeDisplayName.isEmpty() )
@@ -96,15 +96,15 @@ void DriversConfigImpl::Load(const uno::Reference< uno::XComponentContext >& _rx
     {
         if ( !m_aInstalled.isValid() )
         {
-            static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed
+            static const OUString s_sNodeName("org.openoffice.Office.DataAccess.Drivers/Installed"); ///Installed
             m_aInstalled = ::utl::OConfigurationTreeRoot::createWithComponentContext(_rxORB, s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
         }
 
         if ( m_aInstalled.isValid() )
         {
-            const uno::Sequence< ::rtl::OUString > aURLPatterns = m_aInstalled.getNodeNames();
-            const ::rtl::OUString* pPatternIter = aURLPatterns.getConstArray();
-            const ::rtl::OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
+            const uno::Sequence< OUString > aURLPatterns = m_aInstalled.getNodeNames();
+            const OUString* pPatternIter = aURLPatterns.getConstArray();
+            const OUString* pPatternEnd  = pPatternIter + aURLPatterns.getLength();
             for (;pPatternIter != pPatternEnd ; ++pPatternIter)
             {
                 TInstalledDriver aInstalledDriver;
@@ -143,11 +143,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString DriversConfig::getDriverFactoryName(const ::rtl::OUString& _sURL) const
+OUString DriversConfig::getDriverFactoryName(const OUString& _sURL) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
-    ::rtl::OUString sRet;
-    ::rtl::OUString sOldPattern;
+    OUString sRet;
+    OUString sOldPattern;
     TInstalledDrivers::const_iterator aIter = rDrivers.begin();
     TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
@@ -163,11 +163,11 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
     return sRet;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString DriversConfig::getDriverTypeDisplayName(const ::rtl::OUString& _sURL) const
+OUString DriversConfig::getDriverTypeDisplayName(const OUString& _sURL) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
-    ::rtl::OUString sRet;
-    ::rtl::OUString sOldPattern;
+    OUString sRet;
+    OUString sOldPattern;
     TInstalledDrivers::const_iterator aIter = rDrivers.begin();
     TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
@@ -183,26 +183,26 @@ DriversConfig& DriversConfig::operator=( const DriversConfig& _rhs )
     return sRet;
 }
 // -----------------------------------------------------------------------------
-const ::comphelper::NamedValueCollection& DriversConfig::getProperties(const ::rtl::OUString& _sURL) const
+const ::comphelper::NamedValueCollection& DriversConfig::getProperties(const OUString& _sURL) const
 {
     return impl_get(_sURL,1);
 }
 // -----------------------------------------------------------------------------
-const ::comphelper::NamedValueCollection& DriversConfig::getFeatures(const ::rtl::OUString& _sURL) const
+const ::comphelper::NamedValueCollection& DriversConfig::getFeatures(const OUString& _sURL) const
 {
     return impl_get(_sURL,0);
 }
 // -----------------------------------------------------------------------------
-const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const ::rtl::OUString& _sURL) const
+const ::comphelper::NamedValueCollection& DriversConfig::getMetaData(const OUString& _sURL) const
 {
     return impl_get(_sURL,2);
 }
 // -----------------------------------------------------------------------------
-const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const
+const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const OUString& _sURL,sal_Int32 _nProps) const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
     const ::comphelper::NamedValueCollection* pRet = NULL;
-    ::rtl::OUString sOldPattern;
+    OUString sOldPattern;
     TInstalledDrivers::const_iterator aIter = rDrivers.begin();
     TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter)
@@ -233,11 +233,11 @@ const ::comphelper::NamedValueCollection& DriversConfig::impl_get(const ::rtl::O
     return *pRet;
 }
 // -----------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > DriversConfig::getURLs() const
+uno::Sequence< OUString > DriversConfig::getURLs() const
 {
     const TInstalledDrivers& rDrivers = m_aNode->getInstalledDrivers(m_xORB);
-    uno::Sequence< ::rtl::OUString > aRet(rDrivers.size());
-    ::rtl::OUString* pIter = aRet.getArray();
+    uno::Sequence< OUString > aRet(rDrivers.size());
+    OUString* pIter = aRet.getArray();
     TInstalledDrivers::const_iterator aIter = rDrivers.begin();
     TInstalledDrivers::const_iterator aEnd = rDrivers.end();
     for(;aIter != aEnd;++aIter,++pIter)
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 284d2cff0505..b25e3bd25929 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -158,7 +158,7 @@ void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows)
     m_bEOF = m_aRows.empty();
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -295,7 +295,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
@@ -666,55 +666,55 @@ ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue()
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("SELECT"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("SELECT"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("INSERT"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("INSERT"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DELETE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DELETE"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("UPDATE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("UPDATE"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("CREATE"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("CREATE"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("READ"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("READ"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("ALTER"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("ALTER"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("DROP"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DROP"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
 ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue()
 {
-    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(::rtl::OUString("'"));
+    static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("'"));
     return aValueRef;
 }
 // -----------------------------------------------------------------------------
@@ -796,7 +796,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
                                 break;
                             case TypeClass_STRING:
                                 {
-                                    ::rtl::OUString sValue;
+                                    OUString sValue;
                                     *pRowIter >>= sValue;
                                     aValue = new ORowSetValueDecorator(ORowSetValue(sValue));
                                 }
@@ -816,9 +816,9 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
 // XServiceInfo
     // --------------------------------------------------------------------------------
     //------------------------------------------------------------------------------
-    rtl::OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ODatabaseMetaDataResultSet::getImplementationName_Static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
+        return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet");
     }
     //------------------------------------------------------------------------------
     Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static(  ) throw (RuntimeException)
@@ -828,24 +828,24 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA
         return aSNS;
     }
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName(  ) throw(RuntimeException)
+    OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
 
     //------------------------------------------------------------------
-    sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+    sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-        const ::rtl::OUString* pSupported = aSupported.getConstArray();
-        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        Sequence< OUString > aSupported(getSupportedServiceNames());
+        const OUString* pSupported = aSupported.getConstArray();
+        const OUString* pEnd = pSupported + aSupported.getLength();
         for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
             ;
 
         return pSupported != pEnd;
     }
     //------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames(  ) throw(RuntimeException)
+    Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
@@ -869,7 +869,6 @@ namespace
         { 0, 0, 0, 0, 0, 0 }
     };
 }
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::registry::XRegistryKey;
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index 470d27a0ffd2..816a1a453bbc 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -61,49 +61,49 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32
     return sal_True;
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnName();
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getTableName();
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnTypeName();
-    return ::rtl::OUString();
+    return OUString();
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
     return getColumnName(column);
 }
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnServiceName();
-    return ::rtl::OUString();
+    return OUString();
 }
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 65ef48317858..ef968fb9261e 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -418,7 +418,7 @@ ORowSetValue& ORowSetValue::operator=(const ORowSetValue& _rRH)
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                (*this) = ::rtl::OUString(_rRH.m_aValue.m_pString);
+                (*this) = OUString(_rRH.m_aValue.m_pString);
                 break;
             case DataType::DATE:
                 (*this) = *(Date*)_rRH.m_aValue.m_pValue;
@@ -536,7 +536,7 @@ ORowSetValue& ORowSetValue::operator=(const DateTime& _rRH)
 }
 // -------------------------------------------------------------------------
 
-ORowSetValue& ORowSetValue::operator=(const ::rtl::OUString& _rRH)
+ORowSetValue& ORowSetValue::operator=(const OUString& _rRH)
 {
     if(m_eTypeKind != DataType::VARCHAR || m_aValue.m_pString != _rRH.pData)
     {
@@ -796,8 +796,8 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
         case DataType::CHAR:
         case DataType::LONGVARCHAR:
         {
-            ::rtl::OUString aVal1(m_aValue.m_pString);
-            ::rtl::OUString aVal2(_rRH.m_aValue.m_pString);
+            OUString aVal1(m_aValue.m_pString);
+            OUString aVal2(_rRH.m_aValue.m_pString);
             return aVal1 == aVal2;
         }
         default:
@@ -811,8 +811,8 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
         case DataType::DECIMAL:
         case DataType::NUMERIC:
             {
-                ::rtl::OUString aVal1(m_aValue.m_pString);
-                ::rtl::OUString aVal2(_rRH.m_aValue.m_pString);
+                OUString aVal1(m_aValue.m_pString);
+                OUString aVal2(_rRH.m_aValue.m_pString);
                 bRet = aVal1 == aVal2;
             }
             break;
@@ -881,7 +881,7 @@ Any ORowSetValue::makeAny() const
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
                 OSL_ENSURE(m_aValue.m_pString,"Value is null!");
-                rValue <<= (::rtl::OUString)m_aValue.m_pString;
+                rValue <<= (OUString)m_aValue.m_pString;
                 break;
             case DataType::FLOAT:
                 rValue <<= m_aValue.m_nFloat;
@@ -961,10 +961,10 @@ Any ORowSetValue::makeAny() const
     return rValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ORowSetValue::getString( ) const
+OUString ORowSetValue::getString( ) const
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen@sun.com", "ORowSetValue::getString" );
-    ::rtl::OUString aRet;
+    OUString aRet;
     if(!m_bNull)
     {
         switch(getTypeKind())
@@ -996,7 +996,7 @@ Any ORowSetValue::makeAny() const
             case DataType::VARBINARY:
             case DataType::LONGVARBINARY:
                 {
-                    ::rtl::OUStringBuffer sVal(::rtl::OUString("0x"));
+                    OUStringBuffer sVal(OUString("0x"));
                     Sequence<sal_Int8> aSeq(getSequence());
                     const sal_Int8* pBegin  = aSeq.getConstArray();
                     const sal_Int8* pEnd    = pBegin + aSeq.getLength();
@@ -1059,9 +1059,9 @@ bool ORowSetValue::getBool()    const
             case DataType::VARCHAR:
             case DataType::LONGVARCHAR:
                 {
-                    const ::rtl::OUString sValue(m_aValue.m_pString);
-                    const static ::rtl::OUString s_sTrue("true");
-                    const static ::rtl::OUString s_sFalse("false");
+                    const OUString sValue(m_aValue.m_pString);
+                    const static OUString s_sTrue("true");
+                    const static OUString s_sFalse("false");
                     if ( sValue.equalsIgnoreAsciiCase(s_sTrue) )
                     {
                         bRet = sal_True;
@@ -1077,7 +1077,7 @@ bool ORowSetValue::getBool()    const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
 
-                bRet = ::rtl::OUString(m_aValue.m_pString).toInt32() != 0;
+                bRet = OUString(m_aValue.m_pString).toInt32() != 0;
                 break;
             case DataType::FLOAT:
                 bRet = m_aValue.m_nFloat != 0.0;
@@ -1137,7 +1137,7 @@ sal_Int8 ORowSetValue::getInt8()    const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = sal_Int8(::rtl::OUString(m_aValue.m_pString).toInt32());
+                nRet = sal_Int8(OUString(m_aValue.m_pString).toInt32());
                 break;
             case DataType::FLOAT:
                 nRet = sal_Int8(m_aValue.m_nFloat);
@@ -1208,7 +1208,7 @@ sal_uInt8 ORowSetValue::getUInt8()    const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = sal_uInt8(::rtl::OUString(m_aValue.m_pString).toInt32());
+                nRet = sal_uInt8(OUString(m_aValue.m_pString).toInt32());
                 break;
             case DataType::FLOAT:
                 nRet = sal_uInt8(m_aValue.m_nFloat);
@@ -1283,7 +1283,7 @@ sal_Int16 ORowSetValue::getInt16()  const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = sal_Int16(::rtl::OUString(m_aValue.m_pString).toInt32());
+                nRet = sal_Int16(OUString(m_aValue.m_pString).toInt32());
                 break;
             case DataType::FLOAT:
                 nRet = sal_Int16(m_aValue.m_nFloat);
@@ -1354,7 +1354,7 @@ sal_uInt16 ORowSetValue::getUInt16()  const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = sal_uInt16(::rtl::OUString(m_aValue.m_pString).toInt32());
+                nRet = sal_uInt16(OUString(m_aValue.m_pString).toInt32());
                 break;
             case DataType::FLOAT:
                 nRet = sal_uInt16(m_aValue.m_nFloat);
@@ -1426,7 +1426,7 @@ sal_Int32 ORowSetValue::getInt32()  const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = ::rtl::OUString(m_aValue.m_pString).toInt32();
+                nRet = OUString(m_aValue.m_pString).toInt32();
                 break;
             case DataType::FLOAT:
                 nRet = sal_Int32(m_aValue.m_nFloat);
@@ -1499,7 +1499,7 @@ sal_uInt32 ORowSetValue::getUInt32()  const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = ::rtl::OUString(m_aValue.m_pString).toInt32();
+                nRet = OUString(m_aValue.m_pString).toInt32();
                 break;
             case DataType::FLOAT:
                 nRet = sal_uInt32(m_aValue.m_nFloat);
@@ -1573,7 +1573,7 @@ sal_Int64 ORowSetValue::getLong()   const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = ::rtl::OUString(m_aValue.m_pString).toInt64();
+                nRet = OUString(m_aValue.m_pString).toInt64();
                 break;
             case DataType::FLOAT:
                 nRet = sal_Int64(m_aValue.m_nFloat);
@@ -1646,7 +1646,7 @@ sal_uInt64 ORowSetValue::getULong()   const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = static_cast<sal_uInt64>(::rtl::OUString(m_aValue.m_pString).toInt64());
+                nRet = static_cast<sal_uInt64>(OUString(m_aValue.m_pString).toInt64());
                 break;
             case DataType::FLOAT:
                 nRet = sal_uInt64(m_aValue.m_nFloat);
@@ -1720,7 +1720,7 @@ float ORowSetValue::getFloat()  const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = ::rtl::OUString(m_aValue.m_pString).toFloat();
+                nRet = OUString(m_aValue.m_pString).toFloat();
                 break;
             case DataType::FLOAT:
                 nRet = m_aValue.m_nFloat;
@@ -1799,7 +1799,7 @@ double ORowSetValue::getDouble()    const
             case DataType::DECIMAL:
             case DataType::NUMERIC:
             case DataType::LONGVARCHAR:
-                nRet = ::rtl::OUString(m_aValue.m_pString).toDouble();
+                nRet = OUString(m_aValue.m_pString).toDouble();
                 break;
             case DataType::FLOAT:
                 nRet = m_aValue.m_nFloat;
@@ -1915,7 +1915,7 @@ Sequence<sal_Int8>  ORowSetValue::getSequence() const
             case DataType::VARCHAR:
             case DataType::LONGVARCHAR:
                 {
-                    ::rtl::OUString sVal(m_aValue.m_pString);
+                    OUString sVal(m_aValue.m_pString);
                     aSeq = Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(sVal.getStr()),sizeof(sal_Unicode)*sVal.getLength());
                 }
                 break;
@@ -2152,7 +2152,7 @@ namespace detail
     class SAL_NO_VTABLE IValueSource
     {
     public:
-        virtual ::rtl::OUString             getString() const = 0;
+        virtual OUString             getString() const = 0;
         virtual bool                        getBoolean() const = 0;
         virtual sal_Int8                    getByte() const = 0;
         virtual sal_Int16                   getShort() const = 0;
@@ -2184,7 +2184,7 @@ namespace detail
         }
 
         // IValueSource
-        virtual ::rtl::OUString             getString() const           { return m_xRow->getString( m_nPos ); };
+        virtual OUString             getString() const           { return m_xRow->getString( m_nPos ); };
         virtual bool                        getBoolean() const          { return m_xRow->getBoolean( m_nPos ); };
         virtual sal_Int8                    getByte() const             { return m_xRow->getByte( m_nPos ); };
         virtual sal_Int16                   getShort() const            { return m_xRow->getShort( m_nPos ); }
@@ -2217,7 +2217,7 @@ namespace detail
         }
 
         // IValueSource
-        virtual ::rtl::OUString             getString() const           { return m_xColumn->getString(); };
+        virtual OUString             getString() const           { return m_xColumn->getString(); };
         virtual bool                        getBoolean() const          { return m_xColumn->getBoolean(); };
         virtual sal_Int8                    getByte() const             { return m_xColumn->getByte(); };
         virtual sal_Int16                   getShort() const            { return m_xColumn->getShort(); }
@@ -2372,12 +2372,12 @@ void ORowSetValue::fill(const Any& _rValue)
         {
             sal_Unicode aDummy(0);
             _rValue >>= aDummy;
-            (*this) = ::rtl::OUString(aDummy);
+            (*this) = OUString(aDummy);
             break;
         }
         case TypeClass_STRING:
         {
-            ::rtl::OUString sDummy;
+            OUString sDummy;
             _rValue >>= sDummy;
             (*this) = sDummy;
             break;
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index aa487606b5d0..15ad7c9ad9ea 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -35,32 +35,32 @@ namespace connectivity
         ::osl::MutexGuard aGuard(m_aMutex);
         comphelper::SequenceAsHashMap aArgs(_aArguments);
         uno::Reference< sdbc::XConnection > xConnection;
-        xConnection = aArgs.getUnpackedValueOrDefault(::rtl::OUString("ActiveConnection"),xConnection);
+        xConnection = aArgs.getUnpackedValueOrDefault(OUString("ActiveConnection"),xConnection);
         m_xConnection = xConnection;
     }
     //------------------------------------------------------------------------------
-    rtl::OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ParameterSubstitution::getImplementationName_Static(  ) throw(RuntimeException)
     {
-        return ::rtl::OUString("org.openoffice.comp.helper.ParameterSubstitution");
+        return OUString("org.openoffice.comp.helper.ParameterSubstitution");
     }
     //------------------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException)
+    OUString SAL_CALL ParameterSubstitution::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
     //------------------------------------------------------------------
-    sal_Bool SAL_CALL ParameterSubstitution::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+    sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-        const ::rtl::OUString* pSupported = aSupported.getConstArray();
-        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        Sequence< OUString > aSupported(getSupportedServiceNames());
+        const OUString* pSupported = aSupported.getConstArray();
+        const OUString* pEnd = pSupported + aSupported.getLength();
         for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
             ;
 
         return pSupported != pEnd;
     }
     //------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException)
+    Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
@@ -78,17 +78,17 @@ namespace connectivity
         return *(new ParameterSubstitution(_xContext));
     }
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::substituteVariables( const ::rtl::OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, ::sal_Bool /*bSubstRequired*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
     {
-        ::rtl::OUString sRet = _sText;
+        OUString sRet = _sText;
         uno::Reference< sdbc::XConnection > xConnection = m_xConnection;
         if ( xConnection.is() )
         {
             try
             {
                 OSQLParser aParser( m_xContext );
-                ::rtl::OUString sErrorMessage;
-                ::rtl::OUString sNewSql;
+                OUString sErrorMessage;
+                OUString sNewSql;
                 OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sText);
                 if(pNode)
                 {   // special handling for parameters
@@ -105,12 +105,12 @@ namespace connectivity
         return sRet;
     }
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const ::rtl::OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
+    OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (::com::sun::star::uno::RuntimeException)
     {
         return _sText;
     }
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const ::rtl::OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
+    OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException)
     {
         throw container::NoSuchElementException();
     }
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index 95c280befd20..9f1c7c2ed1a6 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -177,7 +177,7 @@ public:
     }
     void operator()( StringIteratorT rFirst,StringIteratorT rSecond) const
     {
-        rtl::OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 );
+        OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 );
         mpContext->maOperandStack.push( ExpressionNodeSharedPtr( new ConstantValueExpression( new ORowSetValueDecorator( sVal ) ) ) );
     }
 };
@@ -199,7 +199,7 @@ public:
     }
     void operator()( StringIteratorT rFirst,StringIteratorT rSecond) const
     {
-        rtl::OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 );
+        OUString sVal( rFirst, rSecond - rFirst, RTL_TEXTENCODING_UTF8 );
         (void)sVal;
     }
 };
@@ -443,13 +443,13 @@ const ParserContextSharedPtr& getParserContext()
 #endif
 }
 
-ExpressionNodeSharedPtr FunctionParser::parseFunction( const ::rtl::OUString& _sFunction)
+ExpressionNodeSharedPtr FunctionParser::parseFunction( const OUString& _sFunction)
 {
     // TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_*
     // gives better conversion robustness here (we might want to map space
     // etc. to ASCII space here)
-    const ::rtl::OString& rAsciiFunction(
-        rtl::OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) );
+    const OString& rAsciiFunction(
+        OUStringToOString( _sFunction, RTL_TEXTENCODING_ASCII_US ) );
 
     StringIteratorT aStart( rAsciiFunction.getStr() );
     StringIteratorT aEnd( rAsciiFunction.getStr()+rAsciiFunction.getLength() );
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 8f68406813c3..8d97941e869f 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -76,7 +76,7 @@ OColumnsHelper::~OColumnsHelper()
 }
 // -----------------------------------------------------------------------------
 
-sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName)
 {
     OSL_ENSURE(m_pTable,"NO Table set. Error!");
     Reference<XConnection> xConnection = m_pTable->getConnection();
@@ -92,8 +92,8 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
     ColumnInformationMap::iterator aFind = m_pImpl->m_aColumnInfo.find(_rName);
     if ( aFind == m_pImpl->m_aColumnInfo.end() ) // we have to fill it
     {
-        ::rtl::OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable );
-        collectColumnInformation(xConnection,sComposedName,::rtl::OUString("*") ,m_pImpl->m_aColumnInfo);
+        OUString sComposedName = ::dbtools::composeTableNameForSelect( xConnection, m_pTable );
+        collectColumnInformation(xConnection,sComposedName,OUString("*") ,m_pImpl->m_aColumnInfo);
         aFind = m_pImpl->m_aColumnInfo.find(_rName);
     }
     if ( aFind != m_pImpl->m_aColumnInfo.end() )
@@ -116,7 +116,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const ::rtl::OUString& _rName)
             nField11 = ColumnValue::NO_NULLS;
         } // if ( xKeys.is() )
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-        ::rtl::OUString aCatalog, aSchema, aTable;
+        OUString aCatalog, aSchema, aTable;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)) >>= aCatalog;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))  >>= aSchema;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))        >>= aTable;
@@ -169,7 +169,7 @@ Reference< XPropertySet > OColumnsHelper::createDescriptor()
 }
 // -----------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OColumnsHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     ::osl::MutexGuard aGuard(m_rMutex);
     OSL_ENSURE(m_pTable,"OColumnsHelper::appendByDescriptor: Table is null!");
@@ -177,10 +177,10 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
         return cloneDescriptor( descriptor );
 
     Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
-    ::rtl::OUString aSql( "ALTER TABLE " );
+    OUString aSql( "ALTER TABLE " );
 
     aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
-    aSql += ::rtl::OUString(" ADD ");
+    aSql += OUString(" ADD ");
     aSql += ::dbtools::createStandardColumnPart(descriptor,m_pTable->getConnection(),NULL,m_pTable->getTypeCreatePattern());
 
     Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
@@ -193,17 +193,17 @@ sdbcx::ObjectType OColumnsHelper::appendObject( const ::rtl::OUString& _rForName
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OColumnsHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     OSL_ENSURE(m_pTable,"OColumnsHelper::dropByName: Table is null!");
     if ( m_pTable && !m_pTable->isNew() )
     {
-        ::rtl::OUString aSql( "ALTER TABLE " );
+        OUString aSql( "ALTER TABLE " );
         Reference<XDatabaseMetaData> xMetaData = m_pTable->getConnection()->getMetaData();
-        ::rtl::OUString aQuote  = xMetaData->getIdentifierQuoteString(  );
+        OUString aQuote  = xMetaData->getIdentifierQuoteString(  );
 
         aSql += ::dbtools::composeTableName( xMetaData, m_pTable, ::dbtools::eInTableDefinitions, false, false, true );
-        aSql += ::rtl::OUString(" DROP ");
+        aSql += OUString(" DROP ");
         aSql += ::dbtools::quoteName( aQuote,_sElementName);
 
         Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index d8b57472b017..dd1a60cf9bad 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -86,7 +86,7 @@ Sequence< sal_Int8 > OMetaConnection::getUnoTunnelImplementationId()
 // -----------------------------------------------------------------------------
 void OMetaConnection::throwGenericSQLException( sal_uInt16 _nErrorResourceId,const Reference< XInterface>& _xContext )
 {
-    ::rtl::OUString sErrorMessage;
+    OUString sErrorMessage;
     if ( _nErrorResourceId )
         sErrorMessage = m_aResources.getResourceString( _nErrorResourceId );
     Reference< XInterface> xContext = _xContext;
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 210b642faac3..9918cf15839a 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -39,8 +39,8 @@ using namespace connectivity;
 ODatabaseMetaDataBase::ODatabaseMetaDataBase(const Reference< XConnection >& _rxConnection,const Sequence< PropertyValue >& _rInfo)
     : m_aConnectionInfo(_rInfo)
     ,m_isCatalogAtStart(false,sal_False)
-    ,m_sCatalogSeparator(false,::rtl::OUString())
-    ,m_sIdentifierQuoteString(false,::rtl::OUString())
+    ,m_sCatalogSeparator(false,OUString())
+    ,m_sIdentifierQuoteString(false,OUString())
     ,m_supportsCatalogsInTableDefinitions(false,sal_False)
     ,m_supportsSchemasInTableDefinitions(false,sal_False)
     ,m_supportsCatalogsInDataManipulation(false,sal_False)
@@ -90,7 +90,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
         Reference< XRow > xRow(xRet,UNO_QUERY);
         ::comphelper::SequenceAsHashMap aMap(m_aConnectionInfo);
         Sequence< Any > aTypeInfoSettings;
-        aTypeInfoSettings = aMap.getUnpackedValueOrDefault(::rtl::OUString("TypeInfoSettings"),aTypeInfoSettings);
+        aTypeInfoSettings = aMap.getUnpackedValueOrDefault(OUString("TypeInfoSettings"),aTypeInfoSettings);
 
         if ( xRow.is() )
         {
@@ -127,7 +127,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
                 catch(ParseError&)
                 {
                     ::connectivity::SharedResources aResources;
-                    const ::rtl::OUString sError( aResources.getResourceString(STR_FORMULA_WRONG));
+                    const OUString sError( aResources.getResourceString(STR_FORMULA_WRONG));
                     ::dbtools::throwGenericSQLException(sError,*this);
                 }
             }
@@ -169,41 +169,41 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo(  ) throw(SQ
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/,
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
         sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/, sal_Int32 /*scope*/,
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/,
         sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference(
-        const Any& /*primaryCatalog*/, const ::rtl::OUString& /*primarySchema*/,
-        const ::rtl::OUString& /*primaryTable*/, const Any& /*foreignCatalog*/,
-        const ::rtl::OUString& /*foreignSchema*/, const ::rtl::OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException)
+        const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/,
+        const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/,
+        const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
@@ -214,21 +214,21 @@ Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection(  ) throw
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
-        const ::rtl::OUString& /*procedureNamePattern*/, const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+        const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
-        const ::rtl::OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+        const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns );
 }
@@ -239,14 +239,14 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas(  ) throw(SQL
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/,
-        const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/,
+        const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& /*table*/) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
@@ -256,9 +256,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs(  ) throw(SQ
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs );
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
-    return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< ::rtl::OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
+    return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
 }
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  ) throw(SQLException, RuntimeException)
@@ -266,9 +266,9 @@ sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart(  ) throw(SQLException
     return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< sal_Bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
-    return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< ::rtl::OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
+    return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
 }
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions(  ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 9beb8007a7ab..b63dd4699dca 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -36,13 +36,13 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
                  , m_pTable(_pTable)
 {
     construct();
-    ::std::vector< ::rtl::OUString> aVector;
+    ::std::vector< OUString> aVector;
     m_pColumns  = new OIndexColumns(this,m_aMutex,aVector);
 }
 // -------------------------------------------------------------------------
 OIndexHelper::OIndexHelper( OTableHelper* _pTable,
-                const ::rtl::OUString& _Name,
-                const ::rtl::OUString& _Catalog,
+                const OUString& _Name,
+                const OUString& _Catalog,
                 sal_Bool _isUnique,
                 sal_Bool _isPrimaryKeyIndex,
                 sal_Bool _isClustered
@@ -63,11 +63,11 @@ void OIndexHelper::refreshColumns()
     if ( !m_pTable )
         return;
 
-    ::std::vector< ::rtl::OUString> aVector;
+    ::std::vector< OUString> aVector;
     if ( !isNew() )
     {
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-        ::rtl::OUString aSchema,aTable;
+        OUString aSchema,aTable;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))       >>= aTable;
 
@@ -78,7 +78,7 @@ void OIndexHelper::refreshColumns()
         if ( xResult.is() )
         {
             Reference< XRow > xRow(xResult,UNO_QUERY);
-            ::rtl::OUString aColName;
+            OUString aColName;
             while( xResult->next() )
             {
                 if ( xRow->getString(6) == m_Name )
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index eb04b27eb391..93a395acc53c 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -38,16 +38,16 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 OIndexColumns::OIndexColumns(   OIndexHelper* _pIndex,
                         ::osl::Mutex& _rMutex,
-                        const ::std::vector< ::rtl::OUString> &_rVector)
+                        const ::std::vector< OUString> &_rVector)
             : connectivity::sdbcx::OCollection(*_pIndex,sal_True,_rMutex,_rVector)
             ,m_pIndex(_pIndex)
 {
 }
 // -------------------------------------------------------------------------
-sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OIndexColumns::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-    ::rtl::OUString aCatalog, aSchema, aTable;
+    OUString aCatalog, aSchema, aTable;
     ::com::sun::star::uno::Any Catalog(m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
     Catalog >>= aCatalog;
     m_pIndex->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
@@ -60,7 +60,7 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aD("D");
+        OUString aD("D");
         while( xResult->next() )
         {
             if(xRow->getString(9) == _rName)
@@ -80,11 +80,11 @@ sdbcx::ObjectType OIndexColumns::createObject(const ::rtl::OUString& _rName)
             if ( xRow->getString(4) == _rName )
             {
                 sal_Int32 nDataType = xRow->getInt(5);
-                ::rtl::OUString aTypeName(xRow->getString(6));
+                OUString aTypeName(xRow->getString(6));
                 sal_Int32 nSize = xRow->getInt(7);
                 sal_Int32 nDec  = xRow->getInt(9);
                 sal_Int32 nNull = xRow->getInt(11);
-                ::rtl::OUString aColumnDef(xRow->getString(13));
+                OUString aColumnDef(xRow->getString(13));
 
                 OIndexColumn* pRet = new OIndexColumn(bAsc,
                                                       _rName,
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index d1db21506511..6c89a81b3458 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -40,7 +40,7 @@ using namespace cppu;
 // -----------------------------------------------------------------------------
 OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
                  ::osl::Mutex& _rMutex,
-             const ::std::vector< ::rtl::OUString> &_rVector
+             const ::std::vector< OUString> &_rVector
              )
     : OCollection(*_pTable,sal_True,_rMutex,_rVector)
     ,m_pTable(_pTable)
@@ -48,14 +48,14 @@ OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
 }
 // -----------------------------------------------------------------------------
 
-sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName)
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
         return NULL;
 
     sdbcx::ObjectType xRet;
-    ::rtl::OUString aName,aQualifier;
+    OUString aName,aQualifier;
     sal_Int32 nLen = _rName.indexOf('.');
     if ( nLen != -1 )
     {
@@ -66,7 +66,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const ::rtl::OUString& _rName)
         aName       = _rName;
 
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-    ::rtl::OUString aSchema,aTable;
+    OUString aSchema,aTable;
     m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
     m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))       >>= aTable;
 
@@ -121,7 +121,7 @@ Reference< XPropertySet > OIndexesHelper::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OIndexesHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
@@ -136,18 +136,18 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
     else
     {
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-        ::rtl::OUStringBuffer aSql( ::rtl::OUString("CREATE "));
-        ::rtl::OUString aQuote  = m_pTable->getMetaData()->getIdentifierQuoteString(  );
-        ::rtl::OUString aDot( "." );
+        OUStringBuffer aSql( OUString("CREATE "));
+        OUString aQuote  = m_pTable->getMetaData()->getIdentifierQuoteString(  );
+        OUString aDot( "." );
 
         if(comphelper::getBOOL(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISUNIQUE))))
             aSql.appendAscii("UNIQUE ");
         aSql.appendAscii("INDEX ");
 
 
-        ::rtl::OUString aCatalog,aSchema,aTable;
+        OUString aCatalog,aSchema,aTable;
         dbtools::qualifiedNameComponents(m_pTable->getMetaData(),m_pTable->getName(),aCatalog,aSchema,aTable,::dbtools::eInDataManipulation);
-        ::rtl::OUString aComposedName;
+        OUString aComposedName;
 
         aComposedName = dbtools::composeTableName(m_pTable->getMetaData(),aCatalog,aSchema,aTable,sal_True,::dbtools::eInIndexDefinitions);
         if (!_rForName.isEmpty() )
@@ -199,7 +199,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
         Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
         if ( xStmt.is() )
         {
-            ::rtl::OUString sSql = aSql.makeStringAndClear();
+            OUString sSql = aSql.makeStringAndClear();
             xStmt->execute(sSql);
             ::comphelper::disposeComponent(xStmt);
         }
@@ -209,7 +209,7 @@ sdbcx::ObjectType OIndexesHelper::appendObject( const ::rtl::OUString& _rForName
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if( xConnection.is() && !m_pTable->isNew())
@@ -220,20 +220,20 @@ void OIndexesHelper::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElem
         }
         else
         {
-            ::rtl::OUString aName,aSchema;
+            OUString aName,aSchema;
             sal_Int32 nLen = _sElementName.indexOf('.');
             if(nLen != -1)
                 aSchema = _sElementName.copy(0,nLen);
             aName   = _sElementName.copy(nLen+1);
 
-            ::rtl::OUString aSql( "DROP INDEX " );
+            OUString aSql( "DROP INDEX " );
 
-            ::rtl::OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true );
-            ::rtl::OUString sIndexName,sTemp;
+            OUString aComposedName = dbtools::composeTableName( m_pTable->getMetaData(), m_pTable, ::dbtools::eInIndexDefinitions, false, false, true );
+            OUString sIndexName,sTemp;
             sIndexName = dbtools::composeTableName( m_pTable->getMetaData(), sTemp, aSchema, aName, sal_True, ::dbtools::eInIndexDefinitions );
 
             aSql += sIndexName
-                    + ::rtl::OUString(" ON ")
+                    + OUString(" ON ")
                         + aComposedName;
 
             Reference< XStatement > xStmt = m_pTable->getConnection()->createStatement(  );
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 0eac87020541..b09b5fee1b40 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -38,7 +38,7 @@ OTableKeyHelper::OTableKeyHelper(OTableHelper* _pTable) : connectivity::sdbcx::O
 }
 // -------------------------------------------------------------------------
 OTableKeyHelper::OTableKeyHelper(   OTableHelper* _pTable
-            ,const ::rtl::OUString& _Name
+            ,const OUString& _Name
             ,const sdbcx::TKeyProperties& _rProps
             ) : connectivity::sdbcx::OKey(_Name,_rProps,sal_True)
                 ,m_pTable(_pTable)
@@ -52,14 +52,14 @@ void OTableKeyHelper::refreshColumns()
     if ( !m_pTable )
         return;
 
-    ::std::vector< ::rtl::OUString> aVector;
+    ::std::vector< OUString> aVector;
     if ( !isNew() )
     {
         aVector = m_aProps->m_aKeyColumnNames;
         if ( aVector.empty() )
         {
             ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-            ::rtl::OUString aSchema,aTable;
+            OUString aSchema,aTable;
             m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
             m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))       >>= aTable;
 
@@ -74,7 +74,7 @@ void OTableKeyHelper::refreshColumns()
                     Reference< XRow > xRow(xResult,UNO_QUERY);
                     while( xResult->next() )
                     {
-                        ::rtl::OUString aForeignKeyColumn = xRow->getString(8);
+                        OUString aForeignKeyColumn = xRow->getString(8);
                         if(xRow->getString(12) == m_Name)
                             aVector.push_back(aForeignKeyColumn);
                     }
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index bb5a36a38f2a..9325b080fee5 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -39,16 +39,16 @@ using namespace ::com::sun::star::lang;
 // -------------------------------------------------------------------------
 OKeyColumnsHelper::OKeyColumnsHelper(   OTableKeyHelper* _pKey,
                 ::osl::Mutex& _rMutex,
-                const ::std::vector< ::rtl::OUString> &_rVector)
+                const ::std::vector< OUString> &_rVector)
             : connectivity::sdbcx::OCollection(*_pKey,sal_True,_rMutex,_rVector)
             ,m_pKey(_pKey)
 {
 }
 // -------------------------------------------------------------------------
-sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OKeyColumnsHelper::createObject(const OUString& _rName)
 {
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-    ::rtl::OUString aCatalog, aSchema, aTable;
+    OUString aCatalog, aSchema, aTable;
     ::com::sun::star::uno::Any Catalog(m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME)));
     Catalog >>= aCatalog;
     m_pKey->getTable()->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))   >>= aSchema;
@@ -58,11 +58,11 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName)
     Reference< XResultSet > xResult = m_pKey->getTable()->getMetaData()->getImportedKeys(
             Catalog, aSchema, aTable);
 
-    ::rtl::OUString aRefColumnName;
+    OUString aRefColumnName;
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aTemp;
+        OUString aTemp;
         while(xResult->next())
         {
             aTemp = xRow->getString(4);
@@ -87,11 +87,11 @@ sdbcx::ObjectType OKeyColumnsHelper::createObject(const ::rtl::OUString& _rName)
             if ( xRow->getString(4) == _rName )
             {
                 sal_Int32 nDataType = xRow->getInt(5);
-                ::rtl::OUString aTypeName(xRow->getString(6));
+                OUString aTypeName(xRow->getString(6));
                 sal_Int32 nSize = xRow->getInt(7);
                 sal_Int32 nDec  = xRow->getInt(9);
                 sal_Int32 nNull = xRow->getInt(11);
-                ::rtl::OUString sColumnDef;
+                OUString sColumnDef;
                 try
                 {
                     sColumnDef = xRow->getString(13);
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index 1c8b6490ab02..7466d5b3513d 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -51,7 +51,7 @@ OKeysHelper::OKeysHelper(   OTableHelper* _pTable,
 {
 }
 // -------------------------------------------------------------------------
-sdbcx::ObjectType OKeysHelper::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName)
 {
     sdbcx::ObjectType xRet = NULL;
 
@@ -82,7 +82,7 @@ Reference< XPropertySet > OKeysHelper::createDescriptor()
 // -----------------------------------------------------------------------------
 /** returns the keyrule string for the primary key
 */
-::rtl::OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule)
+OUString getKeyRuleString(sal_Bool _bUpdate,sal_Int32 _nKeyRule)
 {
     const char* pKeyRule = NULL;
     switch ( _nKeyRule )
@@ -102,9 +102,9 @@ Reference< XPropertySet > OKeysHelper::createDescriptor()
         default:
             ;
     }
-    ::rtl::OUString sRet;
+    OUString sRet;
     if ( pKeyRule )
-        sRet = ::rtl::OUString::createFromAscii(pKeyRule);
+        sRet = OUString::createFromAscii(pKeyRule);
     return sRet;
 }
 // -------------------------------------------------------------------------
@@ -125,7 +125,7 @@ void OKeysHelper::cloneDescriptorColumns( const sdbcx::ObjectType& _rSourceDescr
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OKeysHelper::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( !xConnection.is() )
@@ -140,7 +140,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
     const ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
     sal_Int32 nKeyType      = getINT32(descriptor->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_TYPE)));
     sal_Int32 nUpdateRule = 0, nDeleteRule = 0;
-    ::rtl::OUString sReferencedName;
+    OUString sReferencedName;
 
     if ( nKeyType == KeyType::FOREIGN )
     {
@@ -157,9 +157,9 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
     {
         // if we're here, we belong to a table which is not new, i.e. already exists in the database.
         // In this case, really append the new index.
-        ::rtl::OUStringBuffer aSql;
+        OUStringBuffer aSql;
         aSql.appendAscii("ALTER TABLE ");
-        ::rtl::OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
+        OUString aQuote  = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString(  );
 
         aSql.append(composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable, ::dbtools::eInTableDefinitions, false, false, true ));
         aSql.appendAscii(" ADD ");
@@ -211,10 +211,10 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
         xStmt->execute(aSql.makeStringAndClear());
     }
     // find the name which the database gave the new key
-    ::rtl::OUString sNewName( _rForName );
+    OUString sNewName( _rForName );
     try
     {
-        ::rtl::OUString aSchema,aTable;
+        OUString aSchema,aTable;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME)) >>= aSchema;
         m_pTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))       >>= aTable;
         Reference< XResultSet > xResult;
@@ -235,7 +235,7 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
             Reference< XRow > xRow(xResult,UNO_QUERY);
             while( xResult->next() )
             {
-                ::rtl::OUString sName = xRow->getString(nColumn);
+                OUString sName = xRow->getString(nColumn);
                 if ( !m_pElements->exists(sName) ) // this name wasn't inserted yet so it must be te new one
                 {
                     descriptor->setPropertyValue( rPropMap.getNameByIndex( PROPERTY_ID_NAME ), makeAny( sName ) );
@@ -255,13 +255,13 @@ sdbcx::ObjectType OKeysHelper::appendObject( const ::rtl::OUString& _rForName, c
     return createObject( sNewName );
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OKeysHelper::getDropForeignKey() const
+OUString OKeysHelper::getDropForeignKey() const
 {
-    return ::rtl::OUString(" DROP CONSTRAINT ");
+    return OUString(" DROP CONSTRAINT ");
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
+void OKeysHelper::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
     Reference< XConnection> xConnection = m_pTable->getConnection();
     if ( xConnection.is() && !m_pTable->isNew() )
@@ -273,7 +273,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName
         }
         else
         {
-            ::rtl::OUStringBuffer aSql;
+            OUStringBuffer aSql;
             aSql.appendAscii("ALTER TABLE ");
 
             aSql.append( composeTableName( m_pTable->getConnection()->getMetaData(), m_pTable,::dbtools::eInTableDefinitions, false, false, true ));
@@ -291,7 +291,7 @@ void OKeysHelper::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName
             else
             {
                 aSql.append(getDropForeignKey());
-                const ::rtl::OUString aQuote    = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString();
+                const OUString aQuote    = m_pTable->getConnection()->getMetaData()->getIdentifierQuoteString();
                 aSql.append( ::dbtools::quoteName( aQuote,_sElementName) );
             }
 
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 3aec1f8aa7c6..c26a61eec22f 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -30,14 +30,14 @@ using namespace ::com::sun::star::lang;
 //------------------------------------------------------------------------------
 OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>& _rxMeta
                                            , const Any& catalog
-                                           , const ::rtl::OUString& schemaPattern
-                                           , const ::rtl::OUString& tableNamePattern)
+                                           , const OUString& schemaPattern
+                                           , const OUString& tableNamePattern)
                                            : ODatabaseMetaDataResultSet(eTablePrivileges)
                                            , m_bResetValues(sal_True)
 {
     osl_atomic_increment( &m_refCount );
     {
-        ::rtl::OUString sUserWorkingFor;
+        OUString sUserWorkingFor;
         Sequence< OUString > sTableTypes(3);
         // we want all catalogues, all schemas, all tables
         sTableTypes[0] = "VIEW";
@@ -58,7 +58,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
         static ODatabaseMetaDataResultSet::ORow aRow(8);
         aRow[5] = new ORowSetValueDecorator(sUserWorkingFor);
         aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
-        aRow[7] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+        aRow[7] = new ORowSetValueDecorator(OUString("YES"));
         aRows.push_back(aRow);
         aRow[6] = ODatabaseMetaDataResultSet::getInsertValue();
         aRows.push_back(aRow);
@@ -74,7 +74,7 @@ OResultSetPrivileges::OResultSetPrivileges( const Reference< XDatabaseMetaData>&
         aRows.push_back(aRow);
         aRow[6] = ODatabaseMetaDataResultSet::getDropValue();
         aRows.push_back(aRow);
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString("REFERENCE"));
+        aRow[6] = new ORowSetValueDecorator(OUString("REFERENCE"));
         aRows.push_back(aRow);
 
         setRows(aRows);
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index e17eaa5a013c..8442a2619930 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -53,7 +53,7 @@ typedef ::cppu::WeakImplHelper1 < XContainerListener > OTableContainerListener_B
 class OTableContainerListener : public OTableContainerListener_BASE
 {
     OTableHelper* m_pComponent;
-    ::std::map< ::rtl::OUString,bool> m_aRefNames;
+    ::std::map< OUString,bool> m_aRefNames;
 
     OTableContainerListener(const OTableContainerListener&);
     void operator =(const OTableContainerListener&);
@@ -66,14 +66,14 @@ public:
     }
     virtual void SAL_CALL elementRemoved( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException)
     {
-        ::rtl::OUString sName;
+        OUString sName;
         Event.Accessor  >>= sName;
         if ( m_aRefNames.find(sName) != m_aRefNames.end() )
             m_pComponent->refreshKeys();
     }
     virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (RuntimeException)
     {
-        ::rtl::OUString sOldComposedName,sNewComposedName;
+        OUString sOldComposedName,sNewComposedName;
         Event.ReplacedElement   >>= sOldComposedName;
         Event.Accessor          >>= sNewComposedName;
         if ( sOldComposedName != sNewComposedName && m_aRefNames.find(sOldComposedName) != m_aRefNames.end() )
@@ -84,14 +84,14 @@ public:
     {
     }
     void clear() { m_pComponent = NULL; }
-    inline void add(const ::rtl::OUString& _sRefName) { m_aRefNames.insert(::std::map< ::rtl::OUString,bool>::value_type(_sRefName,true)); }
+    inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); }
 };
 }
 namespace connectivity
 {
-    ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting)
+    OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting)
     {
-        ::rtl::OUString sSupportService;
+        OUString sSupportService;
         Any aValue;
         if ( ::dbtools::getDataSourceSetting(_xConnection,i_sSetting,aValue) )
         {
@@ -122,13 +122,13 @@ namespace connectivity
                 Reference<XMultiServiceFactory> xFac(_xConnection,UNO_QUERY);
                 if ( xFac.is() )
                 {
-                    static const ::rtl::OUString s_sTableRename("TableRenameServiceName");
+                    static const OUString s_sTableRename("TableRenameServiceName");
                     m_xRename.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableRename)),UNO_QUERY);
-                    static const ::rtl::OUString s_sTableAlteration("TableAlterationServiceName");
+                    static const OUString s_sTableAlteration("TableAlterationServiceName");
                     m_xAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sTableAlteration)),UNO_QUERY);
-                    static const ::rtl::OUString s_sKeyAlteration("KeyAlterationServiceName");
+                    static const OUString s_sKeyAlteration("KeyAlterationServiceName");
                     m_xKeyAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sKeyAlteration)),UNO_QUERY);
-                    static const ::rtl::OUString s_sIndexAlteration("IndexAlterationServiceName");
+                    static const OUString s_sIndexAlteration("IndexAlterationServiceName");
                     m_xIndexAlter.set(xFac->createInstance(lcl_getServiceNameForSetting(m_xConnection,s_sIndexAlteration)),UNO_QUERY);
                 }
             }
@@ -150,11 +150,11 @@ OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
 OTableHelper::OTableHelper( sdbcx::OCollection* _pTables,
                             const Reference< XConnection >& _xConnection,
                             sal_Bool _bCase,
-                            const ::rtl::OUString& _Name,
-                            const ::rtl::OUString& _Type,
-                            const ::rtl::OUString& _Description ,
-                            const ::rtl::OUString& _SchemaName,
-                            const ::rtl::OUString& _CatalogName
+                            const OUString& _Name,
+                            const OUString& _Type,
+                            const OUString& _Description ,
+                            const OUString& _SchemaName,
+                            const OUString& _CatalogName
                         ) : OTable_TYPEDEF(_pTables,
                                             _bCase,
                                             _Name,
@@ -194,17 +194,17 @@ namespace
     void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns )
     {
         Reference< XRow > xRow( _rxResult, UNO_QUERY_THROW );
-        ::rtl::OUString sName;
+        OUString sName;
         OrdinalPosition nOrdinalPosition( 0 );
         while ( _rxResult->next() )
         {
             sName = xRow->getString( 4 );           // COLUMN_NAME
             sal_Int32       nField5 = xRow->getInt(5);
-            ::rtl::OUString aField6 = xRow->getString(6);
+            OUString aField6 = xRow->getString(6);
             sal_Int32       nField7 = xRow->getInt(7)
                         ,   nField9 = xRow->getInt(9)
                         ,   nField11= xRow->getInt(11);
-            ::rtl::OUString  sField12 = xRow->getString(12)
+            OUString  sField12 = xRow->getString(12)
                             ,sField13 = xRow->getString(13);
             nOrdinalPosition = xRow->getInt( 17 );  // ORDINAL_POSITION
             _out_rColumns.push_back( ColumnDesc( sName,nField5,aField6,nField7,nField9,nField11,sField12,sField13, nOrdinalPosition ) );
@@ -272,7 +272,7 @@ void OTableHelper::refreshColumns()
             aCatalog,
             m_SchemaName,
             m_Name,
-            ::rtl::OUString("%")
+            OUString("%")
         ) );
 
         // collect the column names, together with their ordinal position
@@ -283,7 +283,7 @@ void OTableHelper::refreshColumns()
         lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc );
 
         // sort by ordinal position
-        ::std::map< OrdinalPosition, ::rtl::OUString > aSortedColumns;
+        ::std::map< OrdinalPosition, OUString > aSortedColumns;
         for (   ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
                 copy != m_pImpl->m_aColumnDesc.end();
                 ++copy
@@ -295,7 +295,7 @@ void OTableHelper::refreshColumns()
             aSortedColumns.begin(),
             aSortedColumns.end(),
             ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
-            ::o3tl::select2nd< ::std::map< OrdinalPosition, ::rtl::OUString >::value_type >()
+            ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >()
         );
     }
 
@@ -305,7 +305,7 @@ void OTableHelper::refreshColumns()
         m_pColumns  = createColumns(aVector);
 }
 // -----------------------------------------------------------------------------
-const ColumnDesc* OTableHelper::getColumnDescription(const ::rtl::OUString& _sName) const
+const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const
 {
     const ColumnDesc* pRet = NULL;
     ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
@@ -329,8 +329,8 @@ void OTableHelper::refreshPrimaryKeys(TStringVector& _rNames)
 
     if ( xResult.is() )
     {
-        sdbcx::TKeyProperties pKeyProps(new sdbcx::KeyProperties(::rtl::OUString(),KeyType::PRIMARY,0,0));
-        ::rtl::OUString aPkName;
+        sdbcx::TKeyProperties pKeyProps(new sdbcx::KeyProperties(OUString(),KeyType::PRIMARY,0,0));
+        OUString aPkName;
         bool bAlreadyFetched = false;
         const Reference< XRow > xRow(xResult,UNO_QUERY);
         while ( xResult->next() )
@@ -360,20 +360,20 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
     if ( xRow.is() )
     {
         sdbcx::TKeyProperties pKeyProps;
-        ::rtl::OUString aName,sCatalog,aSchema,sOldFKName;
+        OUString aName,sCatalog,aSchema,sOldFKName;
         while( xResult->next() )
         {
             // this must be outsid the "if" because we have to call in a right order
             sCatalog    = xRow->getString(1);
             if ( xRow->wasNull() )
-                sCatalog = ::rtl::OUString();
+                sCatalog = OUString();
             aSchema     = xRow->getString(2);
             aName       = xRow->getString(3);
 
-            const ::rtl::OUString sForeignKeyColumn = xRow->getString(8);
+            const OUString sForeignKeyColumn = xRow->getString(8);
             const sal_Int32 nUpdateRule = xRow->getInt(10);
             const sal_Int32 nDeleteRule = xRow->getInt(11);
-            const ::rtl::OUString sFkName = xRow->getString(12);
+            const OUString sFkName = xRow->getString(12);
 
                 if ( pKeyProps.get() )
                 {
@@ -387,7 +387,7 @@ void OTableHelper::refreshForeignKeys(TStringVector& _rNames)
                     if ( pKeyProps.get() )
                         m_pImpl->m_aKeys.insert(TKeyMap::value_type(sOldFKName,pKeyProps));
 
-                    const ::rtl::OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation);
+                    const OUString sReferencedName = ::dbtools::composeTableName(getMetaData(),sCatalog,aSchema,aName,sal_False,::dbtools::eInDataManipulation);
                     pKeyProps.reset(new sdbcx::KeyProperties(sReferencedName,KeyType::FOREIGN,nUpdateRule,nDeleteRule));
                     pKeyProps->m_aKeyColumnNames.push_back(sForeignKeyColumn);
                     _rNames.push_back(sFkName);
@@ -446,9 +446,9 @@ void OTableHelper::refreshIndexes()
         if(xResult.is())
         {
             Reference< XRow > xRow(xResult,UNO_QUERY);
-            ::rtl::OUString aName;
-            ::rtl::OUString sCatalogSep = getMetaData()->getCatalogSeparator();
-            ::rtl::OUString sPreviousRoundName;
+            OUString aName;
+            OUString sCatalogSep = getMetaData()->getCatalogSeparator();
+            OUString sPreviousRoundName;
             while( xResult->next() )
             {
                 aName = xRow->getString(5);
@@ -473,19 +473,19 @@ void OTableHelper::refreshIndexes()
         m_pIndexes  = createIndexes(aVector);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OTableHelper::getRenameStart() const
+OUString OTableHelper::getRenameStart() const
 {
-    ::rtl::OUString sSql("RENAME ");
-    if ( m_Type == ::rtl::OUString("VIEW") )
-        sSql += ::rtl::OUString(" VIEW ");
+    OUString sSql("RENAME ");
+    if ( m_Type == OUString("VIEW") )
+        sSql += OUString(" VIEW ");
     else
-        sSql += ::rtl::OUString(" TABLE ");
+        sSql += OUString(" TABLE ");
 
     return sSql;
 }
 // -------------------------------------------------------------------------
 // XRename
-void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
+void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -504,15 +504,15 @@ void SAL_CALL OTableHelper::rename( const ::rtl::OUString& newName ) throw(SQLEx
         }
         else
         {
-            ::rtl::OUString sSql = getRenameStart();
+            OUString sSql = getRenameStart();
 
-            ::rtl::OUString sCatalog,sSchema,sTable;
+            OUString sCatalog,sSchema,sTable;
             ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-            ::rtl::OUString sComposedName;
+            OUString sComposedName;
             sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_True,::dbtools::eInDataManipulation);
             sSql += sComposedName
-                 + ::rtl::OUString(" TO ");
+                 + OUString(" TO ");
             sComposedName = ::dbtools::composeTableName(getMetaData(),sCatalog,sSchema,sTable,sal_True,::dbtools::eInDataManipulation);
             sSql += sComposedName;
 
@@ -552,9 +552,9 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference
 }
 
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OTableHelper::getName() throw(RuntimeException)
+OUString SAL_CALL OTableHelper::getName() throw(RuntimeException)
 {
-    ::rtl::OUString sComposedName;
+    OUString sComposedName;
     sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,sal_False,::dbtools::eInDataManipulation);
     return sComposedName;
 }
@@ -569,7 +569,7 @@ void SAL_CALL OTableHelper::release() throw()
     OTable_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sName) const
+sdbcx::TKeyProperties OTableHelper::getKeyProperties(const OUString& _sName) const
 {
     sdbcx::TKeyProperties pKeyProps;
     TKeyMap::const_iterator aFind = m_pImpl->m_aKeys.find(_sName);
@@ -586,14 +586,14 @@ sdbcx::TKeyProperties OTableHelper::getKeyProperties(const ::rtl::OUString& _sNa
     return pKeyProps;
 }
 // -----------------------------------------------------------------------------
-void OTableHelper::addKey(const ::rtl::OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties)
+void OTableHelper::addKey(const OUString& _sName,const sdbcx::TKeyProperties& _aKeyProperties)
 {
     m_pImpl->m_aKeys.insert(TKeyMap::value_type(_sName,_aKeyProperties));
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OTableHelper::getTypeCreatePattern() const
+OUString OTableHelper::getTypeCreatePattern() const
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -----------------------------------------------------------------------------
 Reference< XConnection> OTableHelper::getConnection() const
diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx
index 2da06c8f9179..05e6a448122a 100644
--- a/connectivity/source/commontools/conncleanup.cxx
+++ b/connectivity/source/commontools/conncleanup.cxx
@@ -33,9 +33,9 @@ namespace dbtools
     using namespace ::com::sun::star::lang;
 
     //=====================================================================
-    static const ::rtl::OUString& getActiveConnectionPropertyName()
+    static const OUString& getActiveConnectionPropertyName()
     {
-        static const ::rtl::OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
+        static const OUString s_sActiveConnectionPropertyName( "ActiveConnection" );
         return s_sActiveConnectionPropertyName;
     }
 
diff --git a/connectivity/source/commontools/dbcharset.cxx b/connectivity/source/commontools/dbcharset.cxx
index 93fac347ed4a..04c9aec71b10 100644
--- a/connectivity/source/commontools/dbcharset.cxx
+++ b/connectivity/source/commontools/dbcharset.cxx
@@ -99,7 +99,7 @@ namespace dbtools
     }
 
     //-------------------------------------------------------------------------
-    OCharsetMap::CharsetIterator    OCharsetMap::find(const ::rtl::OUString& _rIanaName, const IANA&) const
+    OCharsetMap::CharsetIterator    OCharsetMap::find(const OUString& _rIanaName, const IANA&) const
     {
         ensureConstructed( );
 
@@ -107,7 +107,7 @@ namespace dbtools
         if ( !_rIanaName.isEmpty() )
         {
             // byte string conversion
-            ::rtl::OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US );
+            OString sMimeByteString( _rIanaName.getStr(), _rIanaName.getLength(), RTL_TEXTENCODING_ASCII_US );
             // look up
             eEncoding = rtl_getTextEncodingFromMimeCharset( sMimeByteString.getStr() );
 
@@ -139,7 +139,7 @@ namespace dbtools
     }
 
     //-------------------------------------------------------------------------
-    CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const ::rtl::OUString& _rIanaName )
+    CharsetIteratorDerefHelper:: CharsetIteratorDerefHelper(const rtl_TextEncoding _eEncoding, const OUString& _rIanaName )
         :m_eEncoding( _eEncoding )
         ,m_aIanaName( _rIanaName )
     {
@@ -174,14 +174,14 @@ namespace dbtools
         OSL_ENSURE( m_aPos != m_pContainer->m_aEncodings.end(), "OCharsetMap::CharsetIterator::operator*: invalid position!");
 
         rtl_TextEncoding eEncoding = *m_aPos;
-        ::rtl::OUString sIanaName;
+        OUString sIanaName;
 
         if ( RTL_TEXTENCODING_DONTKNOW != eEncoding )
         {   // it's not the virtual "system charset"
             const char* pIanaName = rtl_getMimeCharsetFromTextEncoding( eEncoding );
             OSL_ENSURE( pIanaName, "OCharsetMap::CharsetIterator: invalid mime name!" );
             if ( pIanaName )
-                sIanaName = ::rtl::OUString::createFromAscii( pIanaName );
+                sIanaName = OUString::createFromAscii( pIanaName );
         }
         return CharsetIteratorDerefHelper( eEncoding, sIanaName );
     }
diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx
index 698ce2e37e18..0af54185befd 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -53,7 +53,7 @@ namespace dbtools
         return STANDARD_DB_DATE;
     }
     //------------------------------------------------------------------------------
-    ::rtl::OUString DBTypeConversion::toDateString(const Date& rDate)
+    OUString DBTypeConversion::toDateString(const Date& rDate)
     {
         sal_Char s[11];
         snprintf(s,
@@ -63,10 +63,10 @@ namespace dbtools
                 (int)rDate.Month,
                 (int)rDate.Day);
         s[10] = 0;
-        return ::rtl::OUString::createFromAscii(s);
+        return OUString::createFromAscii(s);
     }
     //------------------------------------------------------------------
-    ::rtl::OUString DBTypeConversion::toTimeString(const Time& rTime)
+    OUString DBTypeConversion::toTimeString(const Time& rTime)
     {
         sal_Char s[9];
         snprintf(s,
@@ -76,14 +76,14 @@ namespace dbtools
                 (int)rTime.Minutes,
                 (int)rTime.Seconds);
         s[8] = 0;
-        return ::rtl::OUString::createFromAscii(s);
+        return OUString::createFromAscii(s);
     }
 
     //------------------------------------------------------------------
-    ::rtl::OUString DBTypeConversion::toDateTimeString(const DateTime& _rDateTime)
+    OUString DBTypeConversion::toDateTimeString(const DateTime& _rDateTime)
     {
         Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
-        ::rtl::OUStringBuffer aTemp(toDateString(aDate));
+        OUStringBuffer aTemp(toDateString(aDate));
         aTemp.appendAscii(" ");
         Time aTime(0,_rDateTime.Seconds,_rDateTime.Minutes,_rDateTime.Hours);
         aTemp.append( toTimeString(aTime) );
@@ -381,7 +381,7 @@ namespace dbtools
         return xRet;
     }
     //------------------------------------------------------------------------------
-    Date DBTypeConversion::toDate(const ::rtl::OUString& _sSQLString)
+    Date DBTypeConversion::toDate(const OUString& _sSQLString)
     {
         // get the token out of a string
         static sal_Unicode sDateSep = '-';
@@ -402,7 +402,7 @@ namespace dbtools
     }
 
     //-----------------------------------------------------------------------------
-    DateTime DBTypeConversion::toDateTime(const ::rtl::OUString& _sSQLString)
+    DateTime DBTypeConversion::toDateTime(const OUString& _sSQLString)
     {
         //@see http://java.sun.com/j2se/1.4.2/docs/api/java/sql/Timestamp.html#valueOf(java.lang.String)
         //@see http://java.sun.com/j2se/1.4.2/docs/api/java/sql/Date.html#valueOf(java.lang.String)
@@ -419,7 +419,7 @@ namespace dbtools
     }
 
     //-----------------------------------------------------------------------------
-    Time DBTypeConversion::toTime(const ::rtl::OUString& _sSQLString)
+    Time DBTypeConversion::toTime(const OUString& _sSQLString)
     {
         static sal_Unicode sTimeSep = ':';
 
@@ -436,12 +436,12 @@ namespace dbtools
             {
                 nSecond = (sal_uInt16)_sSQLString.getToken(0,sTimeSep,nIndex).toInt32();
                 nIndex = 0;
-                ::rtl::OUString sNano(_sSQLString.getToken(1,'.',nIndex));
+                OUString sNano(_sSQLString.getToken(1,'.',nIndex));
                 if ( !sNano.isEmpty() )
                 {
                     // our time struct only supports hundredth seconds
                     sNano = sNano.copy(0,::std::min<sal_Int32>(sNano.getLength(),2));
-                    const static ::rtl::OUString s_Zeros("00");
+                    const static OUString s_Zeros("00");
                     sNano += s_Zeros.copy(0,s_Zeros.getLength() - sNano.getLength());
                     nHundredthSeconds = static_cast<sal_uInt16>(sNano.toInt32());
                 }
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index 02ae48c75d83..5dcac1bec49c 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -70,7 +70,7 @@ SQLExceptionInfo::SQLExceptionInfo(const ::com::sun::star::sdb::SQLContext& _rEr
 }
 
 //------------------------------------------------------------------------------
-SQLExceptionInfo::SQLExceptionInfo( const ::rtl::OUString& _rSimpleErrorMessage )
+SQLExceptionInfo::SQLExceptionInfo( const OUString& _rSimpleErrorMessage )
 {
     SQLException aError;
     aError.Message = _rSimpleErrorMessage;
@@ -198,12 +198,12 @@ SQLExceptionInfo::operator const ::com::sun::star::sdb::SQLContext*() const
 }
 
 //------------------------------------------------------------------------------
-void SQLExceptionInfo::prepend( const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
+void SQLExceptionInfo::prepend( const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
 {
     SQLException aException;
     aException.Message = _rErrorMessage;
     aException.ErrorCode = _nErrorCode;
-    aException.SQLState = _pAsciiSQLState ? ::rtl::OUString::createFromAscii( _pAsciiSQLState ) : ::rtl::OUString("S1000" );
+    aException.SQLState = _pAsciiSQLState ? OUString::createFromAscii( _pAsciiSQLState ) : OUString("S1000" );
     aException.NextException = m_aContent;
     m_aContent <<= aException;
 
@@ -211,7 +211,7 @@ void SQLExceptionInfo::prepend( const ::rtl::OUString& _rErrorMessage, const sal
 }
 
 //------------------------------------------------------------------------------
-void SQLExceptionInfo::append( TYPE _eType, const ::rtl::OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
+void SQLExceptionInfo::append( TYPE _eType, const OUString& _rErrorMessage, const sal_Char* _pAsciiSQLState, const sal_Int32 _nErrorCode )
 {
     // create the to-be-appended exception
     Any aAppend;
@@ -227,7 +227,7 @@ void SQLExceptionInfo::append( TYPE _eType, const ::rtl::OUString& _rErrorMessag
 
     SQLException* pAppendException( static_cast< SQLException* >( const_cast< void* >( aAppend.getValue() ) ) );
     pAppendException->Message = _rErrorMessage;
-    pAppendException->SQLState = ::rtl::OUString::createFromAscii( _pAsciiSQLState );
+    pAppendException->SQLState = OUString::createFromAscii( _pAsciiSQLState );
     pAppendException->ErrorCode = _nErrorCode;
 
     // find the end of the current chain
@@ -386,7 +386,7 @@ void throwInvalidIndexException(const ::com::sun::star::uno::Reference< ::com::s
     );
 }
 // -----------------------------------------------------------------------------
-void throwFunctionNotSupportedException(const ::rtl::OUString& _rMsg,
+void throwFunctionNotSupportedException(const OUString& _rMsg,
         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context,
         const ::com::sun::star::uno::Any& _Next)  throw ( ::com::sun::star::sdbc::SQLException )
 {
@@ -403,9 +403,9 @@ void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, co
         const ::com::sun::star::uno::Any* _pNextException ) throw ( ::com::sun::star::sdbc::SQLException )
 {
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+    const OUString sError( aResources.getResourceStringWithSubstitution(
             STR_UNSUPPORTED_FUNCTION,
-            "$functionname$", ::rtl::OUString::createFromAscii( _pAsciiFunctionName )
+            "$functionname$", OUString::createFromAscii( _pAsciiFunctionName )
          ) );
     throwFunctionNotSupportedException(
         sError,
@@ -414,14 +414,14 @@ void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, co
     );
 }
 // -----------------------------------------------------------------------------
-void throwGenericSQLException(const ::rtl::OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource)
+void throwGenericSQLException(const OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource)
     throw (::com::sun::star::sdbc::SQLException)
 {
     throwGenericSQLException(_rMsg, _rxSource, Any());
 }
 
 // -----------------------------------------------------------------------------
-void throwGenericSQLException(const ::rtl::OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
+void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException)
     throw (SQLException)
 {
     throw SQLException( _rMsg, _rxSource, getStandardSQLState( SQL_GENERAL_ERROR ), 0, _rNextException);
@@ -432,9 +432,9 @@ void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, co
     throw (SQLException)
 {
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+    const OUString sError( aResources.getResourceStringWithSubstitution(
             STR_UNSUPPORTED_FEATURE,
-            "$featurename$", ::rtl::OUString::createFromAscii( _pAsciiFeatureName )
+            "$featurename$", OUString::createFromAscii( _pAsciiFeatureName )
          ) );
 
     throw SQLException(
@@ -451,9 +451,9 @@ void throwSQLException( const sal_Char* _pAsciiMessage, const sal_Char* _pAsciiS
         const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException)
 {
     throw SQLException(
-        ::rtl::OUString::createFromAscii( _pAsciiMessage ),
+        OUString::createFromAscii( _pAsciiMessage ),
         _rxContext,
-        ::rtl::OUString::createFromAscii( _pAsciiState ),
+        OUString::createFromAscii( _pAsciiState ),
         _nErrorCode,
         _pNextException ? *_pNextException : Any()
     );
@@ -468,7 +468,7 @@ void throwSQLException( const sal_Char* _pAsciiMessage, StandardSQLState _eSQLSt
 }
 
 // -----------------------------------------------------------------------------
-void throwSQLException( const ::rtl::OUString& _rMessage, StandardSQLState _eSQLState,
+void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState,
         const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode,
         const Any* _pNextException ) throw (SQLException)
 {
@@ -518,9 +518,9 @@ const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState )
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString getStandardSQLState( StandardSQLState _eState )
+OUString getStandardSQLState( StandardSQLState _eState )
 {
-    return ::rtl::OUString::createFromAscii( getStandardSQLStateAscii( _eState ) );
+    return OUString::createFromAscii( getStandardSQLStateAscii( _eState ) );
 }
 
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 35030118ab74..79881a425d73 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -81,8 +81,8 @@ namespace dbtools
         Reference< XDatabaseMetaData >  xConnectionMetaData;
         ::connectivity::DriversConfig   aDriverConfig;
 
-        ::boost::optional< ::rtl::OUString >    sCachedIdentifierQuoteString;
-        ::boost::optional< ::rtl::OUString >    sCachedCatalogSeparator;
+        ::boost::optional< OUString >    sCachedIdentifierQuoteString;
+        ::boost::optional< OUString >    sCachedCatalogSeparator;
 
         DatabaseMetaData_Impl()
             :xConnection()
@@ -115,7 +115,7 @@ namespace dbtools
             if ( !_metaDataImpl.xConnection.is() || !_metaDataImpl.xConnectionMetaData.is() )
             {
                 ::connectivity::SharedResources aResources;
-                const ::rtl::OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN));
+                const OUString sError( aResources.getResourceString(STR_NO_CONNECTION_GIVEN));
                 throwSQLException( sError, SQL_CONNECTION_DOES_NOT_EXIST, NULL );
             }
         }
@@ -141,10 +141,10 @@ namespace dbtools
                 {
                     Reference< XPropertySet > xDataSource( xConnectionAsChild->getParent(), UNO_QUERY_THROW );
                     Reference< XPropertySet > xDataSourceSettings(
-                        xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ),
+                        xDataSource->getPropertyValue( OUString( "Settings" ) ),
                         UNO_QUERY_THROW );
 
-                    _out_setting = xDataSourceSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _asciiName ) );
+                    _out_setting = xDataSourceSettings->getPropertyValue( OUString::createFromAscii( _asciiName ) );
                 }
                 else
                 {
@@ -163,9 +163,9 @@ namespace dbtools
         }
 
         //................................................................
-        static const ::rtl::OUString& lcl_getConnectionStringSetting(
-            const DatabaseMetaData_Impl& _metaData, ::boost::optional< ::rtl::OUString >& _cachedSetting,
-            ::rtl::OUString (SAL_CALL XDatabaseMetaData::*_getter)() )
+        static const OUString& lcl_getConnectionStringSetting(
+            const DatabaseMetaData_Impl& _metaData, ::boost::optional< OUString >& _cachedSetting,
+            OUString (SAL_CALL XDatabaseMetaData::*_getter)() )
         {
             if ( !_cachedSetting )
             {
@@ -265,13 +265,13 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString&  DatabaseMetaData::getIdentifierQuoteString() const
+    const OUString&  DatabaseMetaData::getIdentifierQuoteString() const
     {
         return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedIdentifierQuoteString, &XDatabaseMetaData::getIdentifierQuoteString );
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString&  DatabaseMetaData::getCatalogSeparator() const
+    const OUString&  DatabaseMetaData::getCatalogSeparator() const
     {
         return lcl_getConnectionStringSetting( *m_pImpl, m_pImpl->sCachedCatalogSeparator, &XDatabaseMetaData::getCatalogSeparator );
     }
@@ -341,7 +341,7 @@ namespace dbtools
         {
             if ( !bSupport )
             {
-                const ::rtl::OUString url = m_pImpl->xConnectionMetaData->getURL();
+                const OUString url = m_pImpl->xConnectionMetaData->getURL();
                 char pMySQL[] = "sdbc:mysql";
                 bSupport = url.matchAsciiL(pMySQL,(sizeof(pMySQL)/sizeof(pMySQL[0]))-1);
             }
@@ -404,7 +404,7 @@ namespace dbtools
         try
         {
             Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW );
-            ::rtl::OUString sConnectionURL( xMeta->getURL() );
+            OUString sConnectionURL( xMeta->getURL() );
             doDisplay = sConnectionURL.startsWith( "sdbc:mysql:mysqlc" );
         }
         catch( const Exception& )
@@ -421,7 +421,7 @@ namespace dbtools
         try
         {
             Reference< XDatabaseMetaData > xMeta( m_pImpl->xConnectionMetaData, UNO_SET_THROW );
-            ::rtl::OUString sConnectionURL( xMeta->getURL() );
+            OUString sConnectionURL( xMeta->getURL() );
             bSupported = !sConnectionURL.startsWith( "sdbc:mysql:mysqlc" );
         }
         catch( const Exception& )
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 8e6513dc7abd..f362bff17be2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -133,10 +133,10 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     try
     {
         // determine the datatype of the column
-        _xColumn->getPropertyValue(::rtl::OUString("Type")) >>= nDataType;
+        _xColumn->getPropertyValue(OUString("Type")) >>= nDataType;
 
         if (DataType::NUMERIC == nDataType || DataType::DECIMAL == nDataType)
-            _xColumn->getPropertyValue(::rtl::OUString("Scale")) >>= nScale;
+            _xColumn->getPropertyValue(OUString("Scale")) >>= nScale;
     }
     catch (Exception&)
     {
@@ -144,7 +144,7 @@ sal_Int32 getDefaultNumberFormat(const Reference< XPropertySet >& _xColumn,
     }
     return getDefaultNumberFormat(nDataType,
                     nScale,
-                    ::cppu::any2bool(_xColumn->getPropertyValue(::rtl::OUString("IsCurrency"))),
+                    ::cppu::any2bool(_xColumn->getPropertyValue(OUString("IsCurrency"))),
                     _xTypes,
                     _rLocale);
 }
@@ -185,7 +185,7 @@ sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType,
                 {
                     // generate a new format if necessary
                     Reference< XNumberFormats > xFormats(_xTypes, UNO_QUERY);
-                    ::rtl::OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True);
+                    OUString sNewFormat = xFormats->generateFormat( 0L, _rLocale, sal_False, sal_False, (sal_Int16)_nScale, sal_True);
 
                     // and add it to the formatter if necessary
                     nFormat = xFormats->queryKey(sNewFormat, _rLocale, sal_False);
@@ -247,7 +247,7 @@ Reference< XConnection> findConnection(const Reference< XInterface >& xParent)
 
 //------------------------------------------------------------------------------
 Reference< XDataSource> getDataSource_allowException(
-            const ::rtl::OUString& _rsTitleOrPath,
+            const OUString& _rsTitleOrPath,
             const Reference< XComponentContext >& _rxContext )
 {
     ENSURE_OR_RETURN( !_rsTitleOrPath.isEmpty(), "getDataSource_allowException: invalid arg !", NULL );
@@ -259,7 +259,7 @@ Reference< XDataSource> getDataSource_allowException(
 
 //------------------------------------------------------------------------------
 Reference< XDataSource > getDataSource(
-            const ::rtl::OUString& _rsTitleOrPath,
+            const OUString& _rsTitleOrPath,
             const Reference< XComponentContext >& _rxContext )
 {
     Reference< XDataSource > xDS;
@@ -277,9 +277,9 @@ Reference< XDataSource > getDataSource(
 
 //------------------------------------------------------------------------------
 Reference< XConnection > getConnection_allowException(
-            const ::rtl::OUString& _rsTitleOrPath,
-            const ::rtl::OUString& _rsUser,
-            const ::rtl::OUString& _rsPwd,
+            const OUString& _rsTitleOrPath,
+            const OUString& _rsUser,
+            const OUString& _rsPwd,
             const Reference< XComponentContext>& _rxContext)
 {
     Reference< XDataSource> xDataSource( getDataSource_allowException(_rsTitleOrPath, _rxContext) );
@@ -290,13 +290,13 @@ Reference< XConnection > getConnection_allowException(
         if(_rsUser.isEmpty() || _rsPwd.isEmpty())
         {
             Reference<XPropertySet> xProp(xDataSource,UNO_QUERY);
-            ::rtl::OUString sPwd, sUser;
+            OUString sPwd, sUser;
             sal_Bool bPwdReq = sal_False;
             try
             {
                 xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPwd;
-                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(::rtl::OUString("IsPasswordRequired")));
-                xProp->getPropertyValue(::rtl::OUString("User")) >>= sUser;
+                bPwdReq = ::cppu::any2bool(xProp->getPropertyValue(OUString("IsPasswordRequired")));
+                xProp->getPropertyValue(OUString("User")) >>= sUser;
             }
             catch(Exception&)
             {
@@ -322,8 +322,8 @@ Reference< XConnection > getConnection_allowException(
 }
 
 //------------------------------------------------------------------------------
-Reference< XConnection> getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName,
-        const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference< XComponentContext>& _rxContext)
+Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceName,
+        const OUString& _rUser, const OUString& _rPwd, const Reference< XComponentContext>& _rxContext)
     SAL_THROW ( (SQLException) )
 {
     Reference< XConnection > xReturn;
@@ -349,7 +349,7 @@ Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) thro
     Reference< XConnection> xReturn;
     Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY);
     if (xRowSetProps.is())
-        xRowSetProps->getPropertyValue(::rtl::OUString("ActiveConnection")) >>= xReturn;
+        xRowSetProps->getPropertyValue(OUString("ActiveConnection")) >>= xReturn;
     return xReturn;
 }
 
@@ -371,7 +371,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 
         // 1. already connected?
         Reference< XConnection > xExistingConn(
-            xRowSetProps->getPropertyValue( ::rtl::OUString( "ActiveConnection" ) ),
+            xRowSetProps->getPropertyValue( OUString( "ActiveConnection" ) ),
             UNO_QUERY );
 
         if  (   xExistingConn.is()
@@ -383,7 +383,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
         {
             if ( _bSetAsActiveConnection )
             {
-                xRowSetProps->setPropertyValue( ::rtl::OUString( "ActiveConnection" ), makeAny( xExistingConn ) );
+                xRowSetProps->setPropertyValue( OUString( "ActiveConnection" ), makeAny( xExistingConn ) );
                 // no auto disposer needed, since we did not create the connection
             }
 
@@ -393,17 +393,17 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
 
         // build a connection with it's current settings (4. data source name, or 5. URL)
 
-        const ::rtl::OUString sUserProp( "User" );
-        ::rtl::OUString sDataSourceName;
-        xRowSetProps->getPropertyValue(::rtl::OUString("DataSourceName")) >>= sDataSourceName;
-        ::rtl::OUString sURL;
-        xRowSetProps->getPropertyValue(::rtl::OUString("URL")) >>= sURL;
+        const OUString sUserProp( "User" );
+        OUString sDataSourceName;
+        xRowSetProps->getPropertyValue(OUString("DataSourceName")) >>= sDataSourceName;
+        OUString sURL;
+        xRowSetProps->getPropertyValue(OUString("URL")) >>= sURL;
 
         Reference< XConnection > xPureConnection;
         if (!sDataSourceName.isEmpty())
         {   // the row set's data source property is set
             // -> try to connect, get user and pwd setting for that
-            ::rtl::OUString sUser, sPwd;
+            OUString sUser, sPwd;
 
             if (hasProperty(sUserProp, xRowSetProps))
                 xRowSetProps->getPropertyValue(sUserProp) >>= sUser;
@@ -421,7 +421,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
             } catch( const Exception& ) {  }
             if (xDriverManager.is())
             {
-                ::rtl::OUString sUser, sPwd;
+                OUString sUser, sPwd;
                 if (hasProperty(sUserProp, xRowSetProps))
                     xRowSetProps->getPropertyValue(sUserProp) >>= sUser;
                 if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), xRowSetProps))
@@ -458,7 +458,7 @@ SharedConnection lcl_connectRowSet(const Reference< XRowSet>& _rxRowSet, const R
                 }
                 else
                     xRowSetProps->setPropertyValue(
-                        ::rtl::OUString( "ActiveConnection" ),
+                        OUString( "ActiveConnection" ),
                         makeAny( xConnection.getTyped() )
                     );
             }
@@ -489,7 +489,7 @@ SharedConnection ensureRowSetConnection(const Reference< XRowSet>& _rxRowSet, co
 }
 
 //------------------------------------------------------------------------------
-Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,const ::rtl::OUString& _rName)
+Reference< XNameAccess> getTableFields(const Reference< XConnection>& _rxConn,const OUString& _rName)
 {
     Reference< XComponent > xDummy;
     return getFieldsByCommandDescriptor( _rxConn, CommandType::TABLE, _rName, xDummy );
@@ -511,7 +511,7 @@ Reference< XNameAccess> getPrimaryKeyColumns_throw(const Reference< XPropertySet
         if ( xKeys.is() )
         {
             ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-            const ::rtl::OUString sPropName = rPropMap.getNameByIndex(PROPERTY_ID_TYPE);
+            const OUString sPropName = rPropMap.getNameByIndex(PROPERTY_ID_TYPE);
             Reference<XPropertySet> xProp;
             const sal_Int32 nCount = xKeys->getCount();
             for(sal_Int32 i = 0;i< nCount;++i)
@@ -546,7 +546,7 @@ namespace
 
 //------------------------------------------------------------------------------
 Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
-    const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand,
+    const sal_Int32 _nCommandType, const OUString& _rCommand,
     Reference< XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
 {
     OSL_PRECOND( _rxConnection.is(), "::dbtools::getFieldsByCommandDescriptor: invalid connection!" );
@@ -656,7 +656,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 
                 case HANDLE_SQL:
                 {
-                    ::rtl::OUString sStatementToExecute( _rCommand );
+                    OUString sStatementToExecute( _rCommand );
 
                     // well, the main problem here is to handle statements which contain a parameter
                     // If we would simply execute a parametrized statement, then this will fail because
@@ -672,14 +672,14 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 
                         if ( xComposerFac.is() )
                         {
-                            Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( ::rtl::OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY);
+                            Reference< XSingleSelectQueryComposer > xComposer(xComposerFac->createInstance( OUString("com.sun.star.sdb.SingleSelectQueryComposer")),UNO_QUERY);
                             if ( xComposer.is() )
                             {
                                 xComposer->setQuery( sStatementToExecute );
 
                                 // Now set the filter to a dummy restriction which will result in an empty
                                 // result set.
-                                xComposer->setFilter( ::rtl::OUString( "0=1" ) );
+                                xComposer->setFilter( OUString( "0=1" ) );
                                 sStatementToExecute = xComposer->getQuery( );
                             }
                         }
@@ -703,7 +703,7 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
                     {
                         if ( xStatementProps.is() )
                             xStatementProps->setPropertyValue(
-                                ::rtl::OUString( "MaxRows" ),
+                                OUString( "MaxRows" ),
                                 makeAny( sal_Int32( 0 ) )
                             );
                     }
@@ -741,8 +741,8 @@ Reference< XNameAccess > getFieldsByCommandDescriptor( const Reference< XConnect
 }
 
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection,
-    const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand,
+Sequence< OUString > getFieldNamesByCommandDescriptor( const Reference< XConnection >& _rxConnection,
+    const sal_Int32 _nCommandType, const OUString& _rCommand,
     SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
 {
     // get the container for the fields
@@ -750,7 +750,7 @@ Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< X
     Reference< XNameAccess > xFieldContainer = getFieldsByCommandDescriptor( _rxConnection, _nCommandType, _rCommand, xKeepFieldsAlive, _pErrorInfo );
 
     // get the names of the fields
-    Sequence< ::rtl::OUString > aNames;
+    Sequence< OUString > aNames;
     if ( xFieldContainer.is() )
         aNames = xFieldContainer->getElementNames();
 
@@ -762,16 +762,16 @@ Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const Reference< X
 }
 
 //------------------------------------------------------------------------------
-SQLContext prependContextInfo(const SQLException& _rException, const Reference< XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails)
+SQLContext prependContextInfo(const SQLException& _rException, const Reference< XInterface >& _rxContext, const OUString& _rContextDescription, const OUString& _rContextDetails)
 {
-    return SQLContext( _rContextDescription, _rxContext, ::rtl::OUString(), 0, makeAny( _rException ), _rContextDetails );
+    return SQLContext( _rContextDescription, _rxContext, OUString(), 0, makeAny( _rException ), _rContextDetails );
 }
 //------------------------------------------------------------------------------
 SQLException prependErrorInfo( const SQLException& _rChainedException, const Reference< XInterface >& _rxContext,
-    const ::rtl::OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode )
+    const OUString& _rAdditionalError, const StandardSQLState _eSQLState, const sal_Int32 _nErrorCode )
 {
     return SQLException( _rAdditionalError, _rxContext,
-        _eSQLState == SQL_ERROR_UNSPECIFIED ? ::rtl::OUString() : getStandardSQLState( _eSQLState ),
+        _eSQLState == SQL_ERROR_UNSPECIFIED ? OUString() : getStandardSQLState( _eSQLState ),
         _nErrorCode, makeAny( _rChainedException ) );
 }
 
@@ -837,21 +837,21 @@ namespace
 }
 
 //--------------------------------------------------------------------------
-static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData,
-                const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName,
+static OUString impl_doComposeTableName( const Reference< XDatabaseMetaData >& _rxMetaData,
+                const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName,
                 sal_Bool _bQuote, EComposeRule _eComposeRule )
 {
     OSL_ENSURE(_rxMetaData.is(), "impl_doComposeTableName : invalid meta data !");
     if ( !_rxMetaData.is() )
-        return ::rtl::OUString();
+        return OUString();
     OSL_ENSURE(!_rName.isEmpty(), "impl_doComposeTableName : at least the name should be non-empty !");
 
-    const ::rtl::OUString sQuoteString = _rxMetaData->getIdentifierQuoteString();
+    const OUString sQuoteString = _rxMetaData->getIdentifierQuoteString();
     const NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxMetaData, _eComposeRule ) );
 
-    ::rtl::OUStringBuffer aComposedName;
+    OUStringBuffer aComposedName;
 
-    ::rtl::OUString sCatalogSep;
+    OUString sCatalogSep;
     sal_Bool bCatlogAtStart = sal_True;
     if ( !_rCatalog.isEmpty() && aNameComps.bCatalogs )
     {
@@ -887,25 +887,25 @@ static ::rtl::OUString impl_doComposeTableName( const Reference< XDatabaseMetaDa
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta
-                               , const ::rtl::OUString& _rName
+OUString quoteTableName(const Reference< XDatabaseMetaData>& _rxMeta
+                               , const OUString& _rName
                                , EComposeRule _eComposeRule)
 {
-    ::rtl::OUString sCatalog, sSchema, sTable;
+    OUString sCatalog, sSchema, sTable;
     qualifiedNameComponents(_rxMeta,_rName,sCatalog,sSchema,sTable,_eComposeRule);
     return impl_doComposeTableName( _rxMeta, sCatalog, sSchema, sTable, sal_True, _eComposeRule );
 }
 
 //------------------------------------------------------------------------------
-void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule)
+void qualifiedNameComponents(const Reference< XDatabaseMetaData >& _rxConnMetaData, const OUString& _rQualifiedName, OUString& _rCatalog, OUString& _rSchema, OUString& _rName,EComposeRule _eComposeRule)
 {
     OSL_ENSURE(_rxConnMetaData.is(), "QualifiedNameComponents : invalid meta data!");
 
     NameComponentSupport aNameComps( lcl_getNameComponentSupport( _rxConnMetaData, _eComposeRule ) );
 
-    ::rtl::OUString sSeparator = _rxConnMetaData->getCatalogSeparator();
+    OUString sSeparator = _rxConnMetaData->getCatalogSeparator();
 
-    ::rtl::OUString sName(_rQualifiedName);
+    OUString sName(_rQualifiedName);
     // do we have catalogs ?
     if ( aNameComps.bCatalogs )
     {
@@ -952,7 +952,7 @@ Reference< XNumberFormatsSupplier> getNumberFormats(
     // ask the parent of the connection (should be an DatabaseAccess)
     Reference< XNumberFormatsSupplier> xReturn;
     Reference< XChild> xConnAsChild(_rxConn, UNO_QUERY);
-    ::rtl::OUString sPropFormatsSupplier( "NumberFormatsSupplier" );
+    OUString sPropFormatsSupplier( "NumberFormatsSupplier" );
     if (xConnAsChild.is())
     {
         Reference< XPropertySet> xConnParentProps(xConnAsChild->getParent(), UNO_QUERY);
@@ -990,22 +990,22 @@ try
     Property* pOldProps = aOldProperties.getArray();
     Property* pNewProps = aNewProperties.getArray();
 
-    ::rtl::OUString sPropDefaultControl("DefaultControl");
-    ::rtl::OUString sPropLabelControl("LabelControl");
-    ::rtl::OUString sPropFormatsSupplier("FormatsSupplier");
-    ::rtl::OUString sPropCurrencySymbol("CurrencySymbol");
-    ::rtl::OUString sPropDecimals("Decimals");
-    ::rtl::OUString sPropEffectiveMin("EffectiveMin");
-    ::rtl::OUString sPropEffectiveMax("EffectiveMax");
-    ::rtl::OUString sPropEffectiveDefault("EffectiveDefault");
-    ::rtl::OUString sPropDefaultText("DefaultText");
-    ::rtl::OUString sPropDefaultDate("DefaultDate");
-    ::rtl::OUString sPropDefaultTime("DefaultTime");
-    ::rtl::OUString sPropValueMin("ValueMin");
-    ::rtl::OUString sPropValueMax("ValueMax");
-    ::rtl::OUString sPropDecimalAccuracy("DecimalAccuracy");
-    ::rtl::OUString sPropClassId("ClassId");
-    ::rtl::OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" );
+    OUString sPropDefaultControl("DefaultControl");
+    OUString sPropLabelControl("LabelControl");
+    OUString sPropFormatsSupplier("FormatsSupplier");
+    OUString sPropCurrencySymbol("CurrencySymbol");
+    OUString sPropDecimals("Decimals");
+    OUString sPropEffectiveMin("EffectiveMin");
+    OUString sPropEffectiveMax("EffectiveMax");
+    OUString sPropEffectiveDefault("EffectiveDefault");
+    OUString sPropDefaultText("DefaultText");
+    OUString sPropDefaultDate("DefaultDate");
+    OUString sPropDefaultTime("DefaultTime");
+    OUString sPropValueMin("ValueMin");
+    OUString sPropValueMax("ValueMax");
+    OUString sPropDecimalAccuracy("DecimalAccuracy");
+    OUString sPropClassId("ClassId");
+    OUString sFormattedServiceName( "com.sun.star.form.component.FormattedField" );
 
     for (sal_Int16 i=0; i<aOldProperties.getLength(); ++i)
     {
@@ -1030,10 +1030,10 @@ try
                 {
                     OSL_UNUSED( e );
 #ifdef DBG_UTIL
-                    ::rtl::OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
+                    OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
                     sMessage += pResult->Name;
-                    sMessage += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
-                    OSL_FAIL(::rtl::OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
+                    sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+                    OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
 #endif
                 }
             }
@@ -1109,7 +1109,7 @@ try
                 // The Effective-Properties should always be void or string or double ....
 
             if (hasProperty(sPropDefaultDate, xNewProps) && !bIsString)
-            {   // (to convert a ::rtl::OUString into a date will not always succeed, because it might be bound to a text-column,
+            {   // (to convert a OUString into a date will not always succeed, because it might be bound to a text-column,
                 // but we can work with a double)
                 Date aDate = DBTypeConversion::toDate(getDouble(aEffectiveDefault));
                 xNewProps->setPropertyValue(sPropDefaultDate, makeAny(aDate));
@@ -1127,11 +1127,11 @@ try
             }
 
             if (hasProperty(sPropDefaultText, xNewProps) && bIsString)
-            {   // and here the ::rtl::OUString
+            {   // and here the OUString
                 xNewProps->setPropertyValue(sPropDefaultText, aEffectiveDefault);
             }
 
-            // nyi: The translation between doubles and ::rtl::OUString would offer more alternatives
+            // nyi: The translation between doubles and OUString would offer more alternatives
         }
     }
 
@@ -1178,7 +1178,7 @@ try
             }
 
             // With this we can generate a new format ...
-            ::rtl::OUString sNewFormat = xFormats->generateFormat(nBaseKey, _rLocale, sal_False, sal_False, nDecimals, 0);
+            OUString sNewFormat = xFormats->generateFormat(nBaseKey, _rLocale, sal_False, sal_False, nDecimals, 0);
             // No thousands separator, negative numbers are not in red, no leading zeros
 
             // ... and add at FormatsSupplier (if needed)
@@ -1216,7 +1216,7 @@ try
                 aNewDefault <<= DBTypeConversion::toDouble(*(Time*)aTime.getValue());
         }
 
-        // double or ::rtl::OUString will be copied directly
+        // double or OUString will be copied directly
         if (hasProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE), xOldProps))
             aNewDefault = xOldProps->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DEFAULTVALUE));
         if (hasProperty(sPropDefaultText, xOldProps))
@@ -1235,19 +1235,19 @@ catch(const Exception&)
 //------------------------------------------------------------------------------
 sal_Bool canInsert(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::INSERT) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::INSERT) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canUpdate(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::UPDATE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::UPDATE) != 0));
 }
 
 //------------------------------------------------------------------------------
 sal_Bool canDelete(const Reference< XPropertySet>& _rxCursorSet)
 {
-    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(::rtl::OUString("Privileges"))) & Privilege::DELETE) != 0));
+    return ((_rxCursorSet.is() && (getINT32(_rxCursorSet->getPropertyValue(OUString("Privileges"))) & Privilege::DELETE) != 0));
 }
 // -----------------------------------------------------------------------------
 Reference< XDataSource> findDataSource(const Reference< XInterface >& _xParent)
@@ -1281,22 +1281,22 @@ Reference< XSingleSelectQueryComposer > getComposedRowSetStatement( const Refere
             // as this reflects the status after the last execute, not the currently set properties)
 
             sal_Int32 nCommandType = CommandType::COMMAND;
-            ::rtl::OUString sCommand;
+            OUString sCommand;
             sal_Bool bEscapeProcessing = sal_False;
 
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "CommandType" )      ) >>= nCommandType      );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "Command" )          ) >>= sCommand          );
-            OSL_VERIFY( _rxRowSet->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "CommandType" )      ) >>= nCommandType      );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "Command" )          ) >>= sCommand          );
+            OSL_VERIFY( _rxRowSet->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bEscapeProcessing );
 
             StatementComposer aComposer( xConn, sCommand, nCommandType, bEscapeProcessing );
             // append sort
-            aComposer.setOrder( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Order" ) ) ) );
+            aComposer.setOrder( getString( _rxRowSet->getPropertyValue( OUString( "Order" ) ) ) );
 
             // append filter
             sal_Bool bApplyFilter = sal_True;
-            _rxRowSet->getPropertyValue( ::rtl::OUString( "ApplyFilter" ) ) >>= bApplyFilter;
+            _rxRowSet->getPropertyValue( OUString( "ApplyFilter" ) ) >>= bApplyFilter;
             if ( bApplyFilter )
-                aComposer.setFilter( getString( _rxRowSet->getPropertyValue( ::rtl::OUString( "Filter" ) ) ) );
+                aComposer.setFilter( getString( _rxRowSet->getPropertyValue( OUString( "Filter" ) ) ) );
 
             aComposer.getQuery();
 
@@ -1338,10 +1338,10 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
     return xReturn;
 }
 //--------------------------------------------------------------------------
-::rtl::OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData,
-                        const ::rtl::OUString& _rCatalog,
-                        const ::rtl::OUString& _rSchema,
-                        const ::rtl::OUString& _rName,
+OUString composeTableName( const Reference< XDatabaseMetaData >& _rxMetaData,
+                        const OUString& _rCatalog,
+                        const OUString& _rSchema,
+                        const OUString& _rName,
                         sal_Bool _bQuote,
                         EComposeRule _eComposeRule)
 {
@@ -1349,16 +1349,16 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection,
-    const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName )
+OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection,
+    const OUString& _rCatalog, const OUString& _rSchema, const OUString& _rName )
 {
-    sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseCatalogInSelect" ), sal_True );
-    sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, ::rtl::OUString( "UseSchemaInSelect" ), sal_True );
+    sal_Bool bUseCatalogInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseCatalogInSelect" ), sal_True );
+    sal_Bool bUseSchemaInSelect = isDataSourcePropertyEnabled( _rxConnection, OUString( "UseSchemaInSelect" ), sal_True );
 
     return impl_doComposeTableName(
         _rxConnection->getMetaData(),
-        bUseCatalogInSelect ? _rCatalog : ::rtl::OUString(),
-        bUseSchemaInSelect ? _rSchema : ::rtl::OUString(),
+        bUseCatalogInSelect ? _rCatalog : OUString(),
+        bUseSchemaInSelect ? _rSchema : OUString(),
         _rName,
         true,
         eInDataManipulation
@@ -1369,7 +1369,7 @@ Reference< XSingleSelectQueryComposer > getCurrentSettingsComposer(
 namespace
 {
     static void lcl_getTableNameComponents( const Reference<XPropertySet>& _xTable,
-        ::rtl::OUString& _out_rCatalog, ::rtl::OUString& _out_rSchema, ::rtl::OUString& _out_rName )
+        OUString& _out_rCatalog, OUString& _out_rSchema, OUString& _out_rName )
     {
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
         Reference< XPropertySetInfo > xInfo;
@@ -1392,29 +1392,29 @@ namespace
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference<XPropertySet>& _xTable )
+OUString composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference<XPropertySet>& _xTable )
 {
-    ::rtl::OUString sCatalog, sSchema, sName;
+    OUString sCatalog, sSchema, sName;
     lcl_getTableNameComponents( _xTable, sCatalog, sSchema, sName );
 
     return composeTableNameForSelect( _rxConnection, sCatalog, sSchema, sName );
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData,
+OUString composeTableName(const Reference<XDatabaseMetaData>& _xMetaData,
                                  const Reference<XPropertySet>& _xTable,
                                  EComposeRule _eComposeRule,
                                  bool _bSuppressCatalog,
                                  bool _bSuppressSchema,
                                  bool _bQuote )
 {
-    ::rtl::OUString sCatalog, sSchema, sName;
+    OUString sCatalog, sSchema, sName;
     lcl_getTableNameComponents( _xTable, sCatalog, sSchema, sName );
 
     return impl_doComposeTableName(
             _xMetaData,
-            _bSuppressCatalog ? ::rtl::OUString() : sCatalog,
-            _bSuppressSchema ? ::rtl::OUString() : sSchema,
+            _bSuppressCatalog ? OUString() : sCatalog,
+            _bSuppressSchema ? OUString() : sSchema,
             sName,
             _bQuote,
             _eComposeRule
@@ -1441,32 +1441,32 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString createUniqueName( const Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rBaseName, sal_Bool _bStartWithNumber )
+OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, sal_Bool _bStartWithNumber )
 {
-    ::std::set< ::rtl::OUString > aUsedNames;
+    ::std::set< OUString > aUsedNames;
     ::std::copy(
         _rNames.getConstArray(),
         _rNames.getConstArray() + _rNames.getLength(),
-        ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aUsedNames, aUsedNames.end() )
+        ::std::insert_iterator< ::std::set< OUString > >( aUsedNames, aUsedNames.end() )
     );
 
-    ::rtl::OUString sName( _rBaseName );
+    OUString sName( _rBaseName );
     sal_Int32 nPos = 1;
     if ( _bStartWithNumber )
-        sName += ::rtl::OUString::valueOf( nPos );
+        sName += OUString::valueOf( nPos );
 
     while ( aUsedNames.find( sName ) != aUsedNames.end() )
     {
         sName = _rBaseName;
-        sName += ::rtl::OUString::valueOf( ++nPos );
+        sName += OUString::valueOf( ++nPos );
     }
     return sName;
 }
 
 // -----------------------------------------------------------------------------
-::rtl::OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const ::rtl::OUString& _rBaseName,sal_Bool _bStartWithNumber)
+OUString createUniqueName(const Reference<XNameAccess>& _rxContainer,const OUString& _rBaseName,sal_Bool _bStartWithNumber)
 {
-    Sequence< ::rtl::OUString > aElementNames;
+    Sequence< OUString > aElementNames;
 
     OSL_ENSURE( _rxContainer.is(), "createUniqueName: invalid container!" );
     if ( _rxContainer.is() )
@@ -1514,7 +1514,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
             break;
 
         case TypeClass_STRING:
-            _rxUpdatedObject->updateString(_nColumnIndex, *(rtl::OUString*)_rValue.getValue());
+            _rxUpdatedObject->updateString(_nColumnIndex, *(OUString*)_rValue.getValue());
             break;
 
         case TypeClass_BOOLEAN:
@@ -1531,7 +1531,7 @@ sal_Bool implUpdateObject(const Reference< XRowUpdate >& _rxUpdatedObject,
             break;
 
         case TypeClass_CHAR:
-            _rxUpdatedObject->updateString(_nColumnIndex,::rtl::OUString((sal_Unicode *)_rValue.getValue(),1));
+            _rxUpdatedObject->updateString(_nColumnIndex,OUString((sal_Unicode *)_rValue.getValue(),1));
             break;
 
         case TypeClass_UNSIGNED_LONG:
@@ -1615,7 +1615,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
             break;
 
         case TypeClass_STRING:
-            _rxParameters->setString(_nColumnIndex, *(rtl::OUString*)_rValue.getValue());
+            _rxParameters->setString(_nColumnIndex, *(OUString*)_rValue.getValue());
             break;
 
         case TypeClass_BOOLEAN:
@@ -1632,7 +1632,7 @@ sal_Bool implSetObject( const Reference< XParameters >& _rxParameters,
             break;
 
         case TypeClass_CHAR:
-            _rxParameters->setString(_nColumnIndex, ::rtl::OUString((sal_Unicode *)_rValue.getValue(),1));
+            _rxParameters->setString(_nColumnIndex, OUString((sal_Unicode *)_rValue.getValue(),1));
             break;
 
         case TypeClass_UNSIGNED_LONG:
@@ -1756,14 +1756,14 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
     ::std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
     if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
     {
-        static const ::rtl::OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
+        static const OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
         aNewParameterSet.resize(nParamCount ,false);
-        typedef ::std::map< ::rtl::OUString, ::std::vector<sal_Int32> > TParameterPositions;
+        typedef ::std::map< OUString, ::std::vector<sal_Int32> > TParameterPositions;
         TParameterPositions aParameterNames;
         for(sal_Int32 i = 0; i < nParamCount; ++i)
         {
             Reference<XPropertySet> xParam(xParamsAsIndicies->getByIndex(i),UNO_QUERY);
-            ::rtl::OUString sName;
+            OUString sName;
             xParam->getPropertyValue(PROPERTY_NAME) >>= sName;
 
             TParameterPositions::iterator aFind = aParameterNames.find(sName);
@@ -1805,7 +1805,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
             Reference< XPropertySet > xParamColumn(xWrappedParameters->getByIndex(i),UNO_QUERY);
             if (xParamColumn.is())
             {
-                ::rtl::OUString sName;
+                OUString sName;
                 xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName;
                 OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!");
 
@@ -1867,7 +1867,7 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
             case DataType::CLOB:
                 {
                     Any x(_rValue.makeAny());
-                    ::rtl::OUString sValue;
+                    OUString sValue;
                     if ( x >>= sValue )
                         _xParams->setString(parameterIndex,sValue);
                     else
@@ -1961,9 +1961,9 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
             default:
                 {
                     ::connectivity::SharedResources aResources;
-                    const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+                    const OUString sError( aResources.getResourceStringWithSubstitution(
                             STR_UNKNOWN_PARA_TYPE,
-                            "$position$", ::rtl::OUString::valueOf(parameterIndex)
+                            "$position$", OUString::valueOf(parameterIndex)
                          ) );
                     ::dbtools::throwGenericSQLException(sError,NULL);
                 }
@@ -1972,8 +1972,8 @@ void setObjectWithInfo(const Reference<XParameters>& _xParams,
 }
 
 // --------------------------------------------------------------------
-void getBoleanComparisonPredicate( const ::rtl::OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode,
-    ::rtl::OUStringBuffer& _out_rSQLPredicate )
+void getBoleanComparisonPredicate( const OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode,
+    OUStringBuffer& _out_rSQLPredicate )
 {
     switch ( _nBooleanComparisonMode )
     {
@@ -2073,26 +2073,26 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException )
 // -------------------------------------------------------------------------
     OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
                                         OSQLColumns::Vector::const_iterator __last,
-                                        const ::rtl::OUString& _rVal,
+                                        const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
     {
-        ::rtl::OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
+        OUString sName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
         return find(__first,__last,sName,_rVal,_rCase);
     }
     // -------------------------------------------------------------------------
     OSQLColumns::Vector::const_iterator findRealName(   OSQLColumns::Vector::const_iterator __first,
                                         OSQLColumns::Vector::const_iterator __last,
-                                        const ::rtl::OUString& _rVal,
+                                        const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
     {
-        ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
+        OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
         return find(__first,__last,sRealName,_rVal,_rCase);
     }
     // -------------------------------------------------------------------------
     OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
                                         OSQLColumns::Vector::const_iterator __last,
-                                        const ::rtl::OUString& _rProp,
-                                        const ::rtl::OUString& _rVal,
+                                        const OUString& _rProp,
+                                        const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase)
     {
         while (__first != __last && !_rCase(getString((*__first)->getPropertyValue(_rProp)),_rVal))
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index fdccc155312f..df243d3b169c 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -60,20 +60,20 @@ namespace dbtools
     using namespace connectivity;
     using namespace comphelper;
 
-::rtl::OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
+OUString createStandardColumnPart(const Reference< XPropertySet >& xColProp,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern)
 {
 
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
 
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
 
-    ::rtl::OUString sTypeName;
+    OUString sTypeName;
     sal_Int32       nDataType   = 0;
     sal_Int32       nPrecision  = 0;
     sal_Int32       nScale      = 0;
 
-    const ::rtl::OUString sQuoteString = xMetaData->getIdentifierQuoteString();
-    ::rtl::OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))));
+    const OUString sQuoteString = xMetaData->getIdentifierQuoteString();
+    OUStringBuffer aSql = ::dbtools::quoteName(sQuoteString,::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))));
 
     aSql.appendAscii(" ");
 
@@ -86,13 +86,13 @@ namespace dbtools
     xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT))    >>= bIsAutoIncrement;
 
     // check if the user enter a specific string to create autoincrement values
-    ::rtl::OUString sAutoIncrementValue;
+    OUString sAutoIncrementValue;
     Reference<XPropertySetInfo> xPropInfo = xColProp->getPropertySetInfo();
     if ( xPropInfo.is() && xPropInfo->hasPropertyByName(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) )
         xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION)) >>= sAutoIncrementValue;
     // look if we have to use precisions
     sal_Bool bUseLiteral = sal_False;
-    ::rtl::OUString sPreFix,sPostFix,sCreateParams;
+    OUString sPreFix,sPostFix,sCreateParams;
     {
         Reference<XResultSet> xRes = xMetaData->getTypeInfo();
         if(xRes.is())
@@ -100,7 +100,7 @@ namespace dbtools
             Reference<XRow> xRow(xRes,UNO_QUERY);
             while(xRes->next())
             {
-                ::rtl::OUString sTypeName2Cmp = xRow->getString(1);
+                OUString sTypeName2Cmp = xRow->getString(1);
                 sal_Int32 nType = xRow->getShort(2);
                 sPreFix = xRow->getString (4);
                 sPostFix = xRow->getString (5);
@@ -121,7 +121,7 @@ namespace dbtools
     sal_Int32 nIndex = 0;
     if ( !sAutoIncrementValue.isEmpty() && (nIndex = sTypeName.indexOf(sAutoIncrementValue)) != -1 )
     {
-        sTypeName = sTypeName.replaceAt(nIndex,sTypeName.getLength() - nIndex,::rtl::OUString());
+        sTypeName = sTypeName.replaceAt(nIndex,sTypeName.getLength() - nIndex,OUString());
     }
 
     if ( (nPrecision > 0 || nScale > 0) && bUseLiteral )
@@ -157,17 +157,17 @@ namespace dbtools
     else
         aSql.append(sTypeName); // simply add the type name
 
-    ::rtl::OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
+    OUString aDefault = ::comphelper::getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)));
     if ( !aDefault.isEmpty() )
     {
-        aSql.append(::rtl::OUString(" DEFAULT "));
+        aSql.append(OUString(" DEFAULT "));
         aSql.append(sPreFix);
         aSql.append(aDefault);
         aSql.append(sPostFix);
     } // if ( aDefault.getLength() )
 
     if(::comphelper::getINT32(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_ISNULLABLE))) == ColumnValue::NO_NULLS)
-        aSql.append(::rtl::OUString(" NOT NULL"));
+        aSql.append(OUString(" NOT NULL"));
 
     if ( bIsAutoIncrement && !sAutoIncrementValue.isEmpty())
     {
@@ -182,10 +182,10 @@ namespace dbtools
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const ::rtl::OUString& _sCreatePattern)
+OUString createStandardCreateStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection,ISQLStatementHelper* _pHelper,const OUString& _sCreatePattern)
 {
-    ::rtl::OUStringBuffer aSql(::rtl::OUString("CREATE TABLE "));
-    ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
+    OUStringBuffer aSql(OUString("CREATE TABLE "));
+    OUString sCatalog,sSchema,sTable,sComposedName;
 
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
@@ -199,7 +199,7 @@ namespace dbtools
         ::dbtools::throwFunctionSequenceException(_xConnection);
 
     aSql.append(sComposedName);
-    aSql.append(::rtl::OUString(" ("));
+    aSql.append(OUString(" ("));
 
     // columns
     Reference<XColumnsSupplier> xColumnSup(descriptor,UNO_QUERY);
@@ -223,13 +223,13 @@ namespace dbtools
 }
 namespace
 {
-    ::rtl::OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData)
+    OUString generateColumnNames(const Reference<XIndexAccess>& _xColumns,const Reference<XDatabaseMetaData>& _xMetaData)
     {
         ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
-        static const ::rtl::OUString sComma(::rtl::OUString(","));
+        static const OUString sComma(OUString(","));
 
-        const ::rtl::OUString sQuote(_xMetaData->getIdentifierQuoteString());
-        ::rtl::OUString sSql( " (" );
+        const OUString sQuote(_xMetaData->getIdentifierQuoteString());
+        OUString sSql( " (" );
         Reference< XPropertySet > xColProp;
 
         sal_Int32 nColCount  = _xColumns->getCount();
@@ -241,17 +241,17 @@ namespace
         }
 
         if ( nColCount )
-            sSql = sSql.replaceAt(sSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+            sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
         return sSql;
     }
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection)
+OUString createStandardKeyStatement(const Reference< XPropertySet >& descriptor,const Reference< XConnection>& _xConnection)
 {
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
     ::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
 
-    ::rtl::OUStringBuffer aSql;
+    OUStringBuffer aSql;
     // keys
     Reference<XKeysSupplier> xKeySup(descriptor,UNO_QUERY);
     Reference<XIndexAccess> xKeys = xKeySup->getKeys();
@@ -260,7 +260,7 @@ namespace
         Reference< XPropertySet > xColProp;
         Reference<XIndexAccess> xColumns;
         Reference<XColumnsSupplier> xColumnSup;
-        ::rtl::OUString sCatalog,sSchema,sTable,sComposedName;
+        OUString sCatalog,sSchema,sTable,sComposedName;
         sal_Bool bPKey = sal_False;
         for(sal_Int32 i=0;i<xKeys->getCount();++i)
         {
@@ -280,7 +280,7 @@ namespace
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
-                    aSql.append(::rtl::OUString(" PRIMARY KEY "));
+                    aSql.append(OUString(" PRIMARY KEY "));
                     aSql.append(generateColumnNames(xColumns,xMetaData));
                 }
                 else if(nKeyType == KeyType::UNIQUE)
@@ -290,7 +290,7 @@ namespace
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
-                    aSql.append(::rtl::OUString(" UNIQUE "));
+                    aSql.append(OUString(" UNIQUE "));
                     aSql.append(generateColumnNames(xColumns,xMetaData));
                 }
                 else if(nKeyType == KeyType::FOREIGN)
@@ -302,8 +302,8 @@ namespace
                     if(!xColumns.is() || !xColumns->getCount())
                         ::dbtools::throwFunctionSequenceException(_xConnection);
 
-                    aSql.append(::rtl::OUString(" FOREIGN KEY "));
-                    ::rtl::OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
+                    aSql.append(OUString(" FOREIGN KEY "));
+                    OUString sRefTable = getString(xColProp->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_REFERENCEDTABLE)));
                     ::dbtools::qualifiedNameComponents(xMetaData,
                                                         sRefTable,
                                                         sCatalog,
@@ -321,16 +321,16 @@ namespace
                     switch(nDeleteRule)
                     {
                         case KeyRule::CASCADE:
-                            aSql.append(::rtl::OUString(" ON DELETE CASCADE "));
+                            aSql.append(OUString(" ON DELETE CASCADE "));
                             break;
                         case KeyRule::RESTRICT:
-                            aSql.append(::rtl::OUString(" ON DELETE RESTRICT "));
+                            aSql.append(OUString(" ON DELETE RESTRICT "));
                             break;
                         case KeyRule::SET_NULL:
-                            aSql.append(::rtl::OUString(" ON DELETE SET NULL "));
+                            aSql.append(OUString(" ON DELETE SET NULL "));
                             break;
                         case KeyRule::SET_DEFAULT:
-                            aSql.append(::rtl::OUString(" ON DELETE SET DEFAULT "));
+                            aSql.append(OUString(" ON DELETE SET DEFAULT "));
                             break;
                         default:
                             ;
@@ -352,21 +352,21 @@ namespace
 
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString createSqlCreateTableStatement(  const Reference< XPropertySet >& descriptor,
+OUString createSqlCreateTableStatement(  const Reference< XPropertySet >& descriptor,
                                                 const Reference< XConnection>& _xConnection,
                                                 ISQLStatementHelper* _pHelper,
-                                                const ::rtl::OUString& _sCreatePattern)
+                                                const OUString& _sCreatePattern)
 {
-    ::rtl::OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern);
-    const ::rtl::OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection);
+    OUString aSql = ::dbtools::createStandardCreateStatement(descriptor,_xConnection,_pHelper,_sCreatePattern);
+    const OUString sKeyStmt = ::dbtools::createStandardKeyStatement(descriptor,_xConnection);
     if ( !sKeyStmt.isEmpty() )
         aSql += sKeyStmt;
     else
     {
         if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) )
-            aSql = aSql.replaceAt(aSql.getLength()-1,1,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+            aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
         else
-            aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+            aSql += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
     }
     return aSql;
 }
@@ -375,10 +375,10 @@ namespace
     Reference<XPropertySet> lcl_createSDBCXColumn(const Reference<XNameAccess>& _xPrimaryKeyColumns,
                                           const Reference<XConnection>& _xConnection,
                                           const Any& _aCatalog,
-                                          const ::rtl::OUString& _aSchema,
-                                          const ::rtl::OUString& _aTable,
-                                          const ::rtl::OUString& _rQueryName,
-                                          const ::rtl::OUString& _rName,
+                                          const OUString& _aSchema,
+                                          const OUString& _aTable,
+                                          const OUString& _rQueryName,
+                                          const OUString& _rName,
                                           sal_Bool _bCase,
                                           sal_Bool _bQueryForInfo,
                                           sal_Bool _bIsAutoIncrement,
@@ -388,7 +388,7 @@ namespace
         Reference<XPropertySet> xProp;
         Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
         Reference< XResultSet > xResult = xMetaData->getColumns(_aCatalog, _aSchema, _aTable, _rQueryName);
-        ::rtl::OUString sCatalog;
+        OUString sCatalog;
         _aCatalog >>= sCatalog;
 
         if ( xResult.is() )
@@ -400,11 +400,11 @@ namespace
                 if ( aMixCompare(xRow->getString(4),_rName) )
                 {
                     sal_Int32       nField5 = xRow->getInt(5);
-                    ::rtl::OUString aField6 = xRow->getString(6);
+                    OUString aField6 = xRow->getString(6);
                     sal_Int32       nField7 = xRow->getInt(7)
                                 ,   nField9 = xRow->getInt(9)
                                 ,   nField11= xRow->getInt(11);
-                    ::rtl::OUString sField12 = xRow->getString(12),
+                    OUString sField12 = xRow->getString(12),
                                     sField13 = xRow->getString(13);
                     ::comphelper::disposeComponent(xRow);
 
@@ -412,9 +412,9 @@ namespace
                             ,bIsCurrency    = _bIsCurrency;
                     if ( _bQueryForInfo )
                     {
-                        const ::rtl::OUString sQuote = xMetaData->getIdentifierQuoteString();
-                        ::rtl::OUString sQuotedName  = ::dbtools::quoteName(sQuote,_rName);
-                        ::rtl::OUString sComposedName;
+                        const OUString sQuote = xMetaData->getIdentifierQuoteString();
+                        OUString sQuotedName  = ::dbtools::quoteName(sQuote,_rName);
+                        OUString sComposedName;
                         sComposedName = composeTableNameForSelect(_xConnection, getString( _aCatalog ), _aSchema, _aTable );
 
                         ColumnInformationMap aInfo(_bCase);
@@ -447,7 +447,7 @@ namespace
                                 Reference< XRow > xPKeyRow( xPKeys, UNO_QUERY_THROW );
                                 while( xPKeys->next() ) // there can be only one primary key
                                 {
-                                    ::rtl::OUString sKeyColumn = xPKeyRow->getString(4);
+                                    OUString sKeyColumn = xPKeyRow->getString(4);
                                     if ( aMixCompare(_rName,sKeyColumn) )
                                     {
                                         nField11 = ColumnValue::NO_NULLS;
@@ -503,7 +503,7 @@ namespace
 // -----------------------------------------------------------------------------
 Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable,
                                           const Reference<XConnection>& _xConnection,
-                                          const ::rtl::OUString& _rName,
+                                          const OUString& _rName,
                                           sal_Bool _bCase,
                                           sal_Bool _bQueryForInfo,
                                           sal_Bool _bIsAutoIncrement,
@@ -519,10 +519,10 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
     Reference<XDatabaseMetaData> xMetaData = _xConnection->getMetaData();
     Any aCatalog;
     aCatalog = _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_CATALOGNAME));
-    ::rtl::OUString sCatalog;
+    OUString sCatalog;
     aCatalog >>= sCatalog;
 
-    ::rtl::OUString aSchema, aTable;
+    OUString aSchema, aTable;
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_SCHEMANAME))  >>= aSchema;
     _xTable->getPropertyValue(rPropMap.getNameByIndex(PROPERTY_ID_NAME))        >>= aTable;
 
@@ -531,10 +531,10 @@ Reference<XPropertySet> createSDBCXColumn(const Reference<XPropertySet>& _xTable
     xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, _rName,_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
     if ( !xProp.is() )
     {
-        xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, ::rtl::OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
+        xProp = lcl_createSDBCXColumn(xPrimaryKeyColumns,_xConnection,aCatalog, aSchema, aTable, OUString("%"),_rName,_bCase,_bQueryForInfo,_bIsAutoIncrement,_bIsCurrency,_nDataType);
         if ( !xProp.is() )
             xProp = new connectivity::sdbcx::OColumn(_rName,
-                                                ::rtl::OUString(),::rtl::OUString(),::rtl::OUString(),
+                                                OUString(),OUString(),OUString(),
                                                 ColumnValue::NULLABLE_UNKNOWN,
                                                 0,
                                                 0,
@@ -563,10 +563,10 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection,
         if ( xDataSourceProperties.is() )
         {
             Reference< XPropertySet > xSettings(
-                xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ),
+                xDataSourceProperties->getPropertyValue( OUString( "Settings") ),
                 UNO_QUERY_THROW
             );
-            OSL_VERIFY( xSettings->getPropertyValue( ::rtl::OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue );
+            OSL_VERIFY( xSettings->getPropertyValue( OUString::createFromAscii( _pAsciiSettingName ) ) >>= bValue );
         }
     }
     catch( const Exception& )
@@ -576,7 +576,7 @@ bool getBooleanDataSourceSetting( const Reference< XConnection >& _rxConnection,
     return bValue;
 }
 // -------------------------------------------------------------------------
-bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::OUString& _sAsciiSettingsName,
+bool getDataSourceSetting( const Reference< XInterface >& _xChild, const OUString& _sAsciiSettingsName,
     Any& /* [out] */ _rSettingsValue )
 {
     bool bIsPresent = false;
@@ -587,7 +587,7 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
             return false;
 
         const Reference< XPropertySet > xSettings(
-                xDataSourceProperties->getPropertyValue( ::rtl::OUString( "Settings") ),
+                xDataSourceProperties->getPropertyValue( OUString( "Settings") ),
                 UNO_QUERY_THROW
             );
 
@@ -604,11 +604,11 @@ bool getDataSourceSetting( const Reference< XInterface >& _xChild, const ::rtl::
 bool getDataSourceSetting( const Reference< XInterface >& _rxDataSource, const sal_Char* _pAsciiSettingsName,
     Any& /* [out] */ _rSettingsValue )
 {
-    ::rtl::OUString sAsciiSettingsName = ::rtl::OUString::createFromAscii(_pAsciiSettingsName);
+    OUString sAsciiSettingsName = OUString::createFromAscii(_pAsciiSettingsName);
     return getDataSourceSetting( _rxDataSource, sAsciiSettingsName,_rSettingsValue );
 }
 // -----------------------------------------------------------------------------
-sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const ::rtl::OUString& _sProperty,sal_Bool _bDefault)
+sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const OUString& _sProperty,sal_Bool _bDefault)
 {
     sal_Bool bEnabled = _bDefault;
     try
@@ -617,7 +617,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const :
         if ( xProp.is() )
         {
             Sequence< PropertyValue > aInfo;
-            xProp->getPropertyValue(::rtl::OUString("Info")) >>= aInfo;
+            xProp->getPropertyValue(OUString("Info")) >>= aInfo;
             const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(),
                                                 aInfo.getConstArray() + aInfo.getLength(),
                                                 ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
@@ -633,7 +633,7 @@ sal_Bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp,const :
 }
 // -----------------------------------------------------------------------------
 Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
-            const ::rtl::OUString& _rsUrl,
+            const OUString& _rsUrl,
             const Reference< XConnection>& _xConnection,
             const Reference< XComponentContext >& _rxContext)
 {
@@ -658,9 +658,9 @@ Reference< XTablesSupplier> getDataDefinitionByURLAndConnection(
 
 // -----------------------------------------------------------------------------
 sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
-                             const ::rtl::OUString& _sCatalog,
-                             const ::rtl::OUString& _sSchema,
-                             const ::rtl::OUString& _sTable)
+                             const OUString& _sCatalog,
+                             const OUString& _sSchema,
+                             const OUString& _sTable)
 {
     OSL_ENSURE(_xMetaData.is(),"Invalid metadata!");
     sal_Int32 nPrivileges = 0;
@@ -672,25 +672,25 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
         Reference< XResultSet > xPrivileges = _xMetaData->getTablePrivileges(aVal, _sSchema, _sTable);
         Reference< XRow > xCurrentRow(xPrivileges, UNO_QUERY);
 
-        const ::rtl::OUString sUserWorkingFor = _xMetaData->getUserName();
-        static const ::rtl::OUString sSELECT( "SELECT" );
-        static const ::rtl::OUString sINSERT( "INSERT" );
-        static const ::rtl::OUString sUPDATE( "UPDATE" );
-        static const ::rtl::OUString sDELETE( "DELETE" );
-        static const ::rtl::OUString sREAD( "READ" );
-        static const ::rtl::OUString sCREATE( "CREATE" );
-        static const ::rtl::OUString sALTER( "ALTER" );
-        static const ::rtl::OUString sREFERENCE( "REFERENCE" );
-        static const ::rtl::OUString sDROP( "DROP" );
+        const OUString sUserWorkingFor = _xMetaData->getUserName();
+        static const OUString sSELECT( "SELECT" );
+        static const OUString sINSERT( "INSERT" );
+        static const OUString sUPDATE( "UPDATE" );
+        static const OUString sDELETE( "DELETE" );
+        static const OUString sREAD( "READ" );
+        static const OUString sCREATE( "CREATE" );
+        static const OUString sALTER( "ALTER" );
+        static const OUString sREFERENCE( "REFERENCE" );
+        static const OUString sDROP( "DROP" );
 
         if ( xCurrentRow.is() )
         {
             // after creation the set is positioned before the first record, per definition
-            ::rtl::OUString sPrivilege, sGrantee;
+            OUString sPrivilege, sGrantee;
             while ( xPrivileges->next() )
             {
 #ifdef DBG_UTIL
-                ::rtl::OUString sCat, sSchema, sName, sGrantor, sGrantable;
+                OUString sCat, sSchema, sName, sGrantor, sGrantable;
                 sCat        = xCurrentRow->getString(1);
                 sSchema     = xCurrentRow->getString(2);
                 sName       = xCurrentRow->getString(3);
@@ -730,16 +730,16 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
         // Some drivers put a table privilege as soon as any column has the privilege,
         // some drivers only if all columns have the privilege.
         // To unifiy the situation, collect column privileges here, too.
-        Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, ::rtl::OUString("%"));
+        Reference< XResultSet > xColumnPrivileges = _xMetaData->getColumnPrivileges(aVal, _sSchema, _sTable, OUString("%"));
         Reference< XRow > xColumnCurrentRow(xColumnPrivileges, UNO_QUERY);
         if ( xColumnCurrentRow.is() )
         {
             // after creation the set is positioned before the first record, per definition
-            ::rtl::OUString sPrivilege, sGrantee;
+            OUString sPrivilege, sGrantee;
             while ( xColumnPrivileges->next() )
             {
 #ifdef DBG_UTIL
-                ::rtl::OUString sCat, sSchema, sTableName, sColumnName, sGrantor, sGrantable;
+                OUString sCat, sSchema, sTableName, sColumnName, sGrantor, sGrantable;
                 sCat        = xColumnCurrentRow->getString(1);
                 sSchema     = xColumnCurrentRow->getString(2);
                 sTableName  = xColumnCurrentRow->getString(3);
@@ -779,7 +779,7 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
     }
     catch(const SQLException& e)
     {
-        static ::rtl::OUString sNotSupportedState( "IM001" );
+        static OUString sNotSupportedState( "IM001" );
         // some drivers don't support any privileges so we assume that we are allowed to do all we want :-)
         if(e.SQLState == sNotSupportedState)
             nPrivileges |=  Privilege::DROP         |
@@ -799,18 +799,18 @@ sal_Int32 getTablePrivileges(const Reference< XDatabaseMetaData>& _xMetaData,
 // -----------------------------------------------------------------------------
 // we need some more information about the column
 void collectColumnInformation(const Reference< XConnection>& _xConnection,
-                              const ::rtl::OUString& _sComposedName,
-                              const ::rtl::OUString& _rName,
+                              const OUString& _sComposedName,
+                              const OUString& _rName,
                               ColumnInformationMap& _rInfo)
 {
-    static ::rtl::OUString STR_WHERE = ::rtl::OUString(" WHERE ");
+    static OUString STR_WHERE = OUString(" WHERE ");
 
-    ::rtl::OUString sSelect = ::rtl::OUString("SELECT ");
+    OUString sSelect = OUString("SELECT ");
     sSelect += _rName;
-    sSelect += ::rtl::OUString(" FROM ");
+    sSelect += OUString(" FROM ");
     sSelect += _sComposedName;
     sSelect += STR_WHERE;
-    sSelect += ::rtl::OUString("0 = 1");
+    sSelect += OUString("0 = 1");
 
     try
     {
@@ -880,9 +880,9 @@ bool isEmbeddedInDatabase( const Reference< XInterface >& _rxComponent, Referenc
 // -----------------------------------------------------------------------------
 namespace
 {
-    ::rtl::OUString lcl_getEncodingName( rtl_TextEncoding _eEncoding )
+    OUString lcl_getEncodingName( rtl_TextEncoding _eEncoding )
     {
-        ::rtl::OUString sEncodingName;
+        OUString sEncodingName;
 
         OCharsetMap aCharsets;
         OCharsetMap::CharsetIterator aEncodingPos = aCharsets.find( _eEncoding );
@@ -895,7 +895,7 @@ namespace
 }
 
 // -----------------------------------------------------------------------------
-sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSource, ::rtl::OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException))
+sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OString& _rDest, rtl_TextEncoding _eEncoding ) SAL_THROW((com::sun::star::sdbc::SQLException))
 {
     if ( !rtl_convertUStringToString( &_rDest.pData, _rSource.getStr(), _rSource.getLength(),
             _eEncoding,
@@ -906,7 +906,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc
         )
     {
         SharedResources aResources;
-        ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING,
+        OUString sMessage = aResources.getResourceStringWithSubstitution( STR_CANNOT_CONVERT_STRING,
             "$string$", _rSource,
             "$charset$",  lcl_getEncodingName( _eEncoding )
         );
@@ -914,7 +914,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc
         throw SQLException(
             sMessage,
             NULL,
-            ::rtl::OUString( "22018" ),
+            OUString( "22018" ),
             22018,
             Any()
         );
@@ -924,23 +924,23 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const ::rtl::OUString& _rSourc
 }
 
 // -----------------------------------------------------------------------------
-sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString& _rSource, ::rtl::OString&  _rDest,
+sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSource, OString&  _rDest,
    sal_Int32 _nMaxLen, rtl_TextEncoding _eEncoding ) SAL_THROW((SQLException))
 {
     sal_Int32 nLen = convertUnicodeString( _rSource, _rDest, _eEncoding );
     if ( nLen > _nMaxLen )
     {
         SharedResources aResources;
-        ::rtl::OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED,
+        OUString sMessage = aResources.getResourceStringWithSubstitution( STR_STRING_LENGTH_EXCEEDED,
             "$string$", _rSource,
-            "$maxlen$", ::rtl::OUString::valueOf( _nMaxLen ),
+            "$maxlen$", OUString::valueOf( _nMaxLen ),
             "$charset$", lcl_getEncodingName( _eEncoding )
         );
 
         throw SQLException(
             sMessage,
             NULL,
-            ::rtl::OUString( "22001" ),
+            OUString( "22001" ),
             22001,
             Any()
         );
@@ -948,32 +948,32 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
 
    return nLen;
 }
-::rtl::OUString lcl_getReportEngines()
+OUString lcl_getReportEngines()
 {
-    static ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
+    static OUString s_sNodeName("org.openoffice.Office.DataAccess/ReportEngines");
     return s_sNodeName;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString lcl_getDefaultReportEngine()
+OUString lcl_getDefaultReportEngine()
 {
-    static ::rtl::OUString s_sNodeName("DefaultReportEngine");
+    static OUString s_sNodeName("DefaultReportEngine");
     return s_sNodeName;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString lcl_getReportEngineNames()
+OUString lcl_getReportEngineNames()
 {
-    static ::rtl::OUString s_sNodeName("ReportEngineNames");
+    static OUString s_sNodeName("ReportEngineNames");
     return s_sNodeName;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB)
+OUString getDefaultReportEngineServiceName(const Reference< XComponentContext >& _rxORB)
 {
     ::utl::OConfigurationTreeRoot aReportEngines = ::utl::OConfigurationTreeRoot::createWithComponentContext(
         _rxORB, lcl_getReportEngines(), -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
 
     if ( aReportEngines.isValid() )
     {
-        ::rtl::OUString sDefaultReportEngineName;
+        OUString sDefaultReportEngineName;
         aReportEngines.getNodeValue(lcl_getDefaultReportEngine()) >>= sDefaultReportEngineName;
         if ( !sDefaultReportEngineName.isEmpty() )
         {
@@ -983,19 +983,19 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
                 ::utl::OConfigurationNode aReportEngine = aReportEngineNames.openNode(sDefaultReportEngineName);
                 if ( aReportEngine.isValid() )
                 {
-                    ::rtl::OUString sRet;
-                    const static ::rtl::OUString s_sService("ServiceName");
+                    OUString sRet;
+                    const static OUString s_sService("ServiceName");
                     aReportEngine.getNodeValue(s_sService) >>= sRet;
                     return sRet;
                 }
             }
         }
         else
-            return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
+            return OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
     }
     else
-        return ::rtl::OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
-    return ::rtl::OUString();
+        return OUString("org.libreoffice.report.pentaho.SOReportJobFactory");
+    return OUString();
 }
 // -----------------------------------------------------------------------------
 //.........................................................................
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 1388c5b69c29..be526c38409e 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -66,13 +66,13 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString& FilterManager::getFilterComponent( FilterComponent _eWhich ) const
+    const OUString& FilterManager::getFilterComponent( FilterComponent _eWhich ) const
     {
         return m_aFilterComponents[ _eWhich ];
     }
 
     //--------------------------------------------------------------------
-    void FilterManager::setFilterComponent( FilterComponent _eWhich, const ::rtl::OUString& _rComponent )
+    void FilterManager::setFilterComponent( FilterComponent _eWhich, const OUString& _rComponent )
     {
         m_aFilterComponents[ _eWhich ]  = _rComponent;
         try
@@ -108,7 +108,7 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    void FilterManager::appendFilterComponent( ::rtl::OUStringBuffer& io_appendTo, const ::rtl::OUString& i_component ) const
+    void FilterManager::appendFilterComponent( OUStringBuffer& io_appendTo, const OUString& i_component ) const
     {
         if ( io_appendTo.getLength() > 0 )
         {
@@ -123,7 +123,7 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    bool FilterManager::isThereAtMostOneComponent( ::rtl::OUStringBuffer& o_singleComponent ) const
+    bool FilterManager::isThereAtMostOneComponent( OUStringBuffer& o_singleComponent ) const
     {
         sal_Int32 nOnlyNonEmpty = -1;
         sal_Int32 i;
@@ -154,9 +154,9 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString FilterManager::getComposedFilter( ) const
+    OUString FilterManager::getComposedFilter( ) const
     {
-        ::rtl::OUStringBuffer aComposedFilter;
+        OUStringBuffer aComposedFilter;
 
         // if we have only one non-empty component, then there's no need to compose anything
         if ( !isThereAtMostOneComponent( aComposedFilter ) )
diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx
index f079083150bd..daff9098e88a 100644
--- a/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -129,7 +129,7 @@ namespace dbtools
                 _rData.m_xColumnUpdate.set( _rxColumn, UNO_QUERY );
 
                 // determine the field type, and whether it's a numeric field
-                OSL_VERIFY( _rxColumn->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= _rData.m_nFieldType );
+                OSL_VERIFY( _rxColumn->getPropertyValue( OUString( "Type" ) ) >>= _rData.m_nFieldType );
 
                 switch ( _rData.m_nFieldType )
                 {
@@ -156,7 +156,7 @@ namespace dbtools
                 // get the format key of our bound field
                 Reference< XPropertySetInfo > xPSI( _rxColumn->getPropertySetInfo(), UNO_QUERY_THROW );
                 bool bHaveFieldFormat = false;
-                const ::rtl::OUString sFormatKeyProperty( ::rtl::OUString( "FormatKey" ) );
+                const OUString sFormatKeyProperty( OUString( "FormatKey" ) );
                 if ( xPSI->hasPropertyByName( sFormatKeyProperty ) )
                 {
                     bHaveFieldFormat = ( _rxColumn->getPropertyValue( sFormatKeyProperty ) >>= _rData.m_nFormatKey );
@@ -172,7 +172,7 @@ namespace dbtools
                 // some more formatter settings
                 _rData.m_nKeyType  = ::comphelper::getNumberFormatType( xNumberFormatsSupp->getNumberFormats(), _rData.m_nFormatKey );
                 Reference< XPropertySet > xFormatSettings( xNumberFormatsSupp->getNumberFormatSettings(), UNO_QUERY_THROW );
-                OSL_VERIFY( xFormatSettings->getPropertyValue( ::rtl::OUString( "NullDate" ) ) >>= _rData.m_aNullDate );
+                OSL_VERIFY( xFormatSettings->getPropertyValue( OUString( "NullDate" ) ) >>= _rData.m_aNullDate );
 
                 // remember the formatter
                 _rData.m_xFormatter = i_rNumberFormatter;
@@ -273,7 +273,7 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    bool FormattedColumnValue::setFormattedValue( const ::rtl::OUString& _rFormattedStringValue ) const
+    bool FormattedColumnValue::setFormattedValue( const OUString& _rFormattedStringValue ) const
     {
         OSL_PRECOND( m_pData->m_xColumnUpdate.is(), "FormattedColumnValue::setFormattedValue: no column!" );
         if ( !m_pData->m_xColumnUpdate.is() )
@@ -300,11 +300,11 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString FormattedColumnValue::getFormattedValue() const
+    OUString FormattedColumnValue::getFormattedValue() const
     {
         OSL_PRECOND( m_pData->m_xColumn.is(), "FormattedColumnValue::setFormattedValue: no column!" );
 
-        ::rtl::OUString sStringValue;
+        OUString sStringValue;
         if ( m_pData->m_xColumn.is() )
         {
             if ( m_pData->m_bNumericField )
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 5f2a7079f193..32ac6e89ee54 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -112,7 +112,7 @@ namespace dbtools
         m_aParameterInformation.swap( aEmptyInfo );
         m_aMasterFields.realloc( 0 );
         m_aDetailFields.realloc( 0 );
-        m_sIdentifierQuoteString = ::rtl::OUString();
+        m_sIdentifierQuoteString = OUString();
         ::std::vector< bool > aEmptyArray;
         m_aParametersVisited.swap( aEmptyArray );
         m_bUpToDate = false;
@@ -194,7 +194,7 @@ namespace dbtools
                 xParam.clear();
                 m_xInnerParamColumns->getByIndex( i ) >>= xParam;
 
-                ::rtl::OUString sName;
+                OUString sName;
                 xParam->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName;
 
                 // only append additonal parameters when they are not already in the list
@@ -220,22 +220,22 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString ParameterManager::createFilterConditionFromColumnLink(
-        const ::rtl::OUString& _rMasterColumn, const ::rtl::OUString& _rDetailLink, ::rtl::OUString& _rNewParamName )
+    OUString ParameterManager::createFilterConditionFromColumnLink(
+        const OUString& _rMasterColumn, const OUString& _rDetailLink, OUString& _rNewParamName )
     {
-        ::rtl::OUString sFilter;
+        OUString sFilter;
 
         // format is:
         // <detail_column> = :<new_param_name>
         sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink );
-        sFilter += ::rtl::OUString( " = :" );
+        sFilter += OUString( " = :" );
 
         // generate a parameter name which is not already used
-        _rNewParamName = ::rtl::OUString( "link_from_" );
+        _rNewParamName = OUString( "link_from_" );
         _rNewParamName += convertName2SQLName( _rMasterColumn, m_sSpecialCharacters );
         while ( m_aParameterInformation.find( _rNewParamName ) != m_aParameterInformation.end() )
         {
-            _rNewParamName += ::rtl::OUString( "_" );
+            _rNewParamName += OUString( "_" );
         }
 
         return sFilter += _rNewParamName;
@@ -243,7 +243,7 @@ namespace dbtools
 
     //--------------------------------------------------------------------
     void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns,
-        const Reference< XNameAccess >& _rxColumns, ::std::vector< ::rtl::OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception ))
+        const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents ) SAL_THROW(( Exception ))
     {
         OSL_PRECOND( m_aMasterFields.getLength() == m_aDetailFields.getLength(),
             "ParameterManager::classifyLinks: master and detail fields should have the same length!" );
@@ -254,15 +254,15 @@ namespace dbtools
 
         // we may need to strip any links which are invalid, so here go the containers
         // for temporarirly holding the new pairs
-        ::std::vector< ::rtl::OUString > aStrippedMasterFields;
-        ::std::vector< ::rtl::OUString > aStrippedDetailFields;
+        ::std::vector< OUString > aStrippedMasterFields;
+        ::std::vector< OUString > aStrippedDetailFields;
 
         bool bNeedExchangeLinks = false;
 
         // classify the links
-        const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray();
-        const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray();
-        const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength();
+        const OUString* pMasterFields = m_aMasterFields.getConstArray();
+        const OUString* pDetailFields = m_aDetailFields.getConstArray();
+        const OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength();
         for ( ; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields )
         {
             if ( pMasterFields->isEmpty() || pDetailFields->isEmpty() )
@@ -292,8 +292,8 @@ namespace dbtools
                 // does the detail name denote a column?
                 if ( _rxColumns->hasByName( *pDetailFields ) )
                 {
-                    ::rtl::OUString sNewParamName;
-                    const ::rtl::OUString sFilterCondition = createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, sNewParamName );
+                    OUString sNewParamName;
+                    const OUString sFilterCondition = createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, sNewParamName );
                     OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" );
 
                     // remember meta information about this new parameter
@@ -327,10 +327,10 @@ namespace dbtools
 
         if ( bNeedExchangeLinks )
         {
-            ::rtl::OUString *pFields = aStrippedMasterFields.empty() ? 0 : &aStrippedMasterFields[0];
-            m_aMasterFields = Sequence< ::rtl::OUString >( pFields, aStrippedMasterFields.size() );
+            OUString *pFields = aStrippedMasterFields.empty() ? 0 : &aStrippedMasterFields[0];
+            m_aMasterFields = Sequence< OUString >( pFields, aStrippedMasterFields.size() );
             pFields = aStrippedDetailFields.empty() ? 0 : &aStrippedDetailFields[0];
-            m_aDetailFields = Sequence< ::rtl::OUString >( pFields, aStrippedDetailFields.size() );
+            m_aDetailFields = Sequence< OUString >( pFields, aStrippedDetailFields.size() );
         }
     }
 
@@ -374,16 +374,16 @@ namespace dbtools
                 return;
 
             // classify the links - depending on what the detail fields in each link pair denotes
-            ::std::vector< ::rtl::OUString > aAdditionalFilterComponents;
+            ::std::vector< OUString > aAdditionalFilterComponents;
             classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents );
 
             // did we find links where the detail field refers to a detail column (instead of a parameter name)?
             if ( !aAdditionalFilterComponents.empty() )
             {
-                const static ::rtl::OUString s_sAnd( " AND " );
+                const static OUString s_sAnd( " AND " );
                 // build a conjunction of all the filter components
-                ::rtl::OUStringBuffer sAdditionalFilter;
-                for (   ::std::vector< ::rtl::OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
+                OUStringBuffer sAdditionalFilter;
+                for (   ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
                         aComponent != aAdditionalFilterComponents.end();
                         ++aComponent
                     )
@@ -547,8 +547,8 @@ namespace dbtools
         try
         {
             // the master and detail field( name)s of the
-            const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray();
-            const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray();
+            const OUString* pMasterFields = m_aMasterFields.getConstArray();
+            const OUString* pDetailFields = m_aDetailFields.getConstArray();
 
             sal_Int32 nMasterLen = m_aMasterFields.getLength();
             Any aParamType, aScale, aValue;
@@ -667,7 +667,7 @@ namespace dbtools
                 if ( xParamColumn.is() )
                 {
             #ifdef DBG_UTIL
-                    ::rtl::OUString sName;
+                    OUString sName;
                     xParamColumn->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME) ) >>= sName;
                     OSL_ENSURE( sName == pFinalValues->Name, "ParameterManager::completeParameters: inconsistent parameter names!" );
             #endif
@@ -870,14 +870,14 @@ namespace dbtools
                 return;
 
             // loop through all links pairs
-            const ::rtl::OUString* pMasterFields = m_aMasterFields.getConstArray();
-            const ::rtl::OUString* pDetailFields = m_aDetailFields.getConstArray();
+            const OUString* pMasterFields = m_aMasterFields.getConstArray();
+            const OUString* pDetailFields = m_aDetailFields.getConstArray();
 
             Reference< XPropertySet > xMasterField;
             Reference< XPropertySet > xDetailField;
 
             // now really ....
-            const ::rtl::OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength();
+            const OUString* pDetailFieldsEnd = pDetailFields + m_aDetailFields.getLength();
             for ( ; pDetailFields < pDetailFieldsEnd; ++pDetailFields, ++pMasterFields )
             {
                 if ( !xParentColumns->hasByName( *pMasterFields ) )
@@ -914,7 +914,7 @@ namespace dbtools
                     if ( !xInnerParameter.is() )
                         continue;
 
-                    ::rtl::OUString sParamColumnRealName;
+                    OUString sParamColumnRealName;
                     xInnerParameter->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME) ) >>= sParamColumnRealName;
                     if ( xColumns->hasByName( sParamColumnRealName ) )
                     {   // our own columns have a column which's name equals the real name of the param column
@@ -960,7 +960,7 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    void ParameterManager::setObjectNull( sal_Int32 _nIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName )
+    void ParameterManager::setObjectNull( sal_Int32 _nIndex, sal_Int32 sqlType, const OUString& typeName )
     {
         VISIT_PARAMETER( setObjectNull( _nIndex, sqlType, typeName ) );
     }
@@ -1008,7 +1008,7 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    void ParameterManager::setString( sal_Int32 _nIndex, const ::rtl::OUString& x )
+    void ParameterManager::setString( sal_Int32 _nIndex, const OUString& x )
     {
         VISIT_PARAMETER( setString( _nIndex, x ) );
     }
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 25215c93b0c7..bcf49827364c 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -115,7 +115,7 @@ namespace param
     IMPLEMENT_GET_IMPLEMENTATION_ID( ParameterWrapper )
 
     //--------------------------------------------------------------------
-    ::rtl::OUString ParameterWrapper::impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const
+    OUString ParameterWrapper::impl_getPseudoAggregatePropertyName( sal_Int32 _nHandle ) const
     {
         Reference< XPropertySetInfo >  xInfo = const_cast<ParameterWrapper*>( this )->getPropertySetInfo();
         Sequence< Property > aProperties = xInfo->getProperties();
@@ -127,7 +127,7 @@ namespace param
         }
 
         OSL_FAIL( "ParameterWrapper::impl_getPseudoAggregatePropertyName: invalid argument!" );
-        return ::rtl::OUString();
+        return OUString();
     }
 
     //--------------------------------------------------------------------
@@ -148,7 +148,7 @@ namespace param
                 sal_Int32 nProperties( aProperties.getLength() );
                 aProperties.realloc( nProperties + 1 );
                 aProperties[ nProperties ] = Property(
-                    ::rtl::OUString( "Value" ),
+                    OUString( "Value" ),
                     PROPERTY_ID_VALUE,
                     ::cppu::UnoType< Any >::get(),
                     PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID
@@ -185,11 +185,11 @@ namespace param
             {
                 // TODO : aParamType & nScale can be obtained within the constructor ....
                 sal_Int32 nParamType = DataType::VARCHAR;
-                OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nParamType );
+                OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Type" ) ) >>= nParamType );
 
                 sal_Int32 nScale = 0;
-                if ( m_xDelegatorPSI->hasPropertyByName( ::rtl::OUString( "Scale" ) ) )
-                    OSL_VERIFY( m_xDelegator->getPropertyValue( ::rtl::OUString( "Scale" ) ) >>= nScale );
+                if ( m_xDelegatorPSI->hasPropertyByName( OUString( "Scale" ) ) )
+                    OSL_VERIFY( m_xDelegator->getPropertyValue( OUString( "Scale" ) ) >>= nScale );
 
                 if ( m_xValueDestination.is() )
                 {
@@ -213,7 +213,7 @@ namespace param
         }
         else
         {
-            ::rtl::OUString aName = impl_getPseudoAggregatePropertyName( nHandle );
+            OUString aName = impl_getPseudoAggregatePropertyName( nHandle );
             m_xDelegator->setPropertyValue( aName, rValue );
         }
     }
@@ -227,7 +227,7 @@ namespace param
         }
         else
         {
-            ::rtl::OUString aName = impl_getPseudoAggregatePropertyName( nHandle );
+            OUString aName = impl_getPseudoAggregatePropertyName( nHandle );
             rValue = m_xDelegator->getPropertyValue( aName );
         }
     }
@@ -323,7 +323,7 @@ namespace param
     void ParameterWrapperContainer::impl_checkDisposed_throw()
     {
         if ( rBHelper.bDisposed )
-            throw DisposedException( ::rtl::OUString(), *this );
+            throw DisposedException( OUString(), *this );
     }
 
     //--------------------------------------------------------------------
diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx
index ba5ed7692625..a7f8f04f2b57 100644
--- a/connectivity/source/commontools/predicateinput.cxx
+++ b/connectivity/source/commontools/predicateinput.cxx
@@ -61,7 +61,7 @@ namespace dbtools
 
     //=====================================================================
     //---------------------------------------------------------------------
-    static sal_Unicode lcl_getSeparatorChar( const ::rtl::OUString& _rSeparator, sal_Unicode _nFallback )
+    static sal_Unicode lcl_getSeparatorChar( const OUString& _rSeparator, sal_Unicode _nFallback )
     {
         OSL_ENSURE( !_rSeparator.isEmpty(), "::lcl_getSeparatorChar: invalid separator string!" );
 
@@ -134,13 +134,13 @@ namespace dbtools
     }
 
     //---------------------------------------------------------------------
-    OSQLParseNode* OPredicateInputController::implPredicateTree(::rtl::OUString& _rErrorMessage, const ::rtl::OUString& _rStatement, const Reference< XPropertySet > & _rxField) const
+    OSQLParseNode* OPredicateInputController::implPredicateTree(OUString& _rErrorMessage, const OUString& _rStatement, const Reference< XPropertySet > & _rxField) const
     {
         OSQLParseNode* pReturn = const_cast< OSQLParser& >( m_aParser ).predicateTree( _rErrorMessage, _rStatement, m_xFormatter, _rxField );
         if ( !pReturn )
         {   // is it a text field ?
             sal_Int32 nType = DataType::OTHER;
-            _rxField->getPropertyValue( ::rtl::OUString( "Type" ) ) >>= nType;
+            _rxField->getPropertyValue( OUString( "Type" ) ) >>= nType;
 
             if  (   ( DataType::CHAR        == nType )
                 ||  ( DataType::VARCHAR     == nType )
@@ -148,15 +148,15 @@ namespace dbtools
                 ||  ( DataType::CLOB        == nType )
                 )
             {   // yes -> force a quoted text and try again
-                ::rtl::OUString sQuoted( _rStatement );
+                OUString sQuoted( _rStatement );
                 if  (   !sQuoted.isEmpty()
                     &&  (   (sQuoted.getStr()[0] != '\'')
                         ||  (sQuoted.getStr()[ sQuoted.getLength() - 1 ] != '\'' )
                         )
                     )
                 {
-                    static const ::rtl::OUString sSingleQuote( "'" );
-                    static const ::rtl::OUString sDoubleQuote( "''" );
+                    static const OUString sSingleQuote( "'" );
+                    static const OUString sDoubleQuote( "''" );
 
                     sal_Int32 nIndex = -1;
                     sal_Int32 nTemp = 0;
@@ -166,7 +166,7 @@ namespace dbtools
                         nTemp = nIndex+2;
                     }
 
-                    ::rtl::OUString sTemp( sSingleQuote );
+                    OUString sTemp( sSingleQuote );
                     ( sTemp += sQuoted ) += sSingleQuote;
                     sQuoted = sTemp;
                 }
@@ -199,17 +199,17 @@ namespace dbtools
                 try
                 {
                     Reference< XPropertySetInfo > xPSI( _rxField->getPropertySetInfo() );
-                    if ( xPSI.is() && xPSI->hasPropertyByName( ::rtl::OUString( "FormatKey" ) ) )
+                    if ( xPSI.is() && xPSI->hasPropertyByName( OUString( "FormatKey" ) ) )
                     {
                         sal_Int32 nFormatKey = 0;
-                        _rxField->getPropertyValue( ::rtl::OUString( "FormatKey" ) ) >>= nFormatKey;
+                        _rxField->getPropertyValue( OUString( "FormatKey" ) ) >>= nFormatKey;
                         if ( nFormatKey && m_xFormatter.is() )
                         {
                             Locale aFormatLocale;
                             ::comphelper::getNumberFormatProperty(
                                 m_xFormatter,
                                 nFormatKey,
-                                ::rtl::OUString( "Locale" )
+                                OUString( "Locale" )
                             ) >>= aFormatLocale;
 
                             // valid locale
@@ -230,7 +230,7 @@ namespace dbtools
                 if ( bDecDiffers || bFmtDiffers )
                 {   // okay, at least one differs
                     // "translate" the value into the "format locale"
-                    ::rtl::OUString sTranslated( _rStatement );
+                    OUString sTranslated( _rStatement );
                     const sal_Unicode nIntermediate( '_' );
                     sTranslated = sTranslated.replace( nCtxDecSep,  nIntermediate );
                     sTranslated = sTranslated.replace( nCtxThdSep,  nFmtThdSep );
@@ -245,7 +245,7 @@ namespace dbtools
 
     //---------------------------------------------------------------------
     sal_Bool OPredicateInputController::normalizePredicateString(
-        ::rtl::OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, ::rtl::OUString* _pErrorMessage ) const
+        OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField, OUString* _pErrorMessage ) const
     {
         OSL_ENSURE( m_xConnection.is() && m_xFormatter.is() && _rxField.is(),
             "OPredicateInputController::normalizePredicateString: invalid state or params!" );
@@ -254,8 +254,8 @@ namespace dbtools
         if ( m_xConnection.is() && m_xFormatter.is() && _rxField.is() )
         {
             // parse the string
-            ::rtl::OUString sError;
-            ::rtl::OUString sTransformedText( _rPredicateValue );
+            OUString sError;
+            OUString sTransformedText( _rPredicateValue );
             OSQLParseNode* pParseNode = implPredicateTree( sError, sTransformedText, _rxField );
             if ( _pErrorMessage ) *_pErrorMessage = sError;
 
@@ -266,7 +266,7 @@ namespace dbtools
                 getSeparatorChars( rParseContext.getPreferredLocale(), nDecSeparator, nThousandSeparator );
 
                 // translate it back into a string
-                sTransformedText = ::rtl::OUString();
+                sTransformedText = OUString();
                 pParseNode->parseNodeToPredicateStr(
                     sTransformedText, m_xConnection, m_xFormatter, _rxField,
                     rParseContext.getPreferredLocale(), (sal_Char)nDecSeparator, &rParseContext
@@ -282,15 +282,15 @@ namespace dbtools
     }
 
     //---------------------------------------------------------------------
-    ::rtl::OUString OPredicateInputController::getPredicateValue(
-        const ::rtl::OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField,
-        sal_Bool _bForStatementUse, ::rtl::OUString* _pErrorMessage ) const
+    OUString OPredicateInputController::getPredicateValue(
+        const OUString& _rPredicateValue, const Reference< XPropertySet > & _rxField,
+        sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const
     {
         OSL_ENSURE( _rxField.is(), "OPredicateInputController::getPredicateValue: invalid params!" );
-        ::rtl::OUString sReturn;
+        OUString sReturn;
         if ( _rxField.is() )
         {
-            ::rtl::OUString sValue( _rPredicateValue );
+            OUString sValue( _rPredicateValue );
 
             // a little problem : if the field is a text field, the normalizePredicateString added two
             // '-characters to the text. If we would give this to predicateTree this would add
@@ -305,8 +305,8 @@ namespace dbtools
             if ( bValidQuotedText )
             {
                 sValue = sValue.copy( 1, sValue.getLength() - 2 );
-                static const ::rtl::OUString sSingleQuote( "'" );
-                static const ::rtl::OUString sDoubleQuote( "''" );
+                static const OUString sSingleQuote( "'" );
+                static const OUString sDoubleQuote( "''" );
 
                 sal_Int32 nIndex = -1;
                 sal_Int32 nTemp = 0;
@@ -320,7 +320,7 @@ namespace dbtools
             // The following is mostly stolen from the former implementation in the parameter dialog
             // (dbaccess/source/ui/dlg/paramdialog.cxx). I do not fully understand this .....
 
-            ::rtl::OUString sError;
+            OUString sError;
             OSQLParseNode* pParseNode = implPredicateTree( sError, sValue, _rxField );
             if ( _pErrorMessage )
                 *_pErrorMessage = sError;
@@ -331,12 +331,12 @@ namespace dbtools
         return sReturn;
     }
 
-    ::rtl::OUString OPredicateInputController::getPredicateValue(
-        const ::rtl::OUString& _sField, const ::rtl::OUString& _rPredicateValue, sal_Bool _bForStatementUse, ::rtl::OUString* _pErrorMessage ) const
+    OUString OPredicateInputController::getPredicateValue(
+        const OUString& _sField, const OUString& _rPredicateValue, sal_Bool _bForStatementUse, OUString* _pErrorMessage ) const
     {
-        ::rtl::OUString sReturn = _rPredicateValue;
-        ::rtl::OUString sError;
-        ::rtl::OUString sField = _sField;
+        OUString sReturn = _rPredicateValue;
+        OUString sError;
+        OUString sField = _sField;
         sal_Int32 nIndex = 0;
         sField = sField.getToken(0,'(',nIndex);
         if(nIndex == -1)
@@ -345,9 +345,9 @@ namespace dbtools
         if ( nType == DataType::OTHER || sField.isEmpty() )
         {
             // first try the international version
-            ::rtl::OUString sSql;
-            sSql += ::rtl::OUString("SELECT * ");
-            sSql += ::rtl::OUString(" FROM x WHERE ");
+            OUString sSql;
+            sSql += OUString("SELECT * ");
+            sSql += OUString(" FROM x WHERE ");
             sSql += sField;
             sSql += _rPredicateValue;
             ::std::auto_ptr<OSQLParseNode> pParseNode( const_cast< OSQLParser& >( m_aParser ).parseTree( sError, sSql, sal_True ) );
@@ -363,9 +363,9 @@ namespace dbtools
 
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         parse::OParseColumn* pColumn = new parse::OParseColumn( sField,
-                                                                ::rtl::OUString(),
-                                                                ::rtl::OUString(),
-                                                                ::rtl::OUString(),
+                                                                OUString(),
+                                                                OUString(),
+                                                                OUString(),
                                                                 ColumnValue::NULLABLE_UNKNOWN,
                                                                 0,
                                                                 0,
@@ -373,9 +373,9 @@ namespace dbtools
                                                                 sal_False,
                                                                 sal_False,
                                                                 xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
-                                                                ::rtl::OUString(),
-                                                                ::rtl::OUString(),
-                                                                ::rtl::OUString());
+                                                                OUString(),
+                                                                OUString(),
+                                                                OUString());
         Reference<XPropertySet> xColumn = pColumn;
         pColumn->setFunction(sal_True);
         pColumn->setRealName(sField);
@@ -386,9 +386,9 @@ namespace dbtools
         return pParseNode ? implParseNode(pParseNode,_bForStatementUse) : sReturn;
     }
 
-    ::rtl::OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const
+    OUString OPredicateInputController::implParseNode(OSQLParseNode* pParseNode,sal_Bool _bForStatementUse) const
     {
-        ::rtl::OUString sReturn;
+        OUString sReturn;
         if ( pParseNode )
         {
             boost::shared_ptr<OSQLParseNode> xTakeOwnership(pParseNode);
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index 9534664d650f..30df7cb335ae 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -101,9 +101,9 @@ namespace dbtools
                     rtl_uString_release(aIter->second);
         }
         // ------------------------------------------------------------------------------
-        ::rtl::OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
+        OUString OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
         {
-            ::rtl::OUString sRet;
+            OUString sRet;
             ::std::map<sal_Int32 , rtl_uString*>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
             if(aIter == m_aPropertyMap.end())
                 sRet = const_cast<OPropertyMap*>(this)->fillValue(_nIndex);
@@ -112,7 +112,7 @@ namespace dbtools
             return sRet;
         }
         // ------------------------------------------------------------------------------
-        ::rtl::OUString OPropertyMap::fillValue(sal_Int32 _nIndex)
+        OUString OPropertyMap::fillValue(sal_Int32 _nIndex)
         {
             rtl_uString* pStr = NULL;
             switch(_nIndex)
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index 435472aed1a6..bcf4a2cf18cc 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -61,9 +61,9 @@ namespace connectivity
         ~SQLError_Impl();
 
         // versions of the public SQLError methods which are just delegated to this impl-class
-        static const ::rtl::OUString& getMessagePrefix();
-        ::rtl::OUString     getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
-        ::rtl::OUString     getSQLState( const ErrorCondition _eCondition );
+        static const OUString& getMessagePrefix();
+        OUString     getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
+        OUString     getSQLState( const ErrorCondition _eCondition );
         static ErrorCode    getErrorCode( const ErrorCondition _eCondition );
         void                raiseException( const ErrorCondition _eCondition, const Reference< XInterface >& _rxContext, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
         void                raiseException( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 );
@@ -72,11 +72,11 @@ namespace connectivity
 
     private:
         /// returns the basic error message associated with the given error condition, without any parameter replacements
-        ::rtl::OUString
+        OUString
                 impl_getErrorMessage( const ErrorCondition& _eCondition );
 
         /// returns the SQLState associated with the given error condition
-        ::rtl::OUString
+        OUString
                 impl_getSQLState( const ErrorCondition& _eCondition );
 
         /// returns an SQLException describing the given error condition
@@ -111,9 +111,9 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString& SQLError_Impl::getMessagePrefix()
+    const OUString& SQLError_Impl::getMessagePrefix()
     {
-        static ::rtl::OUString s_sMessagePrefix( "[OOoBase]" );
+        static OUString s_sMessagePrefix( "[OOoBase]" );
         return s_sMessagePrefix;
     }
 
@@ -123,7 +123,7 @@ namespace connectivity
         //................................................................
         /** substitutes a given placeholder in the given message with the given value
         */
-        void    lcl_substitutePlaceholder( ::rtl::OUString& _rMessage, const sal_Char* _pPlaceholder, ParamValue _rParamValue )
+        void    lcl_substitutePlaceholder( OUString& _rMessage, const sal_Char* _pPlaceholder, ParamValue _rParamValue )
         {
             size_t nPlaceholderLen( strlen( _pPlaceholder ) );
             sal_Int32 nIndex = _rMessage.indexOfAsciiL( _pPlaceholder, nPlaceholderLen );
@@ -146,9 +146,9 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
+    OUString SQLError_Impl::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
     {
-        ::rtl::OUString sErrorMessage( impl_getErrorMessage( _eCondition ) );
+        OUString sErrorMessage( impl_getErrorMessage( _eCondition ) );
 
         lcl_substitutePlaceholder( sErrorMessage, "$1$", _rParamValue1 );
         lcl_substitutePlaceholder( sErrorMessage, "$2$", _rParamValue2 );
@@ -158,7 +158,7 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition )
+    OUString SQLError_Impl::getSQLState( const ErrorCondition _eCondition )
     {
         return impl_getSQLState( _eCondition );
     }
@@ -234,13 +234,13 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition )
+    OUString SQLError_Impl::impl_getErrorMessage( const ErrorCondition& _eCondition )
     {
-        ::rtl::OUStringBuffer aMessage;
+        OUStringBuffer aMessage;
 
         if ( impl_initResources() )
         {
-            ::rtl::OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
+            OUString sResMessage( m_pResources->loadString( lcl_getResourceID( _eCondition, false ) ) );
             OSL_ENSURE( !sResMessage.isEmpty(), "SQLError_Impl::impl_getErrorMessage: illegal error condition, or invalid resource!" );
             aMessage.append( getMessagePrefix() ).appendAscii( " " ).append( sResMessage );
         }
@@ -249,9 +249,9 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition )
+    OUString SQLError_Impl::impl_getSQLState( const ErrorCondition& _eCondition )
     {
-        ::rtl::OUString sState;
+        OUString sState;
 
         if ( impl_initResources() )
         {
@@ -261,7 +261,7 @@ namespace connectivity
         }
 
         if ( sState.isEmpty() )
-            sState = ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) );
+            sState = OUString::intern( RTL_CONSTASCII_USTRINGPARAM( "S1000" ) );
 
         return sState;
     }
@@ -296,13 +296,13 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    const ::rtl::OUString& SQLError::getMessagePrefix()
+    const OUString& SQLError::getMessagePrefix()
     {
         return SQLError_Impl::getMessagePrefix();
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString SQLError::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
+    OUString SQLError::getErrorMessage( const ErrorCondition _eCondition, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 ) const
     {
         return m_pImpl->getErrorMessage( _eCondition, _rParamValue1, _rParamValue2, _rParamValue3 );
     }
diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx
index d92adb8072f2..0954fd02de9f 100644
--- a/connectivity/source/commontools/statementcomposer.cxx
+++ b/connectivity/source/commontools/statementcomposer.cxx
@@ -59,9 +59,9 @@ namespace dbtools
     {
         const Reference< XConnection >          xConnection;
         Reference< XSingleSelectQueryComposer > xComposer;
-        ::rtl::OUString                         sCommand;
-        ::rtl::OUString                         sFilter;
-        ::rtl::OUString                         sOrder;
+        OUString                         sCommand;
+        OUString                         sFilter;
+        OUString                         sOrder;
         sal_Int32                               nCommandType;
         sal_Bool                                bEscapeProcessing;
         bool                                    bComposerDirty;
@@ -112,7 +112,7 @@ namespace dbtools
 
             try
             {
-                ::rtl::OUString sStatement;
+                OUString sStatement;
                 switch ( _rData.nCommandType )
                 {
                     case CommandType::COMMAND:
@@ -126,9 +126,9 @@ namespace dbtools
                         if ( _rData.sCommand.isEmpty() )
                             break;
 
-                        sStatement = ::rtl::OUString( "SELECT * FROM " );
+                        sStatement = OUString( "SELECT * FROM " );
 
-                        ::rtl::OUString sCatalog, sSchema, sTable;
+                        OUString sCatalog, sSchema, sTable;
                         qualifiedNameComponents( _rData.xConnection->getMetaData(), _rData.sCommand, sCatalog, sSchema, sTable, eInDataManipulation );
 
                         sStatement += composeTableNameForSelect( _rData.xConnection, sCatalog, sSchema, sTable );
@@ -148,12 +148,12 @@ namespace dbtools
 
                         //  a native query ?
                         sal_Bool bQueryEscapeProcessing = sal_False;
-                        xQuery->getPropertyValue( ::rtl::OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing;
+                        xQuery->getPropertyValue( OUString( "EscapeProcessing" ) ) >>= bQueryEscapeProcessing;
                         if ( !bQueryEscapeProcessing )
                             break;
 
                         // the command used by the query
-                        xQuery->getPropertyValue( ::rtl::OUString( "Command" ) ) >>= sStatement;
+                        xQuery->getPropertyValue( OUString( "Command" ) ) >>= sStatement;
                         if ( sStatement.isEmpty() )
                             break;
 
@@ -161,7 +161,7 @@ namespace dbtools
                         Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
                         ::utl::SharedUNOComponent< XSingleSelectQueryComposer > xComposer;
                         xComposer.set(
-                            xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
+                            xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
                             UNO_QUERY_THROW
                         );
 
@@ -169,17 +169,17 @@ namespace dbtools
                         xComposer->setElementaryQuery( sStatement );
 
                         // the sort order
-                        const ::rtl::OUString sPropOrder( ::rtl::OUString( "Order" ) );
+                        const OUString sPropOrder( OUString( "Order" ) );
                         if ( ::comphelper::hasProperty( sPropOrder, xQuery ) )
                         {
-                            ::rtl::OUString sOrder;
+                            OUString sOrder;
                             OSL_VERIFY( xQuery->getPropertyValue( sPropOrder ) >>= sOrder );
                             xComposer->setOrder( sOrder );
                         }
 
                         // the filter
                         sal_Bool bApplyFilter = sal_True;
-                        const ::rtl::OUString sPropApply( "ApplyFilter" );
+                        const OUString sPropApply( "ApplyFilter" );
                         if ( ::comphelper::hasProperty( sPropApply, xQuery ) )
                         {
                             OSL_VERIFY( xQuery->getPropertyValue( sPropApply ) >>= bApplyFilter );
@@ -187,8 +187,8 @@ namespace dbtools
 
                         if ( bApplyFilter )
                         {
-                            ::rtl::OUString sFilter;
-                            OSL_VERIFY( xQuery->getPropertyValue( ::rtl::OUString( "Filter" ) ) >>= sFilter );
+                            OUString sFilter;
+                            OSL_VERIFY( xQuery->getPropertyValue( OUString( "Filter" ) ) >>= sFilter );
                             xComposer->setFilter( sFilter );
                         }
 
@@ -206,7 +206,7 @@ namespace dbtools
                 {
                     // create an composer
                     Reference< XMultiServiceFactory > xFactory( _rData.xConnection, UNO_QUERY_THROW );
-                    Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
+                    Reference< XSingleSelectQueryComposer > xComposer( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
                         UNO_QUERY_THROW );
                     xComposer->setElementaryQuery( sStatement );
 
@@ -238,7 +238,7 @@ namespace dbtools
     //====================================================================
     //--------------------------------------------------------------------
     StatementComposer::StatementComposer( const Reference< XConnection >& _rxConnection,
-        const ::rtl::OUString&  _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing )
+        const OUString&  _rCommand, const sal_Int32 _nCommandType, const sal_Bool _bEscapeProcessing )
         :m_pData( new StatementComposer_Data( _rxConnection ) )
     {
         OSL_PRECOND( _rxConnection.is(), "StatementComposer::StatementComposer: illegal connection!" );
@@ -260,14 +260,14 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    void StatementComposer::setFilter( const ::rtl::OUString& _rFilter )
+    void StatementComposer::setFilter( const OUString& _rFilter )
     {
         m_pData->sFilter = _rFilter;
         m_pData->bComposerDirty = true;
     }
 
     //--------------------------------------------------------------------
-    void StatementComposer::setOrder( const ::rtl::OUString& _rOrder )
+    void StatementComposer::setOrder( const OUString& _rOrder )
     {
         m_pData->sOrder = _rOrder;
         m_pData->bComposerDirty = true;
@@ -281,14 +281,14 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString StatementComposer::getQuery()
+    OUString StatementComposer::getQuery()
     {
         if ( lcl_ensureUpToDateComposer_nothrow( *m_pData ) )
         {
             return m_pData->xComposer->getQuery();
         }
 
-        return ::rtl::OUString();
+        return OUString();
     }
 
 //........................................................................
diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx
index 3a65fc438173..44b7a69de9e8 100644
--- a/connectivity/source/commontools/warningscontainer.cxx
+++ b/connectivity/source/commontools/warningscontainer.cxx
@@ -103,9 +103,9 @@ namespace dbtools
     }
 
     //--------------------------------------------------------------------
-    void WarningsContainer::appendWarning( const ::rtl::OUString& _rWarning, const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext )
+    void WarningsContainer::appendWarning( const OUString& _rWarning, const sal_Char* _pAsciiSQLState, const Reference< XInterface >& _rxContext )
     {
-        appendWarning( SQLWarning( _rWarning, _rxContext, ::rtl::OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) );
+        appendWarning( SQLWarning( _rWarning, _rxContext, OUString::createFromAscii( _pAsciiSQLState ), 0, Any() ) );
     }
 
 //........................................................................
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 83879188af38..476106b7606d 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -51,9 +51,9 @@ void SAL_CALL OPoolTimer::onShot()
 namespace
 {
     //--------------------------------------------------------------------
-    static const ::rtl::OUString& getTimeoutNodeName()
+    static const OUString& getTimeoutNodeName()
     {
-        static ::rtl::OUString s_sNodeName( "Timeout" );
+        static OUString s_sNodeName( "Timeout" );
         return s_sNodeName;
     }
 
@@ -167,7 +167,7 @@ m_xDriverNode.clear();
 m_xDriver.clear();
 }
 //--------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
 
@@ -209,7 +209,7 @@ void SAL_CALL OConnectionPool::disposing( const ::com::sun::star::lang::EventObj
     }
 }
 // -----------------------------------------------------------------------------
-Reference< XConnection> OConnectionPool::createNewConnection(const ::rtl::OUString& _rURL,const Sequence< PropertyValue >& _rInfo)
+Reference< XConnection> OConnectionPool::createNewConnection(const OUString& _rURL,const Sequence< PropertyValue >& _rInfo)
 {
     // create new pooled conenction
     Reference< XPooledConnection > xPooledConnection = new ::connectivity::OPooledConnection(m_xDriver->connect(_rURL,_rInfo),m_xProxyFactory);
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index a18579df980c..6a4d4c8711e5 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -117,7 +117,7 @@ namespace connectivity
         sal_Int32               m_nALiveCount;
 
     private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL,
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const OUString& _rURL,
                                 const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo);
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getPooledConnection(TConnectionMap::iterator& _rIter);
         // calculate the timeout and the corresponding ALiveCount
@@ -133,7 +133,7 @@ namespace connectivity
 
         // delete all refs
         void clear(sal_Bool _bDispose);
-        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
         // XPropertyChangeListener
diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx
index 5666afce188c..e9cd16616293 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -61,7 +61,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement(  ) thr
     return m_xConnection->createStatement();
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -70,7 +70,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen
     return m_xConnection->prepareStatement(sql);
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -79,7 +79,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co
     return m_xConnection->prepareCall(sql);
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -157,7 +157,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly(  ) throw(SQLException, Run
     return m_xConnection->isReadOnly();
 }
 // --------------------------------------------------------------------------------
-void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
@@ -166,7 +166,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const ::rtl::OUString& catalog
     m_xConnection->setCatalog(catalog);
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnectionWeakWrapper::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx
index e9e62000c191..89bac01b2f0e 100644
--- a/connectivity/source/cpool/ZConnectionWrapper.hxx
+++ b/connectivity/source/cpool/ZConnectionWrapper.hxx
@@ -54,9 +54,9 @@ namespace connectivity
 
         // XConnection
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL commit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -65,8 +65,8 @@ namespace connectivity
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::rtl::OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx
index 12887634dec5..f039de4934dd 100644
--- a/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -79,7 +79,7 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    Reference< XConnection > SAL_CALL ODriverWrapper::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
+    Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Reference< XConnection > xConnection;
         if (m_pConnectionPool)
@@ -92,13 +92,13 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException)
+    sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
     {
         return m_xDriver.is() && m_xDriver->acceptsURL(url);
     }
 
     //--------------------------------------------------------------------
-    Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
+    Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Sequence< DriverPropertyInfo > aInfo;
         if (m_xDriver.is())
diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx
index e44be72ceb69..a4ffdc93e9ff 100644
--- a/connectivity/source/cpool/ZDriverWrapper.hxx
+++ b/connectivity/source/cpool/ZDriverWrapper.hxx
@@ -65,9 +65,9 @@ namespace connectivity
         /// dtor
         virtual ~ODriverWrapper();
         // XDriver
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw (::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw (::com::sun::star::uno::RuntimeException);
     };
diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx
index 59de7dbeb58c..0a5aa4b8e849 100644
--- a/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/connectivity/source/cpool/ZPoolCollection.cxx
@@ -42,33 +42,33 @@ using namespace ::osl;
 using namespace connectivity;
 
 //--------------------------------------------------------------------
-static const ::rtl::OUString& getConnectionPoolNodeName()
+static const OUString& getConnectionPoolNodeName()
 {
-    static ::rtl::OUString s_sNodeName(  "org.openoffice.Office.DataAccess/ConnectionPool" );
+    static OUString s_sNodeName(  "org.openoffice.Office.DataAccess/ConnectionPool" );
     return s_sNodeName;
 }
 //--------------------------------------------------------------------
-static const ::rtl::OUString& getEnablePoolingNodeName()
+static const OUString& getEnablePoolingNodeName()
 {
-    static ::rtl::OUString s_sNodeName(  "EnablePooling" );
+    static OUString s_sNodeName(  "EnablePooling" );
     return s_sNodeName;
 }
 //--------------------------------------------------------------------
-static const ::rtl::OUString& getDriverNameNodeName()
+static const OUString& getDriverNameNodeName()
 {
-    static ::rtl::OUString s_sNodeName(  "DriverName" );
+    static OUString s_sNodeName(  "DriverName" );
     return s_sNodeName;
 }
 // -----------------------------------------------------------------------------
-static const ::rtl::OUString& getDriverSettingsNodeName()
+static const OUString& getDriverSettingsNodeName()
 {
-    static ::rtl::OUString s_sNodeName(  "DriverSettings" );
+    static OUString s_sNodeName(  "DriverSettings" );
     return s_sNodeName;
 }
 //--------------------------------------------------------------------------
-static const ::rtl::OUString& getEnableNodeName()
+static const OUString& getEnableNodeName()
 {
-    static ::rtl::OUString s_sNodeName(  "Enable" );
+    static OUString s_sNodeName(  "Enable" );
     return s_sNodeName;
 }
 
@@ -100,18 +100,18 @@ OPoolCollection::~OPoolCollection()
     clearConnectionPools(sal_False);
 }
 // -----------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const ::rtl::OUString& _rURL ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException)
 {
     return getConnectionWithInfo(_rURL,Sequence< PropertyValue >());
 }
 // -----------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     Reference< XConnection > xConnection;
     Reference< XDriver > xDriver;
     Reference< XInterface > xDriverNode;
-    ::rtl::OUString sImplName;
+    OUString sImplName;
     if(isPoolingEnabledByUrl(_rURL,xDriver,sImplName,xDriverNode) && xDriver.is())
     {
         OConnectionPool* pConnectionPool = getConnectionPool(sImplName,xDriver,xDriverNode);
@@ -137,18 +137,18 @@ sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout(  ) throw(RuntimeException)
     return m_xManager->getLoginTimeout();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OPoolCollection::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL OPoolCollection::getImplementationName(  ) throw(RuntimeException)
 {
     MutexGuard aGuard(m_aMutex);
     return getImplementationName_Static();
 }
 
 //--------------------------------------------------------------------------
-sal_Bool SAL_CALL OPoolCollection::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -156,7 +156,7 @@ sal_Bool SAL_CALL OPoolCollection::supportsService( const ::rtl::OUString& _rSer
 }
 
 //--------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
@@ -168,27 +168,27 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference
 }
 
 //--------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OPoolCollection::getImplementationName_Static(  ) throw(RuntimeException)
+OUString SAL_CALL OPoolCollection::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.sdbc.OConnectionPool");
+    return OUString("com.sun.star.sdbc.OConnectionPool");
 }
 
 //--------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static(  ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ConnectionPool");
+    Sequence< OUString > aSupported(1);
+    aSupported[0] = OUString("com.sun.star.sdbc.ConnectionPool");
     return aSupported;
 }
 // -----------------------------------------------------------------------------
-Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUString& _rURL ) throw(RuntimeException)
+Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException)
 {
     // returns the original driver when no connection pooling is enabled else it returns the proxy
     MutexGuard aGuard(m_aMutex);
 
     Reference< XDriver > xDriver;
     Reference< XInterface > xDriverNode;
-    ::rtl::OUString sImplName;
+    OUString sImplName;
     if(isPoolingEnabledByUrl(_rURL,xDriver,sImplName,xDriverNode))
     {
         Reference< XDriver > xExistentProxy;
@@ -223,7 +223,7 @@ Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const ::rtl::OUSt
     return xDriver;
 }
 // -----------------------------------------------------------------------------
-sal_Bool OPoolCollection::isDriverPoolingEnabled(const ::rtl::OUString& _sDriverImplName,
+sal_Bool OPoolCollection::isDriverPoolingEnabled(const OUString& _sDriverImplName,
                                                  Reference< XInterface >& _rxDriverNode)
 {
     sal_Bool bEnabled = sal_False;
@@ -233,9 +233,9 @@ sal_Bool OPoolCollection::isDriverPoolingEnabled(const ::rtl::OUString& _sDriver
 
     if(xDirectAccess.is())
     {
-        Sequence< ::rtl::OUString > aDriverKeys = xDirectAccess->getElementNames();
-        const ::rtl::OUString* pDriverKeys = aDriverKeys.getConstArray();
-        const ::rtl::OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
+        Sequence< OUString > aDriverKeys = xDirectAccess->getElementNames();
+        const OUString* pDriverKeys = aDriverKeys.getConstArray();
+        const OUString* pDriverKeysEnd = pDriverKeys + aDriverKeys.getLength();
         for (;pDriverKeys != pDriverKeysEnd; ++pDriverKeys)
         {
             // the name of the driver in this round
@@ -270,9 +270,9 @@ Reference<XInterface> OPoolCollection::getConfigPoolRoot()
     return m_xConfigNode;
 }
 // -----------------------------------------------------------------------------
-sal_Bool OPoolCollection::isPoolingEnabledByUrl(const ::rtl::OUString& _sUrl,
+sal_Bool OPoolCollection::isPoolingEnabledByUrl(const OUString& _sUrl,
                                                 Reference< XDriver >& _rxDriver,
-                                                ::rtl::OUString& _rsImplName,
+                                                OUString& _rsImplName,
                                                 Reference< XInterface >& _rxDriverNode)
 {
     sal_Bool bEnabled = sal_False;
@@ -299,13 +299,13 @@ void OPoolCollection::clearConnectionPools(sal_Bool _bDispose)
     {
         aIter->second->clear(_bDispose);
         aIter->second->release();
-        ::rtl::OUString sKeyValue = aIter->first;
+        OUString sKeyValue = aIter->first;
         ++aIter;
         m_aPools.erase(sKeyValue);
     }
 }
 // -----------------------------------------------------------------------------
-OConnectionPool* OPoolCollection::getConnectionPool(const ::rtl::OUString& _sImplName,
+OConnectionPool* OPoolCollection::getConnectionPool(const OUString& _sImplName,
                                                     const Reference< XDriver >& _xDriver,
                                                     const Reference< XInterface >& _xDriverNode)
 {
@@ -329,7 +329,7 @@ OConnectionPool* OPoolCollection::getConnectionPool(const ::rtl::OUString& _sImp
     return pRet;
 }
 // -----------------------------------------------------------------------------
-Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::OUString& _rPath) const
+Reference< XInterface > OPoolCollection::createWithServiceFactory(const OUString& _rPath) const
 {
     return createWithProvider(
         com::sun::star::configuration::theDefaultProvider::get(m_xContext),
@@ -337,17 +337,17 @@ Reference< XInterface > OPoolCollection::createWithServiceFactory(const ::rtl::O
 }
 //------------------------------------------------------------------------
 Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMultiServiceFactory >& _rxConfProvider,
-                            const ::rtl::OUString& _rPath) const
+                            const OUString& _rPath) const
 {
     OSL_ASSERT(_rxConfProvider.is());
     Sequence< Any > args(1);
     args[0] = makeAny(
         NamedValue(
-            rtl::OUString("nodepath"),
+            OUString("nodepath"),
             makeAny(_rPath)));
     Reference< XInterface > xInterface(
         _rxConfProvider->createInstanceWithArguments(
-            rtl::OUString( "com.sun.star.configuration.ConfigurationAccess"),
+            OUString( "com.sun.star.configuration.ConfigurationAccess"),
             args));
     OSL_ENSURE(
         xInterface.is(),
@@ -355,7 +355,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu
     return xInterface;
 }
 // -----------------------------------------------------------------------------
-Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
+Reference<XInterface> OPoolCollection::openNode(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) const throw()
 {
     Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
     Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY);
@@ -387,7 +387,7 @@ Reference<XInterface> OPoolCollection::openNode(const ::rtl::OUString& _rPath,co
     return xNode;
 }
 // -----------------------------------------------------------------------------
-Any OPoolCollection::getNodeValue(const ::rtl::OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw()
+Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference<XInterface>& _xTreeNode) throw()
 {
     Reference< XHierarchicalNameAccess > xHierarchyAccess(_xTreeNode, UNO_QUERY);
     Reference< XNameAccess > xDirectAccess(_xTreeNode, UNO_QUERY);
@@ -476,7 +476,7 @@ void SAL_CALL OPoolCollection::propertyChange( const ::com::sun::star::beans::Pr
         evt.NewValue >>= bEnabled;
         if(!bEnabled)
         {
-            ::rtl::OUString sThisDriverName;
+            OUString sThisDriverName;
             getNodeValue(getDriverNameNodeName(),evt.Source) >>= sThisDriverName;
             // 1nd relase the driver
             // look if we already have a proxy for this driver
diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx
index b601c53a21e2..b6cc41b825b3 100644
--- a/connectivity/source/cpool/ZPoolCollection.hxx
+++ b/connectivity/source/cpool/ZPoolCollection.hxx
@@ -81,21 +81,21 @@ namespace connectivity
             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
 
         // some configuration helper methods
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const ::rtl::OUString& _rPath) const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const;
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getConfigPoolRoot();
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createWithProvider(   const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxConfProvider,
-                                                                                                    const ::rtl::OUString& _rPath) const;
-        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const ::rtl::OUString& _rPath,
+                                                                                                    const OUString& _rPath) const;
+        ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > openNode( const OUString& _rPath,
                                                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xTreeNode) const throw();
         sal_Bool isPoolingEnabled();
-        sal_Bool isDriverPoolingEnabled(const ::rtl::OUString& _sDriverImplName,
+        sal_Bool isDriverPoolingEnabled(const OUString& _sDriverImplName,
                                         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
-        sal_Bool isPoolingEnabledByUrl( const ::rtl::OUString& _sUrl,
+        sal_Bool isPoolingEnabledByUrl( const OUString& _sUrl,
                                         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _rxDriver,
-                                        ::rtl::OUString& _rsImplName,
+                                        OUString& _rsImplName,
                                         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
 
-        OConnectionPool* getConnectionPool( const ::rtl::OUString& _sImplName,
+        OConnectionPool* getConnectionPool( const OUString& _sImplName,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver >& _xDriver,
                                             const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDriverNode);
         void clearConnectionPools(sal_Bool _bDispose);
@@ -104,26 +104,26 @@ namespace connectivity
         virtual ~OPoolCollection();
     public:
 
-        static ::com::sun::star::uno::Any getNodeValue( const ::rtl::OUString& _rPath,
+        static ::com::sun::star::uno::Any getNodeValue( const OUString& _rPath,
                                                         const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xTreeNode)throw();
 
     // XDriverManager
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::uno::RuntimeException);
         virtual sal_Int32 SAL_CALL getLoginTimeout(  ) throw(::com::sun::star::uno::RuntimeException);
 
     //XDriverAccess
-        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const ::rtl::OUString& url ) throw (::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (::com::sun::star::uno::RuntimeException);
     // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+        virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo - static methods
         static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL CreateInstance(const::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
-        static ::rtl::OUString SAL_CALL getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
-        static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+        static OUString SAL_CALL getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+        static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static(  ) throw(::com::sun::star::uno::RuntimeException);
 
         // XEventListener
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx
index 5bd0ffb0c403..882b1d57bdbd 100644
--- a/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -37,7 +37,7 @@ IMPLEMENT_SERVICE_INFO(OCallableStatement,"com.sun.star.sdbcx.ACallableStatement
 //**************************************************************
 //************ Class: java.sql.CallableStatement
 //**************************************************************
-OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql )
+OCallableStatement::OCallableStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql )
                 : OPreparedStatement( _pConnection, _TypeInfo, sql )
 {
     m_Command.put_CommandType(adCmdStoredProc);
@@ -124,7 +124,7 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     GET_PARAM()
     return m_aValue;
@@ -145,7 +145,7 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     ADOParameter* pParam = NULL;
     m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam);
diff --git a/connectivity/source/drivers/ado/ACatalog.cxx b/connectivity/source/drivers/ado/ACatalog.cxx
index 1de00a08f04e..4583503f8b7a 100644
--- a/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/connectivity/source/drivers/ado/ACatalog.cxx
@@ -59,7 +59,7 @@ void OCatalog::refreshTables()
         WpADOTable aElement = aTables.GetItem(i);
           if ( aElement.IsValid() )
           {
-              ::rtl::OUString sTypeName = aElement.get_Type();
+              OUString sTypeName = aElement.get_Type();
                   if ( !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("SYSTEM TABLE"))
                     && !sTypeName.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("ACCESS TABLE")) )
                      aVector.push_back(aElement.get_Name());
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 7dcd8cffff43..2706f08d5ca0 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -106,7 +106,7 @@ void OAdoColumn::construct()
     sal_Int32 nAttrib = isNew() ? 0 : PropertyAttribute::READONLY;
 
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISASCENDING),     PROPERTY_ID_ISASCENDING,    nAttrib,&m_IsAscending, ::getBooleanCppuType());
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),   PROPERTY_ID_RELATEDCOLUMN,  nAttrib,&m_ReferencedColumn,    ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN),   PROPERTY_ID_RELATEDCOLUMN,  nAttrib,&m_ReferencedColumn,    ::getCppuType(static_cast< OUString*>(0)));
 }
 // -----------------------------------------------------------------------------
 void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception)
@@ -122,14 +122,14 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
                 break;
             case PROPERTY_ID_RELATEDCOLUMN:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aColumn.put_RelatedColumn(aVal);
                 }
                 break;
             case PROPERTY_ID_NAME:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aColumn.put_Name(aVal);
                 }
@@ -171,7 +171,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
                 break;
 
             case PROPERTY_ID_ISAUTOINCREMENT:
-                OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString( "Autoincrement" ), getBOOL( rValue ) );
+                OTools::putValue( m_aColumn.get_Properties(), OUString( "Autoincrement" ), getBOOL( rValue ) );
                 break;
 
             case PROPERTY_ID_IM001:
@@ -185,7 +185,7 @@ void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& r
         }
 
         if ( pAdoPropertyName )
-            OTools::putValue( m_aColumn.get_Properties(), ::rtl::OUString::createFromAscii( pAdoPropertyName ), getString( rValue ) );
+            OTools::putValue( m_aColumn.get_Properties(), OUString::createFromAscii( pAdoPropertyName ), getString( rValue ) );
     }
     OColumn_ADO::setFastPropertyValue_NoBroadcast(nHandle,rValue);
 }
@@ -209,7 +209,7 @@ void OAdoColumn::fillPropertyValues()
 
         sal_Bool bForceTo = sal_True;
         const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo();
-        const OExtendedTypeInfo* pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),eType,::rtl::OUString(),m_Precision,m_Scale,bForceTo);
+        const OExtendedTypeInfo* pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),eType,OUString(),m_Precision,m_Scale,bForceTo);
         if ( pTypeInfo )
             m_TypeName = pTypeInfo->aSimpleType.aTypeName;
         else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) )
@@ -218,7 +218,7 @@ void OAdoColumn::fillPropertyValues()
             OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(),
                                                             pTypeInfoMap->end(),
                                                             ::o3tl::compose1(
-                                                            ::std::bind2nd(aCase, ::rtl::OUString("VarBinary")),
+                                                            ::std::bind2nd(aCase, OUString("VarBinary")),
                                                                 ::o3tl::compose1(
                                                                     ::std::mem_fun(&OExtendedTypeInfo::getDBName),
                                                                     ::o3tl::select2nd<OTypeInfoMap::value_type>())
@@ -234,7 +234,7 @@ void OAdoColumn::fillPropertyValues()
 
             if ( !pTypeInfo )
             {
-                pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),adBinary,::rtl::OUString(),m_Precision,m_Scale,bForceTo);
+                pTypeInfo = OConnection::getTypeInfoFromType(*m_pConnection->getTypeInfo(),adBinary,OUString(),m_Precision,m_Scale,bForceTo);
                 eType = adBinary;
             }
 
@@ -252,19 +252,19 @@ void OAdoColumn::fillPropertyValues()
 
             if ( aProps.IsValid() )
             {
-                m_IsAutoIncrement = OTools::getValue( aProps, ::rtl::OUString("Autoincrement") );
+                m_IsAutoIncrement = OTools::getValue( aProps, OUString("Autoincrement") );
 
-                m_Description = OTools::getValue( aProps, ::rtl::OUString("Description") );
+                m_Description = OTools::getValue( aProps, OUString("Description") );
 
-                m_DefaultValue = OTools::getValue( aProps, ::rtl::OUString("Default") );
+                m_DefaultValue = OTools::getValue( aProps, OUString("Default") );
 
 #if OSL_DEBUG_LEVEL > 0
                 sal_Int32 nCount = aProps.GetItemCount();
                 for (sal_Int32 i = 0; i<nCount; ++i)
                 {
                     WpADOProperty aProp = aProps.GetItem(i);
-                    ::rtl::OUString sName = aProp.GetName();
-                    ::rtl::OUString sVal = aProp.GetValue();
+                    OUString sName = aProp.GetName();
+                    OUString sVal = aProp.GetValue();
                 }
 #endif
             }
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index 5b918cdfef68..1dad74a6959a 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -42,7 +42,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
 {
     return new OAdoColumn(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -59,7 +59,7 @@ Reference< XPropertySet > OColumns::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoColumn* pColumn = NULL;
     Reference< XPropertySet > xColumn;
@@ -82,7 +82,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc
     nType = ADOS::MapADOType2Jdbc(aColumn.get_Type());
 #endif
 
-    ::rtl::OUString sTypeName;
+    OUString sTypeName;
     pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sTypeName;
 
     const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo();
@@ -110,7 +110,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc
             sal_Bool bAutoIncrement = sal_False;
             pColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
             if ( bAutoIncrement )
-                OTools::putValue( aAddedColumn.get_Properties(), ::rtl::OUString("Autoincrement"), bAutoIncrement );
+                OTools::putValue( aAddedColumn.get_Properties(), OUString("Autoincrement"), bAutoIncrement );
 
             if ( aFind != pTypeInfoMap->end() &&  aColumn.get_Type() != aAddedColumn.get_Type() ) // change column type if necessary
                 aColumn.put_Type(aFind->first);
@@ -127,7 +127,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString&, const Referenc
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OColumns::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OColumns::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(_sElementName))
         ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this));
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 019935d344b4..ee00d3adf862 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -97,7 +97,7 @@ OConnection::~OConnection()
 {
 }
 //-----------------------------------------------------------------------------
-void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)
+void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -105,7 +105,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
 
     sal_Int32 nLen = url.indexOf(':');
     nLen = url.indexOf(':',nLen+1);
-    ::rtl::OUString aDSN(url.copy(nLen+1)),aUID,aPWD;
+    OUString aDSN(url.copy(nLen+1)),aUID,aPWD;
     if ( aDSN.startsWith("access:") )
         aDSN = aDSN.copy(7);
 
@@ -138,8 +138,8 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
             WpADOProperties aProps = m_pAdoConnection->get_Properties();
             if(aProps.IsValid())
             {
-                OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True);
-                OLEVariant aVar(OTools::getValue(aProps,::rtl::OUString("Jet OLEDB:Engine Type")));
+                OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),sal_True);
+                OLEVariant aVar(OTools::getValue(aProps,OUString("Jet OLEDB:Engine Type")));
                 if(!aVar.isNull() && !aVar.isEmpty())
                     m_nEngineType = aVar;
             }
@@ -174,7 +174,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return pStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -186,7 +186,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::
     return xPStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -198,17 +198,17 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::
     return xPStmt;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
 
 
-    ::rtl::OUString sql = _sql;
+    OUString sql = _sql;
     WpADOProperties aProps = m_pAdoConnection->get_Properties();
     if(aProps.IsValid())
     {
-        OTools::putValue(aProps,::rtl::OUString("Jet OLEDB:ODBC Parsing"),sal_True);
+        OTools::putValue(aProps,OUString("Jet OLEDB:ODBC Parsing"),sal_True);
         WpADOCommand aCommand;
         aCommand.Create();
         aCommand.put_ActiveConnection((IDispatch*)*m_pAdoConnection);
@@ -302,7 +302,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
     return m_pAdoConnection->get_Mode() == adModeRead;
 }
 // --------------------------------------------------------------------------------
-void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -311,7 +311,7 @@ void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& catalog ) throw(SQ
     ADOS::ThrowException(*m_pAdoConnection,*this);
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -435,7 +435,7 @@ void OConnection::buildTypeInfo() throw( SQLException)
         if ( bOk )
         {
             // HACK for access
-            static const ::rtl::OUString s_sVarChar("VarChar");
+            static const OUString s_sVarChar("VarChar");
             do
             {
                 sal_Int32 nPos = 1;
@@ -527,7 +527,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
 // -----------------------------------------------------------------------------
 const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _rTypeInfo,
                            DataTypeEnum _nType,
-                           const ::rtl::OUString& _sTypeName,
+                           const OUString& _sTypeName,
                            sal_Int32 _nPrecision,
                            sal_Int32 _nScale,
                            sal_Bool& _brForceToType)
@@ -544,7 +544,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
             // search the best matching type
             OExtendedTypeInfo* pInfo = aIter->second;
     #ifdef DBG_UTIL
-            ::rtl::OUString sDBTypeName = pInfo->aSimpleType.aTypeName;
+            OUString sDBTypeName = pInfo->aSimpleType.aTypeName;
             sal_Int32       nDBTypePrecision = pInfo->aSimpleType.nPrecision;   (void)nDBTypePrecision;
             sal_Int32       nDBTypeScale = pInfo->aSimpleType.nMaximumScale;    (void)nDBTypeScale;
             sal_Int32       nAdoType = pInfo->eType;                            (void)nAdoType;
@@ -571,11 +571,11 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
                 {
 // we can not assert here because we could be in d&d
 /*
-                    OSL_FAIL((  ::rtl::OString("getTypeInfoFromType: assuming column type ")
-                        +=  ::rtl::OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), osl_getThreadTextEncoding())
-                        +=  ::rtl::OString("\" (expected type name ")
-                        +=  ::rtl::OString(_sTypeName.getStr(), _sTypeName.getLength(), osl_getThreadTextEncoding())
-                        +=  ::rtl::OString(" matches the type's local name).")).getStr());
+                    OSL_FAIL((  OString("getTypeInfoFromType: assuming column type ")
+                        +=  OString(aIter->second->aTypeName.getStr(), aIter->second->aTypeName.getLength(), osl_getThreadTextEncoding())
+                        +=  OString("\" (expected type name ")
+                        +=  OString(_sTypeName.getStr(), _sTypeName.getLength(), osl_getThreadTextEncoding())
+                        +=  OString(" matches the type's local name).")).getStr());
 */
                     break;
                 }
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index df38f9e2cfb8..cda9dc531b26 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon)
 {
 }
 // -------------------------------------------------------------------------
-sal_Int32 ODatabaseMetaData::getInt32Property(const ::rtl::OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     //  ADOS::ThrowException(*m_pADOConnection,*this);
@@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const ::rtl::OUString& _aProperty)
 }
 
 // -------------------------------------------------------------------------
-sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -68,14 +68,14 @@ sal_Bool ODatabaseMetaData::getBoolProperty(const ::rtl::OUString& _aProperty)
     return (!aVar.isNull() && !aVar.isEmpty() ? aVar.getBool() : sal_False);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::getStringProperty(const ::rtl::OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty)  throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties());
     ADOS::ThrowException(*m_pADOConnection,*this);
     OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection");
 
     ADO_PROP(_aProperty);
-    ::rtl::OUString aValue;
+    OUString aValue;
     if(!aVar.isNull() && !aVar.isEmpty() && aVar.getType() == VT_BSTR)
         aValue = aVar;
 
@@ -110,7 +110,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs(  ) throw(SQLExc
     return xRef;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
+OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     return getLiteral(DBLITERAL_CATALOG_SEPARATOR);
 }
@@ -133,8 +133,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas(  ) throw(SQLExce
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
-    const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
-    const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table,
+    const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -148,8 +148,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
-    const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern,
-    const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern,
+    const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -164,8 +164,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
-    const Any& catalog, const ::rtl::OUString& schemaPattern,
-    const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern,
+    const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -180,8 +180,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
-    const Any& catalog, const ::rtl::OUString& schemaPattern,
-    const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern,
+    const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -196,8 +196,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures(
-    const Any& catalog, const ::rtl::OUString& schemaPattern,
-    const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern,
+    const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
 {
     // Create elements used in the array
     ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern);
@@ -219,7 +219,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLExc
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Maximum Row Size"));
+    return getInt32Property(OUString("Maximum Row Size"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength(  ) throw(SQLException, RuntimeException)
@@ -249,12 +249,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength(  ) throw(SQLExcept
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Active Sessions"));
+    return getInt32Property(OUString("Active Sessions"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Max Columns in Table"));
+    return getInt32Property(OUString("Max Columns in Table"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength(  ) throw(SQLException, RuntimeException)
@@ -269,11 +269,11 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 {
-    return getInt32Property(::rtl::OUString("Maximum Tables in SELECT"));
+    return getInt32Property(OUString("Maximum Tables in SELECT"));
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
-    const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
-    const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -302,7 +302,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
-    const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -317,7 +317,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
-    const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
+    const Any& catalog, const OUString& schema, const OUString& table,
     sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate);
@@ -333,7 +333,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-    const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException)
+    const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
     Reference< XResultSet > xRef;
     if(!ADOS::isJetEngine(m_pConnection->getEngineType()))
@@ -362,7 +362,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
         aRow[4] = ::connectivity::ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[5] = new ::connectivity::ORowSetValueDecorator(getUserName());
         aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getSelectValue();
-        aRow[7] = new ::connectivity::ORowSetValueDecorator(::rtl::OUString("NO"));
+        aRow[7] = new ::connectivity::ORowSetValueDecorator(OUString("NO"));
 
         aRows.push_back(aRow);
         aRow[6] = ::connectivity::ODatabaseMetaDataResultSet::getInsertValue();
@@ -386,9 +386,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
-    const Any& primaryCatalog, const ::rtl::OUString& primarySchema,
-    const ::rtl::OUString& primaryTable, const Any& foreignCatalog,
-    const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException)
+    const Any& primaryCatalog, const OUString& primarySchema,
+    const OUString& primaryTable, const Any& foreignCatalog,
+    const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable);
     ADOS::ThrowException(*m_pADOConnection,*this);
@@ -404,37 +404,37 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference(
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString("Maximum Row Size Includes BLOB"));
+    return getBoolProperty(OUString("Maximum Row Size Includes BLOB"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw(  )
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw(  )
@@ -449,28 +449,28 @@ sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw(  )
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Maximum Index Size"));
+    return getInt32Property(OUString("Maximum Index Size"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL;
+    return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NON_NULL;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("Catalog Term"));
+    return getStringProperty(OUString("Catalog Term"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
+OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     return getLiteral(DBLITERAL_QUOTE_PREFIX);
 
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
@@ -480,27 +480,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  )
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw(  )
 {
-    return getInt32Property(::rtl::OUString("Catalog Location")) == DBPROPVAL_CL_START;
+    return getInt32Property(OUString("Catalog Location")) == DBPROPVAL_CL_START;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE;
+    return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_IGNORE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT;
+    return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DDL_COMMIT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_DML;
+    return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_DML;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_ALL;
+    return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_ALL;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete(  ) throw(SQLException, RuntimeException)
@@ -515,29 +515,29 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate(  ) throw(SQLExcep
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE;
+    return getInt32Property(OUString("Prepare Abort Behavior")) == DBPROPVAL_CB_PRESERVE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE;
+    return getInt32Property(OUString("Prepare Commit Behavior")) == DBPROPVAL_CB_PRESERVE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
+    return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
+    return (getInt32Property(OUString("Isolation Retention")) & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException)
 {
     sal_Bool bValue(sal_False);
 
-    sal_Int32 nTxn = getInt32Property(::rtl::OUString("Isolation Levels"));
+    sal_Int32 nTxn = getInt32Property(OUString("Isolation Levels"));
     if(level == TransactionIsolation::NONE)
         bValue = sal_True;
     else if(level == TransactionIsolation::READ_UNCOMMITTED)
@@ -554,35 +554,35 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw(  )
 {
-    return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
+    return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
+    return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw(  )
 {
-    return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
+    return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_TABLE_DEFINITION) == DBPROPVAL_SU_TABLE_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw(  )
@@ -604,7 +604,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins(  ) throw(SQLException,
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
-    return getBoolProperty(::rtl::OUString("Outer Join Capabilities"));
+    return getBoolProperty(OUString("Outer Join Capabilities"));
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLException, RuntimeException)
@@ -629,7 +629,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength(  ) throw(SQLExcept
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Transaction DDL")) == DBPROPVAL_TC_NONE;
+    return getInt32Property(OUString("Transaction DDL")) == DBPROPVAL_TC_NONE;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable(  ) throw(SQLException, RuntimeException)
@@ -654,7 +654,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString("Read-Only Data Source"));
+    return getBoolProperty(OUString("Read-Only Data Source"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles(  ) throw(SQLException, RuntimeException)
@@ -674,7 +674,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion(  ) throw(SQLExcepti
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL;
+    return getInt32Property(OUString("NULL Concatenation Behavior")) == DBPROPVAL_CB_NULL;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing(  ) throw(SQLException, RuntimeException)
@@ -689,27 +689,27 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames(  ) throw(SQL
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString("Rowset Conversions on Command"));
+    return getBoolProperty(OUString("Rowset Conversions on Command"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List"));
+    return getBoolProperty(OUString("ORDER BY Columns in Select List"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED;
+    return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_NOT_SUPPORTED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT;
+    return getInt32Property(OUString("GROUP BY Support")) != DBPROPVAL_GB_CONTAINS_SELECT;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION;
+    return getInt32Property(OUString("GROUP BY Support")) == DBPROPVAL_GB_NO_RELATION;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions(  ) throw(SQLException, RuntimeException)
@@ -729,7 +729,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause(  ) throw(SQLExcep
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated(  ) throw(SQLException, RuntimeException)
 {
-    return getBoolProperty(::rtl::OUString("ORDER BY Columns in Select List"));
+    return getBoolProperty(OUString("ORDER BY Columns in Select List"));
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion(  ) throw(SQLException, RuntimeException)
@@ -744,32 +744,32 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll(  ) throw(SQLException, Ru
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
 // -------------------------------------------------------------------------
 sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw(  )
 {
-    return (getInt32Property(::rtl::OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
+    return (getInt32Property(OUString("Identifier Case Sensitivity")) & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
+    return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_END) == DBPROPVAL_NC_END;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
+    return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_START) == DBPROPVAL_NC_START;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
+    return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
+    return (getInt32Property(OUString("NULL Collation Order")) & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(SQLException, RuntimeException)
@@ -779,7 +779,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls(  ) throw(S
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
+    return (getInt32Property(OUString("Schema Usage")) & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls(  ) throw(SQLException, RuntimeException)
@@ -794,73 +794,73 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions(  )
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
+    return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
+    return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
+    return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
+    return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds(  ) throw(SQLException, RuntimeException)
 {
-    return (getInt32Property(::rtl::OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
+    return (getInt32Property(OUString("Subquery Support")) & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString();
+    return OUString("sdbc:ado:")+ m_pADOConnection->GetConnectionString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("User Name"));
+    return getStringProperty(OUString("User Name"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("Provider Friendly Name"));
+    return getStringProperty(OUString("Provider Friendly Name"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("Provider Version"));
+    return getStringProperty(OUString("Provider Version"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("DBMS Version"));
+    return getStringProperty(OUString("DBMS Version"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("DBMS Name"));
+    return getStringProperty(OUString("DBMS Name"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("Procedure Term"));
+    return getStringProperty(OUString("Procedure Term"));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
-    return getStringProperty(::rtl::OUString("Schema Term"));
+    return getStringProperty(OUString("Schema Term"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
@@ -896,7 +896,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
     return 0;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     ADORecordset *pRecordset = NULL;
     OLEVariant  vtEmpty;
@@ -910,7 +910,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
 
         aRecordset.MoveFirst();
         OLEVariant  aValue;
-        ::rtl::OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(","));
+        OUString aRet, aComma(RTL_CONSTASCII_USTRINGPARAM(","));
         while(!aRecordset.IsAtEOF())
         {
             WpOLEAppendCollection<ADOFields, ADOField, WpADOField>  aFields(aRecordset.GetFields());
@@ -923,53 +923,53 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
         if ( !aRet.isEmpty() )
             return aRet.copy(0,aRet.lastIndexOf(','));
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     return getLiteral(DBLITERAL_ESCAPE_PERCENT);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue.copy(0,aValue.lastIndexOf(','));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE);
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar(  ) throw(SQLException, RuntimeException)
 {
-    sal_Int32 nProp = getInt32Property(::rtl::OUString("SQL Support"));
+    sal_Int32 nProp = getInt32Property(OUString("SQL Support"));
     return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM);
 }
 // -------------------------------------------------------------------------
@@ -977,7 +977,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins(  ) throw(SQLExcepti
 {
     if ( ADOS::isJetEngine(m_pConnection->getEngineType()) )
         return sal_True;
-    return (getInt32Property(::rtl::OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L;
+    return (getInt32Property(OUString("Outer Join Capabilities")) & 0x00000004L) == 0x00000004L;
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLException, RuntimeException)
@@ -987,12 +987,12 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins(  ) throw(SQLExce
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Max Columns in GROUP BY"));
+    return getInt32Property(OUString("Max Columns in GROUP BY"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy(  ) throw(SQLException, RuntimeException)
 {
-    return getInt32Property(::rtl::OUString("Max Columns in ORDER BY"));
+    return getInt32Property(OUString("Max Columns in ORDER BY"));
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect(  ) throw(SQLException, RuntimeException)
@@ -1065,7 +1065,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException
     return sal_True;
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaData::getUDTs", *this );
     return Reference< XResultSet >();
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index e2ca3ef77a4e..8b91a62fbb34 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -103,11 +103,11 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
 }
 
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId)
+OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId)
 {
     if(!m_aLiteralInfo.size())
         fillLiterals();
-    ::rtl::OUString sStr;
+    OUString sStr;
     ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
     if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
         sStr = (*aIter).second.pwszLiteralValue;
@@ -117,7 +117,7 @@ sal_Bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 {
-    m_mColumns[8] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"),
+    m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"),
         ColumnValue::NULLABLE,
         3,3,0,
         DataType::VARCHAR);
@@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 {
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("TYPE_NAME"),
+    m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"),
         ColumnValue::NO_NULLS,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[11] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
+    m_mColumns[11] = OColumn(OUString(),OUString("NULLABLE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
+    m_mColumns[12] = OColumn(OUString(),OUString("REMARKS"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[13] = OColumn(::rtl::OUString(),::rtl::OUString("COLUMN_DEF"),
+    m_mColumns[13] = OColumn(OUString(),OUString("COLUMN_DEF"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[14] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"),
+    m_mColumns[14] = OColumn(OUString(),OUString("SQL_DATA_TYPE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[15] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"),
+    m_mColumns[15] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("CHAR_OCTET_LENGTH"),
+    m_mColumns[16] = OColumn(OUString(),OUString("CHAR_OCTET_LENGTH"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 {
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
+    m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 {
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
+    m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 {
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"),
+    m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PK_NAME"),
+    m_mColumns[6] = OColumn(OUString(),OUString("PK_NAME"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 {
-    m_mColumns[4] = OColumn(::rtl::OUString(),::rtl::OUString("NON_UNIQUE"),
+    m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::BIT);
-    m_mColumns[5] = OColumn(::rtl::OUString(),::rtl::OUString("INDEX_QUALIFIER"),
+    m_mColumns[5] = OColumn(OUString(),OUString("INDEX_QUALIFIER"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[10] = OColumn(::rtl::OUString(),::rtl::OUString("ASC_OR_DESC"),
+    m_mColumns[10] = OColumn(OUString(),OUString("ASC_OR_DESC"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 {
-    m_mColumns[6] = OColumn(::rtl::OUString(),::rtl::OUString("PRIVILEGE"),
+    m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("IS_GRANTABLE"),
+    m_mColumns[7] = OColumn(OUString(),OUString("IS_GRANTABLE"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 {
-    m_mColumns[9] = OColumn(::rtl::OUString(),::rtl::OUString("KEY_SEQ"),
+    m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 {
-    m_mColumns[3] = OColumn(::rtl::OUString(),::rtl::OUString("PRECISION"),
+    m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("NULLABLE"),
+    m_mColumns[7] = OColumn(OUString(),OUString("NULLABLE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[12] = OColumn(::rtl::OUString(),::rtl::OUString("AUTO_INCREMENT"),
+    m_mColumns[12] = OColumn(OUString(),OUString("AUTO_INCREMENT"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::BIT);
-    m_mColumns[16] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATA_TYPE"),
+    m_mColumns[16] = OColumn(OUString(),OUString("SQL_DATA_TYPE"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[17] = OColumn(::rtl::OUString(),::rtl::OUString("SQL_DATETIME_SUB"),
+    m_mColumns[17] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
-    m_mColumns[18] = OColumn(::rtl::OUString(),::rtl::OUString("NUM_PREC_RADIX"),
+    m_mColumns[18] = OColumn(OUString(),OUString("NUM_PREC_RADIX"),
         ColumnValue::NO_NULLS,
         1,1,0,
         DataType::INTEGER);
@@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap()
 // -------------------------------------------------------------------------
 void ODatabaseMetaDataResultSetMetaData::setProceduresMap()
 {
-    m_mColumns[7] = OColumn(::rtl::OUString(),::rtl::OUString("REMARKS"),
+    m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"),
         ColumnValue::NULLABLE,
         0,0,0,
         DataType::VARCHAR);
@@ -269,32 +269,32 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnServiceName();
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getTableName();
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getCatalogName();
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnTypeName();
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
@@ -306,11 +306,11 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getSchemaName();
-    return ::rtl::OUString();
+    return OUString();
 }
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
@@ -547,7 +547,7 @@ void WpADOTable::Create()
     }
 }
 // -------------------------------------------------------------------------
-::rtl::OUString WpADOCatalog::GetObjectOwner(const ::rtl::OUString& _rName, ObjectTypeEnum _eNum)
+OUString WpADOCatalog::GetObjectOwner(const OUString& _rName, ObjectTypeEnum _eNum)
 {
     OLEVariant _rVar;
     _rVar.setNoArg();
@@ -571,7 +571,7 @@ void OAdoTable::fillPropertyValues()
         {
             WpADOProperties aProps = m_aTable.get_Properties();
             if(aProps.IsValid())
-                m_Description = OTools::getValue(aProps,::rtl::OUString("Description"));
+                m_Description = OTools::getValue(aProps,OUString("Description"));
         }
     }
 }
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index ce04f82e5128..4fd2d06caca5 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -115,7 +115,7 @@ void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException)
 }
 // -------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed );
@@ -347,7 +347,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -356,7 +356,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex )
 
     columnIndex = mapColumn(columnIndex);
     if(m_aValue.isNull())
-        return ::rtl::OUString();
+        return OUString();
     if(m_aIntValueRange.size() && (m_aIntValueRangeIter = m_aIntValueRange.find(columnIndex)) != m_aIntValueRange.end())
         return (*m_aIntValueRangeIter).second[m_aValue];
 
@@ -675,10 +675,10 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const
     return nValue;
 }
 //------------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaDataResultSet::getCursorName() const
+OUString ODatabaseMetaDataResultSet::getCursorName() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //------------------------------------------------------------------------------
@@ -701,7 +701,7 @@ void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0)
     Sequence< com::sun::star::beans::Property > aProps(5);
     com::sun::star::beans::Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP0(CURSORNAME,          ::rtl::OUString);
+    DECL_PROP0(CURSORNAME,          OUString);
     DECL_PROP0(FETCHDIRECTION,      sal_Int32);
     DECL_PROP0(FETCHSIZE,           sal_Int32);
     DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32);
@@ -901,9 +901,9 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
 
     m_aValueRange[12] = aMap;
 
-    ::std::map< sal_Int32,::rtl::OUString> aMap2;
-    aMap2[0] = ::rtl::OUString("YES");
-    aMap2[1] = ::rtl::OUString("NO");
+    ::std::map< sal_Int32,OUString> aMap2;
+    aMap2[0] = OUString("YES");
+    aMap2[1] = OUString("NO");
     m_aIntValueRange[18] = aMap2;
 
     ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
@@ -1034,10 +1034,10 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
     aMap[1] = 0;
     m_aValueRange[8] = aMap2;
 
-    ::std::map< sal_Int32,::rtl::OUString> aMap3;
-    aMap3[0]                    = ::rtl::OUString();
-    aMap3[DB_COLLATION_ASC]     = ::rtl::OUString("A");
-    aMap3[DB_COLLATION_DESC]    = ::rtl::OUString("D");
+    ::std::map< sal_Int32,OUString> aMap3;
+    aMap3[0]                    = OUString();
+    aMap3[DB_COLLATION_ASC]     = OUString("A");
+    aMap3[DB_COLLATION_DESC]    = OUString("D");
 
     m_aIntValueRange[21] = aMap3;
 
@@ -1057,9 +1057,9 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
     m_aColMapping.push_back(6);
     m_aColMapping.push_back(7);
 
-    ::std::map< sal_Int32,::rtl::OUString> aMap;
-    aMap[0] = ::rtl::OUString("YES");
-    aMap[1] = ::rtl::OUString("NO");
+    ::std::map< sal_Int32,OUString> aMap;
+    aMap[0] = OUString("YES");
+    aMap[1] = OUString("NO");
     m_aIntValueRange[7] = aMap;
 
 
@@ -1084,12 +1084,12 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
     m_aColMapping.push_back(16);
     m_aColMapping.push_back(18);
 
-    ::std::map< ::rtl::OUString,sal_Int32> aMap;
-    aMap[ ::rtl::OUString("CASCADE")] = KeyRule::CASCADE;
-    aMap[ ::rtl::OUString("RESTRICT")] = KeyRule::RESTRICT;
-    aMap[ ::rtl::OUString("SET NULL")] = KeyRule::SET_NULL;
-    aMap[ ::rtl::OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT;
-    aMap[ ::rtl::OUString("NO ACTION")] = KeyRule::NO_ACTION;
+    ::std::map< OUString,sal_Int32> aMap;
+    aMap[ OUString("CASCADE")] = KeyRule::CASCADE;
+    aMap[ OUString("RESTRICT")] = KeyRule::RESTRICT;
+    aMap[ OUString("SET NULL")] = KeyRule::SET_NULL;
+    aMap[ OUString("SET DEFAULT")] = KeyRule::SET_DEFAULT;
+    aMap[ OUString("NO ACTION")] = KeyRule::NO_ACTION;
 
     m_aStrValueRange[14] = aMap;
     m_aStrValueRange[15] = aMap;
@@ -1105,8 +1105,8 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(sal_Bool _bJetEngine)
     for(;i<19;i++)
         m_aColMapping.push_back(i);
 
-    ::std::map< ::rtl::OUString,sal_Int32> aMap1;
-    aMap1[ ::rtl::OUString()] = 10;
+    ::std::map< OUString,sal_Int32> aMap1;
+    aMap1[ OUString()] = 10;
 
     m_aStrValueRange[18] = aMap1;
 
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 136b073cafc0..e0905ed37f02 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -83,20 +83,20 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount(  ) throw(
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnName();
     if(!m_pRecordSet)
-        return ::rtl::OUString();
+        return OUString();
     WpADOField aField = ADOS::getField(m_pRecordSet,m_vMapping[column]);
     if(aField.IsValid())
         return aField.GetName();
 
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end())
         return (*m_mColumnsIter).second.getColumnLabel();
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index 74717ba9a0a0..e96311f022ca 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -82,16 +82,16 @@ void ODriver::disposing()
 }
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.ado.ODriver");
+    return OUString("com.sun.star.comp.sdbc.ado.ODriver");
 }
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > ODriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
-    aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver");
+    Sequence< OUString > aSNS( 2 );
+    aSNS[0] = OUString("com.sun.star.sdbc.Driver");
+    aSNS[1] = OUString("com.sun.star.sdbcx.Driver");
     return aSNS;
 }
 //------------------------------------------------------------------
@@ -101,17 +101,17 @@ Sequence< ::rtl::OUString > ODriver::getSupportedServiceNames_Static(  ) throw (
 }
 
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -119,13 +119,13 @@ sal_Bool SAL_CALL ODriver::supportsService( const ::rtl::OUString& _rServiceName
 }
 
 // --------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( ! acceptsURL(url) )
         return NULL;
@@ -138,53 +138,53 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:ado:");
 }
 // -----------------------------------------------------------------------------
-void ODriver::impl_checkURL_throw(const ::rtl::OUString& _sUrl)
+void ODriver::impl_checkURL_throw(const OUString& _sUrl)
 {
     if ( !acceptsURL(_sUrl) )
     {
         SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+        const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( !acceptsURL(_sUrl) )
 }
 // --------------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBooleanValues(2);
-        aBooleanValues[0] = ::rtl::OUString( "false" );
-        aBooleanValues[1] = ::rtl::OUString( "true" );
+        Sequence< OUString > aBooleanValues(2);
+        aBooleanValues[0] = OUString( "false" );
+        aBooleanValues[1] = OUString( "true" );
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("IgnoreDriverPrivileges")
-                ,::rtl::OUString("Ignore the privileges from the database driver.")
+                OUString("IgnoreDriverPrivileges")
+                ,OUString("Ignore the privileges from the database driver.")
                 ,sal_False
-                ,::rtl::OUString( "false" )
+                ,OUString( "false" )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("EscapeDateTime")
-                ,::rtl::OUString("Escape date time format.")
+                OUString("EscapeDateTime")
+                ,OUString("Escape date time format.")
                 ,sal_False
-                ,::rtl::OUString( "true" )
+                ,OUString( "true" )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("TypeInfoSettings")
-                ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.")
+                OUString("TypeInfoSettings")
+                ,OUString("Defines how the type info of the database metadata should be manipulated.")
                 ,sal_False
-                ,::rtl::OUString( )
-                ,Sequence< ::rtl::OUString > ())
+                ,OUString( )
+                ,Sequence< OUString > ())
         );
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
@@ -242,7 +242,7 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co
     return xTab;
 }
 // --------------------------------------------------------------------------------
-Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     impl_checkURL_throw(url);
     return getDataDefinitionByConnection(connect(url,info));
diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx
index ea54a1ff035c..1ef7304ddaef 100644
--- a/connectivity/source/drivers/ado/AGroup.cxx
+++ b/connectivity/source/drivers/ado/AGroup.cxx
@@ -62,7 +62,7 @@ OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase,    ADOGroup* _pGroup) :
 
 }
 // -------------------------------------------------------------------------
-OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent)
+OAdoGroup::OAdoGroup(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name) : OGroup_ADO(_Name,_bCase),m_pCatalog(_pParent)
 {
     construct();
     m_aGroup.Create();
@@ -116,7 +116,7 @@ void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
         {
             case PROPERTY_ID_NAME:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aGroup.put_Name(aVal);
                 }
@@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 }
 // -------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType)));
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType));
     if(eNum & adRightWithGrant)
@@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const ::rtl::OUString& obj
     return 0;
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OAdoGroup::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges));
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OAdoGroup::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges));
 }
diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx
index 36d4659c7de1..33531fc4c2b6 100644
--- a/connectivity/source/drivers/ado/AGroups.cxx
+++ b/connectivity/source/drivers/ado/AGroups.cxx
@@ -39,7 +39,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
 // -------------------------------------------------------------------------
-sdbcx::ObjectType OGroups::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OGroups::createObject(const OUString& _rName)
 {
     return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName);
 }
@@ -55,7 +55,7 @@ Reference< XPropertySet > OGroups::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OGroups::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoGroup* pGroup = NULL;
     if ( !getImplementation(pGroup,descriptor) || pGroup == NULL )
@@ -66,7 +66,7 @@ sdbcx::ObjectType OGroups::appendObject( const ::rtl::OUString& _rForName, const
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OGroups::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OGroups::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx
index 125508528a4e..065a7e41a8b5 100644
--- a/connectivity/source/drivers/ado/AIndex.cxx
+++ b/connectivity/source/drivers/ado/AIndex.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::sdbc;
 
 // -------------------------------------------------------------------------
 OAdoIndex::OAdoIndex(sal_Bool _bCase,OConnection* _pConnection,ADOIndex* _pIndex)
-    : OIndex_ADO(::rtl::OUString(),::rtl::OUString(),sal_False,sal_False,sal_False,_bCase)
+    : OIndex_ADO(OUString(),OUString(),sal_False,sal_False,sal_False,_bCase)
     ,m_pConnection(_pConnection)
 {
     construct();
@@ -105,14 +105,14 @@ void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons
         {
             case PROPERTY_ID_NAME:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aIndex.put_Name(aVal);
                 }
                 break;
             case PROPERTY_ID_CATALOG:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aIndex.put_Name(aVal);
                 }
diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx
index 7351c9a72304..f5d5c49d5875 100644
--- a/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/connectivity/source/drivers/ado/AIndexes.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OIndexes::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OIndexes::createObject(const OUString& _rName)
 {
     return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -54,7 +54,7 @@ Reference< XPropertySet > OIndexes::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoIndex* pIndex = NULL;
     if ( !getImplementation(pIndex,descriptor) || pIndex == NULL )
@@ -71,7 +71,7 @@ sdbcx::ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, cons
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OIndexes::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OIndexes::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx
index 00dfd0077d15..d92ca58646e1 100644
--- a/connectivity/source/drivers/ado/AKey.cxx
+++ b/connectivity/source/drivers/ado/AKey.cxx
@@ -99,7 +99,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
         {
             case PROPERTY_ID_NAME:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aKey.put_Name(aVal);
                     ADOS::ThrowException(*m_pConnection->getConnection(),*this);
@@ -115,7 +115,7 @@ void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVal
                 break;
             case PROPERTY_ID_REFERENCEDTABLE:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aKey.put_RelatedTable(aVal);
                     ADOS::ThrowException(*m_pConnection->getConnection(),*this);
diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx
index 18da7981c1b0..bda4efcaadeb 100644
--- a/connectivity/source/drivers/ado/AKeys.cxx
+++ b/connectivity/source/drivers/ado/AKeys.cxx
@@ -44,7 +44,7 @@ using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OKeys::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OKeys::createObject(const OUString& _rName)
 {
     return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName));
 }
@@ -60,7 +60,7 @@ Reference< XPropertySet > OKeys::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OKeys::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoKey* pKey = NULL;
     if ( !getImplementation( pKey, descriptor ) || pKey == NULL)
@@ -79,9 +79,9 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference<
 #endif
 
     WpADOKey aKey = pKey->getImpl();
-    ::rtl::OUString sName = aKey.get_Name();
+    OUString sName = aKey.get_Name();
     if(!sName.getLength())
-        aKey.put_Name(::rtl::OUString("PrimaryKey") );
+        aKey.put_Name(OUString("PrimaryKey") );
 
     ADOKeys* pKeys = m_aCollection;
     if ( FAILED(pKeys->Append(OLEVariant((ADOKey*)aKey),
@@ -97,7 +97,7 @@ sdbcx::ObjectType OKeys::appendObject( const ::rtl::OUString&, const Reference<
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OKeys::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OKeys::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(OLEVariant(_sElementName)))
         ADOS::ThrowException(*m_pConnection->getConnection(),static_cast<XTypeProvider*>(this));
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index cca5f6ae001f..dad996bed71e 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -54,21 +54,21 @@ using namespace com::sun::star::util;
 
 IMPLEMENT_SERVICE_INFO(OPreparedStatement,"com.sun.star.sdbcx.APreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
-OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const ::rtl::OUString& sql)
+OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OTypeInfoMap& _TypeInfo,const OUString& sql)
     : OStatement_Base( _pConnection )
     ,m_aTypeInfo(_TypeInfo)
 {
     osl_atomic_increment( &m_refCount );
 
     OSQLParser aParser(comphelper::getComponentContext(_pConnection->getDriver()->getORB()));
-    ::rtl::OUString sErrorMessage;
-    ::rtl::OUString sNewSql;
+    OUString sErrorMessage;
+    OUString sNewSql;
     OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,sql);
     if(pNode)
     {   // special handling for parameters
         /* we recusive replace all occurrences of ? in the statement and replace them with name like "��" */
         sal_Int32 nParameterCount = 0;
-        ::rtl::OUString sDefaultName( "parame" );
+        OUString sDefaultName( "parame" );
         replaceParameterNodeName(pNode,sDefaultName,nParameterCount);
         pNode->parseNodeToStr( sNewSql, _pConnection );
         delete pNode;
@@ -215,8 +215,8 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
     m_pParameters->get_Count(&nCount);
     if(nCount < (parameterIndex-1))
     {
-        ::rtl::OUString sDefaultName( "parame" );
-        sDefaultName += ::rtl::OUString::valueOf(parameterIndex);
+        OUString sDefaultName( "parame" );
+        sDefaultName += OUString::valueOf(parameterIndex);
         ADOParameter* pParam = m_Command.CreateParameter(sDefaultName,_eType,adParamInput,_nSize,_Val);
         if(pParam)
         {
@@ -241,7 +241,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
         if(pParam)
         {
 #if OSL_DEBUG_LEVEL > 0
-            ::rtl::OUString sParam = aParam.GetName();
+            OUString sParam = aParam.GetName();
 
 #endif // OSL_DEBUG_LEVEL
 
@@ -264,7 +264,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
     ADOS::ThrowException(*m_pConnection->getConnection(),*this);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x );
 }
@@ -420,7 +420,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     setNull(parameterIndex,sqlType);
 }
@@ -430,9 +430,9 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
-        const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", ::rtl::OUString::valueOf(parameterIndex)
+                "$position$", OUString::valueOf(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
@@ -491,7 +491,7 @@ void SAL_CALL OPreparedStatement::clearParameters(  ) throw(SQLException, Runtim
             WpADOParameter aParam(pParam);
             if(pParam)
             {
-                ::rtl::OUString sParam = aParam.GetName();
+                OUString sParam = aParam.GetName();
                 CHECK_RETURN(aParam.PutValue(aVal));
             }
         }
@@ -529,7 +529,7 @@ void SAL_CALL OPreparedStatement::release() throw()
 }
 // -----------------------------------------------------------------------------
 void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
-                                                  const ::rtl::OUString& _sDefaultName,
+                                                  const OUString& _sDefaultName,
                                                   sal_Int32& _rParameterCount)
 {
     sal_Int32 nCount = _pNode->count();
@@ -538,10 +538,10 @@ void OPreparedStatement::replaceParameterNodeName(OSQLParseNode* _pNode,
         OSQLParseNode* pChildNode = _pNode->getChild(i);
         if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() == 1)
         {
-            OSQLParseNode* pNewNode = new OSQLParseNode(::rtl::OUString(":") ,SQL_NODE_PUNCTUATION,0);
+            OSQLParseNode* pNewNode = new OSQLParseNode(OUString(":") ,SQL_NODE_PUNCTUATION,0);
             delete pChildNode->replace(pChildNode->getChild(0),pNewNode);
-            ::rtl::OUString sParameterName = _sDefaultName;
-            sParameterName += ::rtl::OUString::valueOf(++_rParameterCount);
+            OUString sParameterName = _sDefaultName;
+            sParameterName += OUString::valueOf(++_rParameterCount);
             pChildNode->append(new OSQLParseNode( sParameterName,SQL_NODE_NAME,0));
         }
         else
diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx
index 804105772a16..b3dc37278b04 100644
--- a/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/connectivity/source/drivers/ado/AResultSet.cxx
@@ -52,24 +52,24 @@ using namespace com::sun::star::sdbc;
 
 //------------------------------------------------------------------------------
 //  IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet");
-::rtl::OUString SAL_CALL OResultSet::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)  \
+OUString SAL_CALL OResultSet::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException)  \
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.ado.ResultSet");
+    return OUString("com.sun.star.sdbcx.ado.ResultSet");
 }
 // -------------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException)
 {
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+    ::com::sun::star::uno::Sequence< OUString > aSupported(2);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -153,7 +153,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep
 
 // -------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -339,7 +339,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     return getValue(columnIndex);
 }
@@ -753,7 +753,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(
     updateValue(columnIndex,x);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     updateValue(columnIndex,x);
 }
@@ -901,7 +901,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks(  ) throw(SQLException, Runtim
     ADOS::ThrowException(*((OConnection*)m_pStmt->getConnection().get())->getConnection(),*this);
     OSL_ENSURE(aProps.IsValid(),"There are no properties at the connection");
 
-    WpADOProperty aProp(aProps.GetItem(::rtl::OUString("Bookmarks Ordered")));
+    WpADOProperty aProp(aProps.GetItem(OUString("Bookmarks Ordered")));
     OLEVariant aVar;
     if(aProp.IsValid())
         aVar = aProp.GetValue();
@@ -1033,10 +1033,10 @@ sal_Int32 OResultSet::getFetchSize() const
     return nValue;
 }
 //------------------------------------------------------------------------------
-::rtl::OUString OResultSet::getCursorName() const
+OUString OResultSet::getCursorName() const
     throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //------------------------------------------------------------------------------
@@ -1058,7 +1058,7 @@ void OResultSet::setFetchSize(sal_Int32 _par0)
     com::sun::star::beans::Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
 
-    //  DECL_PROP1IMPL(CURSORNAME,          ::rtl::OUString) PropertyAttribute::READONLY);
+    //  DECL_PROP1IMPL(CURSORNAME,          OUString) PropertyAttribute::READONLY);
     DECL_PROP0(FETCHDIRECTION,          sal_Int32);
     DECL_PROP0(FETCHSIZE,               sal_Int32);
     DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 31e5938e866e..22461245b5bb 100644
--- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -84,59 +84,59 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(
     {
         WpADOProperties aProps( aField.get_Properties() );
         if ( aProps.IsValid() )
-            bRet = OTools::getValue( aProps, ::rtl::OUString("ISCASESENSITIVE") );
+            bRet = OTools::getValue( aProps, OUString("ISCASESENSITIVE") );
     }
     return bRet;
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if(aField.IsValid())
         return aField.GetName();
 
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString sTableName;
+    OUString sTableName;
 
     WpADOField aField = ADOS::getField(m_pRecordSet,column);
     if ( aField.IsValid() )
     {
         WpADOProperties aProps( aField.get_Properties() );
         if ( aProps.IsValid() )
-            sTableName = OTools::getValue( aProps, ::rtl::OUString("BASETABLENAME") );
+            sTableName = OTools::getValue( aProps, OUString("BASETABLENAME") );
     }
     return sTableName;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     return getColumnName(column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
@@ -160,14 +160,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(
         WpADOProperties aProps( aField.get_Properties() );
         if ( aProps.IsValid() )
         {
-            bRet = OTools::getValue( aProps, ::rtl::OUString("ISAUTOINCREMENT") );
+            bRet = OTools::getValue( aProps, OUString("ISAUTOINCREMENT") );
 #if OSL_DEBUG_LEVEL > 0
             sal_Int32 nCount = aProps.GetItemCount();
             for (sal_Int32 i = 0; i<nCount; ++i)
             {
                 WpADOProperty aProp = aProps.GetItem(i);
-                ::rtl::OUString sName = aProp.GetName();
-                ::rtl::OUString sVal = aProp.GetValue();
+                OUString sName = aProp.GetName();
+                OUString sVal = aProp.GetValue();
             }
 #endif
         }
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 35664bdbbcb6..a55af080ba84 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -250,7 +250,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS )
         m_RecordSet.PutRefDataSource( (IDispatch*)m_Command );
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const ::rtl::OUString& sql ) throw(S
     return m_RecordSet.IsValid();
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -334,7 +334,7 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OStatement::addBatch( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -351,10 +351,10 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
 
     reset();
 
-    ::rtl::OUString aBatchSql;
+    OUString aBatchSql;
     sal_Int32 nLen = 0;
-    for(::std::list< ::rtl::OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
-        aBatchSql = aBatchSql + *i + ::rtl::OUString(";");
+    for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
+        aBatchSql = aBatchSql + *i + OUString(";");
 
 
     if ( m_RecordSet.IsValid() )
@@ -389,7 +389,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch(  ) throw(SQLException,
 // -------------------------------------------------------------------------
 
 
-sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -559,7 +559,7 @@ sal_Int32 OStatement_Base::getMaxFieldSize() const throw(SQLException, RuntimeEx
     return 0;
 }
 //------------------------------------------------------------------------------
-::rtl::OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException)
+OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException)
 {
     return m_Command.GetName();
 }
@@ -640,7 +640,7 @@ void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, R
     ::dbtools::throwFeatureNotImplementedException( "Statement::MaxFieldSize", *this );
 }
 //------------------------------------------------------------------------------
-void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLException, RuntimeException)
+void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -654,7 +654,7 @@ void OStatement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLExcep
     Sequence< com::sun::star::beans::Property > aProps(10);
     com::sun::star::beans::Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP0(CURSORNAME,  ::rtl::OUString);
+    DECL_PROP0(CURSORNAME,  OUString);
     DECL_BOOL_PROP0(ESCAPEPROCESSING);
     DECL_PROP0(FETCHDIRECTION,sal_Int32);
     DECL_PROP0(FETCHSIZE,   sal_Int32);
diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx
index e0c51af338b2..680140525188 100644
--- a/connectivity/source/drivers/ado/ATable.cxx
+++ b/connectivity/source/drivers/ado/ATable.cxx
@@ -149,7 +149,7 @@ sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run
 }
 // -------------------------------------------------------------------------
 // XRename
-void SAL_CALL OAdoTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
+void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -166,7 +166,7 @@ Reference< XDatabaseMetaData> OAdoTable::getMetaData() const
 }
 // -------------------------------------------------------------------------
 // XAlterTable
-void SAL_CALL OAdoTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
+void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -215,7 +215,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV
 
             case PROPERTY_ID_DESCRIPTION:
                 OTools::putValue(   m_aTable.get_Properties(),
-                                ::rtl::OUString("Description"),
+                                OUString("Description"),
                                 getString(rValue));
                 break;
 
@@ -239,7 +239,7 @@ void SAL_CALL OAdoTable::release() throw()
     OTable_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException)
 {
       return m_aTable.get_Name();
 }
diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx
index 1dcb977457a3..ff8d6f292189 100644
--- a/connectivity/source/drivers/ado/ATables.cxx
+++ b/connectivity/source/drivers/ado/ATables.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName));
@@ -62,7 +62,7 @@ Reference< XPropertySet > OTables::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString&, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OTables::appendObject( const OUString&, const Reference< XPropertySet >& descriptor )
 {
     OAdoTable* pTable = NULL;
     if ( !getImplementation( pTable, descriptor ) || pTable == NULL )
@@ -77,14 +77,14 @@ sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString&, const Reference
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OTables::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OTables::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     if ( !m_aCollection.Delete(_sElementName) )
         ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
 }
 // -----------------------------------------------------------------------------
-void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
+void OTables::appendNew(const OUString& _rsNewTable)
 {
     OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid");
     m_aCollection.Refresh();
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx
index b5529202e83b..6fc7c92f22cd 100644
--- a/connectivity/source/drivers/ado/AUser.cxx
+++ b/connectivity/source/drivers/ado/AUser.cxx
@@ -46,7 +46,7 @@ OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase, ADOUser* _pUser)
         m_aUser.Create();
 }
 // -------------------------------------------------------------------------
-OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase,   const ::rtl::OUString& _Name)
+OAdoUser::OAdoUser(OCatalog* _pParent,sal_Bool _bCase,   const OUString& _Name)
     : OUser_TYPEDEF(_Name,_bCase)
     , m_pCatalog(_pParent)
 {
@@ -100,7 +100,7 @@ void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rVa
         {
             case PROPERTY_ID_NAME:
                 {
-                    ::rtl::OUString aVal;
+                    OUString aVal;
                     rValue >>= aVal;
                     m_aUser.put_Name(aVal);
                 }
@@ -127,7 +127,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase,    ADOUser* _pUser)
 {
 }
 // -------------------------------------------------------------------------
-OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUString& _Name)
+OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const OUString& _Name)
     : OAdoUser(_pParent,_bCase,_Name)
 {
 }
@@ -136,7 +136,7 @@ OUserExtend::OUserExtend(OCatalog* _pParent,sal_Bool _bCase, const ::rtl::OUStri
 void OUserExtend::construct()
 {
     OUser_TYPEDEF::construct();
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
 }
 // -----------------------------------------------------------------------------
 cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
@@ -162,7 +162,7 @@ void SAL_CALL OAdoUser::release() throw()
     OUser_TYPEDEF::release();
 }
 // -----------------------------------------------------------------------------
-sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_
     return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)));
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -183,7 +183,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objN
     return nRights;
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -191,7 +191,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int
     ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
@@ -200,7 +200,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_In
 }
 // -----------------------------------------------------------------------------
 // XUser
-void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException)
+void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx
index c5d4c0548d26..285a4551bf28 100644
--- a/connectivity/source/drivers/ado/AUsers.cxx
+++ b/connectivity/source/drivers/ado/AUsers.cxx
@@ -37,7 +37,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OUsers::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
 {
     return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName);
 }
@@ -53,7 +53,7 @@ Reference< XPropertySet > OUsers::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OUserExtend* pUser = NULL;
     if ( !getImplementation( pUser, descriptor ) || pUser == NULL )
@@ -66,7 +66,7 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OUsers::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OUsers::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     m_aCollection.Delete(_sElementName);
 }
diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx
index 814fca8bc15d..fcc156e073a9 100644
--- a/connectivity/source/drivers/ado/AView.cxx
+++ b/connectivity/source/drivers/ado/AView.cxx
@@ -89,7 +89,7 @@ void OAdoView::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
                         ADOCommand* pCom = (ADOCommand*)aVar.getIDispatch();
                         OLEString aBSTR;
                         pCom->get_CommandText(&aBSTR);
-                        rValue <<= (::rtl::OUString) aBSTR;
+                        rValue <<= (OUString) aBSTR;
                     }
                 }
                 break;
diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx
index b7c261597a80..cea3507a47fd 100644
--- a/connectivity/source/drivers/ado/AViews.cxx
+++ b/connectivity/source/drivers/ado/AViews.cxx
@@ -38,7 +38,7 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::container;
 
-sdbcx::ObjectType OViews::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OViews::createObject(const OUString& _rName)
 {
     OAdoView* pView = new OAdoView(isCaseSensitive(),m_aCollection.GetItem(_rName));
     pView->setNew(sal_False);
@@ -57,7 +57,7 @@ Reference< XPropertySet > OViews::createDescriptor()
 
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     OAdoView* pView = NULL;
     if ( !getImplementation( pView, descriptor ) || pView == NULL )
@@ -68,7 +68,7 @@ sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const
     if ( !aCommand.IsValid() )
         m_pCatalog->getConnection()->throwGenericSQLException( STR_VIEW_NO_COMMAND_ERROR,static_cast<XTypeProvider*>(this) );
 
-    ::rtl::OUString sName( _rForName );
+    OUString sName( _rForName );
     aCommand.put_Name(sName);
     aCommand.put_CommandText(getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND))));
     ADOViews* pViews = (ADOViews*)m_aCollection;
@@ -83,7 +83,7 @@ sdbcx::ObjectType OViews::appendObject( const ::rtl::OUString& _rForName, const
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OViews::dropObject(sal_Int32 /*_nPos*/,const ::rtl::OUString _sElementName)
+void OViews::dropObject(sal_Int32 /*_nPos*/,const OUString _sElementName)
 {
     if(!m_aCollection.Delete(_sElementName))
         ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),static_cast<XTypeProvider*>(this));
diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx
index 1a24260b7f7e..d2a29516c5be 100644
--- a/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -35,7 +35,6 @@ using namespace com::sun::star::beans;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace connectivity::ado;
-using ::rtl::OUString;
 
 OLEString::OLEString()
     :m_sStr(NULL)
@@ -45,7 +44,7 @@ OLEString::OLEString(const BSTR& _sBStr)
     :m_sStr(_sBStr)
 {
 }
-OLEString::OLEString(const ::rtl::OUString& _sBStr)
+OLEString::OLEString(const OUString& _sBStr)
 {
     m_sStr = ::SysAllocString(reinterpret_cast<LPCOLESTR>(_sBStr.getStr()));
 }
@@ -54,7 +53,7 @@ OLEString::~OLEString()
     if(m_sStr)
         ::SysFreeString(m_sStr);
 }
-OLEString& OLEString::operator=(const ::rtl::OUString& _rSrc)
+OLEString& OLEString::operator=(const OUString& _rSrc)
 {
     if(m_sStr)
         ::SysFreeString(m_sStr);
@@ -78,9 +77,9 @@ OLEString& OLEString::operator=(const BSTR& _rSrc)
     m_sStr = _rSrc;
     return *this;
 }
-OLEString::operator ::rtl::OUString() const
+OLEString::operator OUString() const
 {
-    return (m_sStr != NULL) ? ::rtl::OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : ::rtl::OUString();
+    return (m_sStr != NULL) ? OUString(reinterpret_cast<const sal_Unicode*>(LPCOLESTR(m_sStr)),::SysStringLen(m_sStr)) : OUString();
 }
 OLEString::operator BSTR() const
 {
@@ -120,7 +119,7 @@ OLEVariant::OLEVariant(sal_Int16 n)             {   VariantInit(this);  vt = VT_
 OLEVariant::OLEVariant(sal_Int32 n)             {   VariantInit(this);  vt = VT_I4;     lVal        = n;}
 OLEVariant::OLEVariant(sal_Int64 x)             {   VariantInit(this);  vt = VT_I4;     lVal        = (LONG)x;}
 
-OLEVariant::OLEVariant(const rtl::OUString& us)
+OLEVariant::OLEVariant(const OUString& us)
 {
     ::VariantInit(this);
     vt      = VT_BSTR;
@@ -289,7 +288,7 @@ void OLEVariant::setBool(sal_Bool b)
     vt = VT_BOOL;
     boolVal     = b ? VARIANT_TRUE : VARIANT_FALSE;
 }
-void OLEVariant::setString(const rtl::OUString& us)
+void OLEVariant::setString(const OUString& us)
 {
     HRESULT eRet = VariantClear(this);
     OSL_ENSURE(eRet == S_OK,"Error while clearing an ado variant!");
@@ -398,13 +397,13 @@ void OLEVariant::set(double n)
     }
 }
 
-OLEVariant::operator rtl::OUString() const
+OLEVariant::operator OUString() const
 {
     if (V_VT(this) == VT_BSTR)
         return reinterpret_cast<const sal_Unicode*>(LPCOLESTR(V_BSTR(this)));
 
     if(isNull())
-        return ::rtl::OUString();
+        return OUString();
 
     OLEVariant varDest;
 
@@ -432,11 +431,11 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc)
                                             vartype ) ) )
         {
             ::connectivity::SharedResources aResources;
-            const ::rtl::OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT));
+            const OUString sError( aResources.getResourceString(STR_TYPE_NOT_CONVERT));
             throw ::com::sun::star::sdbc::SQLException(
                 sError,
                 NULL,
-                ::rtl::OUString( "S1000" ),
+                OUString( "S1000" ),
                 1000,
                 ::com::sun::star::uno::Any()
             );
@@ -486,10 +485,10 @@ OLEVariant::operator ::com::sun::star::uno::Sequence< sal_Int8 >() const
     return aRet;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OLEVariant::getString() const
+OUString OLEVariant::getString() const
 {
     if(isNull())
-        return ::rtl::OUString();
+        return OUString();
     else
         return *this;
 }
diff --git a/connectivity/source/drivers/ado/Aservices.cxx b/connectivity/source/drivers/ado/Aservices.cxx
index ec5cebe70c12..0e6c8485a6ba 100644
--- a/connectivity/source/drivers/ado/Aservices.cxx
+++ b/connectivity/source/drivers/ado/Aservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::ado;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/ado/Awrapado.cxx b/connectivity/source/drivers/ado/Awrapado.cxx
index 5d38e0a8b0a9..660c7dd6b5df 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -58,7 +58,7 @@ WpADOProperties WpADOConnection::get_Properties() const
     return aProps;
 }
 
-rtl::OUString WpADOConnection::GetConnectionString() const
+OUString WpADOConnection::GetConnectionString() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -66,7 +66,7 @@ rtl::OUString WpADOConnection::GetConnectionString() const
     return aBSTR;
 }
 
-sal_Bool WpADOConnection::PutConnectionString(const ::rtl::OUString &aCon) const
+sal_Bool WpADOConnection::PutConnectionString(const OUString &aCon) const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(aCon);
@@ -109,7 +109,7 @@ sal_Bool WpADOConnection::Close( )
     return (SUCCEEDED(pInterface->Close()));
 }
 
-sal_Bool WpADOConnection::Execute(const ::rtl::OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset)
+sal_Bool WpADOConnection::Execute(const OUString& _CommandText,OLEVariant& RecordsAffected,long Options, WpADORecordset** ppiRset)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString sStr1(_CommandText);
@@ -136,7 +136,7 @@ sal_Bool WpADOConnection::RollbackTrans( )
     return SUCCEEDED(pInterface->RollbackTrans());
 }
 
-sal_Bool WpADOConnection::Open(const ::rtl::OUString& ConnectionString, const ::rtl::OUString& UserID,const ::rtl::OUString& Password,long Options)
+sal_Bool WpADOConnection::Open(const OUString& ConnectionString, const OUString& UserID,const OUString& Password,long Options)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString sStr1(ConnectionString);
@@ -152,14 +152,14 @@ sal_Bool WpADOConnection::GetErrors(ADOErrors** pErrors)
     return SUCCEEDED(pInterface->get_Errors(pErrors));
 }
 
-::rtl::OUString WpADOConnection::GetDefaultDatabase() const
+OUString WpADOConnection::GetDefaultDatabase() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR; pInterface->get_DefaultDatabase(&aBSTR);
     return aBSTR;
 }
 
-sal_Bool WpADOConnection::PutDefaultDatabase(const ::rtl::OUString& _bstr)
+sal_Bool WpADOConnection::PutDefaultDatabase(const OUString& _bstr)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_bstr);
@@ -224,14 +224,14 @@ sal_Bool WpADOConnection::put_Mode(const ConnectModeEnum &eNum)
     return SUCCEEDED(pInterface->put_Mode(eNum));
 }
 
-::rtl::OUString WpADOConnection::get_Provider() const
+OUString WpADOConnection::get_Provider() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR; pInterface->get_Provider(&aBSTR);
     return aBSTR;
 }
 
-sal_Bool WpADOConnection::put_Provider(const ::rtl::OUString& _bstr)
+sal_Bool WpADOConnection::put_Provider(const OUString& _bstr)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_bstr);
@@ -252,7 +252,7 @@ sal_Bool WpADOConnection::OpenSchema(SchemaEnum eNum,OLEVariant& Restrictions,OL
     return SUCCEEDED(pInterface->OpenSchema(eNum,Restrictions,SchemaID,pprset));
 }
 
-::rtl::OUString WpADOConnection::get_Version() const
+OUString WpADOConnection::get_Version() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -313,7 +313,7 @@ sal_Int32 WpADOCommand::get_State() const
     return nRet;
 }
 
-::rtl::OUString WpADOCommand::get_CommandText() const
+OUString WpADOCommand::get_CommandText() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -321,7 +321,7 @@ sal_Int32 WpADOCommand::get_State() const
     return aBSTR;
 }
 
-sal_Bool WpADOCommand::put_CommandText(const ::rtl::OUString &aCon)
+sal_Bool WpADOCommand::put_CommandText(const OUString &aCon)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(aCon);
@@ -364,7 +364,7 @@ sal_Bool WpADOCommand::Execute(OLEVariant& RecordsAffected,OLEVariant& Params,lo
     return SUCCEEDED(pInterface->Execute(&RecordsAffected,&Params,Options,ppiRset));
 }
 
-ADOParameter* WpADOCommand::CreateParameter(const ::rtl::OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value)
+ADOParameter* WpADOCommand::CreateParameter(const OUString &_bstr,DataTypeEnum Type,ParameterDirectionEnum Direction,long nSize,const OLEVariant &Value)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     ADOParameter* pPara = NULL;
@@ -397,7 +397,7 @@ CommandTypeEnum WpADOCommand::get_CommandType( ) const
 }
 
 // returns the name of the field
-::rtl::OUString WpADOCommand::GetName() const
+OUString WpADOCommand::GetName() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -405,7 +405,7 @@ CommandTypeEnum WpADOCommand::get_CommandType( ) const
     return aBSTR;
 }
 
-sal_Bool WpADOCommand::put_Name(const ::rtl::OUString& _Name)
+sal_Bool WpADOCommand::put_Name(const OUString& _Name)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_Name);
@@ -419,7 +419,7 @@ sal_Bool WpADOCommand::Cancel()
     return SUCCEEDED(pInterface->Cancel());
 }
 
-::rtl::OUString WpADOError::GetDescription() const
+OUString WpADOError::GetDescription() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -427,7 +427,7 @@ sal_Bool WpADOCommand::Cancel()
     return aBSTR;
 }
 
- ::rtl::OUString WpADOError::GetSource() const
+ OUString WpADOError::GetSource() const
 {
      OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -443,7 +443,7 @@ sal_Bool WpADOCommand::Cancel()
     return nErrNr;
 }
 
- ::rtl::OUString WpADOError::GetSQLState() const
+ OUString WpADOError::GetSQLState() const
 {
      OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -502,7 +502,7 @@ sal_Int32 WpADOField::GetDefinedSize() const
 }
 
 // returns the name of the field
-::rtl::OUString WpADOField::GetName() const
+OUString WpADOField::GetName() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -655,7 +655,7 @@ sal_Bool WpADOProperty::PutValue(const OLEVariant &aValVar)
     return (SUCCEEDED(pInterface->put_Value(aValVar)));
 }
 
- ::rtl::OUString WpADOProperty::GetName() const
+ OUString WpADOProperty::GetName() const
 {
      OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -944,7 +944,7 @@ WpADOProperties WpADORecordset::get_Properties() const
     return SUCCEEDED(pInterface->UpdateBatch(AffectRecords));
 }
 
- ::rtl::OUString WpADOParameter::GetName() const
+ OUString WpADOParameter::GetName() const
 {
      OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1028,7 +1028,7 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize)
     return (SUCCEEDED(pInterface->put_Size(_nSize)));
 }
 
-::rtl::OUString WpADOColumn::get_Name() const
+OUString WpADOColumn::get_Name() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1036,7 +1036,7 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize)
     return aBSTR;
 }
 
-::rtl::OUString WpADOColumn::get_RelatedColumn() const
+OUString WpADOColumn::get_RelatedColumn() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1044,14 +1044,14 @@ sal_Bool WpADOParameter::put_Size(const sal_Int32& _nSize)
     return aBSTR;
 }
 
-void WpADOColumn::put_Name(const ::rtl::OUString& _rName)
+void WpADOColumn::put_Name(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
     sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr));
     (void)bErg;
 }
-void WpADOColumn::put_RelatedColumn(const ::rtl::OUString& _rName)
+void WpADOColumn::put_RelatedColumn(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
@@ -1147,7 +1147,7 @@ WpADOProperties WpADOColumn::get_Properties() const
     return aProps;
 }
 
-::rtl::OUString WpADOKey::get_Name() const
+OUString WpADOKey::get_Name() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1155,7 +1155,7 @@ WpADOProperties WpADOColumn::get_Properties() const
     return aBSTR;
 }
 
-void WpADOKey::put_Name(const ::rtl::OUString& _rName)
+void WpADOKey::put_Name(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
@@ -1177,7 +1177,7 @@ void WpADOKey::put_Type(const KeyTypeEnum& _eNum)
     pInterface->put_Type(_eNum);
 }
 
-::rtl::OUString WpADOKey::get_RelatedTable() const
+OUString WpADOKey::get_RelatedTable() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1185,7 +1185,7 @@ void WpADOKey::put_Type(const KeyTypeEnum& _eNum)
     return aBSTR;
 }
 
-void WpADOKey::put_RelatedTable(const ::rtl::OUString& _rName)
+void WpADOKey::put_RelatedTable(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
@@ -1231,7 +1231,7 @@ WpADOColumns WpADOKey::get_Columns() const
     return aCols;
 }
 
-::rtl::OUString WpADOIndex::get_Name() const
+OUString WpADOIndex::get_Name() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1239,7 +1239,7 @@ WpADOColumns WpADOKey::get_Columns() const
     return aBSTR;
 }
 
-void WpADOIndex::put_Name(const ::rtl::OUString& _rName)
+void WpADOIndex::put_Name(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
@@ -1353,7 +1353,7 @@ ADOProcedures* WpADOCatalog::get_Procedures()
     return pRet;
 }
 
-::rtl::OUString WpADOTable::get_Name() const
+OUString WpADOTable::get_Name() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1361,7 +1361,7 @@ ADOProcedures* WpADOCatalog::get_Procedures()
     return aBSTR;
 }
 
-void WpADOTable::put_Name(const ::rtl::OUString& _rName)
+void WpADOTable::put_Name(const OUString& _rName)
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString bstr(_rName);
@@ -1369,7 +1369,7 @@ void WpADOTable::put_Name(const ::rtl::OUString& _rName)
     (void)bErg;
 }
 
-::rtl::OUString WpADOTable::get_Type() const
+OUString WpADOTable::get_Type() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1427,7 +1427,7 @@ WpADOProperties WpADOTable::get_Properties() const
     return aProps;
 }
 
-::rtl::OUString WpADOView::get_Name() const
+OUString WpADOView::get_Name() const
 {
     OSL_ENSURE(pInterface,"Interface is null!");
     OLEString aBSTR;
@@ -1446,14 +1446,14 @@ void WpADOView::put_Command(OLEVariant& _rVar)
     pInterface->put_Command(_rVar);
 }
 
-::rtl::OUString WpADOGroup::get_Name() const
+OUString WpADOGroup::get_Name() const
 {
     OLEString aBSTR;
     pInterface->get_Name(&aBSTR);
     return aBSTR;
 }
 
-void WpADOGroup::put_Name(const ::rtl::OUString& _rName)
+void WpADOGroup::put_Name(const OUString& _rName)
 {
     OLEString bstr(_rName);
     sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr));
@@ -1491,21 +1491,21 @@ WpADOUsers WpADOGroup::get_Users( )
     return aRet;
 }
 
-::rtl::OUString WpADOUser::get_Name() const
+OUString WpADOUser::get_Name() const
 {
     OLEString aBSTR;
     pInterface->get_Name(&aBSTR);
     return aBSTR;
 }
 
-void WpADOUser::put_Name(const ::rtl::OUString& _rName)
+void WpADOUser::put_Name(const OUString& _rName)
 {
     OLEString bstr(_rName);
     sal_Bool bErg = SUCCEEDED(pInterface->put_Name(bstr));
     (void)bErg;
 }
 
-sal_Bool WpADOUser::ChangePassword(const ::rtl::OUString& _rPwd,const ::rtl::OUString& _rNewPwd)
+sal_Bool WpADOUser::ChangePassword(const OUString& _rPwd,const OUString& _rNewPwd)
 {
     OLEString sStr1(_rPwd);
     OLEString sStr2(_rNewPwd);
@@ -1620,7 +1620,7 @@ WpBase::operator IDispatch*()
     return pIUnknown;
 }
 
-ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
+ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -1660,7 +1660,7 @@ ADORecordset* WpADOConnection::getExportedKeys( const ::com::sun::star::uno::Any
     return pRecordset;
 }
 // -----------------------------------------------------------------------------
-ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
+ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -1702,7 +1702,7 @@ ADORecordset* WpADOConnection::getImportedKeys( const ::com::sun::star::uno::Any
 
 }
 // -----------------------------------------------------------------------------
-ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table )
+ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -1741,7 +1741,7 @@ ADORecordset* WpADOConnection::getPrimaryKeys( const ::com::sun::star::uno::Any&
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getIndexInfo(
-    const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
+    const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table,
     sal_Bool /*unique*/, sal_Bool /*approximate*/ )
 {
     // Create elements used in the array
@@ -1784,8 +1784,8 @@ ADORecordset* WpADOConnection::getIndexInfo(
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schemaPattern,
-                                                  const ::rtl::OUString& tableNamePattern )
+                                                  const OUString& schemaPattern,
+                                                  const OUString& tableNamePattern )
 {
     SAFEARRAYBOUND rgsabound[1];
     SAFEARRAY *psa = NULL;
@@ -1826,11 +1826,11 @@ ADORecordset* WpADOConnection::getTablePrivileges( const ::com::sun::star::uno::
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog,
-                                                  const ::rtl::OUString& primarySchema,
-                                                  const ::rtl::OUString& primaryTable,
+                                                  const OUString& primarySchema,
+                                                  const OUString& primaryTable,
                                                   const ::com::sun::star::uno::Any& foreignCatalog,
-                                                  const ::rtl::OUString& foreignSchema,
-                                                  const ::rtl::OUString& foreignTable)
+                                                  const OUString& foreignSchema,
+                                                  const OUString& foreignTable)
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -1879,8 +1879,8 @@ ADORecordset* WpADOConnection::getCrossReference( const ::com::sun::star::uno::A
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schemaPattern,
-                                                  const ::rtl::OUString& procedureNamePattern )
+                                                  const OUString& schemaPattern,
+                                                  const OUString& procedureNamePattern )
 {
     SAFEARRAYBOUND rgsabound[1];
     SAFEARRAY *psa = NULL;
@@ -1918,9 +1918,9 @@ ADORecordset* WpADOConnection::getProcedures( const ::com::sun::star::uno::Any&
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schemaPattern,
-                                                  const ::rtl::OUString& procedureNamePattern,
-                                                  const ::rtl::OUString& columnNamePattern )
+                                                  const OUString& schemaPattern,
+                                                  const OUString& procedureNamePattern,
+                                                  const OUString& columnNamePattern )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -1963,16 +1963,16 @@ ADORecordset* WpADOConnection::getProcedureColumns( const ::com::sun::star::uno:
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schemaPattern,
-                                                  const ::rtl::OUString& tableNamePattern,
-                                                  const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types )
+                                                  const OUString& schemaPattern,
+                                                  const OUString& tableNamePattern,
+                                                  const ::com::sun::star::uno::Sequence< OUString >& types )
 {
     // Create elements used in the array
     HRESULT hr = S_OK;
     OLEVariant varCriteria[4];
 
     sal_Int32 nPos=0;
-    ::rtl::OUString sCatalog;
+    OUString sCatalog;
     if ( catalog.hasValue() && (catalog >>= sCatalog) )
         varCriteria[nPos].setString(sCatalog);
 
@@ -1985,10 +1985,10 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
         varCriteria[nPos].setString(tableNamePattern);
 
     ++nPos;
-    ::rtl::OUStringBuffer aTypes;
-    ::rtl::OUString aComma( "," );
-    const ::rtl::OUString* pIter = types.getConstArray();
-    const ::rtl::OUString* pEnd = pIter + types.getLength();
+    OUStringBuffer aTypes;
+    OUString aComma( "," );
+    const OUString* pIter = types.getConstArray();
+    const OUString* pEnd = pIter + types.getLength();
     for( ; pIter != pEnd ; ++pIter)
     {
         if ( aTypes.getLength() )
@@ -1996,7 +1996,7 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
         aTypes.append(*pIter);
     }
 
-    ::rtl::OUString sTypeNames = aTypes.makeStringAndClear();
+    OUString sTypeNames = aTypes.makeStringAndClear();
     if ( sTypeNames.getLength() )
         varCriteria[nPos].setString(sTypeNames);
 
@@ -2027,9 +2027,9 @@ ADORecordset* WpADOConnection::getTables( const ::com::sun::star::uno::Any& cata
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schemaPattern,
-                                                  const ::rtl::OUString& tableNamePattern,
-                                                  const ::rtl::OUString& columnNamePattern )
+                                                  const OUString& schemaPattern,
+                                                  const OUString& tableNamePattern,
+                                                  const OUString& columnNamePattern )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
@@ -2071,9 +2071,9 @@ ADORecordset* WpADOConnection::getColumns( const ::com::sun::star::uno::Any& cat
 }
 // -----------------------------------------------------------------------------
 ADORecordset* WpADOConnection::getColumnPrivileges( const ::com::sun::star::uno::Any& catalog,
-                                                  const ::rtl::OUString& schema,
-                                                  const ::rtl::OUString& table,
-                                                  const ::rtl::OUString& columnNamePattern )
+                                                  const OUString& schema,
+                                                  const OUString& table,
+                                                  const OUString& columnNamePattern )
 {
     // Create elements used in the array
     SAFEARRAYBOUND rgsabound[1];
diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx
index 37b6636df462..9ca1a0223393 100644
--- a/connectivity/source/drivers/ado/adoimp.cxx
+++ b/connectivity/source/drivers/ado/adoimp.cxx
@@ -69,7 +69,7 @@ const IID ADOS::IID_ADOVIEW_25              =   MYADOID(0x00000613);
 
 OLEString& ADOS::GetKeyStr()
 {
-    static OLEString sKeyStr(::rtl::OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz"));
+    static OLEString sKeyStr(OUString("gxwaezucfyqpwjgqbcmtsncuhwsnyhiohwxz"));
     return sKeyStr;
 }
 
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 2d0ed7431800..e7478ab55aad 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -42,10 +42,10 @@ void OCalcCatalog::refreshTables()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcCatalog::refreshTables" );
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes;
+    Sequence< OUString > aTypes;
     OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 859fb97d4826..f5542d74c83d 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
 
-sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OCalcColumns::createObject(const OUString& _rName)
 {
     OCalcTable* pTable = (OCalcTable*)m_pTable;
     ::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 3ba98f43182c..bae573fcaf28 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -63,7 +63,7 @@ OCalcConnection::~OCalcConnection()
 {
 }
 
-void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)
+void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
     throw(SQLException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::construct" );
@@ -71,7 +71,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
 
     sal_Int32 nLen = url.indexOf(':');
     nLen = url.indexOf(':',nLen+1);
-    ::rtl::OUString aDSN(url.copy(nLen+1));
+    OUString aDSN(url.copy(nLen+1));
 
     m_aFileName = aDSN;
     INetURLObject aURL;
@@ -88,7 +88,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
     }
     m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
 
-    m_sPassword = ::rtl::OUString();
+    m_sPassword = OUString();
     const char* pPwd        = "password";
 
     const PropertyValue *pIter  = info.getConstArray();
@@ -115,16 +115,16 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
     }
     //  open read-only as long as updating isn't implemented
     Sequence<PropertyValue> aArgs(2);
-    aArgs[0].Name = ::rtl::OUString("Hidden");
+    aArgs[0].Name = OUString("Hidden");
     aArgs[0].Value <<= (sal_Bool) sal_True;
-    aArgs[1].Name = ::rtl::OUString("ReadOnly");
+    aArgs[1].Name = OUString("ReadOnly");
     aArgs[1].Value <<= (sal_Bool) sal_True;
 
     if ( !m_sPassword.isEmpty() )
     {
         const sal_Int32 nPos = aArgs.getLength();
         aArgs.realloc(nPos+1);
-        aArgs[nPos].Name = ::rtl::OUString("Password");
+        aArgs[nPos].Name = OUString("Password");
         aArgs[nPos].Value <<= m_sPassword;
     }
 
@@ -134,7 +134,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
     try
     {
         xComponent = xDesktop->loadComponentFromURL(
-            m_aFileName, ::rtl::OUString("_blank"), 0, aArgs );
+            m_aFileName, OUString("_blank"), 0, aArgs );
     }
     catch( const Exception& )
     {
@@ -162,7 +162,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
             aErrorDetails <<= aDetailException;
         }
 
-        const ::rtl::OUString sError( m_aResources.getResourceStringWithSubstitution(
+        const OUString sError( m_aResources.getResourceStringWithSubstitution(
             STR_COULD_NOT_LOAD_FILE,
             "$filename$", m_aFileName
          ) );
@@ -246,7 +246,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement(  ) throw(SQLE
 
 // --------------------------------------------------------------------------------
 
-Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const ::rtl::OUString& sql )
+Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
     throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareStatement" );
@@ -263,7 +263,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
 
 // --------------------------------------------------------------------------------
 
-Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const ::rtl::OUString& /*sql*/ )
+Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
     throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareCall" );
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 9afd1b1843c9..2d18d449a2f7 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -78,7 +78,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow.reserve(18);
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -100,35 +100,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIME);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = ODatabaseMetaDataResultSet::get0Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
@@ -143,8 +143,8 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw(  )
 // -------------------------------------------------------------------------
 
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern,
-        const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+        const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getColumns" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -163,9 +163,9 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
 
     aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
 
-    Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames());
-    const ::rtl::OUString* pTabIter = aTabNames.getConstArray();
-    const ::rtl::OUString* pTabEnd      = pTabIter + aTabNames.getLength();
+    Sequence< OUString> aTabNames(xNames->getElementNames());
+    const OUString* pTabIter = aTabNames.getConstArray();
+    const OUString* pTabEnd      = pTabIter + aTabNames.getLength();
     for(;pTabIter != pTabEnd;++pTabIter)
     {
         if(match(tableNamePattern,*pTabIter,'\0'))
@@ -178,10 +178,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
             if(!xColumns.is())
                 throw SQLException();
 
-            const Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+            const Sequence< OUString> aColNames(xColumns->getElementNames());
 
-            const ::rtl::OUString* pColumnIter = aColNames.getConstArray();
-            const ::rtl::OUString* pEnd = pColumnIter + aColNames.getLength();
+            const OUString* pColumnIter = aColNames.getConstArray();
+            const OUString* pEnd = pColumnIter + aColNames.getLength();
             Reference< XPropertySet> xColumn;
             for(sal_Int32 i=1;pColumnIter != pEnd;++pColumnIter,++i)
             {
@@ -217,13 +217,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString("NO"));
+                        aRow[18]  = new ORowSetValueDecorator(OUString("NO"));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString("YES"));
+                        aRow[18]  = new ORowSetValueDecorator(OUString("YES"));
                         break;
                     default:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString());
+                        aRow[18]  = new ORowSetValueDecorator(OUString());
                     }
                     aRows.push_back(aRow);
                 }
@@ -240,12 +240,12 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
 
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OCalcDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    return ::rtl::OUString("sdbc:calc:") + m_pConnection->getURL();
+    return OUString("sdbc:calc:") + m_pConnection->getURL();
 }
 
 // -------------------------------------------------------------------------
@@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable(  ) throw(SQLExce
 
 // -------------------------------------------------------------------------
 
-static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName )
 {
     Any aAny = xSheets->getByName( rName );
     Reference<XSpreadsheet> xSheet;
@@ -296,7 +296,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, co
         if (xProp.is())
         {
             sal_Bool bVisible = sal_Bool();
-            Any aVisAny = xProp->getPropertyValue( ::rtl::OUString("IsVisible") );
+            Any aVisAny = xProp->getPropertyValue( OUString("IsVisible") );
             if ( aVisAny >>= bVisible )
                 if (!bVisible)
                     return sal_True;                // hidden
@@ -326,7 +326,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, co
     return sal_False;
 }
 
-static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUString& rName )
 {
     sal_Bool bUnnamed = sal_False;
 
@@ -339,7 +339,7 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
         {
             try
             {
-                Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString("IsUserDefined") );
+                Any aUserAny = xRangeProp->getPropertyValue( OUString("IsUserDefined") );
                 sal_Bool bUserDefined = sal_Bool();
                 if ( aUserAny >>= bUserDefined )
                     bUnnamed = !bUserDefined;
@@ -357,8 +357,8 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
 // -------------------------------------------------------------------------
 
 Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
-        const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types )
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+        const OUString& tableNamePattern, const Sequence< OUString >& types )
         throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getTables" );
@@ -370,7 +370,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     // check if ORowSetValue type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    ::rtl::OUString aTable("TABLE");
+    OUString aTable("TABLE");
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -378,8 +378,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     {
         bTableFound = sal_False;
 
-        const ::rtl::OUString* pIter = types.getConstArray();
-        const ::rtl::OUString* pEnd = pIter + nLength;
+        const OUString* pIter = types.getConstArray();
+        const OUString* pEnd = pIter + nLength;
         for(;pIter != pEnd;++pIter)
         {
             if(*pIter == aTable)
@@ -401,13 +401,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     Reference<XSpreadsheets> xSheets = xDoc->getSheets();
     if ( !xSheets.is() )
         throw SQLException();
-    Sequence< ::rtl::OUString > aSheetNames = xSheets->getElementNames();
+    Sequence< OUString > aSheetNames = xSheets->getElementNames();
 
     ODatabaseMetaDataResultSet::ORows aRows;
     sal_Int32 nSheetCount = aSheetNames.getLength();
     for (sal_Int32 nSheet=0; nSheet<nSheetCount; nSheet++)
     {
-        ::rtl::OUString aName = aSheetNames[nSheet];
+        OUString aName = aSheetNames[nSheet];
         if ( !lcl_IsEmptyOrHidden( xSheets, aName ) && match(tableNamePattern,aName,'\0') )
         {
             ODatabaseMetaDataResultSet::ORow aRow(3);
@@ -424,15 +424,15 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
     Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
     if ( xDocProp.is() )
     {
-        Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") );
+        Any aRangesAny = xDocProp->getPropertyValue( OUString("DatabaseRanges") );
         Reference<XDatabaseRanges> xRanges;
         if ( aRangesAny >>= xRanges )
         {
-            Sequence< ::rtl::OUString > aDBNames = xRanges->getElementNames();
+            Sequence< OUString > aDBNames = xRanges->getElementNames();
             sal_Int32 nDBCount = aDBNames.getLength();
             for (sal_Int32 nRange=0; nRange<nDBCount; nRange++)
             {
-                ::rtl::OUString aName = aDBNames[nRange];
+                OUString aName = aDBNames[nRange];
                 if ( !lcl_IsUnnamed( xRanges, aName ) && match(tableNamePattern,aName,'\0') )
                 {
                     ODatabaseMetaDataResultSet::ORow aRow(3);
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 27ea3e1e5467..c66fbe82e9fa 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -36,12 +36,12 @@ using namespace ::com::sun::star::lang;
 //------------------------------------------------------------------------------
 // static ServiceInfo
 
-rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.calc.ODriver");
+    return OUString("com.sun.star.comp.sdbc.calc.ODriver");
 }
 
-::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
@@ -57,7 +57,7 @@ rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
     return *(new ODriver(_rxFactory));
 }
 
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url,
     const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -75,18 +75,18 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
     return xCon;
 }
 
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
                 throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:calc:");
 }
 
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( !acceptsURL(url) )
     {
         SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+        const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     }
     return Sequence< DriverPropertyInfo >();
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 193be29a4a0d..d110297ff083 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -42,24 +42,24 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName(  ) throw ( RuntimeException)
+OUString SAL_CALL OCalcResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.calc.ResultSet");
+    return OUString("com.sun.star.sdbcx.calc.ResultSet");
 }
 // -------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
+Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
-     Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+     Sequence< OUString > aSupported(2);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ff3c33319a48..1e37cc38ecc3 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -146,7 +146,7 @@ static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell
     CellContentType eCellType = xCell->getType();
     if ( eCellType == CellContentType_FORMULA )
     {
-        static const ::rtl::OUString s_sFormulaResultType("FormulaResultType");
+        static const OUString s_sFormulaResultType("FormulaResultType");
         Reference<XPropertySet> xProp( xCell, UNO_QUERY );
         try
         {
@@ -228,7 +228,7 @@ static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int3
 
 static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats,
                         sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders,
-                        ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
+                        OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
 {
     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnInfo" );
     //! avoid duplicate field names
@@ -265,7 +265,7 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
             sal_Int16 nNumType = NumberFormat::NUMBER;
             try
             {
-                static ::rtl::OUString s_NumberFormat("NumberFormat");
+                static OUString s_NumberFormat("NumberFormat");
                 sal_Int32 nKey = 0;
 
                 if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey )
@@ -431,14 +431,14 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
 
 // -------------------------------------------------------------------------
 
-static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn )
+static OUString lcl_GetColumnStr( sal_Int32 nColumn )
 {
     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnStr" );
     if ( nColumn < 26 )
-        return ::rtl::OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
+        return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
     else
     {
-        ::rtl::OUStringBuffer aBuffer(2);
+        OUStringBuffer aBuffer(2);
         aBuffer.setLength( 2 );
         aBuffer[0] = (sal_Unicode) ( 'A' + ( nColumn / 26 ) - 1 );
         aBuffer[1] = (sal_Unicode) ( 'A' + ( nColumn % 26 ) );
@@ -454,13 +454,13 @@ void OCalcTable::fillColumns()
 
     String aStrFieldName;
     aStrFieldName.AssignAscii("Column");
-    ::rtl::OUString aTypeName;
+    OUString aTypeName;
     ::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
     const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
 
     for (sal_Int32 i = 0; i < m_nDataCols; i++)
     {
-        ::rtl::OUString aColumnName;
+        OUString aColumnName;
         sal_Int32 eType = DataType::OTHER;
         sal_Bool bCurrency = sal_False;
 
@@ -477,41 +477,41 @@ void OCalcTable::fillColumns()
         {
             case DataType::VARCHAR:
                 {
-                    static const ::rtl::OUString s_sType("VARCHAR");
+                    static const OUString s_sType("VARCHAR");
                     aTypeName = s_sType;
                 }
                 break;
             case DataType::DECIMAL:
-                aTypeName = ::rtl::OUString("DECIMAL");
+                aTypeName = OUString("DECIMAL");
                 break;
             case DataType::BIT:
-                aTypeName = ::rtl::OUString("BOOL");
+                aTypeName = OUString("BOOL");
                 break;
             case DataType::DATE:
-                aTypeName = ::rtl::OUString("DATE");
+                aTypeName = OUString("DATE");
                 break;
             case DataType::TIME:
-                aTypeName = ::rtl::OUString("TIME");
+                aTypeName = OUString("TIME");
                 break;
             case DataType::TIMESTAMP:
-                aTypeName = ::rtl::OUString("TIMESTAMP");
+                aTypeName = OUString("TIMESTAMP");
                 break;
             default:
                 OSL_FAIL("missing type name");
-                aTypeName = ::rtl::OUString();
+                aTypeName = OUString();
         }
 
         // check if the column name already exists
-        ::rtl::OUString aAlias = aColumnName;
+        OUString aAlias = aColumnName;
         OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         sal_Int32 nExprCnt = 0;
         while(aFind != m_aColumns->get().end())
         {
-            (aAlias = aColumnName) += ::rtl::OUString::valueOf((sal_Int32)++nExprCnt);
+            (aAlias = aColumnName) += OUString::valueOf((sal_Int32)++nExprCnt);
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),::rtl::OUString(),
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, OUString(),OUString(),
                                                 ColumnValue::NULLABLE, nPrecision, nDecimals,
                                                 eType, sal_False, sal_False, bCurrency,
                                                 bStoresMixedCaseQuotedIdentifiers,
@@ -526,11 +526,11 @@ void OCalcTable::fillColumns()
 
 // -------------------------------------------------------------------------
 OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName
                 ) : OCalcTable_BASE(_pTables,_pConnection,_Name,
                                   _Type,
                                   _Description,
@@ -570,7 +570,7 @@ void OCalcTable::construct()
             Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
             if ( xDocProp.is() )
             {
-                Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ),UNO_QUERY);
+                Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( OUString("DatabaseRanges") ),UNO_QUERY);
 
                 if ( xRanges.is() && xRanges->hasByName( m_Name ) )
                 {
@@ -584,7 +584,7 @@ void OCalcTable::construct()
                         sal_Bool bRangeHeader = sal_True;
                         Reference<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY );
                         if ( xFiltProp.is() )
-                            xFiltProp->getPropertyValue(::rtl::OUString("ContainsHeader")) >>= bRangeHeader;
+                            xFiltProp->getPropertyValue(OUString("ContainsHeader")) >>= bRangeHeader;
 
                         Reference<XSheetCellRange> xSheetRange( xRefer->getReferredCells(), UNO_QUERY );
                         Reference<XCellRangeAddressable> xAddr( xSheetRange, UNO_QUERY );
@@ -618,7 +618,7 @@ void OCalcTable::construct()
         if (xProp.is())
         {
             ::com::sun::star::util::Date aDateStruct;
-            if ( xProp->getPropertyValue( ::rtl::OUString("NullDate") ) >>= aDateStruct )
+            if ( xProp->getPropertyValue( OUString("NullDate") ) >>= aDateStruct )
                 m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year );
         }
     }
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 54eb644dad0d..9ad139186b47 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -36,11 +36,11 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTables::createObject" );
     OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString("TABLE"));
+                                        _rName,OUString("TABLE"));
     sdbcx::ObjectType xRet = pTable;
     pTable->construct();
     return xRet;
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 8c1fc82f713c..1bfbc36731d8 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::calc;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 981be00e2855..6c67969ed46f 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -39,9 +39,9 @@ ODbaseCatalog::ODbaseCatalog(ODbaseConnection* _pCon) : file::OFileCatalog(_pCon
 void ODbaseCatalog::refreshTables()
 {
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes;
+    Sequence< OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/dbase/DCode.cxx b/connectivity/source/drivers/dbase/DCode.cxx
index d10da503da97..9d9b0827eab9 100644
--- a/connectivity/source/drivers/dbase/DCode.cxx
+++ b/connectivity/source/drivers/dbase/DCode.cxx
@@ -48,13 +48,13 @@ OFILEOperandAttr::OFILEOperandAttr(sal_uInt16 _nPos,
 {
     if(_xIndexes.is())
     {
-        ::rtl::OUString sName;
+        OUString sName;
         Reference<XPropertySetInfo> xColInfo = _xColumn->getPropertySetInfo();
         Reference<XPropertySet> xIndex;
 
-        Sequence< ::rtl::OUString> aSeq = _xIndexes->getElementNames();
-        const ::rtl::OUString* pBegin = aSeq.getConstArray();
-        const ::rtl::OUString* pEnd   = pBegin + aSeq.getLength();
+        Sequence< OUString> aSeq = _xIndexes->getElementNames();
+        const OUString* pBegin = aSeq.getConstArray();
+        const OUString* pEnd   = pBegin + aSeq.getLength();
         for(;pBegin != pEnd;++pBegin)
         {
             _xIndexes->getByName(*pBegin) >>= xIndex;
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index 9bdffaa6f48c..eaa6d1a605e1 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -32,7 +32,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName)
 {
 
     ODbaseTable* pTable = (ODbaseTable*)m_pTable;
@@ -59,7 +59,7 @@ Reference< XPropertySet > ODbaseColumns::createDescriptor()
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     if ( m_pTable->isNew() )
         return cloneDescriptor( descriptor );
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseColumns::appendObject( const ::rtl::OUString& _rForName,
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
+void ODbaseColumns::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     if(!m_pTable->isNew())
         m_pTable->dropColumn(_nPos);
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index aa88ae2290bf..99658b39e542 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection)
 ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
 {
     DBG_CTOR(ODbaseConnection,NULL);
-    m_aFilenameExtension = rtl::OUString("dbf");
+    m_aFilenameExtension = OUString("dbf");
 }
 //-----------------------------------------------------------------------------
 ODbaseConnection::~ODbaseConnection()
@@ -98,7 +98,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement(  ) throw(SQL
     return xReturn;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -111,7 +111,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con
     return pStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 9cd9613a082d..c4623c0fa2fa 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -70,19 +70,19 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
         aRow.reserve(18);
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("length")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("length")));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnValue::NULLABLE));
         aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)ColumnSearch::FULL));
         aRow.push_back(ODatabaseMetaDataResultSet::get1Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("C")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("C")));
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::get0Value());
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
@@ -91,62 +91,62 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("LONGVARCHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)2147483647);
         aRow[6] = new ORowSetValueDecorator();
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("M"));
+        aRow[13] = new ORowSetValueDecorator(OUString("M"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("D"));
+        aRow[13] = new ORowSetValueDecorator(OUString("D"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOLEAN"));
+        aRow[1] = new ORowSetValueDecorator(OUString("BOOLEAN"));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[4] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString());
+        aRow[6] = new ORowSetValueDecorator(OUString());
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("L"));
+        aRow[13] = new ORowSetValueDecorator(OUString("L"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DOUBLE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("B"));
+        aRow[13] = new ORowSetValueDecorator(OUString("B"));
         aRows.push_back(aRow);
 
         aRow[11] = new ORowSetValueDecorator(sal_True);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("Y"));
+        aRow[13] = new ORowSetValueDecorator(OUString("Y"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[11] = new ORowSetValueDecorator(sal_False);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("T"));
+        aRow[13] = new ORowSetValueDecorator(OUString("T"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("INTEGER"));
+        aRow[1] = new ORowSetValueDecorator(OUString("INTEGER"));
         aRow[2] = new ORowSetValueDecorator(DataType::INTEGER);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("I"));
+        aRow[13] = new ORowSetValueDecorator(OUString("I"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
-        aRow[6] = new ORowSetValueDecorator(::rtl::OUString("length,scale"));
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("F"));
+        aRow[6] = new ORowSetValueDecorator(OUString("length,scale"));
+        aRow[13] = new ORowSetValueDecorator(OUString("F"));
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(OUString("NUMERIC"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)16);
-        aRow[13] = new ORowSetValueDecorator(::rtl::OUString("N"));
+        aRow[13] = new ORowSetValueDecorator(OUString("N"));
         aRow[15] = new ORowSetValueDecorator((sal_Int32)16);
         aRows.push_back(aRow);
     }
@@ -156,8 +156,8 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern,
-        const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+        const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getColumns" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -175,9 +175,9 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
     ODatabaseMetaDataResultSet::ORow aRow(19);
 
     aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
-    Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames());
-    const ::rtl::OUString* pTabBegin    = aTabNames.getConstArray();
-    const ::rtl::OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
+    Sequence< OUString> aTabNames(xNames->getElementNames());
+    const OUString* pTabBegin    = aTabNames.getConstArray();
+    const OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
     for(;pTabBegin != pTabEnd;++pTabBegin)
     {
         if(match(tableNamePattern,*pTabBegin,'\0'))
@@ -191,10 +191,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
             if(!xColumns.is())
                 throw SQLException();
 
-            Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+            Sequence< OUString> aColNames(xColumns->getElementNames());
 
-            const ::rtl::OUString* pBegin = aColNames.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + aColNames.getLength();
+            const OUString* pBegin = aColNames.getConstArray();
+            const OUString* pEnd = pBegin + aColNames.getLength();
             Reference< XPropertySet> xColumn;
             for(sal_Int32 i=1;pBegin != pEnd;++pBegin,++i)
             {
@@ -226,13 +226,13 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
+                        aRow[18] = new ORowSetValueDecorator(OUString("NO"));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+                        aRow[18] = new ORowSetValueDecorator(OUString("YES"));
                         break;
                     default:
-                        aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
+                        aRow[18] = new ORowSetValueDecorator(OUString());
                     }
                     aRows.push_back(aRow);
                 }
@@ -247,7 +247,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schema*/, const ::rtl::OUString& table,
+    const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
         sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getIndexInfo" );
@@ -264,8 +264,8 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     ODatabaseMetaDataResultSet::ORows aRows;
     ODatabaseMetaDataResultSet::ORow aRow(14);
 
-    aRow[5]     = new ORowSetValueDecorator(::rtl::OUString());
-    aRow[10]    = new ORowSetValueDecorator(::rtl::OUString("A"));
+    aRow[5]     = new ORowSetValueDecorator(OUString());
+    aRow[10]    = new ORowSetValueDecorator(OUString("A"));
 
     Reference< XIndexesSupplier> xTable;
     ::cppu::extractInterface(xTable,xNames->getByName(table));
@@ -276,10 +276,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     if(!xIndexes.is())
         throw SQLException();
 
-    Sequence< ::rtl::OUString> aIdxNames(xIndexes->getElementNames());
+    Sequence< OUString> aIdxNames(xIndexes->getElementNames());
 
-    const ::rtl::OUString* pBegin = aIdxNames.getConstArray();
-    const ::rtl::OUString* pEnd = pBegin + aIdxNames.getLength();
+    const OUString* pBegin = aIdxNames.getConstArray();
+    const OUString* pEnd = pBegin + aIdxNames.getLength();
     Reference< XPropertySet> xIndex;
     for(;pBegin != pEnd;++pBegin)
     {
@@ -304,10 +304,10 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
 
         Reference<XColumnsSupplier> xColumnsSup(xIndex,UNO_QUERY);
         Reference< XNameAccess> xColumns = xColumnsSup->getColumns();
-        Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+        Sequence< OUString> aColNames(xColumns->getElementNames());
 
-        const ::rtl::OUString* pColBegin = aColNames.getConstArray();
-        const ::rtl::OUString* pColEnd = pColBegin + aColNames.getLength();
+        const OUString* pColBegin = aColNames.getConstArray();
+        const OUString* pColEnd = pColBegin + aColNames.getLength();
         Reference< XPropertySet> xColumn;
         for(sal_Int32 j=1;pColBegin != pColEnd;++pColBegin,++j)
         {
@@ -323,11 +323,11 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
     return xRef;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODbaseDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    return ::rtl::OUString("sdbc:dbase:") + m_pConnection->getURL();
+    return OUString("sdbc:dbase:") + m_pConnection->getURL();
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
@@ -378,7 +378,7 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly(  ) throw(SQLException, Run
     ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_Bool bReadOnly = sal_False;
-    static ::rtl::OUString sReadOnly(  "IsReadOnly" );
+    static OUString sReadOnly(  "IsReadOnly" );
     ::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >(), comphelper::getProcessComponentContext());
     aFile.getPropertyValue(sReadOnly) >>= bReadOnly;
 
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 6da0aa49118f..02837f09ef2e 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -34,13 +34,13 @@ using namespace ::com::sun::star::lang;
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.dbase.ODriver");
+    return OUString("com.sun.star.comp.sdbc.dbase.ODriver");
 }
 
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
@@ -51,7 +51,7 @@ rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
     return *(new ODriver(_rxFactory));
 }
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -68,47 +68,47 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:dbase:");
 }
 // -----------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBoolean(2);
-        aBoolean[0] = ::rtl::OUString("0");
-        aBoolean[1] = ::rtl::OUString("1");
+        Sequence< OUString > aBoolean(2);
+        aBoolean[0] = OUString("0");
+        aBoolean[1] = OUString("1");
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("CharSet")
-                ,::rtl::OUString("CharSet of the database.")
+                OUString("CharSet")
+                ,OUString("CharSet of the database.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ShowDeleted")
-                ,::rtl::OUString("Display inactive records.")
+                OUString("ShowDeleted")
+                ,OUString("Display inactive records.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("EnableSQL92Check")
-                ,::rtl::OUString("Use SQL92 naming constraints.")
+                OUString("EnableSQL92Check")
+                ,OUString("Use SQL92 naming constraints.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
     }
 
     SharedResources aResources;
-    const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+    const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 1e70a5cb84a9..bd2ce0d8a351 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -68,8 +68,8 @@ ODbaseIndex::ODbaseIndex(ODbaseTable* _pTable) : OIndex(sal_True/*_pTable->getCo
 // -------------------------------------------------------------------------
 ODbaseIndex::ODbaseIndex(   ODbaseTable* _pTable,
                             const NDXHeader& _rHeader,
-                            const ::rtl::OUString& _rName)
-    :OIndex(_rName,::rtl::OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True)
+                            const OUString& _rName)
+    :OIndex(_rName,OUString(),_rHeader.db_unique,sal_False,sal_False,sal_True)
     ,m_pFileStream(NULL)
     ,m_aHeader(_rHeader)
     ,m_nCurNode(NODE_NOTFOUND)
@@ -92,7 +92,7 @@ void ODbaseIndex::refreshColumns()
     {
         OSL_ENSURE(m_pFileStream,"FileStream is not opened!");
         OSL_ENSURE(m_aHeader.db_name[0] != '\0',"Invalid name for the column!");
-        aVector.push_back(::rtl::OUString::createFromAscii(m_aHeader.db_name));
+        aVector.push_back(OUString::createFromAscii(m_aHeader.db_name));
     }
 
     if(m_pColumns)
@@ -141,7 +141,7 @@ sal_Bool ODbaseIndex::openIndexFile()
 {
     if(!m_pFileStream)
     {
-        ::rtl::OUString sFile = getCompletePath();
+        OUString sFile = getCompletePath();
         if(UCBContentHelper::Exists(sFile))
         {
             m_pFileStream = OFileTable::createStream_simpleError(sFile, STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE);
@@ -156,7 +156,7 @@ sal_Bool ODbaseIndex::openIndexFile()
         }
         if(!m_pFileStream)
         {
-            const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
              ) );
@@ -363,12 +363,12 @@ SvStream& connectivity::dbase::operator << (SvStream &rStream, ODbaseIndex& rInd
     return rStream;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODbaseIndex::getCompletePath()
+OUString ODbaseIndex::getCompletePath()
 {
-    ::rtl::OUString sDir = m_pTable->getConnection()->getURL();
+    OUString sDir = m_pTable->getConnection()->getURL();
     sDir += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sDir += m_Name;
-    sDir += ::rtl::OUString(".ndx");
+    sDir += OUString(".ndx");
     return sDir;
 }
 //------------------------------------------------------------------
@@ -376,44 +376,44 @@ void ODbaseIndex::createINFEntry()
 {
     // synchronize inf-file
     String sEntry = m_Name;
-    sEntry += rtl::OUString(".ndx");
+    sEntry += OUString(".ndx");
 
-    ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
+    OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString(".inf");
+    sCfgFile += OUString(".inf");
 
-    rtl::OUString sPhysicalPath;
+    OUString sPhysicalPath;
     LocalFileHelper::ConvertURLToPhysicalName(sCfgFile,sPhysicalPath);
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
 
     sal_uInt16 nSuffix = aInfFile.GetKeyCount();
-    rtl::OString aNewEntry,aKeyName;
+    OString aNewEntry,aKeyName;
     sal_Bool bCase = isCaseSensitive();
     while (aNewEntry.isEmpty())
     {
-        aNewEntry = rtl::OString(RTL_CONSTASCII_STRINGPARAM("NDX"));
+        aNewEntry = OString(RTL_CONSTASCII_STRINGPARAM("NDX"));
         aNewEntry += OString::number(++nSuffix);
         for (sal_uInt16 i = 0; i < aInfFile.GetKeyCount(); i++)
         {
             aKeyName = aInfFile.GetKeyName(i);
             if (bCase ? aKeyName.equals(aNewEntry) : aKeyName.equalsIgnoreAsciiCase(aNewEntry))
             {
-                aNewEntry = rtl::OString();
+                aNewEntry = OString();
                 break;
             }
         }
     }
-    aInfFile.WriteKey(aNewEntry, rtl::OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding()));
+    aInfFile.WriteKey(aNewEntry, OUStringToOString(sEntry, m_pTable->getConnection()->getTextEncoding()));
 }
 // -------------------------------------------------------------------------
 sal_Bool ODbaseIndex::DropImpl()
 {
     closeImpl();
 
-    ::rtl::OUString sPath = getCompletePath();
+    OUString sPath = getCompletePath();
     if(UCBContentHelper::Exists(sPath))
     {
         if(!UCBContentHelper::Kill(sPath))
@@ -421,21 +421,21 @@ sal_Bool ODbaseIndex::DropImpl()
     }
 
     // synchronize inf-file
-    ::rtl::OUString sCfgFile(m_pTable->getConnection()->getURL());
+    OUString sCfgFile(m_pTable->getConnection()->getURL());
     sCfgFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sCfgFile += m_pTable->getName();
-    sCfgFile += ::rtl::OUString(".inf");
+    sCfgFile += OUString(".inf");
 
-    rtl::OUString sPhysicalPath;
+    OUString sPhysicalPath;
     OSL_VERIFY_RES( LocalFileHelper::ConvertURLToPhysicalName(sCfgFile, sPhysicalPath),
         "Can not convert Config Filename into Physical Name!");
 
     Config aInfFile(sPhysicalPath);
     aInfFile.SetGroup(dBASE_III_GROUP);
     sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-    rtl::OString aKeyName;
+    OString aKeyName;
     String sEntry = m_Name;
-    sEntry += rtl::OUString(".ndx");
+    sEntry += OUString(".ndx");
 
     // delete entries from the inf file
     for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
@@ -444,7 +444,7 @@ sal_Bool ODbaseIndex::DropImpl()
         aKeyName = aInfFile.GetKeyName( nKey );
         if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
         {
-            if(sEntry == String(rtl::OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding())))
+            if(sEntry == String(OStringToOUString(aInfFile.ReadKey(aKeyName),m_pTable->getConnection()->getTextEncoding())))
             {
                 aInfFile.DeleteKey(aKeyName);
                 break;
@@ -454,7 +454,7 @@ sal_Bool ODbaseIndex::DropImpl()
     return sal_True;
 }
 // -------------------------------------------------------------------------
-void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::rtl::OUString& _sFile)
+void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const OUString& _sFile)
 {
     closeImpl();
     if(UCBContentHelper::Exists(_sFile))
@@ -465,10 +465,10 @@ void ODbaseIndex::impl_killFileAndthrowError_throw(sal_uInt16 _nErrorId,const ::
 sal_Bool ODbaseIndex::CreateImpl()
 {
     // Create the Index
-    const ::rtl::OUString sFile = getCompletePath();
+    const OUString sFile = getCompletePath();
     if(UCBContentHelper::Exists(sFile))
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
             STR_COULD_NOT_CREATE_INDEX_NAME,
             "$filename$", sFile
          ) );
@@ -488,7 +488,7 @@ sal_Bool ODbaseIndex::CreateImpl()
     m_pFileStream = OFileTable::createStream_simpleError(sFile,STREAM_READWRITE | STREAM_SHARE_DENYWRITE | STREAM_TRUNC);
     if (!m_pFileStream)
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
             STR_COULD_NOT_LOAD_FILE,
             "$filename$", sFile
          ) );
@@ -552,7 +552,7 @@ sal_Bool ODbaseIndex::CreateImpl()
 
     m_pFileStream->SetStreamSize(DINDEX_PAGE_SIZE);
 
-    rtl::OString aCol(rtl::OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding()));
+    OString aCol(OUStringToOString(aName, m_pTable->getConnection()->getTextEncoding()));
     strncpy(m_aHeader.db_name, aCol.getStr(), std::min<size_t>(sizeof(m_aHeader.db_name), aCol.getLength()));
     m_aHeader.db_unique  = m_IsUnique ? 1: 0;
     m_aHeader.db_keyrec  = m_aHeader.db_keylen + 8;
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 73aa3d525cda..9a2da6e39659 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
 
-sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName)
 {
     const ODbaseTable* pTable = m_pIndex->getTable();
 
@@ -51,7 +51,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName
 
     sdbcx::ObjectType xRet = new sdbcx::OIndexColumn(sal_True,_rName
                                                     ,getString(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)))
-                                                    ,::rtl::OUString()
+                                                    ,OUString()
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION)))
                                                     ,getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)))
@@ -78,7 +78,7 @@ Reference< XPropertySet > ODbaseIndexColumns::createDescriptor()
     return new sdbcx::OIndexColumn(m_pIndex->getTable()->getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers());
 }
 // -------------------------------------------------------------------------
-sdbcx::ObjectType ODbaseIndexColumns::appendObject( const ::rtl::OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseIndexColumns::appendObject( const OUString& /*_rForName*/, const Reference< XPropertySet >& descriptor )
 {
     return cloneDescriptor( descriptor );
 }
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index 154e67b2db47..f96224e43c86 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -37,15 +37,15 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName)
 {
-    ::rtl::OUString sFile = m_pTable->getConnection()->getURL();
+    OUString sFile = m_pTable->getConnection()->getURL();
     sFile += OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER);
     sFile += _rName;
-    sFile += ::rtl::OUString(".ndx");
+    sFile += OUString(".ndx");
     if ( !UCBContentHelper::Exists(sFile) )
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
             ) );
@@ -70,7 +70,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const ::rtl::OUString& _rName)
     }
     else
     {
-        const ::rtl::OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pTable->getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COULD_NOT_LOAD_FILE,
                 "$filename$", sFile
              ) );
@@ -91,7 +91,7 @@ Reference< XPropertySet > ODbaseIndexes::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference<XUnoTunnel> xTunnel(descriptor,UNO_QUERY);
     if(xTunnel.is())
@@ -105,7 +105,7 @@ sdbcx::ObjectType ODbaseIndexes::appendObject( const ::rtl::OUString& _rForName,
 }
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
+void ODbaseIndexes::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     Reference< XUnoTunnel> xTunnel(getObject(_nPos),UNO_QUERY);
     if ( xTunnel.is() )
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index df8bc000008e..b5e0d13563f5 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -46,24 +46,24 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
+OUString SAL_CALL ODbaseResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.dbase.ResultSet");
+    return OUString("com.sun.star.sdbcx.dbase.ResultSet");
 }
 // -------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
+Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
-     Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+     Sequence< OUString > aSupported(2);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL ODbaseResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -123,7 +123,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any&
     if ( !( lhs  >>= nFirst ) || !( rhs >>= nSecond ) )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK);
+        const OUString sMessage = aResources.getResourceString(STR_INVALID_BOOKMARK);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( !( lhs  >>= nFirst ) || !( rhs >>= nSecond ) )
 
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 386d802a1764..61f3c8d01e71 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -320,7 +320,7 @@ void ODbaseTable::fillColumns()
 
     String aStrFieldName;
     aStrFieldName.AssignAscii("Column");
-    ::rtl::OUString aTypeName;
+    OUString aTypeName;
     const sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
     const bool bFoxPro = m_aHeader.db_typ == VisualFoxPro || m_aHeader.db_typ == VisualFoxProAuto || m_aHeader.db_typ == FoxProMemo;
 
@@ -343,7 +343,7 @@ void ODbaseTable::fillColumns()
         char cType[2];
         cType[0] = aDBFColumn.db_typ;
         cType[1] = 0;
-        aTypeName = ::rtl::OUString::createFromAscii(cType);
+        aTypeName = OUString::createFromAscii(cType);
 OSL_TRACE("column type: %c",aDBFColumn.db_typ);
 
         switch (aDBFColumn.db_typ)
@@ -427,8 +427,8 @@ OSL_TRACE("column type: %c",aDBFColumn.db_typ);
 
         Reference< XPropertySet> xCol = new sdbcx::OColumn(aColumnName,
                                                     aTypeName,
-                                                    ::rtl::OUString(),
-                                                    ::rtl::OUString(),
+                                                    OUString(),
+                                                    OUString(),
                                                     ColumnValue::NULLABLE,
                                                     nPrecision,
                                                     aDBFColumn.db_dez,
@@ -458,11 +458,11 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec
 }
 // -------------------------------------------------------------------------
 ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName
                 ) : ODbaseTable_BASE(_pTables,_pConnection,_Name,
                                   _Type,
                                   _Description,
@@ -609,18 +609,18 @@ sal_Bool ODbaseTable::ReadMemoHeader()
     return sal_True;
 }
 // -------------------------------------------------------------------------
-String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _sName )
+String ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" );
-    ::rtl::OUString sURL;
+    OUString sURL;
     try
     {
         Reference< XResultSet > xDir = _pConnection->getDir()->getStaticResultSet();
         Reference< XRow> xRow(xDir,UNO_QUERY);
-        ::rtl::OUString sName;
-        ::rtl::OUString sExt;
+        OUString sName;
+        OUString sExt;
         INetURLObject aURL;
-        static const ::rtl::OUString s_sSeparator("/");
+        static const OUString s_sSeparator("/");
         xDir->beforeFirst();
         while(xDir->next())
         {
@@ -635,7 +635,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const ::rtl::OUString& _s
             // name and extension have to coincide
             if ( _pConnection->matchesExtension( sExt ) )
             {
-                sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString());
+                sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,OUString());
                 if ( sName == _sName )
                 {
                     Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY );
@@ -683,7 +683,7 @@ void ODbaseTable::refreshIndexes()
         Config aInfFile(aURL.getFSysPath(INetURLObject::FSYS_DETECT));
         aInfFile.SetGroup(dBASE_III_GROUP);
         sal_uInt16 nKeyCnt = aInfFile.GetKeyCount();
-        rtl::OString aKeyName;
+        OString aKeyName;
 
         for (sal_uInt16 nKey = 0; nKey < nKeyCnt; nKey++)
         {
@@ -692,8 +692,8 @@ void ODbaseTable::refreshIndexes()
             //...if yes, add the index list of the table
             if (aKeyName.copy(0,3).equalsL(RTL_CONSTASCII_STRINGPARAM("NDX")))
             {
-                rtl::OString aIndexName = aInfFile.ReadKey(aKeyName);
-                aURL.setName(rtl::OStringToOUString(aIndexName, m_eEncoding));
+                OString aIndexName = aInfFile.ReadKey(aKeyName);
+                aURL.setName(OStringToOUString(aIndexName, m_eEncoding));
                 try
                 {
                     Content aCnt(aURL.GetMainURL(INetURLObject::NO_DECODE),Reference<XCommandEnvironment>(), comphelper::getProcessComponentContext());
@@ -873,7 +873,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
             else
             {
                 // Commit the string.  Use intern() to ref-count it.
-                *(_rRow->get())[i] = ::rtl::OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding);
+                *(_rRow->get())[i] = OUString::intern(pData, static_cast<sal_Int32>(nLastPos+1), m_eEncoding);
             }
         } // if (nType == DataType::CHAR || nType == DataType::VARCHAR)
         else if ( DataType::TIMESTAMP == nType )
@@ -946,7 +946,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
                 continue;
             }
 
-            ::rtl::OUString aStr = ::rtl::OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding);
+            OUString aStr = OUString::intern(pData+nPos1, nPos2-nPos1+1, m_eEncoding);
 
             switch (nType)
             {
@@ -1026,9 +1026,9 @@ sal_Bool ODbaseTable::CreateImpl()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::CreateImpl" );
     OSL_ENSURE(!m_pFileStream, "SequenceError");
 
-    if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,::rtl::OUString()) != m_Name )
+    if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,OUString()) != m_Name )
     {
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_SQL_NAME_ERROR,
                 "$name$", m_Name
              ) );
@@ -1040,7 +1040,7 @@ sal_Bool ODbaseTable::CreateImpl()
     String aName = getEntry(m_pConnection,m_Name);
     if(!aName.Len())
     {
-        ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
+        OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
         if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
             aIdent += "/";
         aIdent += m_Name;
@@ -1114,7 +1114,7 @@ sal_Bool ODbaseTable::CreateImpl()
             catch(const Exception&)
             {
 
-                const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                         STR_COULD_NOT_DELETE_FILE,
                         "$name$", aName
                      ) );
@@ -1136,7 +1136,7 @@ sal_Bool ODbaseTable::CreateImpl()
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl::OUString& _sColumnName)
+void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::throwInvalidColumnType" );
     try
@@ -1148,7 +1148,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const ::rtl:
     {
     }
 
-    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
             _nErrorId,
             "$columnname$", _sColumnName
          ) );
@@ -1170,7 +1170,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
     sal_uInt8 nDbaseType = dBaseIII;
     Reference<XIndexAccess> xColumns(getColumns(),UNO_QUERY);
     Reference<XPropertySet> xCol;
-    const ::rtl::OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
+    const OUString sPropType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
 
     try
     {
@@ -1223,10 +1223,10 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
 
     sal_uInt16 nRecLength = 1;                                              // Length 1 for deleted flag
     sal_Int32  nMaxFieldLength = m_pConnection->getMetaData()->getMaxColumnNameLength();
-    ::rtl::OUString aName;
-    const ::rtl::OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
-    const ::rtl::OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION);
-    const ::rtl::OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE);
+    OUString aName;
+    const OUString sPropName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
+    const OUString sPropPrec = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION);
+    const OUString sPropScale = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE);
 
     try
     {
@@ -1240,7 +1240,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
 
             xCol->getPropertyValue(sPropName) >>= aName;
 
-            ::rtl::OString aCol;
+            OString aCol;
             if ( DBTypeConversion::convertUnicodeString( aName, aCol, m_eEncoding ) > nMaxFieldLength)
             {
                 throwInvalidColumnType( STR_INVALID_COLUMN_NAME_LENGTH, aName );
@@ -1425,7 +1425,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
     return sal_True;
 }
 //------------------------------------------------------------------
-sal_Bool ODbaseTable::Drop_Static(const ::rtl::OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
+sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::Drop_Static" );
     INetURLObject aURL;
@@ -1595,7 +1595,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
         return sal_False;
 
     Reference<XPropertySet> xCol;
-    ::rtl::OUString aColName;
+    OUString aColName;
     ::comphelper::UStringMixEqual aCase(isCaseSensitive());
     for (sal_uInt16 i = 0; i < m_pColumns->getCount(); i++)
     {
@@ -1644,7 +1644,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
         Reference<XPropertySet> xCol;
         m_pColumns->getByIndex(_nColumnPos) >>= xCol;
         OSL_ENSURE(xCol.is(),"ODbaseTable::isUniqueByColumnName column is null!");
-        ::rtl::OUString sColName;
+        OUString sColName;
         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= sColName;
 
         Reference<XPropertySet> xIndex;
@@ -1663,7 +1663,7 @@ Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
     return Reference<XPropertySet>();
 }
 //------------------------------------------------------------------
-static double toDouble(const rtl::OString& rString)
+static double toDouble(const OString& rString)
 {
     return ::rtl::math::stringToDouble( rString, '.', ',', NULL, NULL );
 }
@@ -1681,7 +1681,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
     Reference<XPropertySet> xCol;
     Reference<XPropertySet> xIndex;
     sal_uInt16 i;
-    ::rtl::OUString aColName;
+    OUString aColName;
     const sal_Int32 nColumnCount = m_pColumns->getCount();
     ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
 
@@ -1735,7 +1735,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
                         xCol.clear();
                     } // if ( !aColName.getLength() )
-                    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                             STR_DUPLICATE_VALUE_IN_COLUMN
                             ,"$columnname$", aColName
                          ) );
@@ -1913,7 +1913,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
 
                     // one, because const_cast GetFormatPrecision on SvNumberFormat is not constant,
                     // even though it really could and should be
-                    const rtl::OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0));
+                    const OString aDefaultValue( ::rtl::math::doubleToString( n, rtl_math_StringFormat_F, nScale, '.', NULL, 0));
                     const sal_Int32 nValueLen = aDefaultValue.getLength();
                     if ( nValueLen <= nLen )
                     {
@@ -1927,13 +1927,13 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                         m_pColumns->getByIndex(i) >>= xCol;
                         OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
                         xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
-                        ::std::list< ::std::pair<const sal_Char* , ::rtl::OUString > > aStringToSubstitutes;
-                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$columnname$", aColName));
+                        ::std::list< ::std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
+                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$columnname$", aColName));
                         aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
                         aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
-                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , ::rtl::OUString >("$value$", ::rtl::OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+                        aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
 
-                        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+                        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                                 STR_INVALID_COLUMN_DECIMAL_VALUE
                                 ,aStringToSubstitutes
                              ) );
@@ -1956,9 +1956,9 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                     if (!m_pMemoStream || !WriteMemo(thisColVal, nBlockNo))
                         break;
 
-                    rtl::OString aBlock(OString::number(nBlockNo));
+                    OString aBlock(OString::number(nBlockNo));
                     //align aBlock at the right of a nLen sequence, fill to the left with '0'
-                    rtl::OStringBuffer aStr;
+                    OStringBuffer aStr;
                     comphelper::string::padToLength(aStr, nLen - aBlock.getLength(), '0');
                     aStr.append(aBlock);
 
@@ -1969,10 +1969,10 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
                 {
                     memset(pData,' ',nLen); // Clear to NULL
 
-                    ::rtl::OUString sStringToWrite( thisColVal.getString() );
+                    OUString sStringToWrite( thisColVal.getString() );
 
                     // convert the string, using the connection's encoding
-                    ::rtl::OString sEncoded;
+                    OString sEncoded;
 
                     DBTypeConversion::convertUnicodeStringToLength( sStringToWrite, sEncoded, nLen, m_eEncoding );
                     memcpy( pData, sEncoded.getStr(), sEncoded.getLength() );
@@ -1992,7 +1992,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
             if ( xCol.is() )
                 xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
 
-            const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_INVALID_COLUMN_VALUE,
                     "$columnname$", aColName
                  ) );
@@ -2011,7 +2011,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::WriteMemo" );
     // if the BlockNo 0 is given, the block will be appended at the end
     sal_uIntPtr nSize = 0;
-    ::rtl::OString aStr;
+    OString aStr;
     ::com::sun::star::uno::Sequence<sal_Int8> aValue;
     sal_uInt8 nHeader[4];
     const bool bBinary = aVariable.getTypeKind() == DataType::LONGVARBINARY && m_aMemoHeader.db_typ == MemoFoxPro;
@@ -2142,7 +2142,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
 
 // -----------------------------------------------------------------------------
 // XAlterTable
-void SAL_CALL ODbaseTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
+void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::alterColumnByName" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2196,7 +2196,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
 
         pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
         Reference<XPropertySet> xHoldTable = pNewTable;
-        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+        pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         OSL_ENSURE(xAppend.is(),"ODbaseTable::alterColumn: No XAppend interface!");
 
@@ -2235,7 +2235,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
         // construct the new table
         if(!pNewTable->CreateImpl())
         {
-            const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_COLUMN_NOT_ALTERABLE,
                     "$columnname$", ::comphelper::getString(descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
                  ) );
@@ -2283,7 +2283,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
     return getConnection()->getMetaData();
 }
 // -------------------------------------------------------------------------
-void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::rename" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2302,15 +2302,15 @@ void SAL_CALL ODbaseTable::rename( const ::rtl::OUString& newName ) throw(::com:
 }
 namespace
 {
-    void renameFile(OConnection* _pConenction,const ::rtl::OUString& oldName,
-                    const ::rtl::OUString& newName,const String& _sExtension)
+    void renameFile(OConnection* _pConenction,const OUString& oldName,
+                    const OUString& newName,const String& _sExtension)
     {
         String aName = ODbaseTable::getEntry(_pConenction,oldName);
         if(!aName.Len())
         {
-            ::rtl::OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
+            OUString aIdent = _pConenction->getContent()->getIdentifier()->getContentIdentifier();
             if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
-                aIdent += ::rtl::OUString("/");
+                aIdent += OUString("/");
             aIdent += oldName;
             aName = aIdent;
         }
@@ -2329,7 +2329,7 @@ namespace
             Sequence< PropertyValue > aProps( 1 );
             aProps[0].Name      = "Title";
             aProps[0].Handle    = -1; // n/a
-            aProps[0].Value     = makeAny( ::rtl::OUString(sNewName) );
+            aProps[0].Value     = makeAny( OUString(sNewName) );
             Sequence< Any > aValues;
             aContent.executeCommand( "setPropertyValues",makeAny(aProps) ) >>= aValues;
             if(aValues.getLength() && aValues[0].hasValue())
@@ -2342,7 +2342,7 @@ namespace
     }
 }
 // -------------------------------------------------------------------------
-void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::getEntry" );
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -2353,7 +2353,7 @@ void SAL_CALL ODbaseTable::renameImpl( const ::rtl::OUString& newName ) throw(::
     renameFile(m_pConnection,m_Name,newName,m_pConnection->getExtension());
     if ( HasMemoFields() )
     {  // delete the memo fields
-        rtl::OUString sExt("dbt");
+        OUString sExt("dbt");
         renameFile(m_pConnection,m_Name,newName,sExt);
     }
 }
@@ -2365,7 +2365,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
 
     ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
     Reference< XPropertySet > xHold = pNewTable;
-    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
@@ -2394,7 +2394,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
     // construct the new table
     if(!pNewTable->CreateImpl())
     {
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_ADDABLE,
                 "$columnname$", ::comphelper::getString(_xNewColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)))
              ) );
@@ -2438,7 +2438,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
 
     ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
     Reference< XPropertySet > xHold = pNewTable;
-    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(::rtl::OUString(sTempName)));
+    pNewTable->setPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME),makeAny(OUString(sTempName)));
     {
         Reference<XAppend> xAppend(pNewTable->getColumns(),UNO_QUERY);
         sal_Bool bCase = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
@@ -2467,7 +2467,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
     if(!pNewTable->CreateImpl())
     {
         xHold = pNewTable = NULL;
-        const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_COLUMN_NOT_DROP,
                 "$position$", OUString::number(_nPos)
              ) );
@@ -2490,7 +2490,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
 String ODbaseTable::createTempFile()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen@sun.com", "ODbaseTable::createTempFile" );
-    ::rtl::OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
+    OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
     if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
         aIdent += "/";
     String sTempName(aIdent);
@@ -2576,7 +2576,7 @@ void ODbaseTable::throwInvalidDbaseFormat()
     FileClose();
     // no dbase file
 
-    const ::rtl::OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
+    const OUString sError( getConnection()->getResources().getResourceStringWithSubstitution(
                 STR_INVALID_DBASE_FILE,
                 "$filename$", getEntry(m_pConnection,m_Name)
              ) );
@@ -2685,7 +2685,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
         case MemodBaseIII: // dBase III-Memofield, ends with Ctrl-Z
         {
             const char cEOF = (char) DBF_EOL;
-            rtl::OStringBuffer aBStr;
+            OStringBuffer aBStr;
             static char aBuf[514];
             aBuf[512] = 0;          // avoid random value
             sal_Bool bReady = sal_False;
@@ -2704,7 +2704,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
 
             } while (!bReady && !m_pMemoStream->IsEof());
 
-            aVariable = rtl::OStringToOUString(aBStr.makeStringAndClear(),
+            aVariable = OStringToOUString(aBStr.makeStringAndClear(),
                 m_eEncoding);
 
         } break;
@@ -2733,11 +2733,11 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
             {
                 if ( bIsText )
                 {
-                    rtl::OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength));
+                    OStringBuffer aBuffer(read_uInt8s_ToOString(*m_pMemoStream, nLength));
                     //pad it out with ' ' to expected length on short read
                     sal_Int32 nRequested = sal::static_int_cast<sal_Int32>(nLength);
                     comphelper::string::padToLength(aBuffer, nRequested, ' ');
-                    aVariable = rtl::OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding);
+                    aVariable = OStringToOUString(aBuffer.makeStringAndClear(), m_eEncoding);
                 } // if ( bIsText )
                 else
                 {
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 18c9f96f3a58..79cd308cd438 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -43,10 +43,10 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType ODbaseTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName)
 {
     ODbaseTable* pRet = new ODbaseTable(this,(ODbaseConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString("TABLE"));
+                                        _rName,OUString("TABLE"));
 
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
@@ -64,7 +64,7 @@ Reference< XPropertySet > ODbaseTables::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType ODbaseTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     Reference<XUnoTunnel> xTunnel(descriptor,UNO_QUERY);
     if(xTunnel.is())
@@ -92,7 +92,7 @@ sdbcx::ObjectType ODbaseTables::appendObject( const ::rtl::OUString& _rForName,
 }
 // -------------------------------------------------------------------------
 // XDrop
-void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
+void ODbaseTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
     Reference< XUnoTunnel> xTunnel;
     try
@@ -113,7 +113,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementNam
     }
     else
     {
-        const ::rtl::OUString sError( static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( static_cast<OFileCatalog&>(m_rParent).getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_TABLE_NOT_DROP,
                     "$tablename$", _sElementName
                  ) );
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 7f861137d7d1..f38922058754 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::dbase;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index f2ec9c8e3aab..75f959e48dc2 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -45,7 +45,7 @@ ONDXKey::ONDXKey(const ORowSetValue& rVal, sal_Int32 eType, sal_uInt32 nRec)
 {
 }
 // -----------------------------------------------------------------------------
-ONDXKey::ONDXKey(const rtl::OUString& aStr, sal_uInt32 nRec)
+ONDXKey::ONDXKey(const OUString& aStr, sal_uInt32 nRec)
     : ONDXKey_BASE(::com::sun::star::sdbc::DataType::VARCHAR)
      ,nRecord(nRec)
 {
@@ -665,12 +665,12 @@ void ONDXNode::Read(SvStream &rStream, ODbaseIndex& rIndex)
     else
     {
         sal_uInt16 nLen = rIndex.getHeader().db_keylen;
-        rtl::OString aBuf = read_uInt8s_ToOString(rStream, nLen);
+        OString aBuf = read_uInt8s_ToOString(rStream, nLen);
         //get length minus trailing whitespace
         sal_Int32 nContentLen = aBuf.getLength();
         while (nContentLen && aBuf[nContentLen-1] == ' ')
             --nContentLen;
-        aKey = ONDXKey(::rtl::OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord);
+        aKey = ONDXKey(OUString(aBuf.getStr(), nContentLen, rIndex.m_pTable->getConnection()->getTextEncoding()) ,aKey.nRecord);
     }
     rStream >> aChild;
 }
@@ -706,8 +706,8 @@ void ONDXNode::Write(SvStream &rStream, const ONDXPage& rPage) const
         memset(&pBuf[0], 0x20, nLen);
         if (!aKey.getValue().isNull())
         {
-            ::rtl::OUString sValue = aKey.getValue();
-            rtl::OString aText(rtl::OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding()));
+            OUString sValue = aKey.getValue();
+            OString aText(OUStringToOString(sValue, rIndex.m_pTable->getConnection()->getTextEncoding()));
             strncpy(reinterpret_cast<char *>(&pBuf[0]), aText.getStr(),
                 std::min<size_t>(nLen, aText.getLength()));
         }
@@ -909,7 +909,7 @@ void ONDXPage::PrintPage()
         }
         else
         {
-            OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), rtl::OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos());
+            OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), OUStringToOString(rKey.getValue().getString(), rIndex.m_pTable->getConnection()->getTextEncoding()).getStr(),rNode.GetChild().GetPagePos());
         }
     }
     OSL_TRACE("SDB: -----------------------------------------------");
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
index 8b7b5cd1bc00..f8b904852c6e 100644
--- a/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/connectivity/source/drivers/evoab2/EApi.cxx
@@ -131,7 +131,7 @@ bool EApiInit()
 
     for( guint j = 0; j < G_N_ELEMENTS( eBookLibNames ); j++ )
     {
-        aModule = osl_loadModule( rtl::OUString::createFromAscii
+        aModule = osl_loadModule( OUString::createFromAscii
                                   ( eBookLibNames[ j ] ).pData,
                                   SAL_LOADMODULE_DEFAULT );
 
diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx
index 4d035ff4c903..06be9242db79 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -42,15 +42,15 @@ OEvoabCatalog::OEvoabCatalog(OEvoabConnection* _pCon) :
 void OEvoabCatalog::refreshTables()
 {
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString("TABLE");
+    Sequence< OUString > aTypes(1);
+    aTypes[0] = OUString("TABLE");
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
 
     if(xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aName;
+        OUString aName;
 
         while(xResult->next())
         {
diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx
index b131bc36bb95..9f05ea22a80b 100644
--- a/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -35,12 +35,12 @@ using namespace ::com::sun::star::lang;
 using namespace connectivity::evoab;
 
 // -------------------------------------------------------------------------
-sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
-    const ::rtl::OUString sCatalogName;
-    const ::rtl::OUString sSchemaName(m_pTable->getSchema());
-    const ::rtl::OUString sTableName(m_pTable->getTableName());
+    const OUString sCatalogName;
+    const OUString sSchemaName(m_pTable->getSchema());
+    const OUString sTableName(m_pTable->getTableName());
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
         aCatalog,
         sSchemaName,
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx
index b5a183484b05..0d5c9a03ed42 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -32,7 +32,7 @@ namespace connectivity
         protected:
             OEvoabTable*    m_pTable;
 
-            virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+            virtual sdbcx::ObjectType createObject(const OUString& _rName);
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
 
         public:
diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx
index 2602f34480a5..680a8ea2d121 100644
--- a/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -40,27 +40,27 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
-::rtl::OUString implGetExceptionMsg( Exception& e, const ::rtl::OUString& aExceptionType_ )
+OUString implGetExceptionMsg( Exception& e, const OUString& aExceptionType_ )
 {
-     ::rtl::OUString aExceptionType = aExceptionType_;
+     OUString aExceptionType = aExceptionType_;
      if( aExceptionType.isEmpty() )
-         aExceptionType =  ::rtl::OUString("Unknown") ;
+         aExceptionType =  OUString("Unknown") ;
 
-     ::rtl::OUString aTypeLine( "\nType: "  );
+     OUString aTypeLine( "\nType: "  );
      aTypeLine += aExceptionType;
 
-     ::rtl::OUString aMessageLine( "\nMessage: "  );
-         aMessageLine += ::rtl::OUString( e.Message );
+     OUString aMessageLine( "\nMessage: "  );
+         aMessageLine += OUString( e.Message );
 
-     ::rtl::OUString aMsg(aTypeLine);
+     OUString aMsg(aTypeLine);
      aMsg += aMessageLine;
          return aMsg;
 }
 
  // Exception type unknown
-::rtl::OUString implGetExceptionMsg( Exception& e )
+OUString implGetExceptionMsg( Exception& e )
 {
-         ::rtl::OUString aMsg = implGetExceptionMsg( e, ::rtl::OUString() );
+         OUString aMsg = implGetExceptionMsg( e, OUString() );
          return aMsg;
 }
 
@@ -93,12 +93,12 @@ void SAL_CALL OEvoabConnection::release() throw()
 IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection")
 
 //-----------------------------------------------------------------------------
-void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info)  throw(SQLException)
+void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
     SAL_INFO("evoab2", "OEvoabConnection::construct()::url = " << url );
 
-     ::rtl::OUString sPassword;
+     OUString sPassword;
         const char* pPwd                = "password";
 
         const PropertyValue *pIter      = info.getConstArray();
@@ -119,12 +119,12 @@ void OEvoabConnection::construct(const ::rtl::OUString& url, const Sequence< Pro
     else
         setSDBCAddressType(SDBCAddress::EVO_LOCAL);
     setURL(url);
-    setPassword(::rtl::OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8));
+    setPassword(OUStringToOString(sPassword,RTL_TEXTENCODING_UTF8));
     osl_atomic_decrement( &m_refCount );
 }
 
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     // when you need to transform SQL92 to you driver specific you can do it here
     return _sSql;
@@ -170,7 +170,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement(  ) throw(SQL
     return xStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -183,7 +183,7 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con
     return xStmt;
 }
 
-Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw( SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
@@ -248,14 +248,14 @@ sal_Bool SAL_CALL OEvoabConnection::isReadOnly(  ) throw(SQLException, RuntimeEx
 {
     return sal_False;
 }
-void SAL_CALL OEvoabConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this );
 }
 
-::rtl::OUString SAL_CALL OEvoabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
 {
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 1fc9764cb60b..772bfce483b1 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -58,17 +58,17 @@ namespace connectivity
             SDBCAddress::sdbc_address_type  m_eSDBCAddressType;
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
                                             m_xCatalog;
-            ::rtl::OString                  m_aPassword;
+            OString                  m_aPassword;
             ::dbtools::WarningsContainer    m_aWarnings;
 
             virtual ~OEvoabConnection();
 
         public:
             OEvoabConnection( OEvoabDriver& _rDriver );
-            virtual void construct(const ::rtl::OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException);
+            virtual void construct(const OUString& _rUrl,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo ) throw( ::com::sun::star::sdbc::SQLException);
 
-            inline rtl::OString getPassword() { return m_aPassword; }
-            inline void         setPassword( rtl::OString aStr ) { m_aPassword = aStr; }
+            inline OString getPassword() { return m_aPassword; }
+            inline void         setPassword( OString aStr ) { m_aPassword = aStr; }
             // own methods
             inline const OEvoabDriver& getDriver() const { return m_rDriver; }
 
@@ -86,9 +86,9 @@ namespace connectivity
             // XConnection
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog();
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL commit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -97,8 +97,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index a214bd106019..8f3198234c26 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -177,14 +177,14 @@ namespace connectivity
         return nType == G_TYPE_STRING ? DataType::VARCHAR : DataType::BIT;
     }
 
-    guint findEvoabField(const rtl::OUString& aColName)
+    guint findEvoabField(const OUString& aColName)
     {
         guint nRet = (guint)-1;
         sal_Bool bFound = sal_False;
         initFields();
         for (guint i=0;(i < nFields) && !bFound;i++)
         {
-            rtl::OUString aName = getFieldName(i);
+            OUString aName = getFieldName(i);
             if (aName == aColName)
             {
                 nRet = i;
@@ -194,30 +194,30 @@ namespace connectivity
         return nRet;
     }
 
-    rtl::OUString
+    OUString
     getFieldTypeName( guint nCol )
     {
         switch( getFieldType( nCol ) )
         {
             case DataType::BIT:
-                return ::rtl::OUString("BIT");
+                return OUString("BIT");
             case DataType::VARCHAR:
-                return ::rtl::OUString("VARCHAR");
+                return OUString("VARCHAR");
             default:
                 break;
         }
-        return ::rtl::OUString();
+        return OUString();
     }
 
-    rtl::OUString
+    OUString
     getFieldName( guint nCol )
     {
         const GParamSpec *pSpec = getField( nCol )->pField;
-        rtl::OUString aName;
+        OUString aName;
         initFields();
 
         if( pSpec )
-            aName = rtl::OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ),
+            aName = OStringToOUString( g_param_spec_get_name( ( GParamSpec * )pSpec ),
                                             RTL_TEXTENCODING_UTF8 );
             aName = aName.replace( '-', '_' );
         return aName;
@@ -259,7 +259,7 @@ OEvoabDatabaseMetaData::~OEvoabDatabaseMetaData()
 }
 
 // -------------------------------------------------------------------------
-ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const ::rtl::OUString& columnNamePattern )
+ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const OUString& columnNamePattern )
 {
     static ODatabaseMetaDataResultSet::ORows aRows;
     ODatabaseMetaDataResultSet::ORow  aRow(19);
@@ -270,9 +270,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
     // ****************************************************
 
     // Catalog
-    aRow[1] = new ORowSetValueDecorator(::rtl::OUString(""));
+    aRow[1] = new ORowSetValueDecorator(OUString(""));
     // Schema
-    aRow[2] = new ORowSetValueDecorator(::rtl::OUString(""));
+    aRow[2] = new ORowSetValueDecorator(OUString(""));
     // COLUMN_SIZE
     aRow[7] = new ORowSetValueDecorator(s_nCOLUMN_SIZE);
     // BUFFER_LENGTH, not used
@@ -294,10 +294,10 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
     // CHAR_OCTET_LENGTH, refer to [5]
     aRow[16] = new ORowSetValueDecorator(s_nCHAR_OCTET_LENGTH);
     // IS_NULLABLE
-    aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+    aRow[18] = new ORowSetValueDecorator(OUString("YES"));
 
 
-    aRow[3] = new ORowSetValueDecorator(::rtl::OUString("TABLE"));
+    aRow[3] = new ORowSetValueDecorator(OUString("TABLE"));
     ::osl::MutexGuard aGuard( m_aMutex );
 
     initFields();
@@ -320,9 +320,9 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const
     return aRows ;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw(  )
+OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength(  ) throw(SQLException, RuntimeException)
@@ -442,22 +442,22 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns(  ) throw(S
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aVal;
+    OUString aVal;
     return aVal;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
+OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     // normally this is "
-    ::rtl::OUString aVal("\"");
+    OUString aVal("\"");
     return aVal;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aVal;
+    OUString aVal;
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -791,52 +791,52 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) thro
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_pConnection->getURL();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)1);
+    OUString aValue = OUString::valueOf((sal_Int32)1);
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue = ::rtl::OUString::valueOf((sal_Int32)0);
+    OUString aValue = OUString::valueOf((sal_Int32)0);
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -855,36 +855,36 @@ sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion(  ) throw(Runti
     return 0;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
@@ -1002,16 +1002,16 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw
     /* Dont need to change as evoab driver supports only table */
 
     // there exists no possibility to get table types so we have to check
-    static ::rtl::OUString sTableTypes[] =
+    static OUString sTableTypes[] =
     {
-        ::rtl::OUString("TABLE"),
+        OUString("TABLE"),
         // Currently we only support a 'TABLE' nothing more complex
     };
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;
 
     // here we fill the rows which should be visible when ask for data from the resultset returned here
-    sal_Int32  nSize = sizeof(sTableTypes) / sizeof(::rtl::OUString);
+    sal_Int32  nSize = sizeof(sTableTypes) / sizeof(OUString);
     ODatabaseMetaDataResultSet::ORows aRows;
     for(sal_Int32 i=0;i < nSize;++i)
     {
@@ -1043,7 +1043,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
         ODatabaseMetaDataResultSet::ORow aRow;
         aRow.reserve(19);
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
         aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)s_nCHAR_OCTET_LENGTH));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -1065,7 +1065,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
         aRows.push_back(aRow);
@@ -1075,8 +1075,8 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*tableNamePattern*/,
-    const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
+    const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     // this returns an empty resultset where the column-names are already set
     // in special the metadata of the resultset already returns the right columns
@@ -1097,8 +1097,8 @@ bool isSourceBackend(ESource *pSource, const char *backendname)
 }
 
 Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
-    const ::rtl::OUString& /*tableNamePattern*/, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+    const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -1108,7 +1108,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    const ::rtl::OUString aTable("TABLE");
+    const OUString aTable("TABLE");
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -1116,8 +1116,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
         {
             bTableFound = sal_False;
 
-            const ::rtl::OUString* pBegin = types.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + nLength;
+            const OUString* pBegin = types.getConstArray();
+            const OUString* pEnd = pBegin + nLength;
             for(;pBegin != pEnd;++pBegin)
                 {
                     if(*pBegin == aTable)
@@ -1212,7 +1212,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
             {
                 ESource *pSource = E_SOURCE (s->data);
 
-                rtl::OUString aName = rtl::OStringToOUString( e_source_peek_name( pSource ),
+                OUString aName = OStringToOUString( e_source_peek_name( pSource ),
                                                               RTL_TEXTENCODING_UTF8 );
 
                 ODatabaseMetaDataResultSet::ORow aRow(3);
@@ -1230,7 +1230,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
     return xRef;
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFeatureNotImplementedException( "XDatabaseMetaDaza::getUDTs", *this );
     return NULL;
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 7079bf30a511..87ded8659ef2 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -54,9 +54,9 @@ namespace connectivity
         const ColumnProperty *getField(guint n);
         GType                 getGFieldType(guint nCol) ;
         sal_Int32             getFieldType(guint nCol) ;
-        rtl::OUString         getFieldTypeName(guint nCol) ;
-        rtl::OUString         getFieldName(guint nCol) ;
-        guint                 findEvoabField(const rtl::OUString& aColName);
+        OUString         getFieldTypeName(guint nCol) ;
+        OUString         getFieldName(guint nCol) ;
+        guint                 findEvoabField(const OUString& aColName);
 
         void free_column_resources();
 
@@ -64,14 +64,14 @@ namespace connectivity
         {
             OEvoabConnection*                      m_pConnection;
 
-            ODatabaseMetaDataResultSet::ORows& getColumnRows( const ::rtl::OUString& columnNamePattern );
+            ODatabaseMetaDataResultSet::ORows& getColumnRows( const OUString& columnNamePattern );
 
         protected:
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw();
             // cached database information
-            virtual ::rtl::OUString impl_getIdentifierQuoteString_throw(  );
+            virtual OUString impl_getIdentifierQuoteString_throw(  );
             virtual sal_Bool        impl_isCatalogAtStart_throw(  );
-            virtual ::rtl::OUString impl_getCatalogSeparator_throw(  );
+            virtual OUString impl_getCatalogSeparator_throw(  );
             virtual sal_Bool        impl_supportsCatalogsInTableDefinitions_throw(  );
             virtual sal_Bool        impl_supportsSchemasInTableDefinitions_throw(  ) ;
             virtual sal_Bool        impl_supportsCatalogsInDataManipulation_throw(  );
@@ -93,17 +93,17 @@ namespace connectivity
             // XDatabaseMetaData
             virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getURL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getUserName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getURL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getUserName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDriverName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDriverVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -116,13 +116,13 @@ namespace connectivity
             virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
-            virtual ::rtl::OUString SAL_CALL getSQLKeywords(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getNumericFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getStringFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSystemFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getTimeDateFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSearchStringEscape(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getExtraNameCharacters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSQLKeywords(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getNumericFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getStringFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSystemFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullPlusNonNullIsNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsTypeConversion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -148,9 +148,9 @@ namespace connectivity
             virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSchemaTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getProcedureTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSchemaTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getProcedureTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalogTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -198,9 +198,9 @@ namespace connectivity
             virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -213,7 +213,7 @@ namespace connectivity
             virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 86f36afd6db6..601a111630c5 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -78,40 +78,40 @@ void OEvoabDriver::disposing()
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString OEvoabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString(EVOAB_DRIVER_IMPL_NAME);
+    return OUString(EVOAB_DRIVER_IMPL_NAME);
     // this name is referenced in the configuration and in the evoab.xml
     // Please take care when changing it.
 }
 
 //------------------------------------------------------------------
-Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
+    Sequence< OUString > aSNS( 1 );
+    aSNS[0] = OUString("com.sun.star.sdbc.Driver");
     return aSNS;
 }
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabDriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL OEvoabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 //------------------------------------------------------------------
-sal_Bool SAL_CALL OEvoabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
     return pSupported != pEnd;
 }
 //------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
@@ -122,7 +122,7 @@ Sequence< ::rtl::OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames(  )
     return *(new OEvoabDriver(_rxFactory));
 }
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -139,19 +139,19 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString&
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url )
     throw(SQLException, RuntimeException)
 {
     return acceptsURL_Stat(url);
 }
 
 // --------------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( ! acceptsURL(url) )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+        const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( ! acceptsURL(url) )
 
@@ -170,7 +170,7 @@ sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion(  ) throw(RuntimeException)
     return 0;
 }
 // --------------------------------------------------------------------------------
-sal_Bool OEvoabDriver::acceptsURL_Stat( const ::rtl::OUString& url )
+sal_Bool OEvoabDriver::acceptsURL_Stat( const OUString& url )
 {
     return ( url == "sdbc:address:evolution:local" || url == "sdbc:address:evolution:groupwise" || url == "sdbc:address:evolution:ldap" ) && EApiInit();
 }
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx
index a6bcf2ed85e2..60802e64697c 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -62,19 +62,19 @@ namespace connectivity
             virtual void SAL_CALL disposing(void);
 
             // XInterface
-            static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
-            static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
+            static OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+            static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
 
             // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
 
             // XDriver
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getMajorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getMinorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
 
@@ -85,7 +85,7 @@ namespace connectivity
                         getComponentContext( ) const { return comphelper::getComponentContext( m_xFactory ); }
 
             // static methods
-            static sal_Bool acceptsURL_Stat( const ::rtl::OUString& url );
+            static sal_Bool acceptsURL_Stat( const OUString& url );
         };
     }
 
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 3265547c84f6..e067c8d06806 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -51,7 +51,7 @@ OEvoabPreparedStatement::OEvoabPreparedStatement( OEvoabConnection* _pConnection
 }
 
 // -----------------------------------------------------------------------------
-void OEvoabPreparedStatement::construct( const ::rtl::OUString& _sql )
+void OEvoabPreparedStatement::construct( const OUString& _sql )
 {
     m_sSqlStatement = _sql;
 
@@ -145,7 +145,7 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate(  ) throw(SQLException
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const ::rtl::OUString& /*x*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setString", *this );
 }
@@ -260,7 +260,7 @@ void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterI
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     ::dbtools::throwFunctionNotSupportedException( "XParameters::setObjectNull", *this );
 }
@@ -270,9 +270,9 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
-        const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution(
+        const OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", ::rtl::OUString::valueOf(parameterIndex)
+                "$position$", OUString::valueOf(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index c6ab7939dc3d..468b8130571b 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -63,7 +63,7 @@ namespace connectivity
             //====================================================================
 
             // our SQL statement
-            ::rtl::OUString                                                                 m_sSqlStatement;
+            OUString                                                                 m_sSqlStatement;
             // the EBookQuery we're working with
             QueryData                                                                       m_aQueryData;
             // our meta data
@@ -75,7 +75,7 @@ namespace connectivity
         public:
             OEvoabPreparedStatement( OEvoabConnection* _pConnection );
 
-            void construct( const ::rtl::OUString& _sql );
+            void construct( const OUString& _sql );
 
         protected:
             DECLARE_SERVICE_INFO();
@@ -93,7 +93,7 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // XParameters
             virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -101,7 +101,7 @@ namespace connectivity
             virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index f3a5ca33d552..364db8cae361 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -64,23 +64,23 @@ using namespace com::sun::star::io;
 namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition;
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)   \
+OUString SAL_CALL OEvoabResultSet::getImplementationName(  ) throw ( RuntimeException)   \
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.evoab.ResultSet");
+    return OUString("com.sun.star.sdbcx.evoab.ResultSet");
 }
 // -------------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
+ Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
-     Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
+     Sequence< OUString > aSupported(1);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OEvoabResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -99,12 +99,12 @@ struct ComparisonData
     }
 };
 
-static ::rtl::OUString
+static OUString
 valueToOUString( GValue& _rValue )
 {
     const char *pStr = g_value_get_string( &_rValue );
-    rtl::OString aStr( pStr ? pStr : "" );
-    ::rtl::OUString sResult( ::rtl::OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) );
+    OString aStr( pStr ? pStr : "" );
+    OUString sResult( OStringToOUString( aStr, RTL_TEXTENCODING_UTF8 ) );
     g_value_unset( &_rValue );
     return sResult;
 }
@@ -317,7 +317,7 @@ int CompareContacts( gconstpointer _lhs, gconstpointer _rhs, gpointer _userData
     bool bLhsNull = true;
     bool bRhsNull = true;
 
-    ::rtl::OUString sLhs, sRhs;
+    OUString sLhs, sRhs;
     bool bLhs(false), bRhs(false);
 
     const ComparisonData& rCompData = *static_cast< const ComparisonData* >( _userData );
@@ -578,7 +578,7 @@ public:
 
         if( isAuthRequired( pBook ) )
         {
-            rtl::OString aUser( getUserName( pBook ) );
+            OString aUser( getUserName( pBook ) );
             const char *pAuth = e_source_get_property( pSource, "auth" );
             bAuthSuccess = e_book_authenticate_user( pBook, aUser.getStr(), rPassword.getStr(), pAuth, NULL );
         }
@@ -693,7 +693,7 @@ void OEvoabResultSet::construct( const QueryData& _rData )
     }
     if ( bExecuteQuery )
     {
-        rtl::OString aPassword = m_pConnection->getPassword();
+        OString aPassword = m_pConnection->getPassword();
         m_pVersionHelper->executeQuery(pBook, _rData.getQuery(), aPassword);
         m_pConnection->setPassword( aPassword );
 
@@ -752,11 +752,11 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes(  ) throw( RuntimeException)
  * If the equivalent NResultSetMetaData.cxx marks the columntype of
  * nColumnNum as DataType::VARCHAR this accessor is used.
  */
-::rtl::OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
-    rtl::OUString aResult;
+    OUString aResult;
     if ( m_xMetaData.is())
     {
         OEvoabResultSetMetaData *pMeta = (OEvoabResultSetMetaData *) m_xMetaData.get();
@@ -1113,7 +1113,7 @@ Any SAL_CALL OEvoabResultSet::getWarnings(  ) throw(SQLException, RuntimeExcepti
 }
 // -------------------------------------------------------------------------
 //XColumnLocate Interface
-sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 678f123dea3c..4b8bf638d8d7 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -157,7 +157,7 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // XRow
             virtual sal_Bool SAL_CALL wasNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -186,7 +186,7 @@ namespace connectivity
             virtual ::com::sun::star::uno::Any SAL_CALL getWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL clearWarnings(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 02cf66fd43f5..889c9269eccc 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -28,7 +28,7 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::sdbc;
 
-OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName)
+OEvoabResultSetMetaData::OEvoabResultSetMetaData(const OUString& _aTableName)
     : m_aTableName(_aTableName),
       m_aEvoabFields()
 {
@@ -42,18 +42,18 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData()
 void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
         OSQLColumns::Vector::const_iterator aIter;
-        static const ::rtl::OUString aName("Name");
+        static const OUString aName("Name");
 
         for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
         {
-                ::rtl::OUString aFieldName;
+                OUString aFieldName;
 
                 (*aIter)->getPropertyValue(aName) >>= aFieldName;
                 guint nFieldNumber = findEvoabField(aFieldName);
                 if (nFieldNumber == (guint)-1)
                 {
                     connectivity::SharedResources aResource;
-                    const ::rtl::OUString sError( aResource.getResourceStringWithSubstitution(
+                    const OUString sError( aResource.getResourceStringWithSubstitution(
                             STR_INVALID_COLUMNNAME,
                             "$columnname$", aFieldName
                          ) );
@@ -85,49 +85,49 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN
     return sal_True;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getSchemaName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldName( nField );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnTypeName( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     return evoab::getFieldTypeName( nField );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1];
     const ColumnProperty *pSpecs = getField(nField);
     GParamSpec *pSpec = pSpecs->pField;
-    rtl::OUString aLabel;
+    OUString aLabel;
 
     if( pSpec )
-            aLabel = rtl::OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ),
+            aLabel = OStringToOUString( g_param_spec_get_nick( (GParamSpec *) pSpec ),
                                              RTL_TEXTENCODING_UTF8 );
     return aLabel;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getColumnServiceName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getTableName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
-    return m_aTableName;//::rtl::OUString("TABLE");
+    return m_aTableName;//OUString("TABLE");
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OEvoabResultSetMetaData::getCatalogName( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 9ef3b859f8cd..54bef44cd470 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -36,13 +36,13 @@ namespace connectivity
 
         class OEvoabResultSetMetaData : public  OResultSetMetaData_BASE
         {
-          ::rtl::OUString       m_aTableName;
+          OUString       m_aTableName;
                   ::std::vector<sal_Int32>        m_aEvoabFields;
 
         protected:
             virtual ~OEvoabResultSetMetaData();
         public:
-          OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName);
+          OEvoabResultSetMetaData(const OUString& _aTableName);
           void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException);
           inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const
                         { return m_aEvoabFields[columnIndex - 1]; }
@@ -60,19 +60,19 @@ namespace connectivity
           virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
           virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-          virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+          virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx
index e922073df08b..dc3a242fec32 100644
--- a/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/connectivity/source/drivers/evoab2/NServices.cxx
@@ -22,7 +22,6 @@
 #include <osl/diagnose.h>
 
 using namespace connectivity::evoab;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 949a4e6a737e..0252794604df 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -159,12 +159,12 @@ OCommonStatement::createTrue()
 }
 
 EBookQuery *
-OCommonStatement::createTest( const ::rtl::OUString &aColumnName,
+OCommonStatement::createTest( const OUString &aColumnName,
                              EBookQueryTest eTest,
-                             const ::rtl::OUString &aMatch )
+                             const OUString &aMatch )
 {
-    ::rtl::OString sMatch = rtl::OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 );
-    ::rtl::OString sColumnName = rtl::OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 );
+    OString sMatch = OUStringToOString( aMatch, RTL_TEXTENCODING_UTF8 );
+    OString sColumnName = OUStringToOString( aColumnName, RTL_TEXTENCODING_UTF8 );
 
     return e_book_query_field_test( e_contact_field_id( sColumnName.getStr() ),
                                     eTest, sMatch.getStr() );
@@ -172,11 +172,11 @@ OCommonStatement::createTest( const ::rtl::OUString &aColumnName,
 
 // -------------------------------------------------------------------------
 
-::rtl::OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef )
+OUString OCommonStatement::impl_getColumnRefColumnName_throw( const OSQLParseNode& _rColumnRef )
 {
     ENSURE_OR_THROW( SQL_ISRULE( &_rColumnRef, column_ref ), "internal error: only column_refs supported as LHS" );
 
-    ::rtl::OUString sColumnName;
+    OUString sColumnName;
     switch ( _rColumnRef.count() )
     {
     case 3: // SQL_TOKEN_NAME '.' column_val
@@ -233,7 +233,7 @@ void OCommonStatement::orderByAnalysis( const OSQLParseNode* _pOrderByClause, So
         // column name -> column field
         if ( !SQL_ISRULE( pColumnRef, column_ref ) )
             m_pConnection->throwGenericSQLException( STR_SORT_BY_COL_ONLY, *this );
-        const ::rtl::OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) );
+        const OUString sColumnName( impl_getColumnRefColumnName_throw( *pColumnRef ) );
         guint nField = evoab::findEvoabField( sColumnName );
         // ascending/descending?
         bool bAscending = true;
@@ -324,9 +324,9 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
             return ( nLHS == nRHS ) ? createTrue() : NULL;
         }
 
-        ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) );
+        OUString aColumnName( impl_getColumnRefColumnName_throw( *pLHS ) );
 
-        ::rtl::OUString aMatchString;
+        OUString aMatchString;
         if ( pRHS->isToken() )
             aMatchString = pRHS->getTokenValue();
         else
@@ -346,7 +346,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
         if( ! SQL_ISRULE( parseTree->getChild( 0 ), column_ref) )
             m_pConnection->throwGenericSQLException(STR_QUERY_INVALID_LIKE_COLUMN,*this);
 
-        ::rtl::OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) );
+        OUString aColumnName( impl_getColumnRefColumnName_throw( *parseTree->getChild( 0 ) ) );
 
         OSQLParseNode *pAtom      = pPart2->getChild( pPart2->count() - 2 );     // Match String
         bool bNotLike             = pPart2->getChild(0)->isToken();
@@ -363,15 +363,15 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
 
         const sal_Unicode WILDCARD = '%';
 
-        rtl::OUString aMatchString;
+        OUString aMatchString;
         aMatchString = pAtom->getTokenValue();
 
         // Determine where '%' character is...
-        if( aMatchString.equals( ::rtl::OUString::valueOf( WILDCARD ) ) )
+        if( aMatchString.equals( OUString::valueOf( WILDCARD ) ) )
         {
             // String containing only a '%' and nothing else matches everything
             pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS,
-                                  rtl::OUString("") );
+                                  OUString("") );
         }
         else if( aMatchString.indexOf( WILDCARD ) == -1 )
         {   // Simple string , eg. "to match" "contains in evo"
@@ -410,14 +410,14 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
     return pResult;
 }
 
-rtl::OUString OCommonStatement::getTableName()
+OUString OCommonStatement::getTableName()
 {
-    ::rtl::OUString aTableName;
+    OUString aTableName;
 
     if( m_pParseTree && m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT )
     {
         Any aCatalog;
-        ::rtl::OUString aSchema;
+        OUString aSchema;
         const OSQLParseNode *pSelectStmnt = m_aSQLIterator.getParseTree();
         const OSQLParseNode *pAllTableNames = pSelectStmnt->getChild( 3 )->getChild( 0 )->getChild( 1 );
 
@@ -443,13 +443,13 @@ rtl::OUString OCommonStatement::getTableName()
     return aTableName;
 }
 
-void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQueryData )
+void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData )
 {
     SAL_INFO( "evoab2", "parsing " << sql );
 
     _out_rQueryData.eFilterType = eFilterOther;
 
-    ::rtl::OUString aErr;
+    OUString aErr;
     m_pParseTree = m_aParser.parseTree( aErr, sql );
     m_aSQLIterator.setParseTree( m_pParseTree );
     m_aSQLIterator.traverseAll();
@@ -461,7 +461,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer
     if ( pOrderByClause )
     {
     #if OSL_DEBUG_LEVEL > 1
-        ::rtl::OUString sTreeDebug;
+        OUString sTreeDebug;
         pOrderByClause->showParseTree( sTreeDebug );
         SAL_INFO( "evoab2", "found order-by tree:\n" << sTreeDebug );
     #endif
@@ -472,7 +472,7 @@ void OCommonStatement::parseSql( const rtl::OUString& sql, QueryData& _out_rQuer
     if ( pWhereClause && SQL_ISRULE( pWhereClause, where_clause ) )
     {
     #if OSL_DEBUG_LEVEL > 1
-        ::rtl::OUString sTreeDebug;
+        OUString sTreeDebug;
         pWhereClause->showParseTree( sTreeDebug );
         SAL_INFO( "evoab2", "found where tree:\n" << sTreeDebug );
     #endif
@@ -544,7 +544,7 @@ void SAL_CALL OCommonStatement::release() throw()
 }
 
 // -------------------------------------------------------------------------
-QueryData OCommonStatement::impl_getEBookQuery_throw( const ::rtl::OUString& _rSql )
+QueryData OCommonStatement::impl_getEBookQuery_throw( const OUString& _rSql )
 {
     QueryData aData;
     parseSql( _rSql, aData );
@@ -580,7 +580,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const QueryDa
 }
 
 // -------------------------------------------------------------------------
-Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const ::rtl::OUString& _rSql )
+Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUString& _rSql )
 {
     SAL_INFO( "evoab2", "OCommonStatement::impl_executeQuery_throw(" << _rSql << "%s)\n" );
 
@@ -611,7 +611,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase )
 IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase )
 
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -621,7 +621,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& _sql ) throw(SQLEx
 }
 
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString& _sql ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
@@ -630,7 +630,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString
 }
 
 // -----------------------------------------------------------------------------
-sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 187b1fde70d6..4529aae671e1 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -75,7 +75,7 @@ namespace connectivity
             EBookQuery*     pQuery;
 
         public:
-            ::rtl::OUString                             sTable;
+            OUString                             sTable;
             QueryFilterType                             eFilterType;
             ::rtl::Reference< ::connectivity::OSQLColumns >  xSelectColumns;
             SortDescriptor                              aSortOrder;
@@ -153,7 +153,7 @@ namespace connectivity
             connectivity::OSQLParseNode          *m_pParseTree;
 
             // <properties>
-            ::rtl::OUString                             m_aCursorName;
+            OUString                             m_aCursorName;
             sal_Int32                                   m_nMaxFieldSize;
             sal_Int32                                   m_nMaxRows;
             sal_Int32                                   m_nQueryTimeOut;
@@ -176,14 +176,14 @@ namespace connectivity
             virtual ~OCommonStatement();
 
         protected:
-            void         parseSql( const ::rtl::OUString& sql, QueryData& _out_rQueryData );
+            void         parseSql( const OUString& sql, QueryData& _out_rQueryData );
             EBookQuery  *whereAnalysis( const OSQLParseNode*  parseTree );
             void         orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort );
-            rtl::OUString getTableName();
+            OUString getTableName();
             EBookQuery  *createTrue();
-            EBookQuery  *createTest( const ::rtl::OUString &aColumnName,
+            EBookQuery  *createTest( const OUString &aColumnName,
                                      EBookQueryTest eTest,
-                                     const ::rtl::OUString &aMatch );
+                                     const OUString &aMatch );
 
         public:
 
@@ -221,10 +221,10 @@ namespace connectivity
                 Also, all statement dependent members (such as the parser/iterator) will be inited afterwards.
             */
             QueryData
-                impl_getEBookQuery_throw( const ::rtl::OUString& _rSql );
+                impl_getEBookQuery_throw( const OUString& _rSql );
 
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
-                impl_executeQuery_throw( const ::rtl::OUString& _rSql );
+                impl_executeQuery_throw( const OUString& _rSql );
 
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
                 impl_executeQuery_throw( const QueryData& _rData );
@@ -232,7 +232,7 @@ namespace connectivity
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
                 impl_getConnection() { return ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >( (::com::sun::star::sdbc::XConnection*)m_pConnection ); }
 
-            ::rtl::OUString
+            OUString
                 impl_getColumnRefColumnName_throw( const ::connectivity::OSQLParseNode& _rColumnRef );
         };
 
@@ -263,9 +263,9 @@ namespace connectivity
             DECLARE_SERVICE_INFO();
 
             // XStatement
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
-            virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
+            virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
+            virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ;
         };
     }
diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx
index 2d7481413ed8..4b13fa3f8539 100644
--- a/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/connectivity/source/drivers/evoab2/NTable.cxx
@@ -35,11 +35,11 @@ using namespace connectivity::evoab;
 // -------------------------------------------------------------------------
 OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables,
                 OEvoabConnection* _pConnection,
-                const ::rtl::OUString& _Name,
-                const ::rtl::OUString& _Type,
-                const ::rtl::OUString& _Description ,
-                const ::rtl::OUString& _SchemaName,
-                const ::rtl::OUString& _CatalogName
+                const OUString& _Name,
+                const OUString& _Type,
+                const OUString& _Description ,
+                const OUString& _SchemaName,
+                const OUString& _CatalogName
                 ) : OEvoabTable_TYPEDEF(_pTables,sal_True,
                                   _Name,
                                   _Type,
@@ -61,7 +61,7 @@ void OEvoabTable::refreshColumns()
                 Any(),
                 m_SchemaName,
                 m_Name,
-                ::rtl::OUString("%"));
+                OUString("%"));
 
         if (xResult.is())
         {
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx
index 4ce421c87bbf..e1b22f1c7df2 100644
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
@@ -29,7 +29,7 @@ namespace connectivity
     {
         typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF;
 
-        ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
+        OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp);
 
         class OEvoabTable : public OEvoabTable_TYPEDEF
         {
@@ -39,19 +39,19 @@ namespace connectivity
         public:
             OEvoabTable(    sdbcx::OCollection* _pTables,
                     OEvoabConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description = ::rtl::OUString(),
-                    const ::rtl::OUString& _SchemaName = ::rtl::OUString(),
-                    const ::rtl::OUString& _CatalogName = ::rtl::OUString()
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description = OUString(),
+                    const OUString& _SchemaName = OUString(),
+                    const OUString& _CatalogName = OUString()
                 );
 
             OEvoabConnection* getConnection() { return m_pConnection;}
 
             virtual void refreshColumns();
 
-            ::rtl::OUString getTableName() const { return m_Name; }
-            ::rtl::OUString getSchema() const { return m_SchemaName; }
+            OUString getTableName() const { return m_Name; }
+            OUString getSchema() const { return m_SchemaName; }
         };
     }
 }
diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx
index a0f2fa5fcacb..c756cb6dfdcb 100644
--- a/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/connectivity/source/drivers/evoab2/NTables.cxx
@@ -45,13 +45,13 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace dbtools;
 
-ObjectType OEvoabTables::createObject(const ::rtl::OUString& aName)
+ObjectType OEvoabTables::createObject(const OUString& aName)
 {
-    ::rtl::OUString aSchema(  "%" );
+    OUString aSchema(  "%" );
 
-    Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString("TABLE");
-    ::rtl::OUString sEmpty;
+    Sequence< OUString > aTypes(1);
+    aTypes[0] = OUString("TABLE");
+    OUString sEmpty;
 
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);
 
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx
index 3827182abed4..caced2a8d23f 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -29,7 +29,7 @@ namespace connectivity
         {
             ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >       m_xMetaData;
         protected:
-            virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+            virtual sdbcx::ObjectType createObject(const OUString& _rName);
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
         public:
             OEvoabTables(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rMetaData,
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index b7173ef703f6..58d122cdddeb 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -49,7 +49,7 @@ m_xMetaData.clear();
     OFileCatalog_BASE::disposing();
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OFileCatalog::buildName(const Reference< XRow >& _xRow)
+OUString OFileCatalog::buildName(const Reference< XRow >& _xRow)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::buildName" );
     return _xRow->getString(3);
@@ -59,9 +59,9 @@ void OFileCatalog::refreshTables()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileCatalog::refreshTables" );
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes;
+    Sequence< OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
     fillNames(xResult,aVector);
 
     if(m_pTables)
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index 199c0acda4d3..c134c14ce162 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -35,12 +35,12 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
-    const ::rtl::OUString sCatalogName;
-    const ::rtl::OUString sSchemaName(m_pTable->getSchema());
-    const ::rtl::OUString sTableName(m_pTable->getName());
+    const OUString sCatalogName;
+    const OUString sSchemaName(m_pTable->getSchema());
+    const OUString sTableName(m_pTable->getName());
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(Any(),
     sSchemaName, sTableName, _rName);
 
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 0683af96b69a..447a6dc435e3 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -53,7 +53,6 @@ using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::container;
 using namespace com::sun::star::ucb;
 using namespace ::ucbhelper;
-using rtl::OUString;
 typedef connectivity::OMetaConnection OConnection_BASE;
 // --------------------------------------------------------------------------------
 OConnection::OConnection(OFileDriver*   _pDriver)
@@ -94,11 +93,11 @@ sal_Bool OConnection::matchesExtension( const String& _rExt ) const
 }
 
 //-----------------------------------------------------------------------------
-void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
+void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
 
-    ::rtl::OUString aExt;
+    OUString aExt;
     const PropertyValue *pIter  = info.getConstArray();
     const PropertyValue *pEnd    = pIter + info.getLength();
     for(;pIter != pEnd;++pIter)
@@ -107,7 +106,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
             OSL_VERIFY( pIter->Value >>= aExt );
         else if(0 == pIter->Name.compareToAscii("CharSet"))
         {
-            ::rtl::OUString sIanaName;
+            OUString sIanaName;
             OSL_VERIFY( pIter->Value >>= sIanaName );
 
             ::dbtools::OCharsetMap aLookupIanaName;
@@ -130,7 +129,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
     {
         sal_Int32 nLen = url.indexOf(':');
         nLen = url.indexOf(':',nLen+1);
-        ::rtl::OUString aDSN(url.copy(nLen+1));
+        OUString aDSN(url.copy(nLen+1));
 
         String aFileName = aDSN;
         INetURLObject aURL;
@@ -199,7 +198,7 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV
             throwUrlNotValid(getURL(),e.Message);
         }
         if(!m_xDir.is() || !m_xContent.is())
-            throwUrlNotValid(getURL(),::rtl::OUString());
+            throwUrlNotValid(getURL(),OUString());
 
         if (m_aFilenameExtension.Search('*') != STRING_NOTFOUND || m_aFilenameExtension.Search('?') != STRING_NOTFOUND)
             throw SQLException();
@@ -228,7 +227,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement(  ) throw(SQLExcep
     return xReturn;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -241,13 +240,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const ::
     return pStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XConnection::prepareCall", *this );
     return NULL;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     return sql;
 }
@@ -317,14 +316,14 @@ sal_Bool SAL_CALL OConnection::isReadOnly(  ) throw(SQLException, RuntimeExcepti
     return m_bReadOnly;
 }
 // --------------------------------------------------------------------------------
-void SAL_CALL OConnection::setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException)
 {
     throwFeatureNotImplementedException( "XConnection::setCatalog", *this );
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // --------------------------------------------------------------------------------
 void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException)
@@ -395,9 +394,9 @@ Reference< XTablesSupplier > OConnection::createCatalog()
 Reference< XDynamicResultSet > OConnection::getDir() const
 {
     Reference<XDynamicResultSet> xContent;
-    Sequence< ::rtl::OUString > aProps(1);
-    ::rtl::OUString* pProps = aProps.getArray();
-    pProps[ 0 ] = ::rtl::OUString("Title");
+    Sequence< OUString > aProps(1);
+    OUString* pProps = aProps.getArray();
+    pProps[ 0 ] = OUString("Title");
     try
     {
         Reference<XContentIdentifier> xIdent = getContent()->getIdentifier();
@@ -432,7 +431,7 @@ Sequence< sal_Int8 > OConnection::getUnoTunnelImplementationId()
     return pId->getImplementationId();
 }
 // -----------------------------------------------------------------------------
-void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::OUString & _rsMessage)
+void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsMessage)
 {
     SQLException aError;
     aError.Message = getResources().getResourceStringWithSubstitution(
@@ -440,11 +439,11 @@ void OConnection::throwUrlNotValid(const ::rtl::OUString & _rsUrl,const ::rtl::O
                 "$URL$", _rsUrl
             );
 
-    aError.SQLState = ::rtl::OUString("S1000");
+    aError.SQLState = OUString("S1000");
     aError.ErrorCode = 0;
     aError.Context = static_cast< XConnection* >(this);
     if (!_rsMessage.isEmpty())
-        aError.NextException <<= SQLException(_rsMessage, aError.Context, ::rtl::OUString(), 0, Any());
+        aError.NextException <<= SQLException(_rsMessage, aError.Context, OUString(), 0, Any());
 
     throw aError;
 }
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 1bd1a49a2f5a..9448cac04089 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -65,15 +65,15 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw(  )
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
+OUString ODatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getCatalogSeparator_throw" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*tableNamePattern*/,
-        const ::rtl::OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
+        const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getColumns" );
     OSL_FAIL("Should be overloaded!");
@@ -165,8 +165,8 @@ namespace
 
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
-        const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+        const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTables" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -178,7 +178,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     // check if any type is given
     // when no types are given then we have to return all tables e.g. TABLE
 
-    static const ::rtl::OUString aTable("TABLE");
+    static const OUString aTable("TABLE");
 
     sal_Bool bTableFound = sal_True;
     sal_Int32 nLength = types.getLength();
@@ -186,8 +186,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     {
         bTableFound = sal_False;
 
-        const ::rtl::OUString* pBegin = types.getConstArray();
-        const ::rtl::OUString* pEnd = pBegin + nLength;
+        const OUString* pBegin = types.getConstArray();
+        const OUString* pEnd = pBegin + nLength;
         for(;pBegin != pEnd;++pBegin)
         {
             if(*pBegin == aTable)
@@ -220,7 +220,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     String sThisContentExtension;
     ODatabaseMetaDataResultSet::ORows aRows;
     // scan the directory for tables
-    ::rtl::OUString aName;
+    OUString aName;
     INetURLObject aURL;
     xResultSet->beforeFirst();
 
@@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
     {
         aName = xRow->getString(1);
         aURL.SetSmartProtocol(INET_PROT_FILE);
-        String sUrl = m_pConnection->getURL() + ::rtl::OUString("/") + aName;
+        String sUrl = m_pConnection->getURL() + OUString("/") + aName;
         aURL.SetSmartURL( sUrl );
         sThisContentExtension = aURL.getExtension();
 
@@ -270,7 +270,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
 
             if ( sThisContentExtension == aFilenameExtension )
             {
-                aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,::rtl::OUString());
+                aName = aName.replaceAt(aName.getLength()-(aFilenameExtension.Len()+1),aFilenameExtension.Len()+1,OUString());
                 sal_Unicode nChar = aName.toChar();
                 if ( match(tableNamePattern,aName,'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) )
                 {
@@ -289,7 +289,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
                     sal_Unicode nChar = aURL.getBase().getStr()[0];
                     if(match(tableNamePattern,aURL.getBase(),'\0') && ( !bCheckEnabled || ( bCheckEnabled && ((nChar < '0' || nChar > '9')))) )
                     {
-                        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString(aURL.getBase())));
+                        aRow.push_back(new ORowSetValueDecorator(OUString(aURL.getBase())));
                         bNewRow = sal_True;
                     }
                     break;
@@ -388,7 +388,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
-        const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException)
+        const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTablePrivileges" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -402,9 +402,9 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
     if( xTabSup.is())
     {
         Reference< XNameAccess> xNames      = xTabSup->getTables();
-        Sequence< ::rtl::OUString > aNames  = xNames->getElementNames();
-        const ::rtl::OUString* pBegin = aNames.getConstArray();
-        const ::rtl::OUString* pEnd = pBegin + aNames.getLength();
+        Sequence< OUString > aNames  = xNames->getElementNames();
+        const OUString* pBegin = aNames.getConstArray();
+        const OUString* pEnd = pBegin + aNames.getLength();
         for(;pBegin != pEnd;++pBegin)
         {
             if(match(tableNamePattern,*pBegin,'\0'))
@@ -413,7 +413,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges(
 
                 aRow[2] = new ORowSetValueDecorator(*pBegin);
                 aRow[6] = ODatabaseMetaDataResultSet::getSelectValue();
-                aRow[7] = new ORowSetValueDecorator(::rtl::OUString("NO"));
+                aRow[7] = new ORowSetValueDecorator(OUString("NO"));
                 aRows.push_back(aRow);
 
                 Reference< XPropertySet> xTable;
@@ -523,23 +523,23 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLExc
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getCatalogTerm" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
+OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::impl_getIdentifierQuoteString_throw" );
-    static const ::rtl::OUString sQuote("\"");
+    static const OUString sQuote("\"");
     return sQuote;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getExtraNameCharacters" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames(  ) throw(SQLException, RuntimeException)
@@ -692,7 +692,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     {
         ODatabaseMetaDataResultSet::ORow aRow;
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("TABLE")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("TABLE")));
         aRows.push_back(aRow);
     }
     pResult->setRows(aRows);
@@ -951,53 +951,53 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(SQL
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getURL" );
-    static const ::rtl::OUString aValue(  "sdbc:file:" );
+    static const OUString aValue(  "sdbc:file:" );
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUserName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDriverVersion" );
-    return ::rtl::OUString::valueOf((sal_Int32)1);
+    return OUString::valueOf((sal_Int32)1);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductVersion" );
-    return ::rtl::OUString::valueOf((sal_Int32)0);
+    return OUString::valueOf((sal_Int32)0);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getDatabaseProductName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getProcedureTerm" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSchemaTerm" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion(  ) throw(RuntimeException)
@@ -1018,40 +1018,40 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeExc
     return 0;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSQLKeywords" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSearchStringEscape" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getStringFunctions" );
-    return ::rtl::OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
+    return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT");
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getTimeDateFunctions" );
-    return ::rtl::OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
+    return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW");
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getSystemFunctions" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL ODatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getNumericFunctions" );
-    return ::rtl::OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
+    return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS");
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
@@ -1196,7 +1196,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates(  ) throw(SQLException
     return sal_False;
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "ODatabaseMetaData::getUDTs" );
     return NULL;
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index 925cd763c47c..03256f7ab7cc 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -97,32 +97,32 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
     if ( lhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet;
+    OUString sRet;
     ::com::sun::star::util::Date aD = lhs;
     Date aDate(aD.Day,aD.Month,aD.Year);
     DayOfWeek eDayOfWeek = aDate.GetDayOfWeek();
     switch(eDayOfWeek)
     {
         case MONDAY:
-            sRet = ::rtl::OUString("Monday");
+            sRet = OUString("Monday");
             break;
         case TUESDAY:
-            sRet = ::rtl::OUString("Tuesday");
+            sRet = OUString("Tuesday");
             break;
         case WEDNESDAY:
-            sRet = ::rtl::OUString("Wednesday");
+            sRet = OUString("Wednesday");
             break;
         case THURSDAY:
-            sRet = ::rtl::OUString("Thursday");
+            sRet = OUString("Thursday");
             break;
         case FRIDAY:
-            sRet = ::rtl::OUString("Friday");
+            sRet = OUString("Friday");
             break;
         case SATURDAY:
-            sRet = ::rtl::OUString("Saturday");
+            sRet = OUString("Saturday");
             break;
         case SUNDAY:
-            sRet = ::rtl::OUString("Sunday");
+            sRet = OUString("Sunday");
             break;
         default:
             OSL_FAIL("Error in enum values for date");
@@ -135,45 +135,45 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
     if ( lhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet;
+    OUString sRet;
     ::com::sun::star::util::Date aD = lhs;
     switch(aD.Month)
     {
         case 1:
-            sRet = ::rtl::OUString("January");
+            sRet = OUString("January");
             break;
         case 2:
-            sRet = ::rtl::OUString("February");
+            sRet = OUString("February");
             break;
         case 3:
-            sRet = ::rtl::OUString("March");
+            sRet = OUString("March");
             break;
         case 4:
-            sRet = ::rtl::OUString("April");
+            sRet = OUString("April");
             break;
         case 5:
-            sRet = ::rtl::OUString("May");
+            sRet = OUString("May");
             break;
         case 6:
-            sRet = ::rtl::OUString("June");
+            sRet = OUString("June");
             break;
         case 7:
-            sRet = ::rtl::OUString("July");
+            sRet = OUString("July");
             break;
         case 8:
-            sRet = ::rtl::OUString("August");
+            sRet = OUString("August");
             break;
         case 9:
-            sRet = ::rtl::OUString("September");
+            sRet = OUString("September");
             break;
         case 10:
-            sRet = ::rtl::OUString("October");
+            sRet = OUString("October");
             break;
         case 11:
-            sRet = ::rtl::OUString("November");
+            sRet = OUString("November");
             break;
         case 12:
-            sRet = ::rtl::OUString("December");
+            sRet = OUString("December");
             break;
     }
     return sRet;
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 21a0d9dda5ec..79912f3ed308 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -62,31 +62,31 @@ void OFileDriver::disposing()
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString OFileDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString OFileDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.sdbc.driver.file.Driver");
+    return OUString("com.sun.star.sdbc.driver.file.Driver");
 }
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > OFileDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSNS( 2 );
-    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
-    aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver");
+    Sequence< OUString > aSNS( 2 );
+    aSNS[0] = OUString("com.sun.star.sdbc.Driver");
+    aSNS[1] = OUString("com.sun.star.sdbcx.Driver");
     return aSNS;
 }
 
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFileDriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL OFileDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
 //------------------------------------------------------------------
-sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -94,13 +94,13 @@ sal_Bool SAL_CALL OFileDriver::supportsService( const ::rtl::OUString& _rService
 }
 
 //------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OFileDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::connect" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -114,71 +114,71 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const ::rtl::OUString& u
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL OFileDriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url )
                 throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::acceptsURL" );
     return url.startsWith("sdbc:file:");
 }
 // --------------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getPropertyInfo" );
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBoolean(2);
-        aBoolean[0] = ::rtl::OUString("0");
-        aBoolean[1] = ::rtl::OUString("1");
+        Sequence< OUString > aBoolean(2);
+        aBoolean[0] = OUString("0");
+        aBoolean[1] = OUString("1");
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("CharSet")
-                ,::rtl::OUString("CharSet of the database.")
+                OUString("CharSet")
+                ,OUString("CharSet of the database.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("Extension")
-                ,::rtl::OUString("Extension of the file format.")
+                OUString("Extension")
+                ,OUString("Extension of the file format.")
                 ,sal_False
-                ,::rtl::OUString(".*")
-                ,Sequence< ::rtl::OUString >())
+                ,OUString(".*")
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ShowDeleted")
-                ,::rtl::OUString("Display inactive records.")
+                OUString("ShowDeleted")
+                ,OUString("Display inactive records.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("EnableSQL92Check")
-                ,::rtl::OUString("Use SQL92 naming constraints.")
+                OUString("EnableSQL92Check")
+                ,OUString("Use SQL92 naming constraints.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("UseRelativePath")
-                ,::rtl::OUString("Handle the connection url as relative path.")
+                OUString("UseRelativePath")
+                ,OUString("Handle the connection url as relative path.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("URL")
-                ,::rtl::OUString("The URL of the database document which is used to create an absolute path.")
+                OUString("URL")
+                ,OUString("The URL of the database document which is used to create an absolute path.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size());
     } // if ( acceptsURL(url) )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+        const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     } // if ( ! acceptsURL(url) )
     return Sequence< DriverPropertyInfo >();
@@ -226,13 +226,13 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection
 }
 
 // --------------------------------------------------------------------------------
-Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileDriver::getDataDefinitionByURL" );
     if ( ! acceptsURL(url) )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+        const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
         ::dbtools::throwGenericSQLException(sMessage ,*this);
     }
     return getDataDefinitionByConnection(connect(url,info));
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index 37307f6dd7ae..f63d4e0cfc86 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -95,7 +95,7 @@ void OPreparedStatement::disposing()
 
 }
 // -------------------------------------------------------------------------
-void OPreparedStatement::construct(const ::rtl::OUString& sql)  throw(SQLException, RuntimeException)
+void OPreparedStatement::construct(const OUString& sql)  throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::construct" );
     OStatement_Base::construct(sql);
@@ -191,7 +191,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate(  ) throw(SQLException, Run
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setString" );
     setParameter(parameterIndex,x);
@@ -337,7 +337,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
+void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObjectNull" );
     setNull(parameterIndex,sqlType);
@@ -349,9 +349,9 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OPreparedStatement::setObject" );
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
-        const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", ::rtl::OUString::valueOf(parameterIndex)
+                "$position$", OUString::valueOf(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
@@ -477,7 +477,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
     OSL_UNUSED( pMark );
 #endif
 
-    ::rtl::OUString sParameterName;
+    OUString sParameterName;
     // set up Parameter-Column:
     sal_Int32 eType = DataType::VARCHAR;
     sal_uInt32 nPrecision = 255;
@@ -497,9 +497,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
     }
 
     Reference<XPropertySet> xParaColumn = new connectivity::parse::OParseColumn(sParameterName
-                                                    ,::rtl::OUString()
-                                                    ,::rtl::OUString()
-                                                    ,::rtl::OUString()
+                                                    ,OUString()
+                                                    ,OUString()
+                                                    ,OUString()
                                                     ,nNullable
                                                     ,nPrecision
                                                     ,nScale
@@ -507,9 +507,9 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re
                                                     ,sal_False
                                                     ,sal_False
                                                     ,m_aSQLIterator.isCaseSensitive()
-                                                    ,::rtl::OUString()
-                                                    ,::rtl::OUString()
-                                                    ,::rtl::OUString());
+                                                    ,OUString()
+                                                    ,OUString()
+                                                    ,OUString());
     m_xParamColumns->get().push_back(xParaColumn);
     return m_xParamColumns->get().size();
 }
@@ -520,7 +520,7 @@ void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode
     Reference<XPropertySet> xProp;
     if(SQL_ISRULE(_pNode,column_ref))
     {
-        ::rtl::OUString sColumnName,sTableRange;
+        OUString sColumnName,sTableRange;
         m_aSQLIterator.getColumnRange(_pNode,sColumnName,sTableRange);
         if ( !sColumnName.isEmpty() )
         {
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 9e00758c66b6..14b195c056da 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -68,7 +68,7 @@ namespace
     void lcl_throwError(sal_uInt16 _nErrorId,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xContext)
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sMessage = aResources.getResourceString(_nErrorId);
+        const OUString sMessage = aResources.getResourceString(_nErrorId);
         ::dbtools::throwGenericSQLException(sMessage ,_xContext);
     }
 }
@@ -203,7 +203,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes(  ) throw(RuntimeException)
 }
 // -------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::findColumn" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -375,7 +375,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept
     return getValue(columnIndex);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::getString" );
     return getValue(columnIndex);
@@ -795,7 +795,7 @@ void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(
     updateValue(columnIndex,x);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException)
+void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSet::updateString" );
     updateValue(columnIndex,x);
@@ -1634,11 +1634,11 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
     ::comphelper::UStringMixEqual aCase(_xMetaData->supportsMixedCaseQuotedIdentifiers());
 
     Reference<XPropertySet> xTableColumn;
-    ::rtl::OUString sTableColumnName, sSelectColumnRealName;
+    OUString sTableColumnName, sSelectColumnRealName;
 
-    const ::rtl::OUString sName     = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
-    const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
-    const ::rtl::OUString sType     = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
+    const OUString sName     = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME);
+    const OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME);
+    const OUString sType     = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE);
 
     typedef ::std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap;
     IterMap aSelectIters;
@@ -1657,7 +1657,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
             if (xTableColumn.is())
                 xTableColumn->getPropertyValue(sName) >>= sTableColumnName;
             else
-                sTableColumnName = ::rtl::OUString();
+                sTableColumnName = OUString();
 
             // look if we have such a select column
             // TODO: would like to have a O(log n) search here ...
@@ -1703,7 +1703,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
     if ( _bSetColumnMapping && aSelectIters.size() != _rColMapping.size() )
     {
         Reference<XNameAccess> xNameAccess(_xNames,UNO_QUERY);
-        Sequence< ::rtl::OUString > aSelectColumns = xNameAccess->getElementNames();
+        Sequence< OUString > aSelectColumns = xNameAccess->getElementNames();
 
         for (   OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin();
                 aIter != _rxColumns->get().end();
@@ -1721,8 +1721,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow,
                 {
                     aSelectIters.insert(IterMap::value_type(aIter,sal_True));
                     sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1;
-                    const ::rtl::OUString* pBegin = aSelectColumns.getConstArray();
-                    const ::rtl::OUString* pEnd   = pBegin + aSelectColumns.getLength();
+                    const OUString* pBegin = aSelectColumns.getConstArray();
+                    const OUString* pEnd   = pBegin + aSelectColumns.getLength();
                     for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i)
                     {
                         if ( aCase(*pBegin, sSelectColumnRealName) )
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 42a1a2def4ee..8b015ed8bbda 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 // -------------------------------------------------------------------------
-OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const ::rtl::OUString& _aTableName,OFileTable* _pTable)
+OResultSetMetaData::OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns,const OUString& _aTableName,OFileTable* _pTable)
     :m_aTableName(_aTableName)
     ,m_xColumns(_rxColumns)
     ,m_pTable(_pTable)
@@ -86,14 +86,14 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getSchemaName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnName" );
     checkColumnIndex(column);
@@ -102,35 +102,35 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th
     return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getTableName" );
     return m_aTableName;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getCatalogName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnTypeName" );
     checkColumnIndex(column);
     return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME)));
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnLabel" );
     return getColumnName(column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnServiceName" );
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index 7d247247b7c7..af620b2875b2 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -82,7 +82,7 @@ OStatement_Base::OStatement_Base(OConnection* _pConnection )
 
     sal_Int32 nAttrib = 0;
 
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),      PROPERTY_ID_CURSORNAME,         nAttrib,&m_aCursorName,     ::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_CURSORNAME),      PROPERTY_ID_CURSORNAME,         nAttrib,&m_aCursorName,     ::getCppuType(static_cast< OUString*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXFIELDSIZE),    PROPERTY_ID_MAXFIELDSIZE,       nAttrib,&m_nMaxFieldSize,       ::getCppuType(static_cast<sal_Int32*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_MAXROWS),         PROPERTY_ID_MAXROWS,            nAttrib,&m_nMaxRows,        ::getCppuType(static_cast<sal_Int32*>(0)));
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_QUERYTIMEOUT),    PROPERTY_ID_QUERYTIMEOUT,       nAttrib,&m_nQueryTimeOut,   ::getCppuType(static_cast<sal_Int32*>(0)));
@@ -284,7 +284,7 @@ void SAL_CALL OStatement::release() throw()
 }
 // -----------------------------------------------------------------------------
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -295,7 +295,7 @@ sal_Bool SAL_CALL OStatement::execute( const ::rtl::OUString& sql ) throw(SQLExc
 
 // -------------------------------------------------------------------------
 
-Reference< XResultSet > SAL_CALL OStatement::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -317,7 +317,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection(  ) throw(SQLExcepti
     return (Reference< XConnection >)m_pConnection;
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OStatement::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OStatement_BASE::rBHelper.bDisposed);
@@ -398,7 +398,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
                                         OSQLParseNode* pAscendingDescending)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::setOrderbyColumn" );
-    ::rtl::OUString aColumnName;
+    OUString aColumnName;
     if (pColumnRef->count() == 1)
         aColumnName = pColumnRef->getChild(0)->getTokenValue();
     else if (pColumnRef->count() == 3)
@@ -427,10 +427,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef,
 }
 
 // -----------------------------------------------------------------------------
-void OStatement_Base::construct(const ::rtl::OUString& sql)  throw(SQLException, RuntimeException)
+void OStatement_Base::construct(const OUString& sql)  throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OStatement_Base::construct" );
-    ::rtl::OUString aErr;
+    OUString aErr;
     m_pParseTree = m_aParser.parseTree(aErr,sql);
     if(m_pParseTree)
     {
@@ -503,7 +503,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql)  throw(SQLException,
         anylizeSQL();
     }
     else
-        throw SQLException(aErr,*this,::rtl::OUString(),0,Any());
+        throw SQLException(aErr,*this,OUString(),0,Any());
 }
 // -----------------------------------------------------------------------------
 void OStatement_Base::createColumnMapping()
@@ -573,9 +573,9 @@ void OStatement_Base::GetAssignValues()
         OSL_ENSURE(SQL_ISRULE(pOptColumnCommalist,opt_column_commalist),"OResultSet: Fehler im Parse Tree");
         if (pOptColumnCommalist->count() == 0)
         {
-            const Sequence< ::rtl::OUString>& aNames = m_xColNames->getElementNames();
-            const ::rtl::OUString* pBegin = aNames.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + aNames.getLength();
+            const Sequence< OUString>& aNames = m_xColNames->getElementNames();
+            const OUString* pBegin = aNames.getConstArray();
+            const OUString* pEnd = pBegin + aNames.getLength();
             for (; pBegin != pEnd; ++pBegin)
                 aColumnNameList.push_back(*pBegin);
         }
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index e5283967814c..eb3e5c915c30 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -48,7 +48,7 @@ ORowSetValue OOp_Ascii::operate(const ORowSetValue& lhs) const
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOp_Ascii::operate" );
     if ( lhs.isNull() )
         return lhs;
-    ::rtl::OString sStr(::rtl::OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US));
+    OString sStr(OUStringToOString(lhs,RTL_TEXTENCODING_ASCII_US));
     sal_Int32 nAscii = sStr.toChar();
     return nAscii;
 }
@@ -68,7 +68,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
     if ( lhs.empty() )
         return ORowSetValue();
 
-    ::rtl::OUString sRet;
+    OUString sRet;
     ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin();
     ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
     for (; aIter != aEnd; ++aIter)
@@ -77,7 +77,7 @@ ORowSetValue OOp_Char::operate(const ::std::vector<ORowSetValue>& lhs) const
         {
             sal_Char c = static_cast<sal_Char>(static_cast<sal_Int32>(*aIter));
 
-            sRet += ::rtl::OUString(&c,1,RTL_TEXTENCODING_ASCII_US);
+            sRet += OUString(&c,1,RTL_TEXTENCODING_ASCII_US);
         }
     }
 
@@ -90,7 +90,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
     if ( lhs.empty() )
         return ORowSetValue();
 
-    ::rtl::OUStringBuffer sRet;
+    OUStringBuffer sRet;
     ::std::vector<ORowSetValue>::const_reverse_iterator aIter = lhs.rbegin();
     ::std::vector<ORowSetValue>::const_reverse_iterator aEnd = lhs.rend();
     for (; aIter != aEnd; ++aIter)
@@ -98,7 +98,7 @@ ORowSetValue OOp_Concat::operate(const ::std::vector<ORowSetValue>& lhs) const
         if ( aIter->isNull() )
             return ORowSetValue();
 
-        sRet.append(aIter->operator ::rtl::OUString());
+        sRet.append(aIter->operator OUString());
     }
 
     return sRet.makeStringAndClear();
@@ -115,7 +115,7 @@ ORowSetValue OOp_Locate::operate(const ::std::vector<ORowSetValue>& lhs) const
             return ORowSetValue();
     }
     if ( lhs.size() == 2 )
-        return ::rtl::OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1);
+        return OUString::valueOf(lhs[0].getString().indexOf(lhs[1].getString())+1);
 
     else if ( lhs.size() != 3 )
         return ORowSetValue();
@@ -148,8 +148,8 @@ ORowSetValue OOp_LTrim::operate(const ORowSetValue& lhs) const
     if ( lhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet = lhs;
-    ::rtl::OUString sNew = sRet.trim();
+    OUString sRet = lhs;
+    OUString sNew = sRet.trim();
     return sRet.copy(sRet.indexOf(sNew));
 }
 //------------------------------------------------------------------
@@ -159,8 +159,8 @@ ORowSetValue OOp_RTrim::operate(const ORowSetValue& lhs) const
     if ( lhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet = lhs;
-    ::rtl::OUString sNew = sRet.trim();
+    OUString sRet = lhs;
+    OUString sNew = sRet.trim();
     return sRet.copy(0,sRet.lastIndexOf(sNew.getStr()[sNew.getLength()-1])+1);
 }
 //------------------------------------------------------------------
@@ -171,7 +171,7 @@ ORowSetValue OOp_Space::operate(const ORowSetValue& lhs) const
         return lhs;
 
     const sal_Char c = ' ';
-    ::rtl::OUStringBuffer sRet;
+    OUStringBuffer sRet;
     sal_Int32 nCount = lhs;
     for (sal_Int32 i=0; i < nCount; ++i)
     {
@@ -186,9 +186,9 @@ ORowSetValue OOp_Replace::operate(const ::std::vector<ORowSetValue>& lhs) const
     if ( lhs.size() != 3 )
         return ORowSetValue();
 
-    ::rtl::OUString sStr  = lhs[2];
-    ::rtl::OUString sFrom = lhs[1];
-    ::rtl::OUString sTo   = lhs[0];
+    OUString sStr  = lhs[2];
+    OUString sFrom = lhs[1];
+    OUString sTo   = lhs[0];
     sal_Int32 nIndexOf = sStr.indexOf(sFrom);
     while( nIndexOf != -1 )
     {
@@ -205,7 +205,7 @@ ORowSetValue OOp_Repeat::operate(const ORowSetValue& lhs,const ORowSetValue& rhs
     if ( lhs.isNull() || rhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet;
+    OUString sRet;
     sal_Int32 nCount = rhs;
     for (sal_Int32 i=0; i < nCount; ++i)
     {
@@ -220,7 +220,7 @@ ORowSetValue OOp_Insert::operate(const ::std::vector<ORowSetValue>& lhs) const
     if ( lhs.size() != 4 )
         return ORowSetValue();
 
-    ::rtl::OUString sStr = lhs[3];
+    OUString sStr = lhs[3];
 
     sal_Int32 nStart = static_cast<sal_Int32>(lhs[2]);
     if ( nStart < 1 )
@@ -234,7 +234,7 @@ ORowSetValue OOp_Left::operate(const ORowSetValue& lhs,const ORowSetValue& rhs)
     if ( lhs.isNull() || rhs.isNull() )
         return lhs;
 
-    ::rtl::OUString sRet = lhs;
+    OUString sRet = lhs;
     sal_Int32 nCount = rhs;
     if ( nCount < 0 )
         return ORowSetValue();
@@ -248,7 +248,7 @@ ORowSetValue OOp_Right::operate(const ORowSetValue& lhs,const ORowSetValue& rhs)
         return lhs;
 
     sal_Int32 nCount = rhs;
-    ::rtl::OUString sRet = lhs;
+    OUString sRet = lhs;
     if ( nCount < 0 || nCount >= sRet.getLength() )
         return ORowSetValue();
 
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index 8dc2c7106544..3350d8babe92 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -55,11 +55,11 @@ OFileTable::OFileTable(sdbcx::OCollection* _pTables,OConnection* _pConnection)
 }
 // -------------------------------------------------------------------------
 OFileTable::OFileTable( sdbcx::OCollection* _pTables,OConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName
                 ) : OTable_TYPEDEF(_pTables,_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers(),
                                   _Name,
                                   _Type,
@@ -90,7 +90,7 @@ void OFileTable::refreshColumns()
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OFileTable::refreshColumns" );
     TStringVector aVector;
         Reference< XResultSet > xResult = m_pConnection->getMetaData()->getColumns(Any(),
-                                                    m_SchemaName,m_Name,::rtl::OUString("%"));
+                                                    m_SchemaName,m_Name,OUString("%"));
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index 78ff160ad042..cba822e2bb0f 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& /*_rName*/)
+sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/)
 {
     return sdbcx::ObjectType();
 }
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 5ef103f04202..d125c1eb5c9b 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -106,7 +106,7 @@ void OSQLAnalyzer::start(OSQLParseNode* pSQLParseNode)
                     {
                         // push one element for each column of our table
                         const Reference< XNameAccess > xColumnNames( m_aCompiler->getOrigColumns() );
-                        const Sequence< ::rtl::OUString > aColumnNames( xColumnNames->getElementNames() );
+                        const Sequence< OUString > aColumnNames( xColumnNames->getElementNames() );
                         for ( sal_Int32 j=0; j<aColumnNames.getLength(); ++j )
                             m_aSelectionEvaluations.push_back( TPredicates() );
                     }
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 1712d5a00918..894f31d29436 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -154,7 +154,7 @@ const ORowSetValue& OOperandValue::getValue() const
 }
 
 //------------------------------------------------------------------
-OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const rtl::OUString& aStrValue)
+OOperandConst::OOperandConst(const OSQLParseNode& rColumnRef, const OUString& aStrValue)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen@sun.com", "OOperandConst::OOperandConst" );
     switch (rColumnRef.getNodeType())
@@ -336,7 +336,7 @@ sal_Bool OOp_COMPARE::operate(const OOperand* pLeft, const OOperand* pRight) con
         case DataType::VARCHAR:
         case DataType::LONGVARCHAR:
         {
-            rtl::OUString sLH = aLH, sRH = aRH;
+            OUString sLH = aLH, sRH = aRH;
             sal_Int32 nRes = rtl_ustr_compareIgnoreAsciiCase_WithLength
                 (
                  sLH.pData->buffer,
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 5419402bf76e..5b395aebcbe2 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -428,7 +428,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
 
     if (SQL_ISRULE(pPredicateNode,column_ref))
     {
-        ::rtl::OUString aColumnName;
+        OUString aColumnName;
         if (pPredicateNode->count() == 1)
         {
             aColumnName = pPredicateNode->getChild(0)->getTokenValue();
@@ -443,7 +443,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
 
         if(!m_orgColumns->hasByName(aColumnName))
         {
-            const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution(
+            const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_INVALID_COLUMNNAME,
                     "$columnname$", aColumnName
                  ) );
@@ -458,7 +458,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
             }
             else
             {// Column doesn't exist in the Result-set
-                const ::rtl::OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution(
+                const OUString sError( m_pAnalyzer->getConnection()->getResources().getResourceStringWithSubstitution(
                     STR_INVALID_COLUMNNAME,
                     "$columnname$", aColumnName
                  ) );
@@ -488,7 +488,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
             (SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"+") || SQL_ISPUNCTUATION(pPredicateNode->getChild(0),"-")) &&
             pPredicateNode->getChild(1)->getNodeType() == SQL_NODE_INTNUM)
     { // if -1 or +1 is there
-        ::rtl::OUString aValue(pPredicateNode->getChild(0)->getTokenValue());
+        OUString aValue(pPredicateNode->getChild(0)->getTokenValue());
         aValue += pPredicateNode->getChild(1)->getTokenValue();
         pOperand = new OOperandConst(*pPredicateNode->getChild(1), aValue);
     }
@@ -503,7 +503,7 @@ OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) thr
             SQL_ISTOKEN(pODBCNodeChild,T) ||
             SQL_ISTOKEN(pODBCNodeChild,TS) ))
         {
-            ::rtl::OUString sDateTime = pODBCNode->getChild(1)->getTokenValue();
+            OUString sDateTime = pODBCNode->getChild(1)->getTokenValue();
             pOperand = new OOperandConst(*pODBCNode->getChild(1), sDateTime);
             if(SQL_ISTOKEN(pODBCNodeChild,D))
             {
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index b8d9c6bc03f2..2d199e0a9186 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -79,7 +79,7 @@ namespace connectivity
                 }
             }
         }
-        //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(::rtl::OUString(nTokCount))) ? (OUtoCStr(::rtl::OUString(nTokCount))):("NULL")) );
+        //OSL_TRACE("QuotedTokenizedString::nTokCount = %d\n", ((OUtoCStr(OUString(nTokCount))) ? (OUtoCStr(OUString(nTokCount))):("NULL")) );
 
         return nTokCount;
     }
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index 24b897b91bfa..397bf78d5dbb 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -40,9 +40,9 @@ OFlatCatalog::OFlatCatalog(OFlatConnection* _pCon) : file::OFileCatalog(_pCon)
 void OFlatCatalog::refreshTables()
 {
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes;
+    Sequence< OUString > aTypes;
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-        ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+        OUString("%"),OUString("%"),aTypes);
 
     if(xResult.is())
     {
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 4283627006b3..0772f65bb342 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 
 
-sdbcx::ObjectType OFlatColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OFlatColumns::createObject(const OUString& _rName)
 {
 
     OFlatTable* pTable = (OFlatTable*)m_pTable;
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index 8122f4cb0e58..c76d2d6751ae 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -59,7 +59,7 @@ OFlatConnection::~OFlatConnection()
 IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connection", "com.sun.star.sdbc.Connection")
 
 //-----------------------------------------------------------------------------
-void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
+void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)  throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -71,25 +71,25 @@ void OFlatConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
             OSL_VERIFY( pBegin->Value >>= m_bHeaderLine );
         else if(!pBegin->Name.compareToAscii("FieldDelimiter"))
         {
-            ::rtl::OUString aVal;
+            OUString aVal;
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cFieldDelimiter = aVal.toChar();
         }
         else if(!pBegin->Name.compareToAscii("StringDelimiter"))
         {
-            ::rtl::OUString aVal;
+            OUString aVal;
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cStringDelimiter = aVal.toChar();
         }
         else if(!pBegin->Name.compareToAscii("DecimalDelimiter"))
         {
-            ::rtl::OUString aVal;
+            OUString aVal;
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cDecimalDelimiter = aVal.toChar();
         }
         else if(!pBegin->Name.compareToAscii("ThousandDelimiter"))
         {
-            ::rtl::OUString aVal;
+            OUString aVal;
             OSL_VERIFY( pBegin->Value >>= aVal );
             m_cThousandDelimiter = aVal.toChar();
         }
@@ -145,7 +145,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement(  ) throw(SQLE
     return xStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
@@ -159,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons
     return xStmt;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const ::rtl::OUString& /*sql*/ ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(OConnection_B::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index d2ac25a18200..8a44c4949085 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -67,7 +67,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
         ODatabaseMetaDataResultSet::ORow aRow;
 
         aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
-        aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("CHAR")));
+        aRow.push_back(new ORowSetValueDecorator(OUString("CHAR")));
         aRow.push_back(new ORowSetValueDecorator(DataType::CHAR));
         aRow.push_back(new ORowSetValueDecorator((sal_Int32)254));
         aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -88,60 +88,60 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
 
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("VARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("VARCHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::VARCHAR);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("LONGVARCHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("LONGVARCHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::LONGVARCHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)65535);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DATE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)10);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIME);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)8);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+        aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
         aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)19);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRow[5] = ODatabaseMetaDataResultSet::getQuoteValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
         aRow[2] = new ORowSetValueDecorator(DataType::BIT);
         aRow[3] = ODatabaseMetaDataResultSet::get1Value();
         aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
         aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DOUBLE"));
+        aRow[1] = new ORowSetValueDecorator(OUString("DOUBLE"));
         aRow[2] = new ORowSetValueDecorator(DataType::DOUBLE);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = ODatabaseMetaDataResultSet::get0Value();
         aRows.push_back(aRow);
 
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("NUMERIC"));
+        aRow[1] = new ORowSetValueDecorator(OUString("NUMERIC"));
         aRow[2] = new ORowSetValueDecorator(DataType::NUMERIC);
         aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
         aRow[15] = new ORowSetValueDecorator((sal_Int32)20);
@@ -153,8 +153,8 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
-    const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern,
-        const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+    const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+        const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatDatabaseMetaData::getColumns" );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -170,9 +170,9 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
     ODatabaseMetaDataResultSet::ORows aRows;
     ODatabaseMetaDataResultSet::ORow aRow(19);
     aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
-    Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames());
-    const ::rtl::OUString* pTabBegin    = aTabNames.getConstArray();
-    const ::rtl::OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
+    Sequence< OUString> aTabNames(xNames->getElementNames());
+    const OUString* pTabBegin    = aTabNames.getConstArray();
+    const OUString* pTabEnd      = pTabBegin + aTabNames.getLength();
     for(;pTabBegin != pTabEnd;++pTabBegin)
     {
         if(match(tableNamePattern,*pTabBegin,'\0'))
@@ -185,10 +185,10 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
             if(!xColumns.is())
                 throw SQLException();
 
-            Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+            Sequence< OUString> aColNames(xColumns->getElementNames());
 
-            const ::rtl::OUString* pBegin = aColNames.getConstArray();
-            const ::rtl::OUString* pEnd = pBegin + aColNames.getLength();
+            const OUString* pBegin = aColNames.getConstArray();
+            const OUString* pEnd = pBegin + aColNames.getLength();
             Reference< XPropertySet> xColumn;
             for(sal_Int32 i=1;pBegin != pEnd;++pBegin,++i)
             {
@@ -221,13 +221,13 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
                     switch(sal_Int32(aRow[11]->getValue()))
                     {
                     case ColumnValue::NO_NULLS:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString("NO"));
+                        aRow[18]  = new ORowSetValueDecorator(OUString("NO"));
                         break;
                     case ColumnValue::NULLABLE:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString("YES"));
+                        aRow[18]  = new ORowSetValueDecorator(OUString("YES"));
                         break;
                     default:
-                        aRow[18]  = new ORowSetValueDecorator(::rtl::OUString());
+                        aRow[18]  = new ORowSetValueDecorator(OUString());
                     }
                     aRows.push_back(aRow);
                 }
@@ -242,11 +242,11 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns(
     return xRef;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFlatDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OFlatDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatDatabaseMetaData::getURL" );
     ::osl::MutexGuard aGuard( m_aMutex );
-    return ::rtl::OUString("sdbc:flat:") + m_pConnection->getURL();
+    return OUString("sdbc:flat:") + m_pConnection->getURL();
 }
 // -----------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 86bf8fe5ed27..d83e435216b7 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -37,13 +37,13 @@ using namespace ::com::sun::star::lang;
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString("com.sun.star.comp.sdbc.flat.ODriver");
+    return OUString("com.sun.star.comp.sdbc.flat.ODriver");
 }
 
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
@@ -54,7 +54,7 @@ rtl::OUString ODriver::getImplementationName_Static(  ) throw(RuntimeException)
     return *(new ODriver(_rxFactory));
 }
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     if (ODriver_BASE::rBHelper.bDisposed)
@@ -71,62 +71,62 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
     return xCon;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
                 throw(SQLException, RuntimeException)
 {
     return url.startsWith("sdbc:flat:");
 }
 // -----------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBoolean(2);
-        aBoolean[0] = ::rtl::OUString("0");
-        aBoolean[1] = ::rtl::OUString("1");
+        Sequence< OUString > aBoolean(2);
+        aBoolean[0] = OUString("0");
+        aBoolean[1] = OUString("1");
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("FieldDelimiter")
-                ,::rtl::OUString("Field separator.")
+                OUString("FieldDelimiter")
+                ,OUString("Field separator.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("HeaderLine")
-                ,::rtl::OUString("Text contains headers.")
+                OUString("HeaderLine")
+                ,OUString("Text contains headers.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("StringDelimiter")
-                ,::rtl::OUString("Text separator.")
+                OUString("StringDelimiter")
+                ,OUString("Text separator.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("DecimalDelimiter")
-                ,::rtl::OUString("Decimal separator.")
+                OUString("DecimalDelimiter")
+                ,OUString("Decimal separator.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ThousandDelimiter")
-                ,::rtl::OUString("Thousands separator.")
+                OUString("ThousandDelimiter")
+                ,OUString("Thousands separator.")
                 ,sal_False
-                ,::rtl::OUString("0")
+                ,OUString("0")
                 ,aBoolean)
                 );
         return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ),
                                              Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()));
     }
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+    const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 6bccb2cad31c..8e4f17c1b50f 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -43,24 +43,24 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE),         PROPERTY_ID_ISBOOKMARKABLE,       PropertyAttribute::READONLY,&m_bBookmarkable,                ::getBooleanCppuType());
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OFlatResultSet::getImplementationName(  ) throw ( RuntimeException)
+OUString SAL_CALL OFlatResultSet::getImplementationName(  ) throw ( RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.sdbcx.flat.ResultSet");
+    return OUString("com.sun.star.sdbcx.flat.ResultSet");
 }
 // -------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
+Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames(  ) throw( RuntimeException)
 {
-     Sequence< ::rtl::OUString > aSupported(2);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
-    aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+     Sequence< OUString > aSupported(2);
+    aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+    aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
     return aSupported;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL OFlatResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index 570dab66ec84..66398509f465 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -164,7 +164,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale)
             aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
         }
 
-        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],::rtl::OUString(),::rtl::OUString(),
+        sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,m_aTypeNames[i],OUString(),OUString(),
                                                 ColumnValue::NULLABLE,
                                                 m_aPrecisions[i],
                                                 m_aScales[i],
@@ -315,13 +315,13 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                 if(io_nPrecisions)
                 {
                     io_nType = DataType::DECIMAL;
-                    static const ::rtl::OUString s_sDECIMAL("DECIMAL");
+                    static const OUString s_sDECIMAL("DECIMAL");
                     o_sTypeName = s_sDECIMAL;
                 }
                 else
                 {
                     io_nType = DataType::DOUBLE;
-                    static const ::rtl::OUString s_sDOUBLE("DOUBLE");
+                    static const OUString s_sDOUBLE("DOUBLE");
                     o_sTypeName = s_sDOUBLE;
                 }
             }
@@ -340,21 +340,21 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                 case NUMBERFORMAT_DATE:
                     io_nType = DataType::DATE;
                     {
-                        static const ::rtl::OUString s_sDATE("DATE");
+                        static const OUString s_sDATE("DATE");
                         o_sTypeName = s_sDATE;
                     }
                     break;
                 case NUMBERFORMAT_DATETIME:
                     io_nType = DataType::TIMESTAMP;
                     {
-                        static const ::rtl::OUString s_sTIMESTAMP("TIMESTAMP");
+                        static const OUString s_sTIMESTAMP("TIMESTAMP");
                         o_sTypeName = s_sTIMESTAMP;
                     }
                     break;
                 case NUMBERFORMAT_TIME:
                     io_nType = DataType::TIME;
                     {
-                        static const ::rtl::OUString s_sTIME("TIME");
+                        static const OUString s_sTIME("TIME");
                         o_sTypeName = s_sTIME;
                     }
                     break;
@@ -363,7 +363,7 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
                     io_nPrecisions = 0; // nyi: Data can be longer!
                     io_nScales = 0;
                     {
-                        static const ::rtl::OUString s_sVARCHAR("VARCHAR");
+                        static const OUString s_sVARCHAR("VARCHAR");
                         o_sTypeName = s_sVARCHAR;
                     }
             };
@@ -390,11 +390,11 @@ void OFlatTable::impl_fillColumnInfo_nothrow(QuotedTokenizedString& aFirstLine,x
 }
 // -------------------------------------------------------------------------
 OFlatTable::OFlatTable(sdbcx::OCollection* _pTables,OFlatConnection* _pConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName
                 ) : OFlatTable_BASE(_pTables,_pConnection,_Name,
                                   _Type,
                                   _Description,
@@ -423,12 +423,12 @@ void OFlatTable::construct()
           UNO_QUERY_THROW);
     m_xNumberFormatter->attachNumberFormatsSupplier(xSupplier);
     Reference<XPropertySet> xProp(xSupplier->getNumberFormatSettings(),UNO_QUERY);
-    xProp->getPropertyValue(::rtl::OUString("NullDate")) >>= m_aNullDate;
+    xProp->getPropertyValue(OUString("NullDate")) >>= m_aNullDate;
 
     INetURLObject aURL;
     aURL.SetURL(getEntry());
 
-    if(aURL.getExtension() != rtl::OUString(m_pConnection->getExtension()))
+    if(aURL.getExtension() != OUString(m_pConnection->getExtension()))
         aURL.setExtension(m_pConnection->getExtension());
 
     String aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
@@ -458,17 +458,17 @@ void OFlatTable::construct()
 String OFlatTable::getEntry()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "flat", "Ocke.Janssen@sun.com", "OFlatTable::getEntry" );
-    ::rtl::OUString sURL;
+    OUString sURL;
     try
     {
         Reference< XResultSet > xDir = m_pConnection->getDir()->getStaticResultSet();
         Reference< XRow> xRow(xDir,UNO_QUERY);
-        ::rtl::OUString sName;
-        ::rtl::OUString sExt;
+        OUString sName;
+        OUString sExt;
 
         INetURLObject aURL;
         xDir->beforeFirst();
-        static const ::rtl::OUString s_sSeparator("/");
+        static const OUString s_sSeparator("/");
         while(xDir->next())
         {
             sName = xRow->getString(1);
@@ -483,7 +483,7 @@ String OFlatTable::getEntry()
             if ( m_pConnection->matchesExtension( sExt ) )
             {
                 if ( !sExt.isEmpty() )
-                    sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,::rtl::OUString());
+                    sName = sName.replaceAt(sName.getLength()-(sExt.getLength()+1),sExt.getLength()+1,OUString());
                 if ( sName == m_Name )
                 {
                     Reference< XContentAccess > xContentAccess( xDir, UNO_QUERY );
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index a791a2b65389..aee4095cb9ab 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -39,10 +39,10 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
 
-sdbcx::ObjectType OFlatTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName)
 {
     OFlatTable* pRet = new OFlatTable(this,(OFlatConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
-                                        _rName,::rtl::OUString("TABLE"));
+                                        _rName,OUString("TABLE"));
     sdbcx::ObjectType xRet = pRet;
     pRet->construct();
     return xRet;
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 7ef8a28e1cf6..b6b17955f3cd 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::flat;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 22f5a0057834..9c12e10e9fb2 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -41,11 +41,11 @@ OHCatalog::OHCatalog(const Reference< XConnection >& _xConnection) : sdbcx::OCat
 {
 }
 // -----------------------------------------------------------------------------
-void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject,TStringVector& _rNames)
+void OHCatalog::refreshObjects(const Sequence< OUString >& _sKindOfObject,TStringVector& _rNames)
 {
     Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
-                                                            ::rtl::OUString("%"),
-                                                            ::rtl::OUString("%"),
+                                                            OUString("%"),
+                                                            OUString("%"),
                                                             _sKindOfObject);
     fillNames(xResult,_rNames);
 }
@@ -53,10 +53,10 @@ void OHCatalog::refreshObjects(const Sequence< ::rtl::OUString >& _sKindOfObject
 void OHCatalog::refreshTables()
 {
     TStringVector aVector;
-    static const ::rtl::OUString s_sTableTypeView("VIEW");
-    static const ::rtl::OUString s_sTableTypeTable("TABLE");
+    static const OUString s_sTableTypeView("VIEW");
+    static const OUString s_sTableTypeTable("TABLE");
 
-    Sequence< ::rtl::OUString > sTableTypes(2);
+    Sequence< OUString > sTableTypes(2);
     sTableTypes[0] = s_sTableTypeView;
     sTableTypes[1] = s_sTableTypeTable;
 
@@ -70,8 +70,8 @@ void OHCatalog::refreshTables()
 // -------------------------------------------------------------------------
 void OHCatalog::refreshViews()
 {
-    Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString("VIEW");
+    Sequence< OUString > aTypes(1);
+    aTypes[0] = OUString("VIEW");
 
     sal_Bool bSupportsViews = sal_False;
     try
@@ -108,7 +108,7 @@ void OHCatalog::refreshUsers()
 {
     TStringVector aVector;
     Reference< XStatement > xStmt = m_xConnection->createStatement(  );
-    Reference< XResultSet >  xResult = xStmt->executeQuery(::rtl::OUString("select User from hsqldb.user group by User"));
+    Reference< XResultSet >  xResult = xStmt->executeQuery(OUString("select User from hsqldb.user group by User"));
     if ( xResult.is() )
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 44d815c4f43e..07e3fb47aecf 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -55,7 +55,7 @@ OHSQLColumn::OHSQLColumn(   sal_Bool    _bCase)
 // -------------------------------------------------------------------------
 void OHSQLColumn::construct()
 {
-    m_sAutoIncrement = ::rtl::OUString("IDENTITY");
+    m_sAutoIncrement = OUString("IDENTITY");
     registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
 }
 // -----------------------------------------------------------------------------
@@ -69,10 +69,10 @@ void OHSQLColumn::construct()
     return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0);
 }
 // -----------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames(  ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(1);
-    aSupported[0] = ::rtl::OUString("com.sun.star.sdbcx.Column");
+    Sequence< OUString > aSupported(1);
+    aSupported[0] = OUString("com.sun.star.sdbcx.Column");
 
     return aSupported;
 }
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 4fdbc0bb5a95..6d4577c40256 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -180,7 +180,7 @@ namespace connectivity { namespace hsqldb
                 if ( !m_bReadOnly )
                 {
                     Reference< XStatement > xStmt( m_xConnection->createStatement(), UNO_QUERY_THROW );
-                    xStmt->execute( ::rtl::OUString( "CHECKPOINT DEFRAG" ) );
+                    xStmt->execute( OUString( "CHECKPOINT DEFRAG" ) );
                 }
             }
 
@@ -208,7 +208,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const ::rtl::OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException)
+    Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException)
     {
         MethodGuard aGuard( *this );
 
@@ -220,7 +220,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const ::rtl::OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
+    Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
     {
         MethodGuard aGuard( *this );
 
@@ -231,7 +231,7 @@ namespace connectivity { namespace hsqldb
         if ( !_DocumentUI.is() )
         {
             ::connectivity::SharedResources aResources;
-            const ::rtl::OUString sError( aResources.getResourceString(STR_NO_DOCUMENTUI));
+            const OUString sError( aResources.getResourceString(STR_NO_DOCUMENTUI));
             throw IllegalArgumentException(
                 sError,
                 *this,
@@ -261,7 +261,7 @@ namespace connectivity { namespace hsqldb
         catch( const Exception& )
         {
             ::connectivity::SharedResources aResources;
-            const ::rtl::OUString sError( aResources.getResourceString(STR_NO_TABLE_CONTAINER));
+            const OUString sError( aResources.getResourceString(STR_NO_TABLE_CONTAINER));
             throw WrappedTargetException( sError ,*this, ::cppu::getCaughtException() );
         }
 
@@ -271,7 +271,7 @@ namespace connectivity { namespace hsqldb
 
     //TODO: resource
     // -------------------------------------------------------------------
-    void OHsqlConnection::impl_checkExistingTable_throw( const ::rtl::OUString& _rTableName )
+    void OHsqlConnection::impl_checkExistingTable_throw( const OUString& _rTableName )
     {
         bool bDoesExist = false;
         try
@@ -290,7 +290,7 @@ namespace connectivity { namespace hsqldb
         if ( !bDoesExist )
         {
             ::connectivity::SharedResources aResources;
-            const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+            const OUString sError( aResources.getResourceStringWithSubstitution(
                 STR_NO_TABLENAME,
                 "$tablename$", _rTableName
             ));
@@ -299,7 +299,7 @@ namespace connectivity { namespace hsqldb
     }
 
     // -------------------------------------------------------------------
-    bool OHsqlConnection::impl_isTextTable_nothrow( const ::rtl::OUString& _rTableName )
+    bool OHsqlConnection::impl_isTextTable_nothrow( const OUString& _rTableName )
     {
         bool bIsTextTable = false;
         try
@@ -308,11 +308,11 @@ namespace connectivity { namespace hsqldb
 
             // split the fully qualified name
             Reference< XDatabaseMetaData > xMetaData( xMe->getMetaData(), UNO_QUERY_THROW );
-            ::rtl::OUString sCatalog, sSchema, sName;
+            OUString sCatalog, sSchema, sName;
             ::dbtools::qualifiedNameComponents( xMetaData, _rTableName, sCatalog, sSchema, sName, ::dbtools::eComplete );
 
             // get the table information
-            ::rtl::OUStringBuffer sSQL;
+            OUStringBuffer sSQL;
             sSQL.appendAscii( "SELECT HSQLDB_TYPE FROM INFORMATION_SCHEMA.SYSTEM_TABLES" );
             HTools::appendTableFilterCrit( sSQL, sCatalog, sSchema, sName, true );
             sSQL.appendAscii( " AND TABLE_TYPE = 'TABLE'" );
@@ -323,7 +323,7 @@ namespace connectivity { namespace hsqldb
             if ( xTableHsqlType->next() )   // might not succeed in case of VIEWs
             {
                 Reference< XRow > xValueAccess( xTableHsqlType, UNO_QUERY_THROW );
-                ::rtl::OUString sTableType = xValueAccess->getString( 1 );
+                OUString sTableType = xValueAccess->getString( 1 );
                 bIsTextTable = sTableType == "TEXT";
             }
         }
@@ -347,18 +347,18 @@ namespace connectivity { namespace hsqldb
                 xProvider.set( GraphicProvider::create(m_xContext) );
 
             // assemble the image URL
-            ::rtl::OUStringBuffer aImageURL;
+            OUStringBuffer aImageURL;
             // load the graphic from the global graphic repository
             aImageURL.appendAscii( "private:graphicrepository/" );
             // the relative path within the images.zip
             aImageURL.appendAscii( "database/" );
             aImageURL.appendAscii( LINKED_TEXT_TABLE_IMAGE_RESOURCE );
             // the name of the graphic to use
-            ::rtl::OUString sImageURL( aImageURL.makeStringAndClear() );
+            OUString sImageURL( aImageURL.makeStringAndClear() );
 
             // ask the provider to obtain a graphic
             Sequence< PropertyValue > aMediaProperties( 1 );
-            aMediaProperties[0].Name = ::rtl::OUString( "URL" );
+            aMediaProperties[0].Name = OUString( "URL" );
             aMediaProperties[0].Value <<= sImageURL;
             xGraphic = xProvider->queryGraphic( aMediaProperties );
             OSL_ENSURE( xGraphic.is(), "OHsqlConnection::impl_getTextTableIcon_nothrow: the provider did not give us a graphic object!" );
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index 9126a81f9394..d296773404b8 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -131,7 +131,7 @@ namespace connectivity
     {
         if ( !m_xDriver.is() )
         {
-            ::rtl::OUString sURL("jdbc:hsqldb:db");
+            OUString sURL("jdbc:hsqldb:db");
             Reference<XDriverManager2> xDriverAccess = DriverManager::create( m_xContext );
             m_xDriver = xDriverAccess->getDriverByURL(sURL);
         }
@@ -142,23 +142,23 @@ namespace connectivity
     //--------------------------------------------------------------------
     namespace
     {
-        ::rtl::OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext )
+        OUString lcl_getPermittedJavaMethods_nothrow( const Reference< XComponentContext >& _rxContext )
         {
-            ::rtl::OUStringBuffer aConfigPath;
+            OUStringBuffer aConfigPath;
             aConfigPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
             aConfigPath.append     ( ODriverDelegator::getImplementationName_Static() );
             aConfigPath.appendAscii( "/PermittedJavaMethods" );
             ::utl::OConfigurationTreeRoot aConfig( ::utl::OConfigurationTreeRoot::createWithComponentContext(
                 _rxContext, aConfigPath.makeStringAndClear() ) );
 
-            ::rtl::OUStringBuffer aPermittedMethods;
-            Sequence< ::rtl::OUString > aNodeNames( aConfig.getNodeNames() );
-            for (   const ::rtl::OUString* pNodeNames = aNodeNames.getConstArray();
+            OUStringBuffer aPermittedMethods;
+            Sequence< OUString > aNodeNames( aConfig.getNodeNames() );
+            for (   const OUString* pNodeNames = aNodeNames.getConstArray();
                     pNodeNames != aNodeNames.getConstArray() + aNodeNames.getLength();
                     ++pNodeNames
                 )
             {
-                ::rtl::OUString sPermittedMethod;
+                OUString sPermittedMethod;
                 OSL_VERIFY( aConfig.getNodeValue( *pNodeNames ) >>= sPermittedMethod );
 
                 if ( !aPermittedMethods.isEmpty() )
@@ -171,7 +171,7 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
+    Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         Reference< XConnection > xConnection;
         if ( acceptsURL(url) )
@@ -179,7 +179,7 @@ namespace connectivity
             Reference< XDriver > xDriver = loadDriver();
             if ( xDriver.is() )
             {
-                ::rtl::OUString sURL;
+                OUString sURL;
                 Reference<XStorage> xStorage;
                 const PropertyValue* pIter = info.getConstArray();
                 const PropertyValue* pEnd = pIter + info.getLength();
@@ -199,17 +199,17 @@ namespace connectivity
                 if ( !xStorage.is() || sURL.isEmpty() )
                 {
                     ::connectivity::SharedResources aResources;
-                    const ::rtl::OUString sMessage = aResources.getResourceString(STR_NO_STROAGE);
+                    const OUString sMessage = aResources.getResourceString(STR_NO_STROAGE);
                     ::dbtools::throwGenericSQLException(sMessage ,*this);
                 }
 
-                ::rtl::OUString sSystemPath;
+                OUString sSystemPath;
                 osl_getSystemPathFromFileURL( sURL.pData, &sSystemPath.pData );
                 sal_Int32 nIndex = sSystemPath.lastIndexOf('.');
                 if ( sURL.isEmpty() || sSystemPath.isEmpty() )
                 {
                     ::connectivity::SharedResources aResources;
-                    const ::rtl::OUString sMessage = aResources.getResourceString(STR_INVALID_FILE_URL);
+                    const OUString sMessage = aResources.getResourceString(STR_INVALID_FILE_URL);
                     ::dbtools::throwGenericSQLException(sMessage ,*this);
                 }
 
@@ -218,19 +218,19 @@ namespace connectivity
                 ::comphelper::NamedValueCollection aProperties;
 
                 // properties for accessing the embedded storage
-                ::rtl::OUString sConnPartURL = sSystemPath.copy( 0, ::std::max< sal_Int32 >( nIndex, sSystemPath.getLength() ) );
-                ::rtl::OUString sKey = StorageContainer::registerStorage( xStorage, sConnPartURL );
+                OUString sConnPartURL = sSystemPath.copy( 0, ::std::max< sal_Int32 >( nIndex, sSystemPath.getLength() ) );
+                OUString sKey = StorageContainer::registerStorage( xStorage, sConnPartURL );
                 aProperties.put( "storage_key", sKey );
                 aProperties.put( "storage_class_name",
-                    ::rtl::OUString(  "com.sun.star.sdbcx.comp.hsqldb.StorageAccess"  ) );
+                    OUString(  "com.sun.star.sdbcx.comp.hsqldb.StorageAccess"  ) );
                 aProperties.put( "fileaccess_class_name",
-                    ::rtl::OUString(  "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess"  ) );
+                    OUString(  "com.sun.star.sdbcx.comp.hsqldb.StorageFileAccess"  ) );
 
                 // JDBC driver and driver's classpath
                 aProperties.put( "JavaDriverClass",
-                    ::rtl::OUString(  "org.hsqldb.jdbcDriver"  ) );
+                    OUString(  "org.hsqldb.jdbcDriver"  ) );
                 aProperties.put( "JavaDriverClassPath",
-                    ::rtl::OUString(
+                    OUString(
 #ifdef SYSTEM_HSQLDB
                         HSQLDB_JAR
                         " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar"
@@ -243,22 +243,22 @@ namespace connectivity
                 // auto increment handling
                 aProperties.put( "IsAutoRetrievingEnabled", true );
                 aProperties.put( "AutoRetrievingStatement",
-                    ::rtl::OUString(  "CALL IDENTITY()" ) );
+                    OUString(  "CALL IDENTITY()" ) );
                 aProperties.put( "IgnoreDriverPrivileges", true );
 
                 // don't want to expose HSQLDB's schema capabilities which exist since 1.8.0RC10
                 aProperties.put( "default_schema",
-                    ::rtl::OUString(  "true"  ) );
+                    OUString(  "true"  ) );
 
                 // security: permitted Java classes
                 NamedValue aPermittedClasses(
-                    ::rtl::OUString(  "hsqldb.method_class_names"  ),
+                    OUString(  "hsqldb.method_class_names"  ),
                     makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) )
                 );
                 aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) );
 
-                const ::rtl::OUString sProperties(  "properties"  );
-                ::rtl::OUString sMessage;
+                const OUString sProperties(  "properties"  );
+                OUString sMessage;
                 try
                 {
                     if ( !bIsNewDatabase && xStorage->isStreamElement(sProperties) )
@@ -269,14 +269,14 @@ namespace connectivity
                             ::std::auto_ptr<SvStream> pStream( ::utl::UcbStreamHelper::CreateStream(xStream) );
                             if ( pStream.get() )
                             {
-                                rtl::OString sLine;
-                                rtl::OString sVersionString;
+                                OString sLine;
+                                OString sVersionString;
                                 while ( pStream->ReadLine(sLine) )
                                 {
                                     if ( sLine.isEmpty() )
                                         continue;
-                                    const rtl::OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
-                                    const rtl::OString sValue = comphelper::string::getToken(sLine, 1, '=');
+                                    const OString sIniKey = comphelper::string::getToken(sLine, 0, '=');
+                                    const OString sValue = comphelper::string::getToken(sLine, 1, '=');
                                     if (sIniKey.equalsL(RTL_CONSTASCII_STRINGPARAM("hsqldb.compatible_version")))
                                     {
                                         sVersionString = sValue;
@@ -323,17 +323,17 @@ namespace connectivity
                 if ( xProp.is() )
                 {
                     sal_Int32 nMode = 0;
-                    xProp->getPropertyValue(::rtl::OUString("OpenMode")) >>= nMode;
+                    xProp->getPropertyValue(OUString("OpenMode")) >>= nMode;
                     if ( (nMode & ElementModes::WRITE) != ElementModes::WRITE )
                     {
-                        aProperties.put( "readonly", ::rtl::OUString(  "true"  ) );
+                        aProperties.put( "readonly", OUString(  "true"  ) );
                     }
                 }
 
                 Sequence< PropertyValue > aConnectionArgs;
                 aProperties >>= aConnectionArgs;
 
-                ::rtl::OUString sConnectURL("jdbc:hsqldb:");
+                OUString sConnectURL("jdbc:hsqldb:");
 
                 sConnectURL += sConnPartURL;
                 Reference<XConnection> xOrig;
@@ -395,7 +395,7 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const ::rtl::OUString& url ) throw (SQLException, RuntimeException)
+    sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException)
     {
         sal_Bool bEnabled = sal_False;
         OSL_VERIFY_EQUALS( jfw_getEnabled( &bEnabled ), JFW_E_NONE, "error in jfw_getEnabled" );
@@ -403,31 +403,31 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException)
+    Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException)
     {
         if ( !acceptsURL(url) )
             return Sequence< DriverPropertyInfo >();
         ::std::vector< DriverPropertyInfo > aDriverInfo;
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("Storage")
-                ,::rtl::OUString("Defines the storage where the database will be stored.")
+                OUString("Storage")
+                ,OUString("Defines the storage where the database will be stored.")
                 ,sal_True
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("URL")
-                ,::rtl::OUString("Defines the url of the data source.")
+                OUString("URL")
+                ,OUString("Defines the url of the data source.")
                 ,sal_True
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
                 );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("AutoRetrievingStatement")
-                ,::rtl::OUString("Defines the statement which will be executed to retrieve auto increment values.")
+                OUString("AutoRetrievingStatement")
+                ,OUString("Defines the statement which will be executed to retrieve auto increment values.")
                 ,sal_False
-                ,::rtl::OUString("CALL IDENTITY()")
-                ,Sequence< ::rtl::OUString >())
+                ,OUString("CALL IDENTITY()")
+                ,Sequence< OUString >())
                 );
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
@@ -471,12 +471,12 @@ namespace connectivity
     }
 
     //--------------------------------------------------------------------
-    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
+    Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException)
     {
         if ( ! acceptsURL(url) )
         {
             ::connectivity::SharedResources aResources;
-            const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+            const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
             ::dbtools::throwGenericSQLException(sMessage ,*this);
         }
 
@@ -486,37 +486,37 @@ namespace connectivity
     // XServiceInfo
     // --------------------------------------------------------------------------------
     //------------------------------------------------------------------------------
-    rtl::OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
+    OUString ODriverDelegator::getImplementationName_Static(  ) throw(RuntimeException)
     {
-        return rtl::OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
+        return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver");
     }
     //------------------------------------------------------------------------------
-    Sequence< ::rtl::OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+    Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static(  ) throw (RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSNS( 2 );
-        aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
-        aSNS[1] = ::rtl::OUString("com.sun.star.sdbcx.Driver");
+        Sequence< OUString > aSNS( 2 );
+        aSNS[0] = OUString("com.sun.star.sdbc.Driver");
+        aSNS[1] = OUString("com.sun.star.sdbcx.Driver");
         return aSNS;
     }
     //------------------------------------------------------------------
-    ::rtl::OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException)
+    OUString SAL_CALL ODriverDelegator::getImplementationName(  ) throw(RuntimeException)
     {
         return getImplementationName_Static();
     }
 
     //------------------------------------------------------------------
-    sal_Bool SAL_CALL ODriverDelegator::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+    sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
     {
-        Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-        const ::rtl::OUString* pSupported = aSupported.getConstArray();
-        const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+        Sequence< OUString > aSupported(getSupportedServiceNames());
+        const OUString* pSupported = aSupported.getConstArray();
+        const OUString* pEnd = pSupported + aSupported.getLength();
         for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
             ;
 
         return pSupported != pEnd;
     }
     //------------------------------------------------------------------
-    Sequence< ::rtl::OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException)
+    Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames(  ) throw(RuntimeException)
     {
         return getSupportedServiceNames_Static();
     }
@@ -539,12 +539,12 @@ namespace connectivity
                 Reference<XStatement> xStmt = _xConnection->createStatement();
                 if ( xStmt.is() )
                 {
-                    Reference<XResultSet> xRes(xStmt->executeQuery(::rtl::OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
+                    Reference<XResultSet> xRes(xStmt->executeQuery(OUString("SELECT COUNT(*) FROM INFORMATION_SCHEMA.SYSTEM_SESSIONS WHERE USER_NAME ='SA'")),UNO_QUERY);
                     Reference<XRow> xRow(xRes,UNO_QUERY);
                     if ( xRow.is() && xRes->next() )
                         bLastOne = xRow->getInt(1) == 1;
                     if ( bLastOne )
-                        xStmt->execute(::rtl::OUString("SHUTDOWN"));
+                        xStmt->execute(OUString("SHUTDOWN"));
                 }
             }
         }
@@ -582,9 +582,9 @@ namespace connectivity
             Reference< XStorage> xStorage(Source.Source,UNO_QUERY);
             if ( xStorage.is() )
             {
-                ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage);
+                OUString sKey = StorageContainer::getRegisteredKey(xStorage);
                 TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::o3tl::compose1(
-                                ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey)
+                                ::std::bind2nd(::std::equal_to< OUString >(),sKey)
                                 ,::o3tl::compose1(::o3tl::select1st<TWeakConnectionPair>(),::o3tl::select2nd< TWeakPair >())));
                 if ( i != m_aConnections.end() )
                     shutdownConnection(i);
@@ -632,11 +632,11 @@ namespace connectivity
         ::osl::MutexGuard aGuard(m_aMutex);
 
         Reference< XStorage> xStorage(aEvent.Source,UNO_QUERY);
-        ::rtl::OUString sKey = StorageContainer::getRegisteredKey(xStorage);
+        OUString sKey = StorageContainer::getRegisteredKey(xStorage);
         if ( !sKey.isEmpty() )
         {
             TWeakPairVector::iterator i = ::std::find_if(m_aConnections.begin(),m_aConnections.end(),::o3tl::compose1(
-                            ::std::bind2nd(::std::equal_to< ::rtl::OUString >(),sKey)
+                            ::std::bind2nd(::std::equal_to< OUString >(),sKey)
                             ,::o3tl::compose1(::o3tl::select1st<TWeakConnectionPair>(),::o3tl::select2nd< TWeakPair >())));
             OSL_ENSURE( i != m_aConnections.end(), "ODriverDelegator::preCommit: they're committing a storage which I do not know!" );
             if ( i != m_aConnections.end() )
@@ -649,7 +649,7 @@ namespace connectivity
                         Reference< XStatement> xStmt = xConnection->createStatement();
                         OSL_ENSURE( xStmt.is(), "ODriverDelegator::preCommit: no statement!" );
                         if ( xStmt.is() )
-                            xStmt->execute( ::rtl::OUString(  "SET WRITE_DELAY 0"  ) );
+                            xStmt->execute( OUString(  "SET WRITE_DELAY 0"  ) );
 
                         sal_Bool bPreviousAutoCommit = xConnection->getAutoCommit();
                         xConnection->setAutoCommit( sal_False );
@@ -657,7 +657,7 @@ namespace connectivity
                         xConnection->setAutoCommit( bPreviousAutoCommit );
 
                         if ( xStmt.is() )
-                            xStmt->execute( ::rtl::OUString(  "SET WRITE_DELAY 60"  ) );
+                            xStmt->execute( OUString(  "SET WRITE_DELAY 60"  ) );
                     }
                 }
                 catch(Exception&)
@@ -683,7 +683,7 @@ namespace connectivity
     namespace
     {
         //..............................................................
-        const sal_Char* lcl_getCollationForLocale( const ::rtl::OUString& _rLocaleString, bool _bAcceptCountryMismatch = false )
+        const sal_Char* lcl_getCollationForLocale( const OUString& _rLocaleString, bool _bAcceptCountryMismatch = false )
         {
             static const sal_Char* pTranslations[] =
             {
@@ -783,7 +783,7 @@ namespace connectivity
                 NULL, NULL
             };
 
-            ::rtl::OUString sLocaleString( _rLocaleString );
+            OUString sLocaleString( _rLocaleString );
             sal_Char nCompareTermination = 0;
 
             if ( _bAcceptCountryMismatch )
@@ -818,9 +818,9 @@ namespace connectivity
         }
 
         //..............................................................
-        ::rtl::OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext )
+        OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext )
         {
-            ::rtl::OUString sLocaleString = ::rtl::OUString(  "en-US"  );
+            OUString sLocaleString = OUString(  "en-US"  );
             try
             {
                 //.........................................................
@@ -831,13 +831,13 @@ namespace connectivity
                 // arguments for creating the config access
                 Sequence< Any > aArguments(2);
                 // the path to the node to open
-                ::rtl::OUString sNodePath("/org.openoffice.Setup/L10N" );
-                aArguments[0] <<= PropertyValue( ::rtl::OUString("nodepath"), 0,
+                OUString sNodePath("/org.openoffice.Setup/L10N" );
+                aArguments[0] <<= PropertyValue( OUString("nodepath"), 0,
                     makeAny( sNodePath ), PropertyState_DIRECT_VALUE
                 );
                 // the depth: -1 means unlimited
                 aArguments[1] <<= PropertyValue(
-                    ::rtl::OUString("depth"), 0,
+                    OUString("depth"), 0,
                     makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE
                 );
 
@@ -845,7 +845,7 @@ namespace connectivity
                 // create the access
                 Reference< XPropertySet > xNode(
                     xConfigProvider->createInstanceWithArguments(
-                        ::rtl::OUString("com.sun.star.configuration.ConfigurationAccess"),
+                        OUString("com.sun.star.configuration.ConfigurationAccess"),
                         aArguments ),
                     UNO_QUERY );
                 OSL_ENSURE( xNode.is(), "lcl_getSystemLocale: invalid access returned (should throw an exception instead)!" );
@@ -853,7 +853,7 @@ namespace connectivity
                 //.........................................................
                 // ask for the system locale setting
                 if ( xNode.is() )
-                    xNode->getPropertyValue( ::rtl::OUString(  "ooSetupSystemLocale"  ) ) >>= sLocaleString;
+                    xNode->getPropertyValue( OUString(  "ooSetupSystemLocale"  ) ) >>= sLocaleString;
             }
             catch( const Exception& )
             {
@@ -877,7 +877,7 @@ namespace connectivity
             OSL_ENSURE( xStatement.is(), "ODriverDelegator::onConnectedNewDatabase: could not create a statement!" );
             if ( xStatement.is() )
             {
-                ::rtl::OUStringBuffer aStatement;
+                OUStringBuffer aStatement;
                 aStatement.appendAscii( "SET DATABASE COLLATION \"" );
                 aStatement.appendAscii( lcl_getCollationForLocale( lcl_getSystemLocale( m_xContext ) ) );
                 aStatement.appendAscii( "\"" );
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index 125681bbe860..91dd98ee21fd 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -67,8 +67,8 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAcc
 {
 #ifdef HSQLDB_DBG
     {
-        ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key);
-        ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name);
+        OUString sKey = StorageContainer::jstring2ustring(env,key);
+        OUString sName = StorageContainer::jstring2ustring(env,name);
     }
 #endif
     ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
@@ -213,8 +213,8 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js
     OSL_UNUSED( logger );
 #ifdef HSQLDB_DBG
     {
-        ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key);
-        ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name);
+        OUString sKey = StorageContainer::jstring2ustring(env,key);
+        OUString sName = StorageContainer::jstring2ustring(env,name);
     }
 #endif
     ::boost::shared_ptr<StreamHelper> pHelper = StorageContainer::getRegisteredStream(env,name,key);
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index b7309b852cbc..75f804e93df6 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -107,20 +107,20 @@ namespace connectivity
             return s_aMap;
         }
         // -----------------------------------------------------------------------------
-        ::rtl::OUString lcl_getNextCount()
+        OUString lcl_getNextCount()
         {
             static sal_Int32 s_nCount = 0;
-            return ::rtl::OUString::valueOf(s_nCount++);
+            return OUString::valueOf(s_nCount++);
         }
         // -----------------------------------------------------------------------------
-        ::rtl::OUString StorageContainer::removeURLPrefix(const ::rtl::OUString& _sURL,const ::rtl::OUString& _sFileURL)
+        OUString StorageContainer::removeURLPrefix(const OUString& _sURL,const OUString& _sFileURL)
         {
             return _sURL.copy(_sFileURL.getLength()+1);
         }
         // -----------------------------------------------------------------------------
-        ::rtl::OUString StorageContainer::removeOldURLPrefix(const ::rtl::OUString& _sURL)
+        OUString StorageContainer::removeOldURLPrefix(const OUString& _sURL)
         {
-            ::rtl::OUString sRet = _sURL;
+            OUString sRet = _sURL;
 #if defined(WNT)
             sal_Int32 nIndex = sRet.lastIndexOf('\\');
 #else
@@ -136,20 +136,20 @@ namespace connectivity
         /*****************************************************************************/
         /* convert jstring to rtl_uString */
 
-        ::rtl::OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr)
+        OUString StorageContainer::jstring2ustring(JNIEnv * env, jstring jstr)
         {
             if (JNI_FALSE != env->ExceptionCheck())
             {
                 env->ExceptionClear();
                 OSL_FAIL("ExceptionClear");
             }
-            ::rtl::OUString aStr;
+            OUString aStr;
             if ( jstr )
             {
                 jboolean bCopy(sal_True);
                 const jchar* pChar = env->GetStringChars(jstr,&bCopy);
                 jsize len = env->GetStringLength(jstr);
-                aStr = ::rtl::OUString(pChar,len);
+                aStr = OUString(pChar,len);
 
                 if(bCopy)
                     env->ReleaseStringChars(jstr,pChar);
@@ -164,7 +164,7 @@ namespace connectivity
         }
 
         // -----------------------------------------------------------------------------
-        ::rtl::OUString StorageContainer::registerStorage(const Reference< XStorage>& _xStorage,const ::rtl::OUString& _sURL)
+        OUString StorageContainer::registerStorage(const Reference< XStorage>& _xStorage,const OUString& _sURL)
         {
             OSL_ENSURE(_xStorage.is(),"Storage is NULL!");
             TStorages& rMap = lcl_getStorageMap();
@@ -182,7 +182,7 @@ namespace connectivity
             return aFind->first;
         }
         // -----------------------------------------------------------------------------
-        TStorages::mapped_type StorageContainer::getRegisteredStorage(const ::rtl::OUString& _sKey)
+        TStorages::mapped_type StorageContainer::getRegisteredStorage(const OUString& _sKey)
         {
             TStorages::mapped_type aRet;
             TStorages& rMap = lcl_getStorageMap();
@@ -194,9 +194,9 @@ namespace connectivity
             return aRet;
         }
         // -----------------------------------------------------------------------------
-        ::rtl::OUString StorageContainer::getRegisteredKey(const Reference< XStorage>& _xStorage)
+        OUString StorageContainer::getRegisteredKey(const Reference< XStorage>& _xStorage)
         {
-            ::rtl::OUString sKey;
+            OUString sKey;
             OSL_ENSURE(_xStorage.is(),"Storage is NULL!");
             TStorages& rMap = lcl_getStorageMap();
             // check if the storage is already in our map
@@ -210,7 +210,7 @@ namespace connectivity
             return sKey;
         }
         // -----------------------------------------------------------------------------
-        void StorageContainer::revokeStorage(const ::rtl::OUString& _sKey,const Reference<XTransactionListener>& _xListener)
+        void StorageContainer::revokeStorage(const OUString& _sKey,const Reference<XTransactionListener>& _xListener)
         {
             TStorages& rMap = lcl_getStorageMap();
             TStorages::iterator aFind = rMap.find(_sKey);
@@ -239,7 +239,7 @@ namespace connectivity
         {
             TStreamMap::mapped_type pHelper;
             TStorages& rMap = lcl_getStorageMap();
-            ::rtl::OUString sKey = jstring2ustring(env,key);
+            OUString sKey = jstring2ustring(env,key);
             TStorages::iterator aFind = rMap.find(sKey);
             OSL_ENSURE(aFind != rMap.end(),"Storage could not be found in list!");
             if ( aFind != rMap.end() )
@@ -248,8 +248,8 @@ namespace connectivity
                 OSL_ENSURE(aStoragePair.first.first.is(),"No Storage available!");
                 if ( aStoragePair.first.first.is() )
                 {
-                    ::rtl::OUString sOrgName = StorageContainer::jstring2ustring(env,name);
-                    ::rtl::OUString sName = removeURLPrefix(sOrgName,aStoragePair.first.second);
+                    OUString sOrgName = StorageContainer::jstring2ustring(env,name);
+                    OUString sName = removeURLPrefix(sOrgName,aStoragePair.first.second);
                     TStreamMap::iterator aStreamFind = aFind->second.second.find(sName);
                     OSL_ENSURE( aStreamFind == aFind->second.second.end(),"A Stream was already registered for this object!");
                     if ( aStreamFind != aFind->second.second.end() )
@@ -266,7 +266,7 @@ namespace connectivity
                             }
                             catch(const Exception&)
                             {
-                                ::rtl::OUString sStrippedName = removeOldURLPrefix(sOrgName);
+                                OUString sStrippedName = removeOldURLPrefix(sOrgName);
 
                                 if ( ((_nMode & ElementModes::WRITE) != ElementModes::WRITE ) )
                                 {
@@ -289,13 +289,13 @@ namespace connectivity
                         catch(const Exception& e)
                         {
 #if OSL_DEBUG_LEVEL > 0
-                            ::rtl::OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" );
+                            OString sMessage( "[HSQLDB-SDBC] caught an exception while opening a stream\n" );
                             sMessage += "Name: ";
-                            sMessage += ::rtl::OString( sName.getStr(), sName.getLength(), osl_getThreadTextEncoding() );
+                            sMessage += OString( sName.getStr(), sName.getLength(), osl_getThreadTextEncoding() );
                             sMessage += "\nMode: 0x";
                             if ( _nMode < 16 )
                                 sMessage += "0";
-                            sMessage += ::rtl::OString::valueOf( _nMode, 16 ).toAsciiUpperCase();
+                            sMessage += OString::valueOf( _nMode, 16 ).toAsciiUpperCase();
                             OSL_FAIL( sMessage.getStr() );
 #endif
                             StorageContainer::throwJavaException(e,env);
@@ -335,7 +335,7 @@ namespace connectivity
         {
             if (JNI_FALSE != env->ExceptionCheck())
                 env->ExceptionClear();
-            ::rtl::OString cstr( ::rtl::OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
+            OString cstr( OUStringToOString(_aException.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
             OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
             env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr());
         }
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index 5bb035620b59..13b636fc645e 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -73,11 +73,11 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
 // -------------------------------------------------------------------------
 OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables,
                            const Reference< XConnection >& _xConnection,
-                    const ::rtl::OUString& _Name,
-                    const ::rtl::OUString& _Type,
-                    const ::rtl::OUString& _Description ,
-                    const ::rtl::OUString& _SchemaName,
-                    const ::rtl::OUString& _CatalogName,
+                    const OUString& _Name,
+                    const OUString& _Type,
+                    const OUString& _Description ,
+                    const OUString& _SchemaName,
+                    const OUString& _CatalogName,
                     sal_Int32 _nPrivileges
                 ) : OTableHelper(   _pTables,
                                     _xConnection,
@@ -151,7 +151,7 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
 }
 // -------------------------------------------------------------------------
 // XAlterTable
-void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
+void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -173,7 +173,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con
         m_pColumns->getByName(colName) >>= xProp;
         // first check the types
         sal_Int32 nOldType = 0,nNewType = 0,nOldPrec = 0,nNewPrec = 0,nOldScale = 0,nNewScale = 0;
-        ::rtl::OUString sOldTypeName, sNewTypeName;
+        OUString sOldTypeName, sNewTypeName;
 
         ::dbtools::OPropertyMap& rProp = OMetaConnection::getPropMap();
 
@@ -200,17 +200,17 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con
         descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement;
 
         // now we should look if the name of the column changed
-        ::rtl::OUString sNewColumnName;
+        OUString sNewColumnName;
         descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName;
         if ( !sNewColumnName.equals(colName) )
         {
-            const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
+            const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
 
-            ::rtl::OUString sSql = getAlterTableColumnPart();
-            sSql += ::rtl::OUString(" ALTER COLUMN ");
+            OUString sSql = getAlterTableColumnPart();
+            sSql += OUString(" ALTER COLUMN ");
             sSql += ::dbtools::quoteName(sQuote,colName);
 
-            sSql += ::rtl::OUString(" RENAME TO ");
+            sSql += OUString(" RENAME TO ");
             sSql += ::dbtools::quoteName(sQuote,sNewColumnName);
 
             executeStatement(sSql);
@@ -233,7 +233,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con
         }
 
         // third: check the default values
-        ::rtl::OUString sNewDefault,sOldDefault;
+        OUString sNewDefault,sOldDefault;
         xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE))     >>= sOldDefault;
         descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault;
 
@@ -259,15 +259,15 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con
 
 }
 // -----------------------------------------------------------------------------
-void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
+void OHSQLTable::alterColumnType(sal_Int32 nNewType,const OUString& _rColName, const Reference<XPropertySet>& _xDescriptor)
 {
-    ::rtl::OUString sSql = getAlterTableColumnPart();
+    OUString sSql = getAlterTableColumnPart();
 
-    sSql += ::rtl::OUString(" ALTER COLUMN ");
+    sSql += OUString(" ALTER COLUMN ");
 #if OSL_DEBUG_LEVEL > 0
     try
     {
-        ::rtl::OUString sDescriptorName;
+        OUString sDescriptorName;
         OSL_ENSURE( _xDescriptor.is()
                 &&  ( _xDescriptor->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sDescriptorName )
                 &&  ( sDescriptorName == _rColName ),
@@ -290,46 +290,46 @@ void OHSQLTable::alterColumnType(sal_Int32 nNewType,const ::rtl::OUString& _rCol
     executeStatement(sSql);
 }
 // -----------------------------------------------------------------------------
-void OHSQLTable::alterDefaultValue(const ::rtl::OUString& _sNewDefault,const ::rtl::OUString& _rColName)
+void OHSQLTable::alterDefaultValue(const OUString& _sNewDefault,const OUString& _rColName)
 {
-    ::rtl::OUString sSql = getAlterTableColumnPart();
-    sSql += ::rtl::OUString(" ALTER COLUMN ");
+    OUString sSql = getAlterTableColumnPart();
+    sSql += OUString(" ALTER COLUMN ");
 
-    const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
+    const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
     sSql += ::dbtools::quoteName(sQuote,_rColName);
-    sSql += ::rtl::OUString(" SET DEFAULT '") + _sNewDefault;
-    sSql += ::rtl::OUString("'");
+    sSql += OUString(" SET DEFAULT '") + _sNewDefault;
+    sSql += OUString("'");
 
     executeStatement(sSql);
 }
 // -----------------------------------------------------------------------------
-void OHSQLTable::dropDefaultValue(const ::rtl::OUString& _rColName)
+void OHSQLTable::dropDefaultValue(const OUString& _rColName)
 {
-    ::rtl::OUString sSql = getAlterTableColumnPart();
-    sSql += ::rtl::OUString(" ALTER COLUMN ");
+    OUString sSql = getAlterTableColumnPart();
+    sSql += OUString(" ALTER COLUMN ");
 
-    const ::rtl::OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
+    const OUString sQuote = getMetaData()->getIdentifierQuoteString(  );
     sSql += ::dbtools::quoteName(sQuote,_rColName);
-    sSql += ::rtl::OUString(" DROP DEFAULT");
+    sSql += OUString(" DROP DEFAULT");
 
     executeStatement(sSql);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OHSQLTable::getAlterTableColumnPart()
+OUString OHSQLTable::getAlterTableColumnPart()
 {
-    ::rtl::OUString sSql(  "ALTER TABLE " );
+    OUString sSql(  "ALTER TABLE " );
 
-    ::rtl::OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) );
+    OUString sComposedName( ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInTableDefinitions ) );
     sSql += sComposedName;
 
     return sSql;
 }
 // -----------------------------------------------------------------------------
-void OHSQLTable::executeStatement(const ::rtl::OUString& _rStatement )
+void OHSQLTable::executeStatement(const OUString& _rStatement )
 {
-    ::rtl::OUString sSQL = _rStatement;
+    OUString sSQL = _rStatement;
     if(sSQL.lastIndexOf(',') == (sSQL.getLength()-1))
-        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,::rtl::OUString(")"));
+        sSQL = sSQL.replaceAt(sSQL.getLength()-1,1,OUString(")"));
 
     Reference< XStatement > xStmt = getConnection()->createStatement(  );
     if ( xStmt.is() )
@@ -367,7 +367,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes(  ) throw(RuntimeException)
 }
 // -------------------------------------------------------------------------
 // XRename
-void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
+void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(
@@ -380,19 +380,19 @@ void SAL_CALL OHSQLTable::rename( const ::rtl::OUString& newName ) throw(SQLExce
 
     if(!isNew())
     {
-        ::rtl::OUString sSql = ::rtl::OUString("ALTER ");
-        if ( m_Type == ::rtl::OUString("VIEW") )
-            sSql += ::rtl::OUString(" VIEW ");
+        OUString sSql = OUString("ALTER ");
+        if ( m_Type == OUString("VIEW") )
+            sSql += OUString(" VIEW ");
         else
-            sSql += ::rtl::OUString(" TABLE ");
+            sSql += OUString(" TABLE ");
 
-        ::rtl::OUString sCatalog,sSchema,sTable;
+        OUString sCatalog,sSchema,sTable;
         ::dbtools::qualifiedNameComponents(getMetaData(),newName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-        ::rtl::OUString sComposedName(
+        OUString sComposedName(
             ::dbtools::composeTableName( getMetaData(), m_CatalogName, m_SchemaName, m_Name, sal_True, ::dbtools::eInDataManipulation ) );
         sSql += sComposedName
-            + ::rtl::OUString(" RENAME TO ");
+            + OUString(" RENAME TO ");
         sSql += ::dbtools::composeTableName( getMetaData(), sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation );
 
         executeStatement(sSql);
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index 7ca0aab0c609..a68f24a44aa0 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -46,16 +46,16 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace dbtools;
 
-sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OTables::createObject(const OUString& _rName)
 {
-    ::rtl::OUString sCatalog,sSchema,sTable;
+    OUString sCatalog,sSchema,sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData,_rName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-    static const ::rtl::OUString s_sTableTypeView("VIEW");
-    static const ::rtl::OUString s_sTableTypeTable("TABLE");
-    static const ::rtl::OUString s_sAll("%");
+    static const OUString s_sTableTypeView("VIEW");
+    static const OUString s_sTableTypeTable("TABLE");
+    static const OUString s_sAll("%");
 
-    Sequence< ::rtl::OUString > sTableTypes(3);
+    Sequence< OUString > sTableTypes(3);
     sTableTypes[0] = s_sTableTypeView;
     sTableTypes[1] = s_sTableTypeTable;
     sTableTypes[2] = s_sAll;    // just to be sure to include anything else ....
@@ -109,14 +109,14 @@ Reference< XPropertySet > OTables::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OTables::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OTables::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createTable(descriptor);
     return createObject( _rForName );
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
+void OTables::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
     Reference< XInterface > xObject( getObject( _nPos ) );
     sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
@@ -125,19 +125,19 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
         Reference< XConnection > xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
 
 
-        ::rtl::OUString sCatalog,sSchema,sTable;
+        OUString sCatalog,sSchema,sTable;
         ::dbtools::qualifiedNameComponents(m_xMetaData,_sElementName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
 
-        ::rtl::OUString aSql(  "DROP " );
+        OUString aSql(  "DROP " );
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         sal_Bool bIsView;
-        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == ::rtl::OUString("VIEW")))) // here we have a view
-            aSql += ::rtl::OUString("VIEW ");
+        if((bIsView = (xProp.is() && ::comphelper::getString(xProp->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))) == OUString("VIEW")))) // here we have a view
+            aSql += OUString("VIEW ");
         else
-            aSql += ::rtl::OUString("TABLE ");
+            aSql += OUString("TABLE ");
 
-        ::rtl::OUString sComposedName(
+        OUString sComposedName(
             ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInDataManipulation ) );
         aSql += sComposedName;
         Reference< XStatement > xStmt = xConnection->createStatement(  );
@@ -159,7 +159,7 @@ void OTables::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName)
 void OTables::createTable( const Reference< XPropertySet >& descriptor )
 {
     Reference< XConnection > xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
-    ::rtl::OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,xConnection);
+    OUString aSql = ::dbtools::createSqlCreateTableStatement(descriptor,xConnection);
 
     Reference< XStatement > xStmt = xConnection->createStatement(  );
     if ( xStmt.is() )
@@ -169,7 +169,7 @@ void OTables::createTable( const Reference< XPropertySet >& descriptor )
     }
 }
 // -----------------------------------------------------------------------------
-void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
+void OTables::appendNew(const OUString& _rsNewTable)
 {
     insertElement(_rsNewTable,NULL);
 
@@ -180,7 +180,7 @@ void OTables::appendNew(const ::rtl::OUString& _rsNewTable)
         static_cast<XContainerListener*>(aListenerLoop.next())->elementInserted(aEvent);
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
+OUString OTables::getNameForObject(const sdbcx::ObjectType& _xObject)
 {
     OSL_ENSURE(_xObject.is(),"OTables::getNameForObject: Object is NULL!");
     return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false );
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index c674c64a3fea..0a24620a25b2 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -26,8 +26,8 @@ namespace connectivity { namespace hsqldb
     //= HTools
     //====================================================================
     //--------------------------------------------------------------------
-    void HTools::appendTableFilterCrit( ::rtl::OUStringBuffer& _inout_rBuffer, const ::rtl::OUString& _rCatalog,
-        const ::rtl::OUString _rSchema, const ::rtl::OUString _rName, bool _bShortForm )
+    void HTools::appendTableFilterCrit( OUStringBuffer& _inout_rBuffer, const OUString& _rCatalog,
+        const OUString _rSchema, const OUString _rName, bool _bShortForm )
     {
         _inout_rBuffer.appendAscii( " WHERE " );
         if ( !_rCatalog.isEmpty() )
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index daa4a307240b..8d3a7fa0d681 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -43,7 +43,7 @@ OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star
 }
 // -------------------------------------------------------------------------
 OHSQLUser::OHSQLUser(   const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,
-                const ::rtl::OUString& _Name
+                const OUString& _Name
             ) : connectivity::sdbcx::OUser(_Name,sal_True)
                 ,m_xConnection(_xConnection)
 {
@@ -61,7 +61,7 @@ OUserExtend::OUserExtend(   const ::com::sun::star::uno::Reference< ::com::sun::
 // -------------------------------------------------------------------------
 void OUserExtend::construct()
 {
-    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< ::rtl::OUString*>(0)));
+    registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD),    PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(static_cast< OUString*>(0)));
 }
 // -----------------------------------------------------------------------------
 cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const
@@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper()
 }
 typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER;
 // -----------------------------------------------------------------------------
-sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -87,12 +87,12 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const ::rtl::OUString& objName, sal
     return nRights;
 }
 // -----------------------------------------------------------------------------
-void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
+void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException)
 {
     nRightsWithGrant = nRights = 0;
     // first we need to create the sql stmt to select the privs
     Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
-    ::rtl::OUString sCatalog,sSchema,sTable;
+    OUString sCatalog,sSchema,sTable;
     ::dbtools::qualifiedNameComponents(xMeta,objName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
     Reference<XResultSet> xRes;
     switch(objType)
@@ -112,32 +112,32 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName,
                 Any aCatalog;
                 if ( !sCatalog.isEmpty() )
                     aCatalog <<= sCatalog;
-                xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,::rtl::OUString("%"));
+                xRes = xMeta->getColumnPrivileges(aCatalog,sSchema,sTable,OUString("%"));
             }
             break;
     }
 
     if ( xRes.is() )
     {
-        static const ::rtl::OUString sSELECT(  "SELECT" );
-        static const ::rtl::OUString sINSERT(  "INSERT" );
-        static const ::rtl::OUString sUPDATE(  "UPDATE" );
-        static const ::rtl::OUString sDELETE(  "DELETE" );
-        static const ::rtl::OUString sREAD(  "READ" );
-        static const ::rtl::OUString sCREATE(  "CREATE" );
-        static const ::rtl::OUString sALTER(  "ALTER" );
-        static const ::rtl::OUString sREFERENCE(  "REFERENCE" );
-        static const ::rtl::OUString sDROP(  "DROP" );
-        static const ::rtl::OUString sYes(  "YES" );
+        static const OUString sSELECT(  "SELECT" );
+        static const OUString sINSERT(  "INSERT" );
+        static const OUString sUPDATE(  "UPDATE" );
+        static const OUString sDELETE(  "DELETE" );
+        static const OUString sREAD(  "READ" );
+        static const OUString sCREATE(  "CREATE" );
+        static const OUString sALTER(  "ALTER" );
+        static const OUString sREFERENCE(  "REFERENCE" );
+        static const OUString sDROP(  "DROP" );
+        static const OUString sYes(  "YES" );
 
         nRightsWithGrant = nRights = 0;
 
         Reference<XRow> xCurrentRow(xRes,UNO_QUERY);
         while( xCurrentRow.is() && xRes->next() )
         {
-            ::rtl::OUString sGrantee    = xCurrentRow->getString(5);
-            ::rtl::OUString sPrivilege  = xCurrentRow->getString(6);
-            ::rtl::OUString sGrantable  = xCurrentRow->getString(7);
+            OUString sGrantee    = xCurrentRow->getString(5);
+            OUString sPrivilege  = xCurrentRow->getString(6);
+            OUString sGrantable  = xCurrentRow->getString(7);
 
             if (!m_Name.equalsIgnoreAsciiCase(sGrantee))
                 continue;
@@ -201,7 +201,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName,
     }
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
@@ -211,28 +211,28 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& obj
     return nRightsWithGrant;
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED));
+        const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED));
         ::dbtools::throwGenericSQLException(sError,*this);
     } // if ( objType != PrivilegeObject::TABLE )
 
 
     ::osl::MutexGuard aGuard(m_aMutex);
 
-    ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
+    OUString sPrivs = getPrivilegeString(objPrivileges);
     if(!sPrivs.isEmpty())
     {
-        ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString("GRANT ");
+        OUString sGrant;
+        sGrant += OUString("GRANT ");
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString(" ON ");
+        sGrant += OUString(" ON ");
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString(" TO ");
+        sGrant += OUString(" TO ");
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -242,27 +242,27 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In
     }
 }
 // -------------------------------------------------------------------------
-void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
+void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException)
 {
     if ( objType != PrivilegeObject::TABLE )
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED));
+        const OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_REVOKED));
         ::dbtools::throwGenericSQLException(sError,*this);
     } // if ( objType != PrivilegeObject::TABLE )
 
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
-    ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
+    OUString sPrivs = getPrivilegeString(objPrivileges);
     if(!sPrivs.isEmpty())
     {
-        ::rtl::OUString sGrant;
-        sGrant += ::rtl::OUString("REVOKE ");
+        OUString sGrant;
+        sGrant += OUString("REVOKE ");
         sGrant += sPrivs;
-        sGrant += ::rtl::OUString(" ON ");
+        sGrant += OUString(" ON ");
         Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
         sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation);
-        sGrant += ::rtl::OUString(" FROM ");
+        sGrant += OUString(" FROM ");
         sGrant += m_Name;
 
         Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -273,16 +273,16 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I
 }
 // -----------------------------------------------------------------------------
 // XUser
-void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException)
+void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
-    ::rtl::OUString sAlterPwd;
-    sAlterPwd = ::rtl::OUString("SET PASSWORD FOR ");
+    OUString sAlterPwd;
+    sAlterPwd = OUString("SET PASSWORD FOR ");
     sAlterPwd += m_Name;
-    sAlterPwd += ::rtl::OUString("@\"%\" = PASSWORD('") ;
+    sAlterPwd += OUString("@\"%\" = PASSWORD('") ;
     sAlterPwd += newPassword;
-    sAlterPwd += ::rtl::OUString("')") ;
+    sAlterPwd += OUString("')") ;
 
 
     Reference<XStatement> xStmt = m_xConnection->createStatement();
@@ -293,45 +293,45 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/,
     }
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const
+OUString OHSQLUser::getPrivilegeString(sal_Int32 nRights) const
 {
-    ::rtl::OUString sPrivs;
+    OUString sPrivs;
     if((nRights & Privilege::INSERT) == Privilege::INSERT)
-        sPrivs += ::rtl::OUString("INSERT");
+        sPrivs += OUString("INSERT");
 
     if((nRights & Privilege::DELETE) == Privilege::DELETE)
     {
         if(!sPrivs.isEmpty())
-            sPrivs += ::rtl::OUString(",");
-        sPrivs += ::rtl::OUString("DELETE");
+            sPrivs += OUString(",");
+        sPrivs += OUString("DELETE");
     }
 
     if((nRights & Privilege::UPDATE) == Privilege::UPDATE)
     {
         if(!sPrivs.isEmpty())
-            sPrivs += ::rtl::OUString(",");
-        sPrivs += ::rtl::OUString("UPDATE");
+            sPrivs += OUString(",");
+        sPrivs += OUString("UPDATE");
     }
 
     if((nRights & Privilege::ALTER) == Privilege::ALTER)
     {
         if(!sPrivs.isEmpty())
-            sPrivs += ::rtl::OUString(",");
-        sPrivs += ::rtl::OUString("ALTER");
+            sPrivs += OUString(",");
+        sPrivs += OUString("ALTER");
     }
 
     if((nRights & Privilege::SELECT) == Privilege::SELECT)
     {
         if(!sPrivs.isEmpty())
-            sPrivs += ::rtl::OUString(",");
-        sPrivs += ::rtl::OUString("SELECT");
+            sPrivs += OUString(",");
+        sPrivs += OUString("SELECT");
     }
 
     if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE)
     {
         if(!sPrivs.isEmpty())
-            sPrivs += ::rtl::OUString(",");
-        sPrivs += ::rtl::OUString("REFERENCES");
+            sPrivs += OUString(",");
+        sPrivs += OUString("REFERENCES");
     }
 
     return sPrivs;
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 405657d3cf74..609b87504cf7 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -49,7 +49,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent,
 }
 // -----------------------------------------------------------------------------
 
-sdbcx::ObjectType OUsers::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OUsers::createObject(const OUString& _rName)
 {
     return new OHSQLUser(m_xConnection,_rName);
 }
@@ -66,20 +66,20 @@ Reference< XPropertySet > OUsers::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType OUsers::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    ::rtl::OUString aSql(  "GRANT USAGE ON * TO " );
-    ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
-    ::rtl::OUString sUserName( _rForName );
+    OUString aSql(  "GRANT USAGE ON * TO " );
+    OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
+    OUString sUserName( _rForName );
     aSql += ::dbtools::quoteName(aQuote,sUserName)
-                + ::rtl::OUString(" @\"%\" ");
-    ::rtl::OUString sPassword;
+                + OUString(" @\"%\" ");
+    OUString sPassword;
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD)) >>= sPassword;
     if ( !sPassword.isEmpty() )
     {
-        aSql += ::rtl::OUString(" IDENTIFIED BY '");
+        aSql += OUString(" IDENTIFIED BY '");
         aSql += sPassword;
-        aSql += ::rtl::OUString("'");
+        aSql += OUString("'");
     }
 
     Reference< XStatement > xStmt = m_xConnection->createStatement(  );
@@ -91,11 +91,11 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const
 }
 // -------------------------------------------------------------------------
 // XDrop
-void OUsers::dropObject(sal_Int32 /*nPos*/,const ::rtl::OUString _sElementName)
+void OUsers::dropObject(sal_Int32 /*nPos*/,const OUString _sElementName)
 {
     {
-        ::rtl::OUString aSql(  "REVOKE ALL ON * FROM " );
-        ::rtl::OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
+        OUString aSql(  "REVOKE ALL ON * FROM " );
+        OUString aQuote  = m_xConnection->getMetaData()->getIdentifierQuoteString(  );
         aSql += ::dbtools::quoteName(aQuote,_sElementName);
 
         Reference< XStatement > xStmt = m_xConnection->createStatement(  );
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index 9074f600ca92..dc640e16c588 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -60,8 +60,8 @@ namespace connectivity { namespace hsqldb
     //====================================================================
     //--------------------------------------------------------------------
     HView::HView( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive,
-        const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName )
-        :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, ::rtl::OUString() )
+        const OUString& _rSchemaName, const OUString& _rName )
+        :HView_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, OUString() )
         ,m_xConnection( _rxConnection )
     {
     }
@@ -76,7 +76,7 @@ namespace connectivity { namespace hsqldb
     IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE )
 
     //--------------------------------------------------------------------
-    void SAL_CALL HView::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException)
+    void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException)
     {
         // not really atomic ... as long as we do not have something like
         //   ALTER VIEW <name> TO <command>
@@ -90,25 +90,25 @@ namespace connectivity { namespace hsqldb
         // However, there's not much chance to prevent this kind of errors without
         // backend support.
 
-        ::rtl::OUString sQualifiedName( ::dbtools::composeTableName(
+        OUString sQualifiedName( ::dbtools::composeTableName(
             m_xMetaData, m_CatalogName, m_SchemaName, m_Name, true, ::dbtools::eInDataManipulation ) );
 
         ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
 
         // create a statement which can be used to re-create the original view, in case
         // dropping it succeeds, but creating it with a new statement fails
-        ::rtl::OUStringBuffer aRestoreCommand;
+        OUStringBuffer aRestoreCommand;
         aRestoreCommand.appendAscii( "CREATE VIEW " );
         aRestoreCommand.append     ( sQualifiedName );
         aRestoreCommand.appendAscii( " AS " );
         aRestoreCommand.append     ( impl_getCommand_throw( true ) );
-        ::rtl::OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
+        OUString sRestoreCommand( aRestoreCommand.makeStringAndClear() );
 
         bool bDropSucceeded( false );
         try
         {
             // drop the existing view
-            ::rtl::OUStringBuffer aCommand;
+            OUStringBuffer aCommand;
             aCommand.appendAscii( "DROP VIEW " );
             aCommand.append     ( sQualifiedName );
             xStatement->execute( aCommand.makeStringAndClear() );
@@ -158,13 +158,13 @@ namespace connectivity { namespace hsqldb
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString HView::impl_getCommand_throw( bool _bAllowSQLException ) const
+    OUString HView::impl_getCommand_throw( bool _bAllowSQLException ) const
     {
-        ::rtl::OUString sCommand;
+        OUString sCommand;
 
         try
         {
-            ::rtl::OUStringBuffer aCommand;
+            OUStringBuffer aCommand;
             aCommand.appendAscii( "SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.SYSTEM_VIEWS " );
             HTools::appendTableFilterCrit( aCommand, m_CatalogName, m_SchemaName, m_Name, false );
             ::utl::SharedUNOComponent< XStatement > xStatement; xStatement.set( m_xConnection->createStatement(), UNO_QUERY_THROW );
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 1da4d9a32336..265981fda0ff 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -60,9 +60,9 @@ HViews::HViews( const Reference< XConnection >& _rxConnection, ::cppu::OWeakObje
 }
 
 // -------------------------------------------------------------------------
-sdbcx::ObjectType HViews::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType HViews::createObject(const OUString& _rName)
 {
-    ::rtl::OUString sCatalog,sSchema,sTable;
+    OUString sCatalog,sSchema,sTable;
     ::dbtools::qualifiedNameComponents(m_xMetaData,
                                         _rName,
                                         sCatalog,
@@ -92,14 +92,14 @@ Reference< XPropertySet > HViews::createDescriptor()
 }
 // -------------------------------------------------------------------------
 // XAppend
-sdbcx::ObjectType HViews::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor )
+sdbcx::ObjectType HViews::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
     createView(descriptor);
     return createObject( _rForName );
 }
 // -------------------------------------------------------------------------
 // XDrop
-void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
+void HViews::dropObject(sal_Int32 _nPos,const OUString /*_sElementName*/)
 {
     if ( m_bInDrop )
         return;
@@ -108,7 +108,7 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
     sal_Bool bIsNew = connectivity::sdbcx::ODescriptor::isNew( xObject );
     if (!bIsNew)
     {
-        ::rtl::OUString aSql(  "DROP VIEW" );
+        OUString aSql(  "DROP VIEW" );
 
         Reference<XPropertySet> xProp(xObject,UNO_QUERY);
         aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true );
@@ -120,7 +120,7 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/)
     }
 }
 // -----------------------------------------------------------------------------
-void HViews::dropByNameImpl(const ::rtl::OUString& elementName)
+void HViews::dropByNameImpl(const OUString& elementName)
 {
     m_bInDrop = sal_True;
     OCollection_TYPE::dropByName(elementName);
@@ -131,12 +131,12 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
 {
     Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection();
 
-    ::rtl::OUString aSql(  "CREATE VIEW " );
-    ::rtl::OUString sCommand;
+    OUString aSql(  "CREATE VIEW " );
+    OUString sCommand;
 
     aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true );
 
-    aSql += ::rtl::OUString(" AS ");
+    aSql += OUString(" AS ");
     descriptor->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_COMMAND)) >>= sCommand;
     aSql += sCommand;
 
@@ -151,7 +151,7 @@ void HViews::createView( const Reference< XPropertySet >& descriptor )
     OTables* pTables = static_cast<OTables*>(static_cast<OHCatalog&>(m_rParent).getPrivateTables());
     if ( pTables )
     {
-        ::rtl::OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false );
+        OUString sName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInDataManipulation, false, false, false );
         pTables->appendNew(sName);
     }
 }
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index 0a7ef5b2c048..a043185a682e 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::hsqldb;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 05c5556814ba..a579ce6be60f 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -48,10 +48,10 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA
     {
         try
         {
-            ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name);
+            OUString sName = StorageContainer::jstring2ustring(env,name);
             try
             {
-                ::rtl::OUString sOldName = StorageContainer::removeOldURLPrefix(sName);
+                OUString sOldName = StorageContainer::removeOldURLPrefix(sName);
                 if ( aStoragePair.first.first->isStreamElement(sOldName) )
                 {
                     try
@@ -79,7 +79,7 @@ SAL_JNI_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileA
             OSL_FAIL("Exception caught! : Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement");
             if (JNI_FALSE != env->ExceptionCheck())
                 env->ExceptionClear();
-            ::rtl::OString cstr( ::rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
+            OString cstr( OUStringToOString(e.Message, RTL_TEXTENCODING_JAVA_UTF8 ) );
             OSL_TRACE( __FILE__": forwarding Exception: %s", cstr.getStr() );
         }
     }
@@ -97,8 +97,8 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces
 {
 #ifdef HSQLDB_DBG
     {
-        ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key);
-        ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name);
+        OUString sKey = StorageContainer::jstring2ustring(env,key);
+        OUString sName = StorageContainer::jstring2ustring(env,name);
     }
 #endif
     TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key));
@@ -132,9 +132,9 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces
 {
 #ifdef HSQLDB_DBG
     {
-        ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key);
-        ::rtl::OUString sNewName = StorageContainer::jstring2ustring(env,newname);
-        ::rtl::OUString sOldName = StorageContainer::jstring2ustring(env,oldname);
+        OUString sKey = StorageContainer::jstring2ustring(env,key);
+        OUString sNewName = StorageContainer::jstring2ustring(env,newname);
+        OUString sOldName = StorageContainer::jstring2ustring(env,oldname);
     }
 #endif
     TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key));
@@ -148,7 +148,7 @@ SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAcces
             );
 #ifdef HSQLDB_DBG
             {
-                ::rtl::OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second);
+                OUString sNewName = StorageContainer::removeURLPrefix(StorageContainer::jstring2ustring(env,newname),aStoragePair.first.second);
                 OSL_ENSURE(aStoragePair.first.first->isStreamElement(sNewName),"Stream could not be renamed");
             }
 #endif
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 61295b3c1a4e..9a878d445a4c 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -168,8 +168,8 @@ extern "C" SAL_JNI_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_Stora
 #ifdef HSQLDB_DBG
     OperationLogFile( env, name, "output" ).logOperation( "flush" );
 
-    ::rtl::OUString sKey = StorageContainer::jstring2ustring(env,key);
-    ::rtl::OUString sName = StorageContainer::jstring2ustring(env,name);
+    OUString sKey = StorageContainer::jstring2ustring(env,key);
+    OUString sName = StorageContainer::jstring2ustring(env,name);
 #endif
 }
 // -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx
index bb0a279743cf..075a32d1bd8f 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -37,8 +37,8 @@ namespace connectivity { namespace hsqldb
     LogFile::LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
     {
         m_sFileName = StorageContainer::jstring2ustring(env,streamName);
-        m_sFileName += ::rtl::OUString(".");
-        m_sFileName += ::rtl::OUString::createFromAscii( _pAsciiSuffix );
+        m_sFileName += OUString(".");
+        m_sFileName += OUString::createFromAscii( _pAsciiSuffix );
     }
 
     //---------------------------------------------------------------------
@@ -47,7 +47,7 @@ namespace connectivity { namespace hsqldb
         FILE*& pLogFile = getStreams()[m_sFileName];
         if ( !pLogFile )
         {
-            ::rtl::OString sByteLogName = ::rtl::OUStringToOString(m_sFileName,osl_getThreadTextEncoding());
+            OString sByteLogName = OUStringToOString(m_sFileName,osl_getThreadTextEncoding());
             pLogFile = fopen( sByteLogName.getStr(), "a+" );
         }
         return pLogFile;
diff --git a/connectivity/source/drivers/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx
index d836bfa38943..8175ac56370f 100644
--- a/connectivity/source/drivers/hsqldb/accesslog.hxx
+++ b/connectivity/source/drivers/hsqldb/accesslog.hxx
@@ -32,7 +32,7 @@ namespace connectivity { namespace hsqldb
     class LogFile
     {
     private:
-        ::rtl::OUString     m_sFileName;
+        OUString     m_sFileName;
 
     public:
         LogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix );
@@ -50,7 +50,7 @@ namespace connectivity { namespace hsqldb
     {
     public:
         OperationLogFile( JNIEnv* env, jstring streamName, const sal_Char* _pAsciiSuffix )
-            :LogFile( env, streamName, ( ::rtl::OString( _pAsciiSuffix ) += ".op" ).getStr() )
+            :LogFile( env, streamName, ( OString( _pAsciiSuffix ) += ".op" ).getStr() )
         {
         }
 
@@ -61,24 +61,24 @@ namespace connectivity { namespace hsqldb
 
         void logOperation( const sal_Char* _pOp, jlong _nLongArg )
         {
-            ::rtl::OString sLine( _pOp );
+            OString sLine( _pOp );
             sLine += "( ";
-            sLine += ::rtl::OString::valueOf( _nLongArg );
+            sLine += OString::valueOf( _nLongArg );
             sLine += " )";
             writeString( sLine.getStr(), true );
         }
 
         void logReturn( jlong _nRetVal )
         {
-            ::rtl::OString sLine( " -> " );
-            sLine += ::rtl::OString::valueOf( _nRetVal );
+            OString sLine( " -> " );
+            sLine += OString::valueOf( _nRetVal );
             writeString( sLine.getStr(), true );
         }
 
         void logReturn( jint _nRetVal )
         {
-            ::rtl::OString sLine( " -> " );
-            sLine += ::rtl::OString::valueOf( _nRetVal );
+            OString sLine( " -> " );
+            sLine += OString::valueOf( _nRetVal );
             writeString( sLine.getStr(), true );
         }
 
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index d1e9cbd1a5a8..d5c71fa8d4fc 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -40,7 +40,7 @@ jclass java_sql_Array::getMyClass() const
     return theClass;
 }
 
-::rtl::OUString SAL_CALL java_sql_Array::getBaseTypeName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL java_sql_Array::getBaseTypeName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     static jmethodID mID(NULL);
     return callStringMethod("getBaseTypeName",mID);
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 73de2c931c32..7ab349f3e1fa 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -43,7 +43,7 @@ IMPLEMENT_SERVICE_INFO(java_sql_CallableStatement,"com.sun.star.sdbcx.ACallableS
 //**************************************************************
 //************ Class: java.sql.CallableStatement
 //**************************************************************
-java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const ::rtl::OUString& sql )
+java_sql_CallableStatement::java_sql_CallableStatement( JNIEnv * pEnv, java_sql_Connection& _rCon,const OUString& sql )
     : java_sql_PreparedStatement( pEnv, _rCon, sql )
 {
 }
@@ -167,7 +167,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex )
     return callMethodWithIntArg<jshort>(pCallMethod,"getShort","(I)S",mID,columnIndex);
 }
 
-::rtl::OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException)
+OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(starsdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -197,7 +197,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex )
     return out ? static_cast <com::sun::star::util::DateTime> (java_sql_Timestamp( t.pEnv, out )) : ::com::sun::star::util::DateTime();
 }
 
-void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(starsdbc::SQLException, RuntimeException)
+void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(starsdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index ec19bb5cd61b..5d03bd3448da 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -39,13 +39,13 @@ jclass java_lang_Class::getMyClass() const
     return theClass;
 }
 
-java_lang_Class * java_lang_Class::forName( const ::rtl::OUString& _par0 )
+java_lang_Class * java_lang_Class::forName( const OUString& _par0 )
 {
     jobject out(NULL);
     SDBThreadAttach t;
 
     {
-        ::rtl::OString sClassName = ::rtl::OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
+        OString sClassName = OUStringToOString(_par0, RTL_TEXTENCODING_JAVA_UTF8);
         sClassName = sClassName.replace('.','/');
         out = t.pEnv->FindClass(sClassName.getStr());
         ThrowSQLException(t.pEnv,0);
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index fd781de276e8..d707c572ca69 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -67,11 +67,11 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLEx
     return (sal_Int64)out;
 }
 
-::rtl::OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::getSubString" );
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
-    ::rtl::OUString aStr;
+    OUString aStr;
     {
         // initialize temporary variable
         static const char * cSignature = "(JI)Ljava/lang/String;";
@@ -98,7 +98,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length(  ) throw(::com::sun::star::sdbc::SQLEx
     return out==0 ? 0 : new java_io_Reader( t.pEnv, out );
 }
 
-sal_Int64 SAL_CALL java_sql_Clob::position( const ::rtl::OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_Clob::position" );
     jlong out(0);
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 4f0b748c8c49..550db58ec1ec 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -83,34 +83,34 @@ namespace comphelper { namespace log { namespace convert
     using ::com::sun::star::util::DateTime;
 
     //--------------------------------------------------------------------
-    ::rtl::OUString convertLogArgToString( const Date& _rDate )
+    OUString convertLogArgToString( const Date& _rDate )
     {
         char buffer[ 30 ];
         const size_t buffer_size = sizeof( buffer );
         snprintf( buffer, buffer_size, "%04i-%02i-%02i",
             (int)_rDate.Year, (int)_rDate.Month, (int)_rDate.Day );
-        return ::rtl::OUString::createFromAscii( buffer );
+        return OUString::createFromAscii( buffer );
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString convertLogArgToString( const Time& _rTime )
+    OUString convertLogArgToString( const Time& _rTime )
     {
         char buffer[ 30 ];
         const size_t buffer_size = sizeof( buffer );
         snprintf( buffer, buffer_size, "%02i:%02i:%02i.%02i",
             (int)_rTime.Hours, (int)_rTime.Minutes, (int)_rTime.Seconds, (int)_rTime.HundredthSeconds );
-        return ::rtl::OUString::createFromAscii( buffer );
+        return OUString::createFromAscii( buffer );
     }
 
     //--------------------------------------------------------------------
-    ::rtl::OUString convertLogArgToString( const DateTime& _rDateTime )
+    OUString convertLogArgToString( const DateTime& _rDateTime )
     {
         char buffer[ 30 ];
         const size_t buffer_size = sizeof( buffer );
         snprintf( buffer, buffer_size, "%04i-%02i-%02i %02i:%02i:%02i.%02i",
             (int)_rDateTime.Year, (int)_rDateTime.Month, (int)_rDateTime.Day,
             (int)_rDateTime.Hours, (int)_rDateTime.Minutes, (int)_rDateTime.Seconds, (int)_rDateTime.HundredthSeconds );
-        return ::rtl::OUString::createFromAscii( buffer );
+        return OUString::createFromAscii( buffer );
     }
 
 //........................................................................
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 61722dd1df4d..ce6d2fd00c4e 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -80,7 +80,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs(  ) thro
     return impl_callResultSetMethod( "getCatalogs", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw(  )
+OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getCatalogSeparator", mID );
@@ -93,14 +93,14 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas(  ) throw
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
-        const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern );
@@ -108,7 +108,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns(
 
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
-        const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& _types ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException)
 {
     static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/String;)Ljava/sql/ResultSet;";
     static const char * cMethodName = "getTables";
@@ -131,7 +131,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
         {
             jobjectArray pObjArray = static_cast< jobjectArray >( t.pEnv->NewObjectArray( (jsize)typeFilterCount, java_lang_String::st_getMyClass(), 0 ) );
             OSL_VERIFY_RES( !isExceptionOccurred( t.pEnv, sal_True ), "Exception occurred!" );
-            const ::rtl::OUString* typeFilter = _types.getConstArray();
+            const OUString* typeFilter = _types.getConstArray();
             bool bIncludeAllTypes = false;
             for ( sal_Int32 i=0; i<typeFilterCount; ++i, ++typeFilter )
             {
@@ -222,21 +222,21 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns(
-        const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any&
-                catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
+                catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table );
@@ -315,28 +315,28 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw(  )
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table,
+        const Any& catalog, const OUString& schema, const OUString& table,
         sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException)
 {
     static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZZ)Ljava/sql/ResultSet;";
@@ -377,7 +377,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier(
-        const Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope,
+        const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope,
         sal_Bool nullable ) throw(SQLException, RuntimeException)
 {
     static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZ)Ljava/sql/ResultSet;";
@@ -417,7 +417,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
-        const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(SQLException, RuntimeException)
+        const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException)
 {
     if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() )
         return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern);
@@ -436,17 +436,17 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
             {
                 // here we know that the count of column doesn't match
                 ::std::map<sal_Int32,sal_Int32> aColumnMatching;
-                static const ::rtl::OUString sPrivs[] = {
-                                            ::rtl::OUString("TABLE_CAT"),
-                                            ::rtl::OUString("TABLE_SCHEM"),
-                                            ::rtl::OUString("TABLE_NAME"),
-                                            ::rtl::OUString("GRANTOR"),
-                                            ::rtl::OUString("GRANTEE"),
-                                            ::rtl::OUString("PRIVILEGE"),
-                                            ::rtl::OUString("IS_GRANTABLE")
+                static const OUString sPrivs[] = {
+                                            OUString("TABLE_CAT"),
+                                            OUString("TABLE_SCHEM"),
+                                            OUString("TABLE_NAME"),
+                                            OUString("GRANTOR"),
+                                            OUString("GRANTEE"),
+                                            OUString("PRIVILEGE"),
+                                            OUString("IS_GRANTABLE")
                                         };
 
-                ::rtl::OUString sColumnName;
+                OUString sColumnName;
                 sal_Int32 nCount = xMeta->getColumnCount();
                 for (sal_Int32 i = 1 ; i <= nCount ; ++i)
                 {
@@ -467,7 +467,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
                 xReturn = pNewPrivRes;
                 ODatabaseMetaDataResultSet::ORows aRows;
                 Reference< XRow > xRow(xTemp,UNO_QUERY);
-                ::rtl::OUString sValue;
+                OUString sValue;
 
                 ODatabaseMetaDataResultSet::ORow aRow(8);
                 while ( xRow.is() && xTemp->next() )
@@ -493,9 +493,9 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference(
-        const Any& primaryCatalog, const ::rtl::OUString& primarySchema,
-        const ::rtl::OUString& primaryTable, const Any& foreignCatalog,
-        const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(SQLException, RuntimeException)
+        const Any& primaryCatalog, const OUString& primarySchema,
+        const OUString& primaryTable, const Any& foreignCatalog,
+        const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException)
 {
     static const char * cSignature = "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Ljava/sql/ResultSet;";
     static const char * cMethodName = "getCrossReference";
@@ -551,16 +551,16 @@ sal_Bool java_sql_DatabaseMetaData::impl_callBooleanMethod( const char* _pMethod
 }
 
 // -------------------------------------------------------------------------
-::rtl::OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
+OUString java_sql_DatabaseMetaData::impl_callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID )
 {
     m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, _pMethodName );
 
-    const ::rtl::OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) );
+    const OUString sReturn( callStringMethod(_pMethodName,_inout_MethodID) );
     if ( m_aLogger.isLoggable( LogLevel::FINEST ) )
     {
-        ::rtl::OUString sLoggedResult( sReturn );
+        OUString sLoggedResult( sReturn );
         if ( sLoggedResult.isEmpty() )
-            sLoggedResult = ::rtl::OUString( "<empty string>" );
+            sLoggedResult = OUString( "<empty string>" );
         m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_RESULT, _pMethodName, sLoggedResult );
     }
 
@@ -599,11 +599,11 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethod( con
 
 // -------------------------------------------------------------------------
 Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithStrings( const char* _pMethodName, jmethodID& _inout_MethodID,
-    const Any& _rCatalog, const ::rtl::OUString& _rSchemaPattern, const ::rtl::OUString& _rLeastPattern,
-    const ::rtl::OUString* _pOptionalAdditionalString )
+    const Any& _rCatalog, const OUString& _rSchemaPattern, const OUString& _rLeastPattern,
+    const OUString* _pOptionalAdditionalString )
 {
     bool bCatalog = _rCatalog.hasValue();
-    ::rtl::OUString sCatalog;
+    OUString sCatalog;
     _rCatalog >>= sCatalog;
 
     bool bSchema = _rSchemaPattern.toChar() != '%';
@@ -611,8 +611,8 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS
     // log the call
     if ( m_aLogger.isLoggable( LogLevel::FINEST ) )
     {
-        ::rtl::OUString sCatalogLog = bCatalog ? sCatalog : ::rtl::OUString( "null" );
-        ::rtl::OUString sSchemaLog = bSchema ? _rSchemaPattern : ::rtl::OUString( "null" );
+        OUString sCatalogLog = bCatalog ? sCatalog : OUString( "null" );
+        OUString sSchemaLog = bSchema ? _rSchemaPattern : OUString( "null" );
         if ( _pOptionalAdditionalString )
             m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG4, _pMethodName, sCatalogLog, sSchemaLog, _rLeastPattern, *_pOptionalAdditionalString );
         else
@@ -735,19 +735,19 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns(  ) thro
     return impl_callBooleanMethod( "supportsNonNullableColumns", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getCatalogTerm", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
+OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw(  )
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getIdentifierQuoteString", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getExtraNameCharacters", mID );
@@ -1163,9 +1163,9 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  ) t
     return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString sURL = m_pConnection->getURL();
+    OUString sURL = m_pConnection->getURL();
     if ( sURL.isEmpty() )
     {
         static jmethodID mID(NULL);
@@ -1174,43 +1174,43 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL(  ) t
     return sURL;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getUserName", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDriverName", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDriverVersion", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDatabaseProductVersion", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getDatabaseProductName", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getProcedureTerm", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSchemaTerm", mID );
@@ -1234,37 +1234,37 @@ sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion(  ) throw(Ru
     return impl_callIntMethod( "getDriverMinorVersion", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSQLKeywords", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSearchStringEscape", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getStringFunctions", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getTimeDateFunctions", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getSystemFunctions", mID );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     return impl_callStringMethod( "getNumericFunctions", mID );
@@ -1410,7 +1410,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates(  ) throw(SQLE
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs(
-        const Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern,
+        const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern,
         const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException)
 {
     jobject out(0);
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index c60f92a270cc..f510d8cc93d9 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -60,9 +60,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
     return aInfo;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString java_sql_DriverPropertyInfo::name()
+OUString java_sql_DriverPropertyInfo::name()
 {
-    ::rtl::OUString aStr;
+    OUString aStr;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
 
     {
@@ -73,9 +73,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
     return aStr;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString java_sql_DriverPropertyInfo::description()
+OUString java_sql_DriverPropertyInfo::description()
 {
-    ::rtl::OUString aStr;
+    OUString aStr;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
 
     {
@@ -86,9 +86,9 @@ java_sql_DriverPropertyInfo::operator starsdbc::DriverPropertyInfo()
     return aStr;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString java_sql_DriverPropertyInfo::value()
+OUString java_sql_DriverPropertyInfo::value()
 {
-    ::rtl::OUString aStr;
+    OUString aStr;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
 
     {
@@ -112,7 +112,7 @@ sal_Bool java_sql_DriverPropertyInfo::required()
     return out;
 }
 // --------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices()
+Sequence< OUString> java_sql_DriverPropertyInfo::choices()
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
 
@@ -121,11 +121,11 @@ Sequence< ::rtl::OUString> java_sql_DriverPropertyInfo::choices()
         if(id)
         {
             const java_lang_String * pEmpty = NULL;
-            const ::rtl::OUString * pEmpty2 = NULL;
+            const OUString * pEmpty2 = NULL;
             return copyArrayAndDelete(t.pEnv,(jobjectArray)t.pEnv->GetObjectField( object, id), pEmpty2, pEmpty);
         }
     } //t.pEnv
-    return Sequence< ::rtl::OUString>();
+    return Sequence< OUString>();
 }
 // --------------------------------------------------------------------------------
 
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index 5332c063a66c..c274d51f5835 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput(  ) throw(::com::sun::star::io::No
 sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
     if (nBytesToRead < 0)
-        throw ::com::sun::star::io::BufferSizeExceededException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this );
+        throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this );
 
     jint out(0);
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 9dd05410ddc1..67ab1772ae6f 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -38,7 +38,7 @@ jclass java_math_BigDecimal::getMyClass() const
     return theClass;
 }
 
-java_math_BigDecimal::java_math_BigDecimal( const ::rtl::OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
+java_math_BigDecimal::java_math_BigDecimal( const OUString& _par0 ): java_lang_Object( NULL, (jobject)NULL )
 {
     SDBThreadAttach t;
     if( !t.pEnv )
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index ec2e62bbce4d..db94bbe18ba9 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -59,12 +59,12 @@ namespace {
 
 struct ClassMapEntry {
     ClassMapEntry(
-        rtl::OUString const & theClassPath, rtl::OUString const & theClassName):
+        OUString const & theClassPath, OUString const & theClassName):
         classPath(theClassPath), className(theClassName), classLoader(NULL),
         classObject(NULL) {}
 
-    rtl::OUString classPath;
-    rtl::OUString className;
+    OUString classPath;
+    OUString className;
     jweak classLoader;
     jweak classObject;
 };
@@ -125,7 +125,7 @@ bool getLocalFromWeakRef( jweak& _weak, LocalRef< T >& _inout_local )
 // If false is returned, a (still pending) JNI exception occurred.
 bool loadClass(
     Reference< XComponentContext > const & context, JNIEnv& environment,
-    rtl::OUString const & classPath, rtl::OUString const & name,
+    OUString const & classPath, OUString const & name,
     LocalRef< jobject > * classLoaderPtr, LocalRef< jclass > * classPtr)
 {
     OSL_ASSERT(classLoaderPtr != NULL);
@@ -321,7 +321,7 @@ jclass java_sql_Connection::getMyClass() const
 }
 
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_Connection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
@@ -379,7 +379,7 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly(  ) throw(SQLException, Runtim
     return callBooleanMethod( "isReadOnly", mID );
 }
 // -------------------------------------------------------------------------
-void SAL_CALL java_sql_Connection::setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException)
+void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException)
 {
     static jmethodID mID(NULL);
     callVoidMethodWithStringArg("setCatalog",mID,catalog);
@@ -463,16 +463,16 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  ) throw(
     return xStmt;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString java_sql_Connection::transFormPreparedStatement(const ::rtl::OUString& _sSQL)
+OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL)
 {
-    ::rtl::OUString sSqlStatement = _sSQL;
+    OUString sSqlStatement = _sSQL;
     if ( m_bParameterSubstitution )
     {
         try
         {
             OSQLParser aParser( m_pDriver->getContext() );
-            ::rtl::OUString sErrorMessage;
-            ::rtl::OUString sNewSql;
+            OUString sErrorMessage;
+            OUString sNewSql;
             OSQLParseNode* pNode = aParser.parseTree(sErrorMessage,_sSQL);
             if(pNode)
             {   // special handling for parameters
@@ -489,14 +489,14 @@ Reference< XStatement > SAL_CALL java_sql_Connection::createStatement(  ) throw(
     return sSqlStatement;
 }
 // -------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
     m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_STATEMENT, sql );
 
     SDBThreadAttach t;
-    ::rtl::OUString sSqlStatement = sql;
+    OUString sSqlStatement = sql;
     sSqlStatement = transFormPreparedStatement( sSqlStatement );
 
     java_sql_PreparedStatement* pStatement = new java_sql_PreparedStatement( t.pEnv, *this, sSqlStatement );
@@ -507,14 +507,14 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement(
     return xReturn;
 }
 // -------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
     m_aLogger.log( LogLevel::FINE, STR_LOG_PREPARE_CALL, sql );
 
     SDBThreadAttach t;
-    ::rtl::OUString sSqlStatement = sql;
+    OUString sSqlStatement = sql;
     sSqlStatement = transFormPreparedStatement( sSqlStatement );
 
     java_sql_CallableStatement* pStatement = new java_sql_CallableStatement( t.pEnv, *this, sSqlStatement );
@@ -525,12 +525,12 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const
     return xStmt;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_Connection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString aStr;
+    OUString aStr;
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     {
 
@@ -590,15 +590,15 @@ Any SAL_CALL java_sql_Connection::getWarnings(  ) throw(SQLException, RuntimeExc
 // -----------------------------------------------------------------------------
 namespace
 {
-    ::rtl::OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const ::rtl::OUString& _rDriverClass, const ::rtl::OUString& _rDriverClassPath )
+    OUString lcl_getDriverLoadErrorMessage( const ::connectivity::SharedResources& _aResource,const OUString& _rDriverClass, const OUString& _rDriverClassPath )
     {
-        ::rtl::OUString sError1( _aResource.getResourceStringWithSubstitution(
+        OUString sError1( _aResource.getResourceStringWithSubstitution(
                 STR_NO_CLASSNAME,
                 "$classname$", _rDriverClass
              ) );
         if ( !_rDriverClassPath.isEmpty() )
         {
-            const ::rtl::OUString sError2( _aResource.getResourceStringWithSubstitution(
+            const OUString sError2( _aResource.getResourceStringWithSubstitution(
                 STR_NO_CLASSNAME_PATH,
                 "$classpath$", _rDriverClassPath
              ) );
@@ -636,7 +636,7 @@ namespace
                 ++pSystemProp
             )
         {
-            ::rtl::OUString sValue;
+            OUString sValue;
             OSL_VERIFY( pSystemProp->Value >>= sValue );
 
             _rLogger.log( LogLevel::FINER, STR_LOG_SETTING_SYSTEM_PROPERTY, pSystemProp->Name, sValue );
@@ -655,11 +655,11 @@ namespace
 }
 
 // -----------------------------------------------------------------------------
-void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDriverClass, const ::rtl::OUString& _sDriverClassPath,
+void java_sql_Connection::loadDriverFromProperties( const OUString& _sDriverClass, const OUString& _sDriverClassPath,
     const Sequence< NamedValue >& _rSystemProperties )
 {
     // contains the statement which should be used when query for automatically generated values
-    ::rtl::OUString     sGeneratedValueStatement;
+    OUString     sGeneratedValueStatement;
     // set to <TRUE/> when we should allow to query for generated values
     sal_Bool            bAutoRetrievingEnabled = sal_False;
 
@@ -738,7 +738,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
         throw SQLException(
             lcl_getDriverLoadErrorMessage( getResources(),_sDriverClass, _sDriverClassPath ),
             *this,
-            ::rtl::OUString(),
+            OUString(),
             1000,
             makeAny(e)
         );
@@ -755,12 +755,12 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
     setAutoRetrievingStatement( sGeneratedValueStatement );
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const ::rtl::OUString& _sDriverClass)
+OUString java_sql_Connection::impl_getJavaDriverClassPath_nothrow(const OUString& _sDriverClass)
 {
-    static const ::rtl::OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
+    static const OUString s_sNodeName("org.openoffice.Office.DataAccess/JDBC/DriverClassPaths");
     ::utl::OConfigurationTreeRoot aNamesRoot = ::utl::OConfigurationTreeRoot::createWithComponentContext(
         m_pDriver->getContext(), s_sNodeName, -1, ::utl::OConfigurationTreeRoot::CM_READONLY);
-    ::rtl::OUString sURL;
+    OUString sURL;
     if ( aNamesRoot.isValid() && aNamesRoot.hasByName( _sDriverClass ) )
     {
         ::utl::OConfigurationNode aRegisterObj = aNamesRoot.openNode( _sDriverClass );
@@ -769,7 +769,7 @@ void java_sql_Connection::loadDriverFromProperties( const ::rtl::OUString& _sDri
     return sURL;
 }
 // -----------------------------------------------------------------------------
-sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
+sal_Bool java_sql_Connection::construct(const OUString& url,
                                     const Sequence< PropertyValue >& info)
 {
     { // initialize the java vm
@@ -782,9 +782,9 @@ sal_Bool java_sql_Connection::construct(const ::rtl::OUString& url,
     if ( !t.pEnv )
         throwGenericSQLException(STR_NO_JAVA,*this);
 
-    ::rtl::OUString     sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values
+    OUString     sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values
     sal_Bool            bAutoRetrievingEnabled = sal_False; // set to <TRUE/> when we should allow to query for generated values
-    ::rtl::OUString sDriverClassPath,sDriverClass;
+    OUString sDriverClassPath,sDriverClass;
     Sequence< NamedValue > aSystemProperties;
 
     ::comphelper::NamedValueCollection aSettings( info );
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index d99dfee7d22c..d0759c10ef68 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -52,17 +52,17 @@ java_sql_Driver::~java_sql_Driver()
 
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString java_sql_Driver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.comp.sdbc.JDBCDriver");
+    return OUString("com.sun.star.comp.sdbc.JDBCDriver");
         // this name is referenced in the configuration and in the jdbc.xml
         // Please take care when changing it.
 }
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
+    Sequence< OUString > aSNS( 1 );
+    aSNS[0] = OUString("com.sun.star.sdbc.Driver");
     return aSNS;
 }
 //------------------------------------------------------------------
@@ -71,17 +71,17 @@ Sequence< ::rtl::OUString > java_sql_Driver::getSupportedServiceNames_Static(  )
     return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory)));
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_Driver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL java_sql_Driver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
     for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
         ;
 
@@ -89,12 +89,12 @@ sal_Bool SAL_CALL java_sql_Driver::supportsService( const ::rtl::OUString& _rSer
 }
 
 // --------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 // -------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUString& url, const
+Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const
                                                          Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url );
@@ -112,7 +112,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const ::rtl::OUStrin
     return xOut;
 }
 // -------------------------------------------------------------------------
-sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException)
 {
     // don't ask the real driver for the url
     // I feel responsible for all jdbc url's
@@ -121,112 +121,112 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const ::rtl::OUString& url ) thro
     return bEnabled && url.startsWith("jdbc:");
 }
 // -------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const ::rtl::OUString& url,
+Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url,
                                                                          const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
 {
     if ( acceptsURL(url) )
     {
         ::std::vector< DriverPropertyInfo > aDriverInfo;
 
-        Sequence< ::rtl::OUString > aBooleanValues(2);
-        aBooleanValues[0] = ::rtl::OUString(  "false"  );
-        aBooleanValues[1] = ::rtl::OUString(  "true"  );
+        Sequence< OUString > aBooleanValues(2);
+        aBooleanValues[0] = OUString(  "false"  );
+        aBooleanValues[1] = OUString(  "true"  );
 
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("JavaDriverClass")
-                ,::rtl::OUString("The JDBC driver class name.")
+                OUString("JavaDriverClass")
+                ,OUString("The JDBC driver class name.")
                 ,sal_True
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("JavaDriverClassPath")
-                ,::rtl::OUString("The class path where to look for the JDBC driver.")
+                OUString("JavaDriverClassPath")
+                ,OUString("The class path where to look for the JDBC driver.")
                 ,sal_True
-                ,::rtl::OUString(  ""  )
-                ,Sequence< ::rtl::OUString >())
+                ,OUString(  ""  )
+                ,Sequence< OUString >())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("SystemProperties")
-                ,::rtl::OUString("Additional properties to set at java.lang.System before loading the driver.")
+                OUString("SystemProperties")
+                ,OUString("Additional properties to set at java.lang.System before loading the driver.")
                 ,sal_True
-                ,::rtl::OUString(  ""  )
-                ,Sequence< ::rtl::OUString >())
+                ,OUString(  ""  )
+                ,Sequence< OUString >())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ParameterNameSubstitution")
-                ,::rtl::OUString("Change named parameters with '?'.")
+                OUString("ParameterNameSubstitution")
+                ,OUString("Change named parameters with '?'.")
                 ,sal_False
-                ,::rtl::OUString(  "false"  )
+                ,OUString(  "false"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("IgnoreDriverPrivileges")
-                ,::rtl::OUString("Ignore the privileges from the database driver.")
+                OUString("IgnoreDriverPrivileges")
+                ,OUString("Ignore the privileges from the database driver.")
                 ,sal_False
-                ,::rtl::OUString(  "false"  )
+                ,OUString(  "false"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("IsAutoRetrievingEnabled")
-                ,::rtl::OUString("Retrieve generated values.")
+                OUString("IsAutoRetrievingEnabled")
+                ,OUString("Retrieve generated values.")
                 ,sal_False
-                ,::rtl::OUString(  "false"  )
+                ,OUString(  "false"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("AutoRetrievingStatement")
-                ,::rtl::OUString("Auto-increment statement.")
+                OUString("AutoRetrievingStatement")
+                ,OUString("Auto-increment statement.")
                 ,sal_False
-                ,::rtl::OUString()
-                ,Sequence< ::rtl::OUString >())
+                ,OUString()
+                ,Sequence< OUString >())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("GenerateASBeforeCorrelationName")
-                ,::rtl::OUString("Generate AS before table correlation names.")
+                OUString("GenerateASBeforeCorrelationName")
+                ,OUString("Generate AS before table correlation names.")
                 ,sal_False
-                ,::rtl::OUString(  "true"  )
+                ,OUString(  "true"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("IgnoreCurrency")
-                ,::rtl::OUString("Ignore the currency field from the ResultsetMetaData.")
+                OUString("IgnoreCurrency")
+                ,OUString("Ignore the currency field from the ResultsetMetaData.")
                 ,sal_False
-                ,::rtl::OUString(  "false"  )
+                ,OUString(  "false"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("EscapeDateTime")
-                ,::rtl::OUString("Escape date time format.")
+                OUString("EscapeDateTime")
+                ,OUString("Escape date time format.")
                 ,sal_False
-                ,::rtl::OUString(  "true"  )
+                ,OUString(  "true"  )
                 ,aBooleanValues)
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("TypeInfoSettings")
-                ,::rtl::OUString("Defines how the type info of the database metadata should be manipulated.")
+                OUString("TypeInfoSettings")
+                ,OUString("Defines how the type info of the database metadata should be manipulated.")
                 ,sal_False
-                ,::rtl::OUString( )
-                ,Sequence< ::rtl::OUString > ())
+                ,OUString( )
+                ,Sequence< OUString > ())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ImplicitCatalogRestriction")
-                ,::rtl::OUString("The catalog which should be used in getTables calls, when the caller passed NULL.")
+                OUString("ImplicitCatalogRestriction")
+                ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.")
                 ,sal_False
-                ,::rtl::OUString( )
-                ,Sequence< ::rtl::OUString > ())
+                ,OUString( )
+                ,Sequence< OUString > ())
         );
         aDriverInfo.push_back(DriverPropertyInfo(
-                ::rtl::OUString("ImplicitSchemaRestriction")
-                ,::rtl::OUString("The schema which should be used in getTables calls, when the caller passed NULL.")
+                OUString("ImplicitSchemaRestriction")
+                ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.")
                 ,sal_False
-                ,::rtl::OUString( )
-                ,Sequence< ::rtl::OUString > ())
+                ,OUString( )
+                ,Sequence< OUString > ())
         );
         return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size());
     }
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+    const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
     ::dbtools::throwGenericSQLException(sMessage ,*this);
     return Sequence< DriverPropertyInfo >();
 }
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index e0d4c45b727a..d4ec58907326 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -170,7 +170,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues(  )
         OSL_ENSURE( m_pConnection && m_pConnection->isAutoRetrievingEnabled(),"Illegal call here. isAutoRetrievingEnabled is false!");
         if ( m_pConnection )
         {
-            ::rtl::OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement);
+            OUString sStmt = m_pConnection->getTransformedGeneratedStatement(m_sSqlStatement);
             if ( !sStmt.isEmpty() )
             {
                 m_aLogger.log( LogLevel::FINER, STR_LOG_GENERATED_VALUES_FALLBACK, sStmt );
@@ -219,7 +219,7 @@ void SAL_CALL java_sql_Statement::clearBatch(  ) throw(::com::sun::star::sdbc::S
 }
 // -------------------------------------------------------------------------
 
-sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -253,7 +253,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const ::rtl::OUString& sql )
 }
 // -------------------------------------------------------------------------
 
-Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -303,7 +303,7 @@ Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(Runt
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL java_sql_Statement::addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
+void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -337,7 +337,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch(  ) throw(::com:
 // -------------------------------------------------------------------------
 
 
-sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -473,7 +473,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime
     return impl_getProperty("getMaxFieldSize",mID);
 }
 //------------------------------------------------------------------------------
-::rtl::OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException)
+OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -487,7 +487,7 @@ sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, Runtime
     catch(const SQLException&)
     {
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 //------------------------------------------------------------------------------
 void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException)
@@ -578,7 +578,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio
     callVoidMethodWithIntArg("setMaxFieldSize",mID,_par0,true);
 }
 //------------------------------------------------------------------------------
-void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw(SQLException, RuntimeException)
+void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -596,7 +596,7 @@ void java_sql_Statement_Base::setCursorName(const ::rtl::OUString &_par0) throw(
     Sequence< Property > aProps(10);
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP0(CURSORNAME,  ::rtl::OUString);
+    DECL_PROP0(CURSORNAME,  OUString);
     DECL_BOOL_PROP0(ESCAPEPROCESSING);
     DECL_PROP0(FETCHDIRECTION,sal_Int32);
     DECL_PROP0(FETCHSIZE,   sal_Int32);
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index 9395a11771ac..ed6d2ea03de2 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -151,7 +151,7 @@ void java_lang_Object::saveRef( JNIEnv * pXEnv, jobject myObj )
 }
 
 
-::rtl::OUString java_lang_Object::toString() const
+OUString java_lang_Object::toString() const
 {
     static jmethodID mID(NULL);
     return callStringMethod("toString",mID);
@@ -183,12 +183,12 @@ namespace
 #if OSL_DEBUG_LEVEL > 0
             pThrow->printStackTrace();
 #endif
-            ::rtl::OUString sMessage = pThrow->getMessage();
+            OUString sMessage = pThrow->getMessage();
             if ( sMessage.isEmpty() )
                 sMessage = pThrow->getLocalizedMessage();
             if(  sMessage.isEmpty() )
                 sMessage = pThrow->toString();
-            _out_rException = SQLException( sMessage, _rxContext, ::rtl::OUString(), -1, Any() );
+            _out_rException = SQLException( sMessage, _rxContext, OUString(), -1, Any() );
             return true;
         }
         else
@@ -328,7 +328,7 @@ void java_lang_Object::callVoidMethodWithBoolArg( const char* _pMethodName, jmet
         ThrowSQLException( t.pEnv, NULL );
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
+OUString java_lang_Object::callStringMethod( const char* _pMethodName, jmethodID& _inout_MethodID ) const
 {
     SDBThreadAttach t;
     OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" );
@@ -358,7 +358,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char*
     return out;
 }
 // -----------------------------------------------------------------------------
-::rtl::OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const
+OUString java_lang_Object::callStringMethodWithIntArg( const char* _pMethodName, jmethodID& _inout_MethodID , sal_Int32 _nArgument) const
 {
     SDBThreadAttach t;
     OSL_ENSURE( t.pEnv, "java_lang_Object::callStringMethod: no Java enviroment anymore!" );
@@ -366,7 +366,7 @@ jobject java_lang_Object::callObjectMethodWithIntArg( JNIEnv * _pEnv,const char*
     return JavaString2String( t.pEnv, out );
 }
 // -------------------------------------------------------------------------
-void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const
+void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const
 {
     SDBThreadAttach t;
     OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethod: no Java enviroment anymore!" );
@@ -378,7 +378,7 @@ void java_lang_Object::callVoidMethodWithStringArg( const char* _pMethodName, jm
     ThrowSQLException( t.pEnv, NULL );
 }
 // -------------------------------------------------------------------------
-sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const ::rtl::OUString& _nArgument ) const
+sal_Int32 java_lang_Object::callIntMethodWithStringArg( const char* _pMethodName, jmethodID& _inout_MethodID,const OUString& _nArgument ) const
 {
     SDBThreadAttach t;
     OSL_ENSURE( t.pEnv, "java_lang_Object::callIntMethodWithStringArg: no Java enviroment anymore!" );
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 22966688ee23..0458ad7d5af4 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::lang;
 //**************************************************************
 IMPLEMENT_SERVICE_INFO(java_sql_PreparedStatement,"com.sun.star.sdbcx.JPreparedStatement","com.sun.star.sdbc.PreparedStatement");
 
-java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const ::rtl::OUString& sql )
+java_sql_PreparedStatement::java_sql_PreparedStatement( JNIEnv * pEnv, java_sql_Connection& _rCon, const OUString& sql )
     : OStatement_BASE2( pEnv, _rCon )
 {
     m_sSqlStatement = sql;
@@ -111,7 +111,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate(  ) throw(::com::su
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed);
@@ -346,7 +346,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
                         {
                             ORowSetValue aValue;
                             aValue.fill(x);
-                            const ::rtl::OUString sValue = aValue;
+                            const OUString sValue = aValue;
                             if ( !sValue.isEmpty() )
                                 pBigDecimal.reset(new java_math_BigDecimal(sValue));
                             else
@@ -370,7 +370,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const ::rtl::OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex );
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -387,9 +387,9 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c
 {
     if(!::dbtools::implSetObject(this,parameterIndex,x))
     {
-        const ::rtl::OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
+        const OUString sError( m_pConnection->getResources().getResourceStringWithSubstitution(
                 STR_UNKNOWN_PARA_TYPE,
-                "$position$", ::rtl::OUString::valueOf(parameterIndex)
+                "$position$", OUString::valueOf(parameterIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index 46c95a58353f..cc7bbcd0a7a3 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const
     return theClass;
 }
 
-::rtl::OUString SAL_CALL java_sql_Ref::getBaseTypeName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL java_sql_Ref::getBaseTypeName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     static jmethodID mID(NULL);
     return callStringMethod("getBaseTypeName",mID);
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index 035b3306e219..13b9de190fe2 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -135,7 +135,7 @@ m_xMetaData.clear();
 }
 // -------------------------------------------------------------------------
 
-sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::findColumn" );
     static jmethodID mID(NULL);
@@ -340,7 +340,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen
             if ( t.pEnv->IsInstanceOf(out,java_lang_String::st_getMyClass()) )
             {
                 java_lang_String aVal(t.pEnv,out);
-                aRet <<= (::rtl::OUString)aVal;
+                aRet <<= (OUString)aVal;
             }
             else if ( t.pEnv->IsInstanceOf(out,java_lang_Boolean::st_getMyClass()) )
             {
@@ -381,7 +381,7 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S
 // -------------------------------------------------------------------------
 
 
-::rtl::OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getString" );
     static jmethodID mID(NULL);
@@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x
 }
 // -------------------------------------------------------------------------
 
-void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::updateString" );
     SDBThreadAttach t;
@@ -841,9 +841,9 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const ::c
     if(!::dbtools::implUpdateObject(this,columnIndex,x))
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+        const OUString sError( aResources.getResourceStringWithSubstitution(
                 STR_UNKNOWN_COLUMN_TYPE,
-                "$position$", ::rtl::OUString::valueOf(columnIndex)
+                "$position$", OUString::valueOf(columnIndex)
              ) );
         ::dbtools::throwGenericSQLException(sError,*this);
     }
@@ -921,7 +921,7 @@ sal_Int32 java_sql_ResultSet::getFetchSize() const throw(::com::sun::star::sdbc:
     return callIntMethod("getFetchSize",mID,true);
 }
 //------------------------------------------------------------------------------
-::rtl::OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
+OUString java_sql_ResultSet::getCursorName() const throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSet::getCursorName" );
     static jmethodID mID(NULL);
@@ -956,7 +956,7 @@ void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(::com::sun::star::s
     Sequence< Property > aProps(5);
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP1IMPL(CURSORNAME,          ::rtl::OUString) PropertyAttribute::READONLY);
+    DECL_PROP1IMPL(CURSORNAME,          OUString) PropertyAttribute::READONLY);
     DECL_PROP0(FETCHDIRECTION,      sal_Int32);
     DECL_PROP0(FETCHSIZE,           sal_Int32);
     DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY);
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 351099937dfd..62ee5728dd19 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column
     return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column );
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getSchemaName" );
     static jmethodID mID(NULL);
@@ -102,42 +102,42 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column
 }
 // -------------------------------------------------------------------------
 
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnName",mID,column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getTableName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getTableName",mID,column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getCatalogName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getCatalogName",mID,column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnTypeName" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnTypeName",mID,column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnLabel" );
     static jmethodID mID(NULL);
     return callStringMethodWithIntArg("getColumnLabel",mID,column);
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
+OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException)
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "jdbc", "Ocke.Janssen@sun.com", "java_sql_ResultSetMetaData::getColumnServiceName" );
     static jmethodID mID(NULL);
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 59e57f333278..c8857ab2beef 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -76,7 +76,7 @@ starsdbc::SQLException java_sql_SQLException_BASE::getNextException()  const
     return starsdbc::SQLException();
 }
 
-::rtl::OUString java_sql_SQLException_BASE::getSQLState() const
+OUString java_sql_SQLException_BASE::getSQLState() const
 {
     static jmethodID mID(NULL);
     return callStringMethod("getSQLState",mID);
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index fbc33d360a03..ce9d464ecf3e 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -42,11 +42,11 @@ jclass java_lang_String::st_getMyClass()
 }
 
 //--------------------------------------------------------------------------
-java_lang_String::operator ::rtl::OUString()
+java_lang_String::operator OUString()
 {
     SDBThreadAttach t;
     if(!t.pEnv)
-        return ::rtl::OUString();
+        return OUString();
     return JavaString2String(t.pEnv,(jstring)object);
 }
 
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index e943aec88067..90b4a015e673 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -42,14 +42,14 @@ jclass java_lang_Throwable::st_getMyClass()
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString java_lang_Throwable::getMessage() const
+OUString java_lang_Throwable::getMessage() const
 {
     static jmethodID mID(NULL);
     return callStringMethod("getMessage",mID);
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString java_lang_Throwable::getLocalizedMessage() const
+OUString java_lang_Throwable::getLocalizedMessage() const
 {
     static jmethodID mID(NULL);
     return callStringMethod("getLocalizedMessage",mID);
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 1d541d8f4f2a..a1d1bcd5e92e 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -36,7 +36,7 @@ java_sql_Date::java_sql_Date( const ::com::sun::star::util::Date& _rOut ) : java
         return;
     jvalue args[1];
     // Convert parameters
-    ::rtl::OUString sDateStr;
+    OUString sDateStr;
     sDateStr = ::dbtools::DBTypeConversion::toDateString(_rOut);
     args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
 
@@ -102,7 +102,7 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_
         return;
     jvalue args[1];
     // Convert parameters
-    ::rtl::OUString sDateStr;
+    OUString sDateStr;
     sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut);
     args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
 
@@ -155,7 +155,7 @@ java_sql_Timestamp::java_sql_Timestamp(const ::com::sun::star::util::DateTime& _
         return;
     jvalue args[1];
     // Convert parameters
-    ::rtl::OUString sDateStr;
+    OUString sDateStr;
     sDateStr = ::dbtools::DBTypeConversion::toDateTimeString(_rOut);
 
     args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr);
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 90302e3a0004..53358a6cf7b6 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -21,7 +21,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index ee4cac4a7585..02a8094ae36d 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -35,7 +35,7 @@ using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
-void java_util_Properties::setProperty(const ::rtl::OUString key, const ::rtl::OUString& value)
+void java_util_Properties::setProperty(const OUString key, const OUString& value)
 {
     SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
     jobject out(0);
@@ -92,7 +92,7 @@ java_util_Properties::java_util_Properties( ): java_lang_Object( NULL, (jobject)
 }
 
 // --------------------------------------------------------------------------------
-jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const ::rtl::OUString& _rTemp)
+jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _rTemp)
 {
     OSL_ENSURE(pEnv,"Environment is NULL!");
     jstring pStr = pEnv->NewString(_rTemp.getStr(), _rTemp.getLength());
@@ -145,7 +145,7 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
             &&  pBegin->Name.compareToAscii( "RespectDriverResultSetType" )
             )
         {
-            ::rtl::OUString aStr;
+            OUString aStr;
             OSL_VERIFY( pBegin->Value >>= aStr );
             pProps->setProperty(pBegin->Name,aStr);
         }
@@ -153,15 +153,15 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
     return pProps;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str)
+OUString connectivity::JavaString2String(JNIEnv *pEnv,jstring _Str)
 {
-    ::rtl::OUString aStr;
+    OUString aStr;
     if(_Str)
     {
         jboolean bCopy(sal_True);
         const jchar* pChar = pEnv->GetStringChars(_Str,&bCopy);
         jsize len = pEnv->GetStringLength(_Str);
-        aStr = ::rtl::OUString(pChar,len);
+        aStr = OUString(pChar,len);
 
         if(bCopy)
             pEnv->ReleaseStringChars(_Str,pChar);
@@ -174,7 +174,7 @@ jobject connectivity::convertTypeMapToJavaMap(JNIEnv* /*pEnv*/,const Reference<
 {
     if ( _rMap.is() )
     {
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = _rMap->getElementNames();
+        ::com::sun::star::uno::Sequence< OUString > aNames = _rMap->getElementNames();
         if ( aNames.getLength() > 0 )
             ::dbtools::throwFeatureNotImplementedException( "Type maps", NULL );
     }
@@ -197,7 +197,7 @@ sal_Bool connectivity::isExceptionOccurred(JNIEnv *pEnv,sal_Bool _bClear)
         {
 
             java_sql_SQLException_BASE* pException = new java_sql_SQLException_BASE(pEnv,pThrowable);
-            ::rtl::OUString sError = pException->getMessage();
+            OUString sError = pException->getMessage();
             delete pException;
         }
 #else
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx
index de5be71cdc23..fb6e330fac6a 100644
--- a/connectivity/source/drivers/kab/KCatalog.cxx
+++ b/connectivity/source/drivers/kab/KCatalog.cxx
@@ -42,18 +42,18 @@ KabCatalog::KabCatalog(KabConnection* _pCon)
 void KabCatalog::refreshTables()
 {
     TStringVector aVector;
-    Sequence< ::rtl::OUString > aTypes(1);
-    aTypes[0] = ::rtl::OUString("%");
+    Sequence< OUString > aTypes(1);
+    aTypes[0] = OUString("%");
     Reference< XResultSet > xResult = m_xMetaData->getTables(
         Any(),
-        ::rtl::OUString("%"),
-        ::rtl::OUString("%"),
+        OUString("%"),
+        OUString("%"),
         aTypes);
 
     if (xResult.is())
     {
         Reference< XRow > xRow(xResult,UNO_QUERY);
-        ::rtl::OUString aName;
+        OUString aName;
 
         while (xResult->next())
         {
diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx
index 5ab9598073ee..a73f813d357f 100644
--- a/connectivity/source/drivers/kab/KColumns.cxx
+++ b/connectivity/source/drivers/kab/KColumns.cxx
@@ -35,12 +35,12 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
 // -------------------------------------------------------------------------
-sdbcx::ObjectType KabColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType KabColumns::createObject(const OUString& _rName)
 {
     const Any aCatalog;
-    const ::rtl::OUString sCatalogName;
-    const ::rtl::OUString sSchemaName(m_pTable->getSchema());
-    const ::rtl::OUString sTableName(m_pTable->getTableName());
+    const OUString sCatalogName;
+    const OUString sSchemaName(m_pTable->getSchema());
+    const OUString sTableName(m_pTable->getTableName());
     Reference< XResultSet > xResult = m_pTable->getConnection()->getMetaData()->getColumns(
         aCatalog, sSchemaName, sTableName, _rName);
 
diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx
index 5e3cfdce365a..67bde9627db1 100644
--- a/connectivity/source/drivers/kab/KColumns.hxx
+++ b/connectivity/source/drivers/kab/KColumns.hxx
@@ -32,7 +32,7 @@ namespace connectivity
         protected:
             KabTable*   m_pTable;
 
-            virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+            virtual sdbcx::ObjectType createObject(const OUString& _rName);
             virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
 
         public:
diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx
index ffabd1e1c42c..0e0cc690083b 100644
--- a/connectivity/source/drivers/kab/KConnection.cxx
+++ b/connectivity/source/drivers/kab/KConnection.cxx
@@ -61,7 +61,7 @@ void SAL_CALL KabConnection::release() throw()
     relase_ChildImpl();
 }
 // -----------------------------------------------------------------------------
-void KabConnection::construct(const ::rtl::OUString&, const Sequence< PropertyValue >&) throw(SQLException)
+void KabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException)
 {
     osl_atomic_increment( &m_refCount );
 
@@ -87,7 +87,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement(  ) throw(SQLExc
     return xReturn;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -99,7 +99,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const
     return xReturn;
 }
 // --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -108,7 +108,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const ::rtl
     return NULL;
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabConnection::nativeSQL( const ::rtl::OUString& _sSql ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     // when you need to transform SQL92 to you driver specific you can do it here
@@ -191,7 +191,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly(  ) throw(SQLException, RuntimeExcep
     return sal_False;
 }
 // --------------------------------------------------------------------------------
-void SAL_CALL KabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
@@ -199,14 +199,14 @@ void SAL_CALL KabConnection::setCatalog( const ::rtl::OUString& ) throw(SQLExcep
     // if your database doesn't work with catalogs you go to next method otherwise you kjnow what to do
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabConnection::getCatalog(  ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabConnection_BASE::rBHelper.bDisposed);
 
 
     // return your current catalog
-    return ::rtl::OUString();
+    return OUString();
 }
 // --------------------------------------------------------------------------------
 void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx
index b14bbac334f9..0c3244355db7 100644
--- a/connectivity/source/drivers/kab/KConnection.hxx
+++ b/connectivity/source/drivers/kab/KConnection.hxx
@@ -74,7 +74,7 @@ namespace connectivity
                                                     m_xCatalog;     // needed for the SQL interpreter
 
         public:
-            virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
+            virtual void construct( const OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException);
 
             KabConnection(KabDriver* _pDriver);
             virtual ~KabConnection();
@@ -92,9 +92,9 @@ namespace connectivity
 
             // XConnection
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL getAutoCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL commit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -103,8 +103,8 @@ namespace connectivity
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalog(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getTransactionIsolation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
index 304ef30d0833..486eaff38e66 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx
@@ -49,17 +49,17 @@ KabDatabaseMetaData::~KabDatabaseMetaData()
 {
 }
 // -------------------------------------------------------------------------
-const ::rtl::OUString & KabDatabaseMetaData::getAddressBookTableName()
+const OUString & KabDatabaseMetaData::getAddressBookTableName()
 {
-    static const ::rtl::OUString aAddressBookTableName
-        (::rtl::OUString::createFromAscii( i18n("Address Book") ));
+    static const OUString aAddressBookTableName
+        (OUString::createFromAscii( i18n("Address Book") ));
 
     return aAddressBookTableName;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aVal;
+    OUString aVal;
     if (m_bUseCatalog)
     { // do some special here for you database
     }
@@ -197,25 +197,25 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns(  ) throw(SQLE
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aVal;
+    OUString aVal;
     if (m_bUseCatalog)
     {
     }
     return aVal;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString(  ) throw(SQLException, RuntimeException)
 {
     // normally this is "
-    ::rtl::OUString aVal("\"");
+    OUString aVal("\"");
     return aVal;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aVal;
+    OUString aVal;
     return aVal;
 }
 // -------------------------------------------------------------------------
@@ -552,53 +552,53 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL(  ) throw(S
     return sal_False;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getURL(  ) throw(SQLException, RuntimeException)
 {
     // if someday we support more than the default address book,
     // this method should return the URL which was used to create it
-    ::rtl::OUString aValue(  "sdbc:address:kab:" );
+    OUString aValue(  "sdbc:address:kab:" );
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getUserName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getDriverName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue(  "kab" );
+    OUString aValue(  "kab" );
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue(KAB_DRIVER_VERSION);
+    OUString aValue(KAB_DRIVER_VERSION);
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
@@ -617,36 +617,36 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion(  ) throw(RuntimeE
     return KAB_DRIVER_VERSION_MINOR;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape(  ) throw(SQLException, RuntimeException)
 {
-    ::rtl::OUString aValue;
+    OUString aValue;
     return aValue;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getStringFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions(  ) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLException, RuntimeException)
@@ -781,7 +781,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes(  ) throw(SQ
     Reference< XResultSet > xRef = pResult;
 
     static ODatabaseMetaDataResultSet::ORows aRows;
-    static const ::rtl::OUString aTable("TABLE");
+    static const OUString aTable("TABLE");
 
     if (aRows.empty())
     {
@@ -805,7 +805,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo(  ) throw(SQLE
         ODatabaseMetaDataResultSet::ORow aRow(19);
 
         aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
-        aRow[1] = new ORowSetValueDecorator(::rtl::OUString("CHAR"));
+        aRow[1] = new ORowSetValueDecorator(OUString("CHAR"));
         aRow[2] = new ORowSetValueDecorator(DataType::CHAR);
         aRow[3] = new ORowSetValueDecorator((sal_Int32) 254);
         aRow[4] = ODatabaseMetaDataResultSet::getQuoteValue();
@@ -842,17 +842,17 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas(  ) throw(SQLEx
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString&,
-    const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString&,
+    const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
     const Any&,
-    const ::rtl::OUString&,
-    const ::rtl::OUString& tableNamePattern,
-    const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException)
+    const OUString&,
+    const OUString& tableNamePattern,
+    const OUString& columnNamePattern) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns);
     Reference< XResultSet > xRef = pResult;
@@ -876,11 +876,11 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
         aRow[14] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[15] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[16] = new ORowSetValueDecorator((sal_Int32) 254);
-        aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+        aRow[18] = new ORowSetValueDecorator(OUString("YES"));
 
         sal_Int32 nPosition = 1;
         QString aQtName;
-        ::rtl::OUString sName;
+        OUString sName;
 
         aQtName = ::KABC::Addressee::revisionLabel();
         sName = (const sal_Unicode *) aQtName.ucs2();
@@ -888,7 +888,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
         {
             aRow[4] = new ORowSetValueDecorator(sName);
             aRow[5] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-            aRow[6] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+            aRow[6] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
             aRow[17] = new ORowSetValueDecorator(nPosition++);
             aRows.push_back(aRow);
         }
@@ -906,7 +906,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
             {
                 aRow[4] = new ORowSetValueDecorator(sName);
                 aRow[5] = new ORowSetValueDecorator(DataType::CHAR);
-                aRow[6] = new ORowSetValueDecorator(::rtl::OUString("CHAR"));
+                aRow[6] = new ORowSetValueDecorator(OUString("CHAR"));
                 aRow[7] = new ORowSetValueDecorator((sal_Int32) 256);
 // Might be VARCHAR and not CHAR[256]...
                 aRow[17] = new ORowSetValueDecorator(nPosition);
@@ -920,9 +920,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns(
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     const Any&,
-    const ::rtl::OUString&,
-    const ::rtl::OUString&,
-    const Sequence< ::rtl::OUString >& types) throw(SQLException, RuntimeException)
+    const OUString&,
+    const OUString&,
+    const Sequence< OUString >& types) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables);
     Reference< XResultSet > xRef = pResult;
@@ -930,9 +930,9 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
     // check whether we have tables in the requested types
     // for the moment, we answer only the "TABLE" table type
     // when no types are given at all, we return all the tables
-    static const ::rtl::OUString aTable("TABLE");
+    static const OUString aTable("TABLE");
     sal_Bool bTableFound = sal_False;
-    const ::rtl::OUString* p = types.getConstArray(),
+    const OUString* p = types.getConstArray(),
                          * pEnd = p + types.getLength();
 
     if (p == pEnd)
@@ -970,21 +970,21 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns(
-    const Any&, const ::rtl::OUString&,
-    const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&,
+    const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures(
-    const Any&, const ::rtl::OUString&,
-    const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&,
+    const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException)
 {
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns);
 
@@ -996,14 +996,14 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
     {
         ODatabaseMetaDataResultSet::ORow aRow( 9 );
         QString aQtName = ::KABC::Addressee::revisionLabel();
-        ::rtl::OUString sName = (const sal_Unicode *) aQtName.ucs2();
+        OUString sName = (const sal_Unicode *) aQtName.ucs2();
 
         aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue();
 
         aRow[2] = new ORowSetValueDecorator(sName);
         aRow[3] = new ORowSetValueDecorator(DataType::TIMESTAMP);
-        aRow[4] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+        aRow[4] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
 
         aRow[5] = ODatabaseMetaDataResultSet::getEmptyValue();
         aRow[6] = ODatabaseMetaDataResultSet::getEmptyValue();
@@ -1017,52 +1017,52 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns(
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString&,
+    const Any&, const OUString&, const OUString&,
     sal_Bool, sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32,
+    const Any&, const OUString&, const OUString&, sal_Int32,
     sal_Bool ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges(
-    const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges );
 }
 // -------------------------------------------------------------------------
 Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference(
-    const Any&, const ::rtl::OUString&,
-    const ::rtl::OUString&, const Any&,
-    const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException)
+    const Any&, const OUString&,
+    const OUString&, const Any&,
+    const OUString&, const OUString& ) throw(SQLException, RuntimeException)
 {
     return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference );
 }
 // -------------------------------------------------------------------------
-Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException)
+Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException)
 {
     OSL_FAIL("Not implemented yet!");
     throw SQLException();
diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
index 0e3787b5de60..6cd891493889 100644
--- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx
@@ -42,24 +42,24 @@ namespace connectivity
         public:
 
             KabDatabaseMetaData(KabConnection* _pCon);
-            static const ::rtl::OUString & getAddressBookTableName();
+            static const OUString & getAddressBookTableName();
             virtual ~KabDatabaseMetaData();
 
             // this interface is really BIG
             // XDatabaseMetaData
             virtual sal_Bool SAL_CALL allProceduresAreCallable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL allTablesAreSelectable(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getURL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getUserName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getURL(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getUserName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isReadOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedHigh(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedLow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedAtStart(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL nullsAreSortedAtEnd(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getDriverVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDatabaseProductName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDatabaseProductVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDriverName(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getDriverVersion(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getDriverMajorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getDriverMinorVersion(  ) throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL usesLocalFiles(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -72,14 +72,14 @@ namespace connectivity
             virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSQLKeywords(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getNumericFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getStringFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSystemFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getTimeDateFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSearchStringEscape(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getExtraNameCharacters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getIdentifierQuoteString(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSQLKeywords(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getNumericFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getStringFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSystemFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getTimeDateFunctions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSearchStringEscape(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getExtraNameCharacters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsColumnAliasing(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -107,11 +107,11 @@ namespace connectivity
             virtual sal_Bool SAL_CALL supportsOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsFullOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsLimitedOuterJoins(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSchemaTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getProcedureTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSchemaTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getProcedureTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalogTerm(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isCatalogAtStart(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogSeparator(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalogSeparator(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -165,23 +165,23 @@ namespace connectivity
             virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedures( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getProcedureColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTables( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const ::com::sun::star::uno::Sequence< OUString >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getSchemas(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCatalogs(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTableTypes(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTablePrivileges( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getVersionColumns( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getImportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getExportedKeys( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getCrossReference( const ::com::sun::star::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const ::com::sun::star::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getTypeInfo(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getIndexInfo( const ::com::sun::star::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -194,7 +194,7 @@ namespace connectivity
             virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL supportsBatchUpdates(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL getUDTs( const ::com::sun::star::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const ::com::sun::star::uno::Sequence< sal_Int32 >& types ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
     }
diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index d086838af909..44b946d1ea63 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -91,12 +91,12 @@ namespace
         if ( _rModule )
         {
             //
-            const ::rtl::OUString sSymbolName = ::rtl::OUString::createFromAscii( _pAsciiSymbolName );
+            const OUString sSymbolName = OUString::createFromAscii( _pAsciiSymbolName );
             _rFunction = (FUNCTION)( osl_getSymbol( _rModule, sSymbolName.pData ) );
 
             if ( !_rFunction )
             {   // did not find the symbol
-                rtl::OStringBuffer aBuf;
+                OStringBuffer aBuf;
                 aBuf.append( "lcl_getFunctionFromModuleOrUnload: could not find the symbol " );
                 aBuf.append( _pAsciiSymbolName );
                 OSL_FAIL( aBuf.makeStringAndClear().getStr() );
@@ -119,7 +119,7 @@ bool KabImplModule::impl_loadModule()
     OSL_ENSURE( !m_hConnectorModule && !m_pConnectionFactoryFunc && !m_pApplicationInitFunc && !m_pApplicationShutdownFunc && !m_pKDEVersionCheckFunc,
         "KabImplModule::impl_loadModule: inconsistence: inconsistency (never attempted load before, but some values already set)!");
 
-    const ::rtl::OUString sModuleName( SAL_MODULENAME( "kabdrv1"  ));
+    const OUString sModuleName( SAL_MODULENAME( "kabdrv1"  ));
     m_hConnectorModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, SAL_LOADMODULE_NOW );   // LAZY! #i61335#
     OSL_ENSURE( m_hConnectorModule, "KabImplModule::impl_loadModule: could not load the implementation library!" );
     if ( !m_hConnectorModule )
@@ -184,17 +184,17 @@ bool KabImplModule::impl_doAllowNewKDEVersion()
             com::sun::star::configuration::theDefaultProvider::get( m_xContext ) );
         Sequence< Any > aCreationArgs(1);
         aCreationArgs[0] <<= PropertyValue(
-                                ::rtl::OUString(  "nodepath"  ),
+                                OUString(  "nodepath"  ),
                                 0,
                                 makeAny( KabDriver::impl_getConfigurationSettingsPath() ),
                                 PropertyState_DIRECT_VALUE );
         Reference< XPropertySet > xSettings( xConfigProvider->createInstanceWithArguments(
-                ::rtl::OUString(  "com.sun.star.configuration.ConfigurationAccess"  ),
+                OUString(  "com.sun.star.configuration.ConfigurationAccess"  ),
                 aCreationArgs ),
             UNO_QUERY_THROW );
 
         sal_Bool bDisableCheck = sal_False;
-        xSettings->getPropertyValue( ::rtl::OUString(  "DisableKDEMaximumVersionCheck"  ) ) >>= bDisableCheck;
+        xSettings->getPropertyValue( OUString(  "DisableKDEMaximumVersionCheck"  ) ) >>= bDisableCheck;
 
         return bDisableCheck != sal_False;
     }
@@ -209,7 +209,7 @@ bool KabImplModule::impl_doAllowNewKDEVersion()
 void KabImplModule::impl_throwNoKdeException()
 {
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sError( aResources.getResourceString(
+    const OUString sError( aResources.getResourceString(
             STR_NO_KDE_INST
          ) );
     impl_throwGenericSQLException( sError );
@@ -219,20 +219,20 @@ void KabImplModule::impl_throwNoKdeException()
 void KabImplModule::impl_throwKdeTooOldException()
 {
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+    const OUString sError( aResources.getResourceStringWithSubstitution(
             STR_KDE_VERSION_TOO_OLD,
-            "$major$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR),
-            "$minor$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR)
+            "$major$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR),
+            "$minor$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR)
          ) );
     impl_throwGenericSQLException( sError );
 }
 
 // --------------------------------------------------------------------------------
-void KabImplModule::impl_throwGenericSQLException( const ::rtl::OUString& _rMessage )
+void KabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
 {
     SQLException aError;
     aError.Message = _rMessage;
-    aError.SQLState = ::rtl::OUString(  "S1000"  );
+    aError.SQLState = OUString(  "S1000"  );
     aError.ErrorCode = 0;
     throw aError;
 }
@@ -245,14 +245,14 @@ void KabImplModule::impl_throwKdeTooNewException()
     SQLException aError;
     aError.Message = aResources.getResourceStringWithSubstitution(
             STR_KDE_VERSION_TOO_NEW,
-            "$major$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR),
-            "$minor$",::rtl::OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR)
+            "$major$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MAJOR),
+            "$minor$",OUString::valueOf((sal_Int32)MIN_KDE_VERSION_MINOR)
          );
-    aError.SQLState = ::rtl::OUString(  "S1000"  );
+    aError.SQLState = OUString(  "S1000"  );
     aError.ErrorCode = 0;
 
     SQLContext aDetails;
-    ::rtl::OUStringBuffer aMessage;
+    OUStringBuffer aMessage;
     aMessage.append( aResources.getResourceString(STR_KDE_VERSION_TOO_NEW_WORK_AROUND) );
 
     aMessage.appendAscii( "Sub disableKDEMaxVersionCheck\n" );
@@ -340,43 +340,43 @@ void KabDriver::disposing()
 }
 // static ServiceInfo
 //------------------------------------------------------------------------------
-rtl::OUString KabDriver::getImplementationName_Static(  ) throw(RuntimeException)
+OUString KabDriver::getImplementationName_Static(  ) throw(RuntimeException)
 {
-    return rtl::OUString::createFromAscii( impl_getAsciiImplementationName() );
+    return OUString::createFromAscii( impl_getAsciiImplementationName() );
 }
 //------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
+Sequence< OUString > KabDriver::getSupportedServiceNames_Static(  ) throw (RuntimeException)
 {
     // which service is supported
     // for more information @see com.sun.star.sdbc.Driver
-    Sequence< ::rtl::OUString > aSNS( 1 );
-    aSNS[0] = ::rtl::OUString("com.sun.star.sdbc.Driver");
+    Sequence< OUString > aSNS( 1 );
+    aSNS[0] = OUString("com.sun.star.sdbc.Driver");
 
     return aSNS;
 }
 //------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabDriver::getImplementationName(  ) throw(RuntimeException)
+OUString SAL_CALL KabDriver::getImplementationName(  ) throw(RuntimeException)
 {
     return getImplementationName_Static();
 }
 //------------------------------------------------------------------
-sal_Bool SAL_CALL KabDriver::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException)
+sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException)
 {
-    Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
-    const ::rtl::OUString* pSupported = aSupported.getConstArray();
-    const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+    Sequence< OUString > aSupported(getSupportedServiceNames());
+    const OUString* pSupported = aSupported.getConstArray();
+    const OUString* pEnd = pSupported + aSupported.getLength();
 
     while (pSupported != pEnd && !pSupported->equals(_rServiceName))
         ++pSupported;
     return pSupported != pEnd;
 }
 //------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL KabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
+Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames(  ) throw(RuntimeException)
 {
     return getSupportedServiceNames_Static();
 }
 // --------------------------------------------------------------------------------
-Reference< XConnection > SAL_CALL KabDriver::connect( const ::rtl::OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
+Reference< XConnection > SAL_CALL KabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
 
@@ -399,7 +399,7 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const ::rtl::OUString& url
     return xConnection;
 }
 // --------------------------------------------------------------------------------
-sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
         throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard(m_aMutex);
@@ -411,7 +411,7 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const ::rtl::OUString& url )
     return url.startsWith("sdbc:address:kab:");
 }
 // --------------------------------------------------------------------------------
-Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const ::rtl::OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException)
 {
     // if you have something special to say, return it here :-)
     return Sequence< DriverPropertyInfo >();
@@ -449,9 +449,9 @@ const sal_Char* KabDriver::impl_getAsciiImplementationName()
         // Please be careful when changing it.
 }
 // --------------------------------------------------------------------------------
-::rtl::OUString KabDriver::impl_getConfigurationSettingsPath()
+OUString KabDriver::impl_getConfigurationSettingsPath()
 {
-    ::rtl::OUStringBuffer aPath;
+    OUStringBuffer aPath;
     aPath.appendAscii( "/org.openoffice.Office.DataAccess/DriverSettings/" );
     aPath.appendAscii( "com.sun.star.comp.sdbc.kab.Driver" );
     return aPath.makeStringAndClear();
diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx
index 678f5a835924..5b7614116a77 100644
--- a/connectivity/source/drivers/kab/KDriver.hxx
+++ b/connectivity/source/drivers/kab/KDriver.hxx
@@ -132,7 +132,7 @@ namespace connectivity
 
             /** throws a generic SQL exception with SQLState S1000 and error code 0
             */
-            void    impl_throwGenericSQLException( const ::rtl::OUString& _rMessage );
+            void    impl_throwGenericSQLException( const OUString& _rMessage );
 
             /** determines whether it's allowed to run on a too-new (not confirmed to work) version
             */
@@ -159,8 +159,8 @@ namespace connectivity
             static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception );
 
             // XServiceInfo - static versions
-            static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
-            static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
+            static OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+            static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(  ) throw (::com::sun::star::uno::RuntimeException);
 
             ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
             getComponentContext() const { return m_xContext; }
@@ -171,7 +171,7 @@ namespace connectivity
 
             /** returns the path of our configuration settings
             */
-            static ::rtl::OUString  impl_getConfigurationSettingsPath();
+            static OUString  impl_getConfigurationSettingsPath();
 
         protected:
             KabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext);
@@ -180,14 +180,14 @@ namespace connectivity
             virtual void SAL_CALL disposing(void);
 
             // XServiceInfo
-            virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
 
             // XDriver
-            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getMajorVersion() throw(::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getMinorVersion() throw(::com::sun::star::uno::RuntimeException);
 
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx
index be7efa0224fc..85a254b6b69c 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.cxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx
@@ -53,7 +53,7 @@ void KabPreparedStatement::setKabFields() const throw(SQLException)
     if (!xColumns.is())
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sError( aResources.getResourceString(
+        const OUString sError( aResources.getResourceString(
                 STR_INVALID_COLUMN_SELECTION
              ) );
         ::dbtools::throwGenericSQLException(sError,NULL);
@@ -66,12 +66,12 @@ void KabPreparedStatement::resetParameters() const throw(SQLException)
     m_nParameterIndex = 0;
 }
 // -------------------------------------------------------------------------
-void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException)
+void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException)
 {
     if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size())
     {
         ::connectivity::SharedResources aResources;
-        const ::rtl::OUString sError( aResources.getResourceString(
+        const OUString sError( aResources.getResourceString(
                 STR_INVALID_PARA_COUNT
              ) );
         ::dbtools::throwGenericSQLException(sError,*(KabPreparedStatement *) this);
@@ -84,7 +84,7 @@ void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const t
 // -------------------------------------------------------------------------
 KabPreparedStatement::KabPreparedStatement(
     KabConnection* _pConnection,
-    const ::rtl::OUString& sql)
+    const OUString& sql)
     : KabPreparedStatement_BASE(_pConnection),
       m_sSqlStatement(sql),
       m_bPrepared(sal_False),
@@ -187,7 +187,7 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32)
     (m_aParameterRow->get())[parameterIndex - 1].setNull();
 }
 // -------------------------------------------------------------------------
-void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException)
+void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
 
 
@@ -251,7 +251,7 @@ void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLExcept
 ::dbtools::throwFunctionNotSupportedException("setDouble", NULL);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const ::rtl::OUString &x) throw(SQLException, RuntimeException)
+void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx
index 9011b29b9a8c..5c0d274d10bb 100644
--- a/connectivity/source/drivers/kab/KPreparedStatement.hxx
+++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx
@@ -40,7 +40,7 @@ namespace connectivity
         class KabPreparedStatement : public  KabPreparedStatement_BASE
         {
         protected:
-            ::rtl::OUString                 m_sSqlStatement;
+            OUString                 m_sSqlStatement;
             ::rtl::Reference< KabResultSetMetaData >
                                             m_xMetaData;
             sal_Bool                        m_bPrepared;
@@ -56,12 +56,12 @@ namespace connectivity
                     const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception);
 
             virtual void resetParameters() const throw(::com::sun::star::sdbc::SQLException);
-            virtual void getNextParameter(::rtl::OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException);
+            virtual void getNextParameter(OUString &rParameter) const throw(::com::sun::star::sdbc::SQLException);
             virtual ~KabPreparedStatement();
 
         public:
             DECLARE_SERVICE_INFO();
-            KabPreparedStatement(KabConnection* _pConnection, const ::rtl::OUString& sql);
+            KabPreparedStatement(KabConnection* _pConnection, const OUString& sql);
 
             // OComponentHelper
             virtual void SAL_CALL disposing();
@@ -77,7 +77,7 @@ namespace connectivity
 
             // XParameters
             virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -85,7 +85,7 @@ namespace connectivity
             virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx
index 5841932f2057..0ba7e01518c4 100644
--- a/connectivity/source/drivers/kab/KResultSet.cxx
+++ b/connectivity/source/drivers/kab/KResultSet.cxx
@@ -148,7 +148,7 @@ Sequence<  Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException)
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 // -------------------------------------------------------------------------
-sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -164,7 +164,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t
                 return i;
 
     ::connectivity::SharedResources aResources;
-    const ::rtl::OUString sError( aResources.getResourceStringWithSubstitution(
+    const OUString sError( aResources.getResourceStringWithSubstitution(
             STR_INVALID_COLUMNNAME,
             "$columnname$",columnName
          ) );
@@ -175,12 +175,12 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t
     return 0;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString aRet;
+    OUString aRet;
     sal_Int32 nAddressees = m_aKabAddressees.size();
     ::KABC::Field::List aFields = ::KABC::Field::allFields();
 
@@ -203,7 +203,7 @@ return aRet;
         if (!aQtName.isNull())
         {
             m_bWasNull = false;
-            aRet = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2());
+            aRet = OUString((const sal_Unicode *) aQtName.ucs2());
             return aRet;
         }
     }
@@ -732,7 +732,7 @@ void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException,
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 }
 // -------------------------------------------------------------------------
-void SAL_CALL KabResultSet::updateString(sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException)
+void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException)
 {
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
@@ -803,7 +803,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException,  RuntimeException)
         if (m_nRowPos != -1 && m_nRowPos != nAddressees)
         {
                 QString aQtName = m_aKabAddressees[m_nRowPos].uid();
-               ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2());
+               OUString sUniqueIdentifier = OUString((const sal_Unicode *) aQtName.ucs2());
         return makeAny(sUniqueIdentifier);
     }
     return Any();
@@ -814,13 +814,13 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const  Any& bookmark) throw( SQLE
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString sBookmark = comphelper::getString(bookmark);
+    OUString sBookmark = comphelper::getString(bookmark);
         sal_Int32 nAddressees = m_aKabAddressees.size();
 
     for (sal_Int32 nRow = 0; nRow < nAddressees; nRow++)
     {
                 QString aQtName = m_aKabAddressees[nRow].uid();
-               ::rtl::OUString sUniqueIdentifier = ::rtl::OUString((const sal_Unicode *) aQtName.ucs2());
+               OUString sUniqueIdentifier = OUString((const sal_Unicode *) aQtName.ucs2());
 
         if (sUniqueIdentifier == sBookmark)
         {
@@ -857,8 +857,8 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const  Any& firstItem, const
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString sFirst = comphelper::getString(firstItem);
-    ::rtl::OUString sSecond = comphelper::getString(secondItem);
+    OUString sFirst = comphelper::getString(firstItem);
+    OUString sSecond = comphelper::getString(secondItem);
 
     if (sFirst < sSecond)
         return CompareBookmark::LESS;
@@ -877,7 +877,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const  Any& bookmark) throw( SQLEx
     ::osl::MutexGuard aGuard( m_aMutex );
     checkDisposed(KabResultSet_BASE::rBHelper.bDisposed);
 
-    ::rtl::OUString sBookmark = comphelper::getString(bookmark);
+    OUString sBookmark = comphelper::getString(bookmark);
 
     return sBookmark.hashCode();
 }
@@ -896,7 +896,7 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const
     Sequence< Property > aProps(6);
     Property* pProperties = aProps.getArray();
     sal_Int32 nPos = 0;
-    DECL_PROP1IMPL(CURSORNAME,          ::rtl::OUString) PropertyAttribute::READONLY);
+    DECL_PROP1IMPL(CURSORNAME,          OUString) PropertyAttribute::READONLY);
     DECL_PROP0(FETCHDIRECTION,          sal_Int32);
     DECL_PROP0(FETCHSIZE,               sal_Int32);
     DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx
index c6413b8a70cf..f4071342e0aa 100644
--- a/connectivity/source/drivers/kab/KResultSet.hxx
+++ b/connectivity/source/drivers/kab/KResultSet.hxx
@@ -141,7 +141,7 @@ namespace connectivity
 
             // XRow
             virtual sal_Bool SAL_CALL wasNull(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -190,7 +190,7 @@ namespace connectivity
             virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -201,7 +201,7 @@ namespace connectivity
             virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             // XColumnLocate
-            virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
 
             // XRowLocate
             virtual ::com::sun::star::uno::Any SAL_CALL getBookmark(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
index 14fc35296b20..ed384ba19801 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx
@@ -39,11 +39,11 @@ KabResultSetMetaData::~KabResultSetMetaData()
 void KabResultSetMetaData::setKabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(SQLException)
 {
     OSQLColumns::Vector::const_iterator aIter;
-    static const ::rtl::OUString aName("Name");
+    static const OUString aName("Name");
 
     for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter)
     {
-        ::rtl::OUString aFieldName;
+        OUString aFieldName;
         sal_uInt32 nFieldNumber;
 
         (*aIter)->getPropertyValue(aName) >>= aFieldName;
@@ -72,12 +72,12 @@ sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLExce
     return sal_True;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException)
 {
     sal_uInt32 nFieldNumber = m_aKabFields[column - 1];
     ::KABC::Field::List aFields = ::KABC::Field::allFields();
@@ -91,34 +91,34 @@ sal_Bool SAL_CALL KabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLExce
         default:
             aQtName = aFields[nFieldNumber - KAB_DATA_FIELDS]->label();
     }
-    ::rtl::OUString aName((const sal_Unicode *) aQtName.ucs2());
+    OUString aName((const sal_Unicode *) aQtName.ucs2());
 
     return aName;
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException)
 {
     return KabDatabaseMetaData::getAddressBookTableName();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException)
+OUString SAL_CALL KabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException)
 {
-    return ::rtl::OUString();
+    return OUString();
 }
 // -------------------------------------------------------------------------
 sal_Bool SAL_CALL KabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
index 4738106f3e3a..4c341f324679 100644
--- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx
+++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx
@@ -62,19 +62,19 @@ namespace connectivity
             virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
             virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
-            virtual ::rtl::OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
+            virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
         };
     }
 }
diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx
index 66badd5bb624..e1174efa485d 100644
--- a/connectivity/source/drivers/kab/KServices.cxx
+++ b/connectivity/source/drivers/kab/KServices.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::kab;
-using ::rtl::OUString;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::lang::XSingleServiceFactory;
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx
index b4933423bc92..99a08dd58b8e 100644
--- a/connectivity/source/drivers/kab/KStatement.cxx
+++ b/connectivity/source/drivers/kab/KStatement.cxx