mass removal of rtl:: prefixes for O(U)String*

Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).

Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09

13 files changed, 246 insertions, 249 deletions

diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index b129ea16c764..05c78c394ed2 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
-using ::rtl::OUString;
 
 #define ID_TOOLBAR                          1
 #define ID_GRIDWIN                          2
@@ -145,7 +144,7 @@ namespace bib
                 if ( xPropSet.is() && m_xGridModel.is() )
                 {
                     uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" );
-                    rtl::OUString aControlName;
+                    OUString aControlName;
                     aAny >>= aControlName;
 
                     m_xControl = Reference< awt::XControl > ( xContext->getServiceManager()->createInstanceWithContext(aControlName, xContext), UNO_QUERY_THROW );
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index e8ff2f2f7a2d..ada5cc721c89 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::sdb;
 
-using ::rtl::OUString;
 
 const char cDataSourceHistory[] = "DataSourceHistory";
 
@@ -214,7 +213,7 @@ void BibConfig::SetBibliographyURL(const BibDBDescriptor& rDesc)
     SetModified();
 };
 //---------------------------------------------------------------------------
-void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& )
+void BibConfig::Notify( const com::sun::star::uno::Sequence<OUString>& )
 {
 }
 
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index fea6b7ed72de..fb17abdcf3a0 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -63,14 +63,14 @@ typedef boost::ptr_vector<Mapping> MappingArray;
 //-----------------------------------------------------------------------------
 struct StringPair
 {
-    rtl::OUString   sRealColumnName;
-    rtl::OUString   sLogicalColumnName;
+    OUString   sRealColumnName;
+    OUString   sLogicalColumnName;
 };
 //-----------------------------------------------------------------------------
 struct Mapping
 {
-    rtl::OUString       sTableName;
-    rtl::OUString       sURL;
+    OUString       sTableName;
+    OUString       sURL;
     sal_Int16           nCommandType;
     StringPair          aColumnPairs[COLUMN_COUNT];
 
@@ -80,34 +80,34 @@ struct Mapping
 //-----------------------------------------------------------------------------
 struct BibDBDescriptor
 {
-    rtl::OUString   sDataSource;
-    rtl::OUString   sTableOrQuery;
+    OUString   sDataSource;
+    OUString   sTableOrQuery;
     sal_Int32       nCommandType;
 };
 //-----------------------------------------------------------------------------
 
 class BibConfig : public utl::ConfigItem
 {
-    rtl::OUString   sDataSource;
-    rtl::OUString   sTableOrQuery;
+    OUString   sDataSource;
+    OUString   sTableOrQuery;
     sal_Int32       nTblOrQuery;
 
-    rtl::OUString   sQueryField;
-    rtl::OUString   sQueryText;
+    OUString   sQueryField;
+    OUString   sQueryText;
     MappingArray*               pMappingsArr;
     long            nBeamerSize;
     long            nViewSize;
     sal_Bool        bShowColumnAssignmentWarning;
 
-    rtl::OUString               aColumnDefaults[COLUMN_COUNT];
+    OUString               aColumnDefaults[COLUMN_COUNT];
 
-    com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames();
+    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 public:
     BibConfig();
     ~BibConfig();
 
     virtual void    Commit();
-    virtual void            Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+    virtual void            Notify( const com::sun::star::uno::Sequence<OUString>& aPropertyNames);
 
     BibDBDescriptor         GetBibliographyURL();
     void                    SetBibliographyURL(const BibDBDescriptor& rDesc);
@@ -115,7 +115,7 @@ public:
     const Mapping*          GetMapping(const BibDBDescriptor& rDesc) const;
     void                    SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping);
 
-    const rtl::OUString&    GetDefColumnName(sal_uInt16 nIndex) const
+    const OUString&    GetDefColumnName(sal_uInt16 nIndex) const
                                             {return aColumnDefaults[nIndex];}
 
 
@@ -124,11 +124,11 @@ public:
     void                    setViewSize(long nSize) {SetModified(); nViewSize = nSize;}
     long                    getViewSize() {return nViewSize;}
 
-    const rtl::OUString&    getQueryField() const {return sQueryField;}
-    void                    setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;}
+    const OUString&    getQueryField() const {return sQueryField;}
+    void                    setQueryField(const OUString& rSet) {SetModified(); sQueryField = rSet;}
 
-    const rtl::OUString&    getQueryText() const {return sQueryText;}
-    void                    setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;}
+    const OUString&    getQueryText() const {return sQueryText;}
+    void                    setQueryText(const OUString& rSet) {SetModified(); sQueryText = rSet;}
 
     sal_Bool                IsShowColumnAssignmentWarning() const
                                 { return bShowColumnAssignmentWarning;}
@@ -138,12 +138,12 @@ public:
 
 class DBChangeDialogConfig_Impl
 {
-    com::sun::star::uno::Sequence<rtl::OUString> aSourceNames;
+    com::sun::star::uno::Sequence<OUString> aSourceNames;
 public:
     DBChangeDialogConfig_Impl();
     ~DBChangeDialogConfig_Impl();
 
-    const com::sun::star::uno::Sequence<rtl::OUString>& GetDataSourceNames();
+    const com::sun::star::uno::Sequence<OUString>& GetDataSourceNames();
 
 };
 #endif
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
index 4330a1877923..ed7627e2bdf7 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
@@ -83,7 +83,7 @@ class BibliographyLoader : public cppu::WeakImplHelper4
 
 private:
 
-    void                    loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
+    void                    loadView(const Reference< XFrame > & aFrame, const OUString& aURL,
                                 const Sequence< PropertyValue >& aArgs,
                                 const Reference< XLoadEventListener > & aListener);
 
@@ -97,10 +97,10 @@ public:
                             ~BibliographyLoader();
 
     // XServiceInfo
-    rtl::OUString               SAL_CALL getImplementationName() throw(  );
-    sal_Bool                    SAL_CALL supportsService(const rtl::OUString& ServiceName) throw(  );
-    Sequence< rtl::OUString >   SAL_CALL getSupportedServiceNames(void) throw(  );
-    static rtl::OUString                getImplementationName_Static() throw(  )
+    OUString               SAL_CALL getImplementationName() throw(  );
+    sal_Bool                    SAL_CALL supportsService(const OUString& ServiceName) throw(  );
+    Sequence< OUString >   SAL_CALL getSupportedServiceNames(void) throw(  );
+    static OUString                getImplementationName_Static() throw(  )
 
                             {
                                 //!
@@ -109,9 +109,9 @@ public:
                             }
 
     //XNameAccess
-    virtual Any SAL_CALL getByName(const rtl::OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException );
-    virtual Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw ( RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& aName) throw ( RuntimeException );
+    virtual Any SAL_CALL getByName(const OUString& aName) throw ( NoSuchElementException, WrappedTargetException, RuntimeException );
+    virtual Sequence< OUString > SAL_CALL getElementNames(void) throw ( RuntimeException );
+    virtual sal_Bool SAL_CALL hasByName(const OUString& aName) throw ( RuntimeException );
 
     //XElementAccess
     virtual Type  SAL_CALL getElementType(void) throw ( RuntimeException );
@@ -119,19 +119,19 @@ public:
 
     //XPropertySet
     virtual Reference< XPropertySetInfo >  SAL_CALL getPropertySetInfo(void) throw ( RuntimeException );
-    virtual void SAL_CALL setPropertyValue(const rtl::OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException );
-    virtual Any SAL_CALL getPropertyValue(const rtl::OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
-    virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL setPropertyValue(const OUString& PropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException );
+    virtual Any SAL_CALL getPropertyValue(const OUString& PropertyName) throw ( UnknownPropertyException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL addPropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL removePropertyChangeListener(const OUString& PropertyName, const Reference< XPropertyChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
+    virtual void SAL_CALL removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException );
 
-    static Sequence<rtl::OUString>  SAL_CALL getSupportedServiceNames_Static(void) throw(  );
+    static Sequence<OUString>  SAL_CALL getSupportedServiceNames_Static(void) throw(  );
 
     friend  Reference< XInterface >     SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception );
 
     // XLoader
-    virtual void            SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL,
+    virtual void            SAL_CALL load(const Reference< XFrame > & aFrame, const OUString& aURL,
                                 const Sequence< PropertyValue >& aArgs,
                                 const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException);
     virtual void            SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException);
@@ -160,17 +160,17 @@ Reference< XInterface >  SAL_CALL BibliographyLoader_CreateInstance( const Refer
 
 
 // XServiceInfo
-rtl::OUString BibliographyLoader::getImplementationName() throw(  )
+OUString BibliographyLoader::getImplementationName() throw(  )
 
 {
     return getImplementationName_Static();
 }
 
 // XServiceInfo
-sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) throw(  )
+sal_Bool BibliographyLoader::supportsService(const OUString& ServiceName) throw(  )
 {
-    Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
-    const rtl::OUString * pArray = aSNL.getConstArray();
+    Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pArray = aSNL.getConstArray();
     for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
         if( pArray[i] == ServiceName )
             return sal_True;
@@ -178,15 +178,15 @@ sal_Bool BibliographyLoader::supportsService(const rtl::OUString& ServiceName) t
 }
 
 // XServiceInfo
-Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames(void) throw(  )
+Sequence< OUString > BibliographyLoader::getSupportedServiceNames(void) throw(  )
 {
     return getSupportedServiceNames_Static();
 }
 
 // ORegistryServiceManager_Static
-Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw(  )
+Sequence< OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw(  )
 {
-    Sequence< rtl::OUString > aSNS( 2 );
+    Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[0] = "com.sun.star.frame.FrameLoader";
     //!
     aSNS.getArray()[1] = "com.sun.star.frame.Bibliography";
@@ -224,7 +224,7 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep
     //!
 }
 
-void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL,
+void BibliographyLoader::load(const Reference< XFrame > & rFrame, const OUString& rURL,
         const Sequence< PropertyValue >& rArgs,
         const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException)
 {
@@ -249,7 +249,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS
 }
 
 // -----------------------------------------------------------------------
-void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl::OUString& /*rURL*/,
+void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const OUString& /*rURL*/,
         const Sequence< PropertyValue >& /*rArgs*/,
         const Reference< XLoadEventListener > & rListener)
 {
@@ -400,7 +400,7 @@ Reference< sdb::XColumn >  BibliographyLoader::GetIdentifierColumn() const
 {
     BibDataManager* pDatMan = GetDataManager();
     Reference< XNameAccess >  xColumns = GetDataColumns();
-    rtl::OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping();
+    OUString sIdentifierColumnName = pDatMan->GetIdentifierMapping();
 
     Reference< sdb::XColumn >  xReturn;
     if (xColumns.is() && xColumns->hasByName(sIdentifierColumnName))
@@ -420,7 +420,7 @@ Reference< XResultSet >  BibliographyLoader::GetDataCursor() const
     return m_xCursor;
 }
 
-static rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
+static OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
         const Mapping* pMapping, const String& rColumnName)
 {
     String sColumnName(rColumnName);
@@ -435,8 +435,8 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
             }
         }
     }
-    rtl::OUString uColumnName(sColumnName);
-    rtl::OUString uRet;
+    OUString uColumnName(sColumnName);
+    OUString uRet;
     Reference< sdb::XColumn >  xCol;
     if (xColumns->hasByName(uColumnName))
         xCol = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(uColumnName).getValue(), UNO_QUERY);
@@ -445,7 +445,7 @@ static rtl::OUString lcl_AddProperty(Reference< XNameAccess >  xColumns,
     return uRet;
 }
 //-----------------------------------------------------------------------------
-Any BibliographyLoader::getByName(const rtl::OUString& rName) throw
+Any BibliographyLoader::getByName(const OUString& rName) throw
                         ( NoSuchElementException, WrappedTargetException, RuntimeException )
 {
     Any aRet;
@@ -463,7 +463,7 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw
             return aRet;
 
         String sIdentifierMapping = pDatMan->GetIdentifierMapping();
-        rtl::OUString sId = sIdentifierMapping;
+        OUString sId = sIdentifierMapping;
         Reference< sdb::XColumn >  xColumn;
         if (xColumns->hasByName(sId))
             xColumn = Reference< sdb::XColumn > (*(Reference< XInterface > *)xColumns->getByName(sId).getValue(), UNO_QUERY);
@@ -500,9 +500,9 @@ Any BibliographyLoader::getByName(const rtl::OUString& rName) throw
     return aRet;
 }
 
-Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException )
+Sequence< OUString > BibliographyLoader::getElementNames(void) throw ( RuntimeException )
 {
-    Sequence< rtl::OUString > aRet(10);
+    Sequence< OUString > aRet(10);
     int nRealNameCount = 0;
     try
     {
@@ -512,13 +512,13 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt
         {
             do
             {
-                rtl::OUString sTemp = xIdColumn->getString();
+                OUString sTemp = xIdColumn->getString();
                 if (!sTemp.isEmpty() && !xIdColumn->wasNull())
                 {
                     int nLen = aRet.getLength();
                     if(nLen == nRealNameCount)
                         aRet.realloc(nLen + 10);
-                    rtl::OUString* pArray = aRet.getArray();
+                    OUString* pArray = aRet.getArray();
                     pArray[nRealNameCount] = sTemp;
                     nRealNameCount++;
                 }
@@ -535,7 +535,7 @@ Sequence< rtl::OUString > BibliographyLoader::getElementNames(void) throw ( Runt
     return aRet;
 }
 
-sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( RuntimeException )
+sal_Bool BibliographyLoader::hasByName(const OUString& rName) throw ( RuntimeException )
 {
     sal_Bool bRet = sal_False;
     try
@@ -547,7 +547,7 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti
         {
             do
             {
-                rtl::OUString sCurrentId = xIdColumn->getString();
+                OUString sCurrentId = xIdColumn->getString();
                 if (!xIdColumn->wasNull() && rName.startsWith(sCurrentId))
                 {
                     bRet = sal_True;
@@ -589,7 +589,7 @@ Reference< XPropertySetInfo >  BibliographyLoader::getPropertySetInfo(void) thro
     return xRet;
 }
 
-void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/,
+void BibliographyLoader::setPropertyValue(const OUString& /*PropertyName*/,
                                         const Any& /*aValue*/)
     throw( UnknownPropertyException, PropertyVetoException,
         IllegalArgumentException, WrappedTargetException, RuntimeException)
@@ -598,7 +598,7 @@ void BibliographyLoader::setPropertyValue(const rtl::OUString& /*PropertyName*/,
     //no changeable properties
 }
 
-Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName)
+Any BibliographyLoader::getPropertyValue(const OUString& rPropertyName)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     Any aRet;
@@ -654,28 +654,28 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName)
 }
 
 void BibliographyLoader::addPropertyChangeListener(
-        const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
+        const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no bound properties
 }
 
 void BibliographyLoader::removePropertyChangeListener(
-        const rtl::OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
+        const OUString& /*PropertyName*/, const Reference< XPropertyChangeListener > & /*aListener*/)
         throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no bound properties
 }
 
 void BibliographyLoader::addVetoableChangeListener(
-    const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
+    const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no vetoable properties
 }
 
 void BibliographyLoader::removeVetoableChangeListener(
-    const rtl::OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
+    const OUString& /*PropertyName*/, const Reference< XVetoableChangeListener > & /*aListener*/)
     throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
 {
     //no vetoable properties
diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx
index 74ad9b42bf18..d642e2620f42 100644
--- a/extensions/source/bibliography/bibmod.cxx
+++ b/extensions/source/bibliography/bibmod.cxx
@@ -89,7 +89,7 @@ BibConfig*  BibModul::GetConfig()
 
 
 // PropertyNames
-#define STATIC_USTRING(a,b) rtl::OUString a(b)
+#define STATIC_USTRING(a,b) OUString a(b)
 STATIC_USTRING(FM_PROP_LABEL,"Label");
 STATIC_USTRING(FM_PROP_CONTROLSOURCE,"DataField");
 STATIC_USTRING(FM_PROP_NAME,"Name");
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 9891fe077fff..b22a7d12ab33 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -81,7 +81,7 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::lang;
 
-Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
+Reference< XConnection > getConnection(const OUString& _rURL)
 {
     // first get the sdb::DataSource corresponding to the url
     Reference< XDataSource >    xDataSource;
@@ -166,7 +166,7 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
             {
                 DBG_ASSERT((*(sal_Int32*)xFormProps->getPropertyValue("CommandType").getValue()) == CommandType::TABLE,
                     "::getColumns : invalid form (has no table as data source) !");
-                ::rtl::OUString sTable;
+                OUString sTable;
                 xFormProps->getPropertyValue("Command") >>= sTable;
                 Reference< XNameAccess >  xTables = xSupplyTables->getTables();
                 if (xTables.is() && xTables->hasByName(sTable))
@@ -178,10 +178,10 @@ Reference< XNameAccess >  getColumns(const Reference< XForm > & _rxForm)
             catch (const Exception& e)
             {
 #ifdef DBG_UTIL
-                String sMsg(rtl::OUString("::getColumns : catched an exception ("));
+                String sMsg(OUString("::getColumns : catched an exception ("));
                 sMsg += String(e.Message);
                 sMsg.AppendAscii(") ...");
-                OSL_FAIL(rtl::OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr());
+                OSL_FAIL(OUStringToOString(sMsg, RTL_TEXTENCODING_ASCII_US ).getStr());
 #else
                 (void)e;
 #endif
@@ -280,7 +280,7 @@ public:
 };
 
 static sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig ,
-                                    const ::rtl::OUString& rLogicalColumnName)
+                                    const OUString& rLogicalColumnName)
 {
     for(sal_uInt16 i = 0; i < COLUMN_COUNT; i++)
     {
@@ -400,7 +400,7 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
 
     aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl));
     String sTitle = GetText();
-    sTitle.SearchAndReplace(rtl::OUString("%1"), pDatMan->getActiveDataTable(), 0);
+    sTitle.SearchAndReplace(OUString("%1"), pDatMan->getActiveDataTable(), 0);
     SetText(sTitle);
 
     aListBoxes[0] = &aIdentifierLB;
@@ -440,9 +440,9 @@ MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) :
     DBG_ASSERT(xFields.is(), "MappingDialog_Impl::MappingDialog_Impl : gave me an invalid form !");
     if(xFields.is())
     {
-        Sequence< ::rtl::OUString > aNames = xFields->getElementNames();
+        Sequence< OUString > aNames = xFields->getElementNames();
         sal_Int32 nFieldsCount = aNames.getLength();
-        const ::rtl::OUString* pNames = aNames.getConstArray();
+        const OUString* pNames = aNames.getConstArray();
 
         for(sal_Int32 nField = 0; nField < nFieldsCount; nField++)
             aListBoxes[0]->InsertEntry(pNames[nField]);
@@ -579,9 +579,9 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
         aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_CLIPCHILDREN|WB_SORT);
         aSelectionLB.GetModel()->SetSortMode(SortAscending);
 
-        ::rtl::OUString sActiveSource = pDatMan->getActiveDataSource();
-        const Sequence< ::rtl::OUString >& rSources = aConfig.GetDataSourceNames();
-        const ::rtl::OUString* pSourceNames = rSources.getConstArray();
+        OUString sActiveSource = pDatMan->getActiveDataSource();
+        const Sequence< OUString >& rSources = aConfig.GetDataSourceNames();
+        const OUString* pSourceNames = rSources.getConstArray();
         for(int i = 0; i < rSources.getLength(); i++)
         {
             SvTreeListEntry* pEntry = aSelectionLB.InsertEntry(pSourceNames[i]);
@@ -644,7 +644,7 @@ void BibInterceptorHelper::ReleaseInterceptor()
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL
-    BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException)
+    BibInterceptorHelper::queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException)
 {
     Reference< XDispatch > xReturn;
 
@@ -696,11 +696,11 @@ void SAL_CALL BibInterceptorHelper::setMasterDispatchProvider( const ::com::sun:
 
 //-----------------------------------------------------------------------------
 #define STR_UID "uid"
-::rtl::OUString gGridName("theGrid");
-::rtl::OUString gViewName("theView");
-::rtl::OUString gGlobalName("theGlobals");
-::rtl::OUString gBeamerSize("theBeamerSize");
-::rtl::OUString gViewSize("theViewSize");
+OUString gGridName("theGrid");
+OUString gViewName("theView");
+OUString gGlobalName("theGlobals");
+OUString gBeamerSize("theBeamerSize");
+OUString gViewSize("theViewSize");
 
 BibDataManager::BibDataManager()
     :BibDataManager_Base( GetMutex() )
@@ -749,9 +749,9 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
         // remove the old fields
         if ( xColContainer->hasElements() )
         {
-            Sequence< ::rtl::OUString > aNames = xColContainer->getElementNames();
-            const ::rtl::OUString* pNames = aNames.getConstArray();
-            const ::rtl::OUString* pNamesEnd = pNames + aNames.getLength();
+            Sequence< OUString > aNames = xColContainer->getElementNames();
+            const OUString* pNames = aNames.getConstArray();
+            const OUString* pNamesEnd = pNames + aNames.getLength();
             for ( ; pNames != pNamesEnd; ++pNames )
                 xColContainer->removeByName( *pNames );
         }
@@ -764,16 +764,16 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
 
         Reference< XPropertySet >  xField;
 
-        Sequence< ::rtl::OUString > aFields( xFields->getElementNames() );
-        const ::rtl::OUString* pFields = aFields.getConstArray();
-        const ::rtl::OUString* pFieldsEnd = pFields + aFields.getLength();
+        Sequence< OUString > aFields( xFields->getElementNames() );
+        const OUString* pFields = aFields.getConstArray();
+        const OUString* pFieldsEnd = pFields + aFields.getLength();
 
         for ( ; pFields != pFieldsEnd; ++pFields )
         {
             xFields->getByName( *pFields ) >>= xField;
 
-            ::rtl::OUString sCurrentModelType;
-            const ::rtl::OUString sType("Type");
+            OUString sCurrentModelType;
+            const OUString sType("Type");
             sal_Int32 nType = 0;
             sal_Bool bIsFormatted           = sal_False;
             sal_Bool bFormattedIsNumeric    = sal_True;
@@ -807,7 +807,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
             Reference< XPropertySet >  xCurrentCol = xColFactory->createColumn(sCurrentModelType);
             if (bIsFormatted)
             {
-                ::rtl::OUString sFormatKey("FormatKey");
+                OUString sFormatKey("FormatKey");
                 xCurrentCol->setPropertyValue(sFormatKey, xField->getPropertyValue(sFormatKey));
                 Any aFormatted(&bFormattedIsNumeric, ::getBooleanCppuType());
                 xCurrentCol->setPropertyValue("TreatAsNumber", aFormatted);
@@ -835,7 +835,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference<
     try
     {
         Reference< XPropertySet >  aFormPropSet( xDbForm, UNO_QUERY );
-        ::rtl::OUString sName;
+        OUString sName;
         aFormPropSet->getPropertyValue("Command") >>= sName;
 
         if ( !m_xGridModel.is() )
@@ -889,13 +889,13 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
             Reference< XNameAccess >  xTables = xSupplyTables.is() ?
                                 xSupplyTables->getTables() : Reference< XNameAccess > ();
 
-            Sequence< ::rtl::OUString > aTableNameSeq;
+            Sequence< OUString > aTableNameSeq;
             if (xTables.is())
                 aTableNameSeq = xTables->getElementNames();
 
             if(aTableNameSeq.getLength() > 0)
             {
-                const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray();
+                const OUString* pTableNames = aTableNameSeq.getConstArray();
                 if(!rDesc.sTableOrQuery.isEmpty())
                     aActiveDataTable = rDesc.sTableOrQuery;
                 else
@@ -915,11 +915,11 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
                 if ( xFactory.is() )
-                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
+                    m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
-                ::rtl::OUString aString("SELECT * FROM ");
+                OUString aString("SELECT * FROM ");
 
-                ::rtl::OUString sCatalog, sSchema, sName;
+                OUString sCatalog, sSchema, sName;
                 ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation );
                 aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName );
 
@@ -940,9 +940,9 @@ Reference< XForm >  BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
     return xResult;
 }
 //------------------------------------------------------------------------
-Sequence< ::rtl::OUString > BibDataManager::getDataSources()
+Sequence< OUString > BibDataManager::getDataSources()
 {
-    Sequence< ::rtl::OUString > aTableNameSeq;
+    Sequence< OUString > aTableNameSeq;
 
     try
     {
@@ -961,19 +961,19 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources()
     return aTableNameSeq;
 }
 //------------------------------------------------------------------------
-::rtl::OUString BibDataManager::getActiveDataTable()
+OUString BibDataManager::getActiveDataTable()
 {
     return aActiveDataTable;
 }
 //------------------------------------------------------------------------
-void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
+void BibDataManager::setFilter(const OUString& rQuery)
 {
     if(!m_xParser.is())
         return;
     try
     {
         m_xParser->setFilter( rQuery );
-        ::rtl::OUString aQuery = m_xParser->getFilter();
+        OUString aQuery = m_xParser->getFilter();
         Reference< XPropertySet >  xFormProps( m_xForm, UNO_QUERY_THROW );
         xFormProps->setPropertyValue( "Filter", makeAny( aQuery ) );
         xFormProps->setPropertyValue( "ApplyFilter", makeAny( sal_True ) );
@@ -987,10 +987,10 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
 
 }
 //------------------------------------------------------------------------
-::rtl::OUString BibDataManager::getFilter()
+OUString BibDataManager::getFilter()
 {
 
-    ::rtl::OUString aQueryString;
+    OUString aQueryString;
     try
     {
         Reference< XPropertySet > xFormProps( m_xForm, UNO_QUERY_THROW );
@@ -1006,23 +1006,23 @@ void BibDataManager::setFilter(const ::rtl::OUString& rQuery)
 
 }
 //------------------------------------------------------------------------
-Sequence< ::rtl::OUString > BibDataManager::getQueryFields()
+Sequence< OUString > BibDataManager::getQueryFields()
 {
-    Sequence< ::rtl::OUString > aFieldSeq;
+    Sequence< OUString > aFieldSeq;
     Reference< XNameAccess >  xFields = getColumns( m_xForm );
     if (xFields.is())
         aFieldSeq = xFields->getElementNames();
     return aFieldSeq;
 }
 //------------------------------------------------------------------------
-::rtl::OUString BibDataManager::getQueryField()
+OUString BibDataManager::getQueryField()
 {
     BibConfig* pConfig = BibModul::GetConfig();
-    ::rtl::OUString aFieldString = pConfig->getQueryField();
+    OUString aFieldString = pConfig->getQueryField();
     if(aFieldString.isEmpty())
     {
-        Sequence< ::rtl::OUString > aSeq = getQueryFields();
-        const ::rtl::OUString* pFields = aSeq.getConstArray();
+        Sequence< OUString > aSeq = getQueryFields();
+        const OUString* pFields = aSeq.getConstArray();
         if(aSeq.getLength()>0)
         {
             aFieldString=pFields[0];
@@ -1031,12 +1031,12 @@ Sequence< ::rtl::OUString > BibDataManager::getQueryFields()
     return aFieldString;
 }
 //------------------------------------------------------------------------
-void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery)
+void BibDataManager::startQueryWith(const OUString& rQuery)
 {
     BibConfig* pConfig = BibModul::GetConfig();
     pConfig->setQueryText( rQuery );
 
-    ::rtl::OUString aQueryString;
+    OUString aQueryString;
     if(!rQuery.isEmpty())
     {
         aQueryString=aQuoteChar;
@@ -1052,9 +1052,9 @@ void BibDataManager::startQueryWith(const ::rtl::OUString& rQuery)
     setFilter(aQueryString);
 }
 
-void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
+void BibDataManager::setActiveDataSource(const OUString& rURL)
 {
-    ::rtl::OUString sTmp(aDataSourceURL);
+    OUString sTmp(aDataSourceURL);
     aDataSourceURL = rURL;
 
     Reference< XPropertySet >  aPropertySet( m_xForm, UNO_QUERY );
@@ -1075,12 +1075,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
         aPropertySet->setPropertyValue("ActiveConnection", aVal);
         Reference< XMultiServiceFactory >   xFactory(xConnection, UNO_QUERY);
         if ( xFactory.is() )
-            m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
+            m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
         if(xOldConnection.is())
             xOldConnection->dispose();
 
-        Sequence< ::rtl::OUString > aTableNameSeq;
+        Sequence< OUString > aTableNameSeq;
         Reference< XTablesSupplier >  xSupplyTables(xConnection, UNO_QUERY);
         if(xSupplyTables.is())
         {
@@ -1089,7 +1089,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
         }
         if(aTableNameSeq.getLength() > 0)
         {
-            const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray();
+            const OUString* pTableNames = aTableNameSeq.getConstArray();
             aActiveDataTable = pTableNames[0];
             aVal <<= aActiveDataTable;
             aPropertySet->setPropertyValue("Command", aVal);
@@ -1097,12 +1097,12 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
             //Caching for Performance
             aVal <<= (sal_Int32)50;
             aPropertySet->setPropertyValue("FetchSize", aVal);
-            ::rtl::OUString aString("SELECT * FROM ");
+            OUString aString("SELECT * FROM ");
             // quote the table name which may contain catalog.schema.table
             Reference<XDatabaseMetaData> xMetaData(xConnection->getMetaData(),UNO_QUERY);
             aQuoteChar = xMetaData->getIdentifierQuoteString();
 
-            ::rtl::OUString sCatalog, sSchema, sName;
+            OUString sCatalog, sSchema, sName;
             ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation );
             aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName );
 
@@ -1133,7 +1133,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL)
 }
 
 
-void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
+void BibDataManager::setActiveDataTable(const OUString& rTable)
 {
     ResetIdentifierMapping();
     try
@@ -1145,11 +1145,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
             Reference< XConnection >    xConnection = getConnection( m_xForm );
             Reference< XTablesSupplier >  xSupplyTables(xConnection, UNO_QUERY);
             Reference< XNameAccess > xAccess = xSupplyTables->getTables();
-            Sequence< ::rtl::OUString > aTableNameSeq = xAccess->getElementNames();
+            Sequence< OUString > aTableNameSeq = xAccess->getElementNames();
             sal_uInt32 nCount = aTableNameSeq.getLength();
 
-            const ::rtl::OUString* pTableNames = aTableNameSeq.getConstArray();
-            const ::rtl::OUString* pTableNamesEnd = pTableNames + nCount;
+            const OUString* pTableNames = aTableNameSeq.getConstArray();
+            const OUString* pTableNamesEnd = pTableNames + nCount;
 
             for ( ; pTableNames != pTableNamesEnd; ++pTableNames )
             {
@@ -1168,11 +1168,11 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
 
                 Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY);
                 if ( xFactory.is() )
-                    m_xParser.set( xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
+                    m_xParser.set( xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ), UNO_QUERY );
 
-                ::rtl::OUString aString("SELECT * FROM ");
+                OUString aString("SELECT * FROM ");
 
-                ::rtl::OUString sCatalog, sSchema, sName;
+                OUString sCatalog, sSchema, sName;
                 ::dbtools::qualifiedNameComponents( xMetaData, aActiveDataTable, sCatalog, sSchema, sName, ::dbtools::eInDataManipulation );
                 aString += ::dbtools::composeTableNameForSelect( xConnection, sCatalog, sSchema, sName );
 
@@ -1291,7 +1291,7 @@ void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener
 }
 
 //------------------------------------------------------------------------
-Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName)
+Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString& rName)
 {
     Reference< awt::XControlModel > xModel;
 
@@ -1307,17 +1307,17 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
         xPropSet->setPropertyValue( "Name", makeAny( rName ) );
 
         // set the name of the to-be-created control
-        ::rtl::OUString aControlName("com.sun.star.form.control.InteractionGridControl");
+        OUString aControlName("com.sun.star.form.control.InteractionGridControl");
         Any aAny; aAny <<= aControlName;
         xPropSet->setPropertyValue( "DefaultControl",aAny );
 
         // the helpURL
-        ::rtl::OUString uProp("HelpURL");
+        OUString uProp("HelpURL");
         Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo();
         if (xPropInfo->hasPropertyByName(uProp))
         {
-            ::rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ));
-            sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL );
+            OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ));
+            sId += OUString::createFromAscii( HID_BIB_DB_GRIDCTRL );
             xPropSet->setPropertyValue( uProp, makeAny( sId ) );
         }
     }
@@ -1329,9 +1329,9 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
     return xModel;
 }
 //------------------------------------------------------------------------
-::rtl::OUString BibDataManager::getControlName(sal_Int32 nFormatKey )
+OUString BibDataManager::getControlName(sal_Int32 nFormatKey )
 {
-    ::rtl::OUString aResStr;
+    OUString aResStr;
     switch (nFormatKey)
     {
         case DataType::BIT:
@@ -1369,10 +1369,10 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS
 }
 //------------------------------------------------------------------------
 Reference< awt::XControlModel > BibDataManager::loadControlModel(
-                    const ::rtl::OUString& rName, sal_Bool bForceListBox)
+                    const OUString& rName, sal_Bool bForceListBox)
 {
     Reference< awt::XControlModel > xModel;
-    ::rtl::OUString aName("View_");
+    OUString aName("View_");
     aName += rName;
 
     try
@@ -1390,11 +1390,11 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
             aElement >>= xField;
             Reference< XPropertySetInfo >  xInfo = xField.is() ? xField->getPropertySetInfo() : Reference< XPropertySetInfo > ();
 
-            const ::rtl::OUString sType("Type");
+            const OUString sType("Type");
             sal_Int32 nFormatKey = 0;
             xField->getPropertyValue(sType) >>= nFormatKey;
 
-            ::rtl::OUString aInstanceName("com.sun.star.form.component.");
+            OUString aInstanceName("com.sun.star.form.component.");
 
             if (bForceListBox)
                 aInstanceName += "ListBox";
@@ -1409,7 +1409,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel(
 
             xPropSet->setPropertyValue( FM_PROP_NAME,aFieldName);
             xPropSet->setPropertyValue( FM_PROP_CONTROLSOURCE, makeAny( rName ) );
-            xPropSet->setPropertyValue( ::rtl::OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) );
+            xPropSet->setPropertyValue( OUString( "NativeWidgetLook" ), makeAny( (sal_Bool)sal_True ) );
 
             Reference< XFormComponent >  aFormComp(xModel,UNO_QUERY );
 
@@ -1494,11 +1494,11 @@ void BibDataManager::SetMeAsUidListener()
         if (!xFields.is())
             return;
 
-        Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
-        const ::rtl::OUString* pFields = aFields.getConstArray();
+        Sequence< OUString > aFields(xFields->getElementNames());
+        const OUString* pFields = aFields.getConstArray();
         sal_Int32 nCount=aFields.getLength();
-        rtl::OUString StrUID(STR_UID);
-        ::rtl::OUString theFieldName;
+        OUString StrUID(STR_UID);
+        OUString theFieldName;
         for( sal_Int32 i=0; i<nCount; i++ )
         {
             String aName= pFields[i];
@@ -1538,11 +1538,11 @@ void BibDataManager::RemoveMeAsUidListener()
             return;
 
 
-        Sequence< ::rtl::OUString > aFields(xFields->getElementNames());
-        const ::rtl::OUString* pFields = aFields.getConstArray();
+        Sequence< OUString > aFields(xFields->getElementNames());
+        const OUString* pFields = aFields.getConstArray();
         sal_Int32 nCount=aFields.getLength();
-        rtl::OUString StrUID(STR_UID);
-        ::rtl::OUString theFieldName;
+        OUString StrUID(STR_UID);
+        OUString theFieldName;
         for( sal_Int32 i=0; i<nCount; i++ )
         {
             String aName= pFields[i];
@@ -1582,9 +1582,9 @@ void BibDataManager::CreateMappingDialog(Window* pParent)
     delete pDlg;
 }
 
-::rtl::OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
+OUString BibDataManager::CreateDBChangeDialog(Window* pParent)
 {
-    ::rtl::OUString uRet;
+    OUString uRet;
     DBChangeDialog_Impl * pDlg = new DBChangeDialog_Impl(pParent, this );
     if(RET_OK == pDlg->Execute())
     {
@@ -1604,7 +1604,7 @@ void BibDataManager::DispatchDBChangeDialog()
         pToolbar->SendDispatch(TBC_BT_CHANGESOURCE, Sequence< PropertyValue >());
 }
 
-const ::rtl::OUString& BibDataManager::GetIdentifierMapping()
+const OUString& BibDataManager::GetIdentifierMapping()
 {
     if(sIdentifierMapping.isEmpty())
     {
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index b450bada2b23..ea3acb6eb9f0 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -66,7 +66,7 @@ public:
     void ReleaseInterceptor();
 
     // XDispatchProvider
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException);
     // XDispatchProviderInterceptor
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -92,9 +92,9 @@ private:
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >      m_xFormDispatch;
         BibInterceptorHelper* m_pInterceptorHelper;
 
-        ::rtl::OUString                     aActiveDataTable;
-        ::rtl::OUString                     aDataSourceURL;
-        ::rtl::OUString                     aQuoteChar;
+        OUString                     aActiveDataTable;
+        OUString                     aDataSourceURL;
+        OUString                     aQuoteChar;
         ::com::sun::star::uno::Any                      aUID;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >              xBibCursor;
 
@@ -103,19 +103,19 @@ private:
         ::bib::BibView*             pBibView;
         BibToolBar*                 pToolbar;
 
-        rtl::OUString               sIdentifierMapping;
+        OUString               sIdentifierMapping;
 protected:
 
         void                        InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid);
         void                        SetMeAsUidListener();
         void                        RemoveMeAsUidListener();
 
-        void                        UpdateAddressbookCursor(::rtl::OUString aSourceName);
+        void                        UpdateAddressbookCursor(OUString aSourceName);
 
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
                                     updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm);
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
-                                    createGridModel( const ::rtl::OUString& rName );
+                                    createGridModel( const OUString& rName );
 
         // XLoadable
         virtual void SAL_CALL load(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -143,32 +143,32 @@ public:
 
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >            updateGridModel();
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString>           getDataSources();
+        ::com::sun::star::uno::Sequence< OUString>           getDataSources();
 
-        ::rtl::OUString             getActiveDataSource() {return aDataSourceURL;}
-        void                        setActiveDataSource(const ::rtl::OUString& rURL);
+        OUString             getActiveDataSource() {return aDataSourceURL;}
+        void                        setActiveDataSource(const OUString& rURL);
 
-        ::rtl::OUString             getActiveDataTable();
-        void                        setActiveDataTable(const ::rtl::OUString& rTable);
+        OUString             getActiveDataTable();
+        void                        setActiveDataTable(const OUString& rTable);
 
-        void                        setFilter(const ::rtl::OUString& rQuery);
-        ::rtl::OUString                     getFilter();
+        void                        setFilter(const OUString& rQuery);
+        OUString                     getFilter();
 
-        ::com::sun::star::uno::Sequence< ::rtl::OUString>           getQueryFields();
-        ::rtl::OUString                     getQueryField();
-        void                        startQueryWith(const ::rtl::OUString& rQuery);
+        ::com::sun::star::uno::Sequence< OUString>           getQueryFields();
+        OUString                     getQueryField();
+        void                        startQueryWith(const OUString& rQuery);
 
         const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >&    getParser() { return m_xParser; }
         const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >&                        getForm()   { return m_xForm; }
 
 
-        ::rtl::OUString                     getControlName(sal_Int32 nFormatKey );
+        OUString                     getControlName(sal_Int32 nFormatKey );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >            loadControlModel(const ::rtl::OUString& rName,
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >            loadControlModel(const OUString& rName,
                                                         sal_Bool bForceListBox = sal_False);
 
         void                        CreateMappingDialog(Window* pParent);
-        ::rtl::OUString             CreateDBChangeDialog(Window* pParent);
+        OUString             CreateDBChangeDialog(Window* pParent);
 
         void                        DispatchDBChangeDialog();
         sal_Bool                    HasActiveConnection() const;
@@ -177,8 +177,8 @@ public:
 
         void                        SetToolbar(BibToolBar* pSet);
 
-        const rtl::OUString&        GetIdentifierMapping();
-        void                        ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();}
+        const OUString&        GetIdentifierMapping();
+        void                        ResetIdentifierMapping() {sIdentifierMapping = OUString();}
 
         ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController();
         // #100312# ----------
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 9dfd994a031b..5a6cd4f95e6d 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -60,7 +60,6 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
-using ::rtl::OUString;
 
 struct DispatchInfo
 {
@@ -99,7 +98,7 @@ static DispatchInfo SupportedCommandsArray[] =
     { 0                         ,   0                               , sal_False }
 };
 
-typedef ::boost::unordered_map< ::rtl::OUString, CacheDispatchInfo, rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > CmdToInfoCache;
+typedef ::boost::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
 
 const CmdToInfoCache& GetCommandToInfoCache()
 {
@@ -114,7 +113,7 @@ const CmdToInfoCache& GetCommandToInfoCache()
             sal_Int32 i( 0 );
             while ( SupportedCommandsArray[i].pCommand != 0 )
             {
-                rtl::OUString aCommand( rtl::OUString::createFromAscii( SupportedCommandsArray[i].pCommand ));
+                OUString aCommand( OUString::createFromAscii( SupportedCommandsArray[i].pCommand ));
 
                 CacheDispatchInfo aDispatchInfo;
                 aDispatchInfo.nGroupId          = SupportedCommandsArray[i].nGroupId;
@@ -202,22 +201,22 @@ BibFrameController_Impl::~BibFrameController_Impl()
         CloseBibModul(pBibMod);
 }
 
-::rtl::OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException)
+OUString SAL_CALL BibFrameController_Impl::getImplementationName() throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString("com.sun.star.comp.extensions.Bibliography");
+    return OUString("com.sun.star.comp.extensions.Bibliography");
 }
 
-sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
+sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const OUString& sServiceName ) throw (::com::sun::star::uno::RuntimeException)
 {
     return ( sServiceName == "com.sun.star.frame.Bibliography" || sServiceName == "com.sun.star.frame.Controller" );
 }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException)
+::com::sun::star::uno::Sequence< OUString > SAL_CALL BibFrameController_Impl::getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException)
 {
     // return only top level services ...
     // base services are included there and should be asked by uno-rtti.
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1);
-    lNames[0] = ::rtl::OUString("com.sun.star.frame.Bibliography");
+    ::com::sun::star::uno::Sequence< OUString > lNames(1);
+    lNames[0] = OUString("com.sun.star.frame.Bibliography");
     return lNames;
 }
 
@@ -281,7 +280,7 @@ void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::X
     pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener );
 }
 
-uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException)
+uno::Reference< frame::XDispatch >  BibFrameController_Impl::queryDispatch( const util::URL& aURL, const OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
     if ( !bDisposing )
     {
@@ -434,14 +433,14 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
         }
         else if(aCommand.EqualsAscii("Bib/sdbsource"))
         {
-            rtl::OUString aURL = pDatMan->CreateDBChangeDialog(pParent);
+            OUString aURL = pDatMan->CreateDBChangeDialog(pParent);
             if(!aURL.isEmpty())
             {
                 try
                 {
                     uno::Sequence< beans::PropertyValue > aNewDataSource(2);
                     beans::PropertyValue* pProps = aNewDataSource.getArray();
-                    pProps[0].Value <<= rtl::OUString();
+                    pProps[0].Value <<= OUString();
                     pProps[1].Value <<= aURL;
                     ChangeDataSource(aNewDataSource);
                 }
@@ -471,11 +470,11 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
 
             const beans::PropertyValue* pPropertyValue = aArgs.getConstArray();
             uno::Any aValue=pPropertyValue[0].Value;
-            rtl::OUString aQuery;
+            OUString aQuery;
             aValue >>= aQuery;
 
             aValue=pPropertyValue[1].Value;
-            rtl::OUString aQueryField;
+            OUString aQueryField;
             aValue >>= aQueryField;
             BibConfig* pConfig = BibModul::GetConfig();
             pConfig->setQueryField(aQueryField);
@@ -495,7 +494,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                 {
                     // the dialog has been executed successfully, and the filter on the query composer
                     // has been changed
-                    ::rtl::OUString sNewFilter = pDatMan->getParser()->getFilter();
+                    OUString sNewFilter = pDatMan->getParser()->getFilter();
                     pDatMan->setFilter( sNewFilter );
                 }
             }
@@ -669,15 +668,15 @@ void BibFrameController_Impl::addStatusListener(
     {
         aEvent.IsEnabled  = sal_True;
         const char*  pHier = bHierarchical? "" : "*" ;
-        aEvent.State <<= rtl::OUString::createFromAscii(pHier);
+        aEvent.State <<= OUString::createFromAscii(pHier);
     }
     else if(aURL.Path == "Bib/MenuFilter")
     {
         aEvent.IsEnabled  = sal_True;
         aEvent.FeatureDescriptor=pDatMan->getQueryField();
 
-        uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields();
-        aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0));
+        uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields();
+        aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0));
 
     }
     else if ( aURL.Path == "Bib/source")
@@ -685,8 +684,8 @@ void BibFrameController_Impl::addStatusListener(
         aEvent.IsEnabled  = sal_True;
         aEvent.FeatureDescriptor=pDatMan->getActiveDataTable();
 
-        uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getDataSources();
-        aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<rtl::OUString>*)0));
+        uno::Sequence<OUString> aStringSeq=pDatMan->getDataSources();
+        aEvent.State.setValue(&aStringSeq,::getCppuType((uno::Sequence<OUString>*)0));
     }
     else if( aURL.Path == "Bib/sdbsource" ||
              aURL.Path == "Bib/Mapping" ||
@@ -702,7 +701,7 @@ void BibFrameController_Impl::addStatusListener(
     }
     else if (aURL.Path == "Bib/removeFilter" )
     {
-        rtl::OUString aFilterStr=pDatMan->getFilter();
+        OUString aFilterStr=pDatMan->getFilter();
         aEvent.IsEnabled  = !aFilterStr.isEmpty();
     }
     else if(aURL.Path == "Cut")
@@ -746,7 +745,7 @@ void BibFrameController_Impl::addStatusListener(
                     try
                     {
                         uno::Any aData = xDataObj->getTransferData( aFlavor );
-                        ::rtl::OUString aText;
+                        OUString aText;
                         aData >>= aText;
                         aEvent.IsEnabled  = !aText.isEmpty();
                     }
@@ -804,7 +803,7 @@ void BibFrameController_Impl::removeStatusListener(
 //-----------------------------------------------------------------------------
 void BibFrameController_Impl::RemoveFilter()
 {
-    rtl::OUString aQuery;
+    OUString aQuery;
     pDatMan->startQueryWith(aQuery);
 
     sal_uInt16 nCount = aStatusListeners.size();
@@ -847,14 +846,14 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
 {
     const beans::PropertyValue* pPropertyValue = aArgs.getConstArray();
     uno::Any aValue=pPropertyValue[0].Value;
-    rtl::OUString aDBTableName;
+    OUString aDBTableName;
     aValue >>= aDBTableName;
 
 
     if(aArgs.getLength() > 1)
     {
         uno::Any aDB = pPropertyValue[1].Value;
-        rtl::OUString aURL;
+        OUString aURL;
         aDB >>= aURL;
         pDatMan->setActiveDataSource(aURL);
         aDBTableName = pDatMan->getActiveDataTable();
@@ -884,7 +883,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope
             aEvent.Source     = (XDispatch *) this;
             aEvent.FeatureDescriptor=pDatMan->getQueryField();
 
-            uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields();
+            uno::Sequence<OUString> aStringSeq=pDatMan->getQueryFields();
             aEvent.State  = makeAny( aStringSeq );
 
             pObj->xListener->statusChanged( aEvent );
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 18203cd8703c..775ad18ebbbf 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -85,9 +85,9 @@ public:
     void                        RemoveFilter();
 
                                 // ::com::sun::star::lang::XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& sServiceName ) 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& sServiceName ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::frame::XController
     virtual void                SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException);
@@ -104,7 +104,7 @@ public:
     virtual void                SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException);
 
                                 // ::com::sun::star::frame::XDispatchProvider
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >          SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >          SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException);
 
                                 //class ::com::sun::star::frame::XDispatch
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 7b9a4a4e50c7..6023fcbf742f 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -128,7 +128,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
                     }
                 }
             }
-            rtl::OUString uTypeMapping = sTypeMapping;
+            OUString uTypeMapping = sTypeMapping;
 
             uno::Reference< form::XForm >  xForm = pDatMan->getForm();
             uno::Reference< sdbcx::XColumnsSupplier >  xSupplyCols(xForm, UNO_QUERY);
@@ -149,8 +149,8 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
                     // getShort returns zero if the value is not a number
                     if (!nTempVal || xCol->wasNull())
                     {
-                        rtl::OUString sTempVal = xCol->getString();
-                        if(sTempVal != rtl::OUString('0'))
+                        OUString sTempVal = xCol->getString();
+                        if(sTempVal != OUString('0'))
                             nTempVal = -1;
                     }
                 }
@@ -432,7 +432,7 @@ void BibGeneralPage::CommitActiveControl()
 }
 //-----------------------------------------------------------------------------
 void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::Point& rPos, const ::Size& rSize,
-                                String& rErrorString, String aColumnUIName, const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray )
+                                String& rErrorString, String aColumnUIName, const OString& sHelpId, sal_uInt16 nIndexInFTArray )
 {
     // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT
 
@@ -456,7 +456,7 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P
 //-----------------------------------------------------------------------------
 uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
         const String& rName,
-        ::Point rPos, ::Size rSize, const rtl::OString& sHelpId, sal_Int16& rIndex )
+        ::Point rPos, ::Size rSize, const OString& sHelpId, sal_Int16& rIndex )
 {
     uno::Reference< awt::XControlModel >  xCtrModel;
     try
@@ -472,15 +472,15 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                 uno::Reference< beans::XPropertySetInfo >  xPropInfo = xPropSet->getPropertySetInfo();
 
                 uno::Any aAny = xPropSet->getPropertyValue( "DefaultControl" );
-                rtl::OUString aControlName;
+                OUString aControlName;
                 aAny >>= aControlName;
 
-                rtl::OUString uProp("HelpURL");
+                OUString uProp("HelpURL");
                 if(xPropInfo->hasPropertyByName(uProp))
                 {
-                    ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME );
-                    DBG_ASSERT( INetURLObject( rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
-                    sId += ::rtl::OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 );
+                    OUString sId = OUString::createFromAscii( INET_HID_SCHEME );
+                    DBG_ASSERT( INetURLObject( OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
+                    sId += OStringToOUString( sHelpId, RTL_TEXTENCODING_UTF8 );
                     xPropSet->setPropertyValue( uProp, makeAny( sId ) );
                 }
 
@@ -493,23 +493,23 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
                     aAny.setValue( &eSet, ::getCppuType((const ListSourceType*)0) );
                     xPropSet->setPropertyValue("ListSourceType", aAny);
 
-                    uno::Sequence<rtl::OUString> aListSource(TYPE_COUNT);
-                    rtl::OUString* pListSourceArr = aListSource.getArray();
+                    uno::Sequence<OUString> aListSource(TYPE_COUNT);
+                    OUString* pListSourceArr = aListSource.getArray();
                     //pListSourceArr[0] = "select TypeName, TypeIndex from TypeNms";
                     for(sal_Int32 i = 0; i < TYPE_COUNT; ++i)
-                        pListSourceArr[i] = rtl::OUString::valueOf(i);
-                    aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<rtl::OUString>*)0));
+                        pListSourceArr[i] = OUString::valueOf(i);
+                    aAny.setValue(&aListSource, ::getCppuType((uno::Sequence<OUString>*)0));
 
                     xPropSet->setPropertyValue("ListSource", aAny);
 
-                    uno::Sequence<rtl::OUString> aValues(TYPE_COUNT + 1);
-                    rtl::OUString* pValuesArr = aValues.getArray();
+                    uno::Sequence<OUString> aValues(TYPE_COUNT + 1);
+                    OUString* pValuesArr = aValues.getArray();
                     for(sal_uInt16 j = 0; j < TYPE_COUNT; j++)
                         pValuesArr[j]  = aBibTypeArr[j];
                     // empty string if an invalid value no values is set
-                    pValuesArr[TYPE_COUNT] = rtl::OUString();
+                    pValuesArr[TYPE_COUNT] = OUString();
 
-                    aAny.setValue(&aValues, ::getCppuType((uno::Sequence<rtl::OUString>*)0));
+                    aAny.setValue(&aValues, ::getCppuType((uno::Sequence<OUString>*)0));
 
                     xPropSet->setPropertyValue("StringItemList", aAny);
 
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 2b4a7ddb8c87..f9b97db7f5ef 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -124,12 +124,12 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage
     BibDataManager*     pDatMan;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >
-                                AddXControl( const String& rName, Point aPos, Size aSize, const rtl::OString& sHelpId,
+                                AddXControl( const String& rName, Point aPos, Size aSize, const OString& sHelpId,
                                             sal_Int16& rIndex );
 
-    void                        AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos,
+    void                        AddControlWithError( const OUString& rColumnName, const Point& rPos,
                                             const Size& rSize, String& rErrorString, String aColumnUIName,
-                                            const rtl::OString& sHelpId, sal_uInt16 nIndexInFTArray );
+                                            const OString& sHelpId, sal_uInt16 nIndexInFTArray );
 
     void                        AdjustScrollbars();
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 3b40e721a32f..ea3999fe03f1 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -45,7 +45,7 @@ using namespace ::com::sun::star::beans;
 // Konstanten -------------------------------------------------------------
 
 
-BibToolBarListener::BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
+BibToolBarListener::BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
         nIndex(nId),
         aCommand(aStr),
         pToolBar(pTB)
@@ -73,12 +73,12 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta
     }
 };
 
-rtl::OUString   BibToolBarListener::GetCommand() const
+OUString   BibToolBarListener::GetCommand() const
 {
     return aCommand;
 }
 
-BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
+BibTBListBoxListener::BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
     BibToolBarListener(pTB,aStr,nId)
 {
 }
@@ -95,13 +95,13 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
         pToolBar->EnableSourceList(rEvt.IsEnabled);
 
         Any aState = rEvt.State;
-        if(aState.getValueType() == ::getCppuType((Sequence<rtl::OUString>*)0))
+        if(aState.getValueType() == ::getCppuType((Sequence<OUString>*)0))
         {
             pToolBar->UpdateSourceList(sal_False);
             pToolBar->ClearSourceList();
 
-            Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*)aState.getValue();
-            const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray();
+            Sequence<OUString>* pStringSeq = (Sequence<OUString>*)aState.getValue();
+            const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray();
 
             sal_uInt32 nCount = pStringSeq->getLength();
             XubString aEntry;
@@ -118,7 +118,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS
     }
 };
 
-BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
+BibTBQueryMenuListener::BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
     BibToolBarListener(pTB,aStr,nId)
 {
 }
@@ -135,12 +135,12 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
         pToolBar->EnableSourceList(rEvt.IsEnabled);
 
         uno::Any aState=rEvt.State;
-        if(aState.getValueType()==::getCppuType((Sequence<rtl::OUString>*)0))
+        if(aState.getValueType()==::getCppuType((Sequence<OUString>*)0))
         {
             pToolBar->ClearFilterMenu();
 
-            Sequence<rtl::OUString>* pStringSeq = (Sequence<rtl::OUString>*) aState.getValue();
-            const rtl::OUString* pStringArray = (const rtl::OUString*)pStringSeq->getConstArray();
+            Sequence<OUString>* pStringSeq = (Sequence<OUString>*) aState.getValue();
+            const OUString* pStringArray = (const OUString*)pStringSeq->getConstArray();
 
             sal_uInt32 nCount = pStringSeq->getLength();
             for( sal_uInt32 i=0; i<nCount; i++ )
@@ -155,7 +155,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt)
     }
 };
 
-BibTBEditListener::BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId):
+BibTBEditListener::BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId):
     BibToolBarListener(pTB,aStr,nId)
 {
 }
@@ -315,7 +315,7 @@ void BibToolBar::Select()
         Sequence<PropertyValue> aPropVal(2);
         PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray();
         pPropertyVal[0].Name="QueryText";
-        rtl::OUString aSelection = aEdQuery.GetText();
+        OUString aSelection = aEdQuery.GetText();
         pPropertyVal[0].Value <<= aSelection;
 
         pPropertyVal[1].Name="QueryField";
@@ -326,7 +326,7 @@ void BibToolBar::Select()
 
 void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& rArgs)
 {
-    rtl::OUString aCommand = GetItemCommand(nId);
+    OUString aCommand = GetItemCommand(nId);
 
     uno::Reference< frame::XDispatchProvider >  xDSP( xController, UNO_QUERY );
 
@@ -341,7 +341,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r
 
             xTrans->parseStrict( aURL );
 
-            uno::Reference< frame::XDispatch >  xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF );
+            uno::Reference< frame::XDispatch >  xDisp = xDSP->queryDispatch( aURL, OUString(), frame::FrameSearchFlag::SELF );
 
             if ( xDisp.is() )
                     xDisp->dispatch( aURL, rArgs);
@@ -443,7 +443,7 @@ long BibToolBar::PreNotify( NotifyEvent& rNEvt )
             Sequence<PropertyValue> aPropVal(2);
             PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray();
             pPropertyVal[0].Name = "QueryText";
-            rtl::OUString aSelection = aEdQuery.GetText();
+            OUString aSelection = aEdQuery.GetText();
             pPropertyVal[0].Value <<= aSelection;
             pPropertyVal[1].Name="QueryField";
             pPropertyVal[1].Value <<= aQueryField;
@@ -470,7 +470,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/)
     PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray();
     pPropertyVal[0].Name = "DataSourceName";
     String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) );
-    rtl::OUString aSelection = aEntry;
+    OUString aSelection = aEntry;
     pPropertyVal[0].Value <<= aSelection;
     SendDispatch(TBC_LB_SOURCE,aPropVal);
 
@@ -497,7 +497,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/)
             Sequence<PropertyValue> aPropVal(2);
             PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray();
             pPropertyVal[0].Name = "QueryText";
-            rtl::OUString aSelection = aEdQuery.GetText();
+            OUString aSelection = aEdQuery.GetText();
             pPropertyVal[0].Value <<= aSelection;
             pPropertyVal[1].Name="QueryField";
             pPropertyVal[1].Value <<= aQueryField;
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 956ec905fa8e..877931c8a1a5 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -40,7 +40,7 @@ class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame
 private:
 
     sal_uInt16      nIndex;
-    rtl::OUString           aCommand;
+    OUString           aCommand;
 
 protected:
 
@@ -48,10 +48,10 @@ protected:
 
 public:
 
-    BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
+    BibToolBarListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
     ~BibToolBarListener();
 
-    rtl::OUString           GetCommand() const;
+    OUString           GetCommand() const;
 
     // ::com::sun::star::lang::XEventListener
     // we do not hold References to dispatches, so there is nothing to do on disposal
@@ -68,7 +68,7 @@ class BibTBListBoxListener: public BibToolBarListener
 {
 public:
 
-    BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
+    BibTBListBoxListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
     ~BibTBListBoxListener();
 
     virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
@@ -80,7 +80,7 @@ class BibTBEditListener: public BibToolBarListener
 {
 public:
 
-    BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
+    BibTBEditListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
     ~BibTBEditListener();
 
     virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
@@ -92,7 +92,7 @@ class BibTBQueryMenuListener:   public BibToolBarListener
 {
 public:
 
-    BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId);
+    BibTBQueryMenuListener(BibToolBar *pTB,OUString aStr,sal_uInt16 nId);
     ~BibTBQueryMenuListener();
 
     virtual void    SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event)
@@ -122,7 +122,7 @@ class BibToolBar:   public ToolBox
         PopupMenu               aPopupMenu;
         sal_uInt16              nMenuId;
         sal_uInt16              nSelMenuItem;
-        rtl::OUString           aQueryField;
+        OUString           aQueryField;
         Link                    aLayoutManager;
         sal_Int16               nSymbolsSize;
         sal_Int16               nOutStyle;