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

7 files changed, 133 insertions, 133 deletions

diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 81a809263ab0..b5e9b8e20539 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -47,11 +47,11 @@ namespace svx
     //= OColumnTransferable
     //====================================================================
     //--------------------------------------------------------------------
-    OColumnTransferable::OColumnTransferable(const ::rtl::OUString& _rDatasource
-                                            ,const ::rtl::OUString& _rConnectionResource
+    OColumnTransferable::OColumnTransferable(const OUString& _rDatasource
+                                            ,const OUString& _rConnectionResource
                                             ,const sal_Int32        _nCommandType
-                                            ,const ::rtl::OUString& _rCommand
-                                            ,const ::rtl::OUString& _rFieldName
+                                            ,const OUString& _rCommand
+                                            ,const OUString& _rFieldName
                                             ,sal_Int32  _nFormats)
         :m_nFormatFlags(_nFormats)
     {
@@ -62,7 +62,7 @@ namespace svx
     OColumnTransferable::OColumnTransferable(const ODataAccessDescriptor& _rDescriptor, sal_Int32 _nFormats )
         :m_nFormatFlags(_nFormats)
     {
-        ::rtl::OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName;
+        OUString sDataSource, sDatabaseLocation, sConnectionResource, sCommand, sFieldName;
         if ( _rDescriptor.has( daDataSource ) )         _rDescriptor[ daDataSource ] >>= sDataSource;
         if ( _rDescriptor.has( daDatabaseLocation ) )   _rDescriptor[ daDatabaseLocation ] >>= sDatabaseLocation;
         if ( _rDescriptor.has( daConnectionResource ) ) _rDescriptor[ daConnectionResource ] >>= sConnectionResource;
@@ -88,15 +88,15 @@ namespace svx
 
     //--------------------------------------------------------------------
     OColumnTransferable::OColumnTransferable(const Reference< XPropertySet >& _rxForm,
-            const ::rtl::OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn,
+            const OUString& _rFieldName, const Reference< XPropertySet >& _rxColumn,
             const Reference< XConnection >& _rxConnection, sal_Int32 _nFormats)
         :m_nFormatFlags(_nFormats)
     {
         OSL_ENSURE(_rxForm.is(), "OColumnTransferable::OColumnTransferable: invalid form!");
         // collect the necessary information from the form
-        ::rtl::OUString sCommand;
+        OUString sCommand;
         sal_Int32       nCommandType = CommandType::TABLE;
-        ::rtl::OUString sDatasource,sURL;
+        OUString sDatasource,sURL;
 
         sal_Bool        bTryToParse = sal_True;
         try
@@ -119,14 +119,14 @@ namespace svx
             try
             {
                 Reference< XTablesSupplier > xSupTab;
-                _rxForm->getPropertyValue(::rtl::OUString("SingleSelectQueryComposer")) >>= xSupTab;
+                _rxForm->getPropertyValue(OUString("SingleSelectQueryComposer")) >>= xSupTab;
 
                 if(xSupTab.is())
                 {
                     Reference< XNameAccess > xNames = xSupTab->getTables();
                     if (xNames.is())
                     {
-                        Sequence< ::rtl::OUString > aTables = xNames->getElementNames();
+                        Sequence< OUString > aTables = xNames->getElementNames();
                         if (1 == aTables.getLength())
                         {
                             sCommand        = aTables[0];
@@ -158,23 +158,23 @@ namespace svx
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\""));
+            s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ColumnDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return s_nFormat;
     }
 
     //--------------------------------------------------------------------
-    void OColumnTransferable::implConstruct( const ::rtl::OUString& _rDatasource
-                                            ,const ::rtl::OUString& _rConnectionResource
+    void OColumnTransferable::implConstruct( const OUString& _rDatasource
+                                            ,const OUString& _rConnectionResource
                                             ,const sal_Int32 _nCommandType
-                                            ,const ::rtl::OUString& _rCommand
-                                            , const ::rtl::OUString& _rFieldName)
+                                            ,const OUString& _rCommand
+                                            , const OUString& _rFieldName)
     {
         const sal_Unicode       cSeparator = sal_Unicode(11);
-        const ::rtl::OUString   sSeparator(&cSeparator, 1);
+        const OUString   sSeparator(&cSeparator, 1);
 
-        m_sCompatibleFormat = ::rtl::OUString();
+        m_sCompatibleFormat = OUString();
         m_sCompatibleFormat += _rDatasource;
         m_sCompatibleFormat += sSeparator;
         m_sCompatibleFormat += _rCommand;
@@ -193,7 +193,7 @@ namespace svx
                 cCommandType = '2';
                 break;
         }
-        m_sCompatibleFormat += ::rtl::OUString(&cCommandType, 1);
+        m_sCompatibleFormat += OUString(&cCommandType, 1);
         m_sCompatibleFormat += sSeparator;
         m_sCompatibleFormat += _rFieldName;
 
@@ -291,7 +291,7 @@ namespace svx
         }
 
         // only the old (compatible) format exists -> use the other extract method ...
-        ::rtl::OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource;
+        OUString sDatasource, sCommand, sFieldName,sDatabaseLocation,sConnectionResource;
         sal_Int32 nCommandType = CommandType::COMMAND;
 
         ODataAccessDescriptor aDescriptor;
@@ -314,12 +314,12 @@ namespace svx
 
     //--------------------------------------------------------------------
     sal_Bool OColumnTransferable::extractColumnDescriptor(const TransferableDataHelper& _rData
-                                            ,::rtl::OUString& _rDatasource
-                                            ,::rtl::OUString& _rDatabaseLocation
-                                            ,::rtl::OUString& _rConnectionResource
+                                            ,OUString& _rDatasource
+                                            ,OUString& _rDatabaseLocation
+                                            ,OUString& _rConnectionResource
                                             ,sal_Int32& _nCommandType
-                                            ,::rtl::OUString& _rCommand
-                                            ,::rtl::OUString& _rFieldName)
+                                            ,OUString& _rCommand
+                                            ,OUString& _rFieldName)
     {
         if ( _rData.HasFormat(getDescriptorFormatId()) )
         {
@@ -384,20 +384,20 @@ namespace svx
     //= ODataAccessObjectTransferable
     //====================================================================
     ODataAccessObjectTransferable::ODataAccessObjectTransferable(
-            const ::rtl::OUString&  _rDatasource
-            ,const ::rtl::OUString& _rConnectionResource
+            const OUString&  _rDatasource
+            ,const OUString& _rConnectionResource
             ,const sal_Int32        _nCommandType
-            ,const ::rtl::OUString& _rCommand
+            ,const OUString& _rCommand
         )
     {
         construct(_rDatasource,_rConnectionResource,_nCommandType,_rCommand,NULL,(CommandType::COMMAND == _nCommandType),_rCommand);
     }
     //--------------------------------------------------------------------
     ODataAccessObjectTransferable::ODataAccessObjectTransferable(
-                    const ::rtl::OUString&  _rDatasource
-                    ,const ::rtl::OUString& _rConnectionResource
+                    const OUString&  _rDatasource
+                    ,const OUString& _rConnectionResource
                     ,const sal_Int32        _nCommandType
-                    ,const ::rtl::OUString& _rCommand
+                    ,const OUString& _rCommand
                     ,const Reference< XConnection >& _rxConnection)
     {
         OSL_ENSURE(_rxConnection.is(),"Wrong ctor used.!");
@@ -408,9 +408,9 @@ namespace svx
     ODataAccessObjectTransferable::ODataAccessObjectTransferable(const Reference< XPropertySet >& _rxLivingForm)
     {
         // collect some properties of the form
-        ::rtl::OUString sDatasourceName,sConnectionResource;
+        OUString sDatasourceName,sConnectionResource;
         sal_Int32       nObjectType = CommandType::COMMAND;
-        ::rtl::OUString sObjectName;
+        OUString sObjectName;
         Reference< XConnection > xConnection;
         try
         {
@@ -427,7 +427,7 @@ namespace svx
         }
 
         // check if the SQL-statement is modified
-        ::rtl::OUString sCompleteStatement;
+        OUString sCompleteStatement;
         try
         {
             _rxLivingForm->getPropertyValue(FM_PROP_ACTIVECOMMAND) >>= sCompleteStatement;
@@ -553,7 +553,7 @@ namespace svx
     void ODataAccessObjectTransferable::addCompatibleSelectionDescription( const Sequence< Any >& _rSelRows )
     {
         const sal_Unicode       cSeparator(11);
-        const ::rtl::OUString   sSeparator(&cSeparator, 1);
+        const OUString   sSeparator(&cSeparator, 1);
 
         const Any* pSelRows = _rSelRows.getConstArray();
         const Any* pSelRowsEnd = pSelRows + _rSelRows.getLength();
@@ -562,7 +562,7 @@ namespace svx
             sal_Int32 nSelectedRow( 0 );
             OSL_VERIFY( *pSelRows >>= nSelectedRow );
 
-            m_sCompatibleObjectDescription += ::rtl::OUString::valueOf((sal_Int32)nSelectedRow);
+            m_sCompatibleObjectDescription += OUString::valueOf((sal_Int32)nSelectedRow);
             m_sCompatibleObjectDescription += sSeparator;
         }
     }
@@ -573,13 +573,13 @@ namespace svx
         m_aDescriptor.clear();
     }
     // -----------------------------------------------------------------------------
-    void ODataAccessObjectTransferable::construct(  const ::rtl::OUString&  _rDatasource
-                                                    ,const ::rtl::OUString& _rConnectionResource
+    void ODataAccessObjectTransferable::construct(  const OUString&  _rDatasource
+                                                    ,const OUString& _rConnectionResource
                                                     ,const sal_Int32        _nCommandType
-                                                    ,const ::rtl::OUString& _rCommand
+                                                    ,const OUString& _rCommand
                                                     ,const Reference< XConnection >& _rxConnection
                                                     ,sal_Bool _bAddCommand
-                                                    ,const ::rtl::OUString& _sActiveCommand)
+                                                    ,const OUString& _sActiveCommand)
     {
         m_aDescriptor.setDataSource(_rDatasource);
         // build the descriptor (the property sequence)
@@ -592,8 +592,8 @@ namespace svx
 
         // extract the single values from the sequence
 
-        ::rtl::OUString sObjectName;
-        ::rtl::OUString sDatasourceName = _rDatasource;
+        OUString sObjectName;
+        OUString sDatasourceName = _rDatasource;
         sObjectName = _rCommand;
 
         // for compatibility: create a string which can be used for the SOT_FORMATSTR_ID_SBA_DATAEXCHANGE format
@@ -602,7 +602,7 @@ namespace svx
             // statements are - in this old and ugly format - described as queries
 
         const sal_Unicode       cSeparator = sal_Unicode(11);
-        const ::rtl::OUString   sSeparator(&cSeparator, 1);
+        const OUString   sSeparator(&cSeparator, 1);
 
         const sal_Unicode       cTableMark = '1';
         const sal_Unicode       cQueryMark = '0';
@@ -610,23 +610,23 @@ namespace svx
         // build the descriptor string
         m_sCompatibleObjectDescription += sDatasourceName;
         m_sCompatibleObjectDescription += sSeparator;
-        m_sCompatibleObjectDescription += bTreatAsStatement ? ::rtl::OUString() : sObjectName;
+        m_sCompatibleObjectDescription += bTreatAsStatement ? OUString() : sObjectName;
         m_sCompatibleObjectDescription += sSeparator;
         switch (_nCommandType)
         {
             case CommandType::TABLE:
-                m_sCompatibleObjectDescription += ::rtl::OUString(&cTableMark, 1);
+                m_sCompatibleObjectDescription += OUString(&cTableMark, 1);
                 break;
             case CommandType::QUERY:
-                m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1);
+                m_sCompatibleObjectDescription += OUString(&cQueryMark, 1);
                 break;
             case CommandType::COMMAND:
-                m_sCompatibleObjectDescription += ::rtl::OUString(&cQueryMark, 1);
+                m_sCompatibleObjectDescription += OUString(&cQueryMark, 1);
                 // think of it as a query
                 break;
         }
         m_sCompatibleObjectDescription += sSeparator;
-        m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : ::rtl::OUString();
+        m_sCompatibleObjectDescription += _bAddCommand ? _sActiveCommand : OUString();
         m_sCompatibleObjectDescription += sSeparator;
     }
 
@@ -640,7 +640,7 @@ namespace svx
         static sal_uInt32 s_nFormat = (sal_uInt32)-1;
         if ((sal_uInt32)-1 == s_nFormat)
         {
-            s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\""));
+            s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.MultipleColumnDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormat, "OColumnTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return s_nFormat;
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 1f0b1df05096..182e74fd49d1 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -47,7 +47,7 @@ namespace svx
     //= OComponentTransferable
     //====================================================================
     //--------------------------------------------------------------------
-    OComponentTransferable::OComponentTransferable(const ::rtl::OUString& _rDatasourceOrLocation
+    OComponentTransferable::OComponentTransferable(const OUString& _rDatasourceOrLocation
             ,const Reference< XContent>& _xContent)
     {
         m_aDescriptor.setDataSource(_rDatasourceOrLocation);
@@ -62,12 +62,12 @@ namespace svx
         static sal_uInt32 s_nFormFormat = (sal_uInt32)-1;
         if ( _bExtractForm && (sal_uInt32)-1 == s_nFormFormat )
         {
-            s_nFormFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" ));
+            s_nFormFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.FormComponentDescriptorTransfer\"" ));
             OSL_ENSURE((sal_uInt32)-1 != s_nFormFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!");
         }
         else if ( !_bExtractForm && (sal_uInt32)-1 == s_nReportFormat)
         {
-            s_nReportFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\""));
+            s_nReportFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"dbaccess.ReportComponentDescriptorTransfer\""));
             OSL_ENSURE((sal_uInt32)-1 != s_nReportFormat, "OComponentTransferable::getDescriptorFormatId: bad exchange id!");
         }
         return _bExtractForm ? s_nFormFormat : s_nReportFormat;
@@ -82,7 +82,7 @@ namespace svx
             Reference<XPropertySet> xProp;
             m_aDescriptor[daComponent] >>= xProp;
             if ( xProp.is() )
-                xProp->getPropertyValue(::rtl::OUString("IsForm")) >>= bForm;
+                xProp->getPropertyValue(OUString("IsForm")) >>= bForm;
         }
         catch(Exception)
         {}
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index f0ec0421841d..b3c259deda8b 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -89,7 +89,7 @@ using namespace ::svx;
 
 //==============================================================================
 //------------------------------------------------------------------------------
-::rtl::OUString FieldServiceFromId(sal_Int32 nID)
+OUString FieldServiceFromId(sal_Int32 nID)
 {
     switch (nID)
     {
@@ -104,7 +104,7 @@ using namespace ::svx;
         case SID_FM_PATTERNFIELD    : return FM_COL_PATTERNFIELD;
         case SID_FM_FORMATTEDFIELD  : return FM_COL_FORMATTEDFIELD;
     }
-    return ::rtl::OUString();
+    return OUString();
 }
 
 //==============================================================================
@@ -193,7 +193,7 @@ void FmGridHeader::RequestHelp( const HelpEvent& rHEvt )
             try
             {
                 Reference< ::com::sun::star::beans::XPropertySet >  xColumn(xColumns->getByIndex(nPos),UNO_QUERY);
-                ::rtl::OUString aHelpText;
+                OUString aHelpText;
                 xColumn->getPropertyValue(FM_PROP_HELPTEXT) >>= aHelpText;
                 if ( aHelpText.isEmpty() )
                     xColumn->getPropertyValue(FM_PROP_DESCRIPTION) >>= aHelpText;
@@ -248,7 +248,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
     }
 
     // extract the descriptor
-    ::rtl::OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource;
+    OUString sDatasouce, sCommand, sFieldName,sDatabaseLocation,sConnnectionResource;
     sal_Int32       nCommandType = CommandType::COMMAND;
     Reference< XPreparedStatement >     xStatement;
     Reference< XResultSet >             xResultSet;
@@ -284,8 +284,8 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
         {   // the transferable did not contain the connection -> build an own one
             try
             {
-                ::rtl::OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce );
-                xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, ::rtl::OUString(),::rtl::OUString(),
+                OUString sSignificantSource( sDatasouce.isEmpty() ? sDatabaseLocation : sDatasouce );
+                xConnection = OStaticDataAccessTools().getConnection_withFeedback(sSignificantSource, OUString(),OUString(),
                                   comphelper::getComponentContext( static_cast<FmGridControl*>(GetParent())->getServiceManager() ));
             }
             catch(NoSuchElementException&)
@@ -336,7 +336,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
                     // not interested in any results
 
                     Reference< XPropertySet > xStatProps(xStatement,UNO_QUERY);
-                    xStatProps->setPropertyValue(rtl::OUString("MaxRows"), makeAny(sal_Int32(0)));
+                    xStatProps->setPropertyValue(OUString("MaxRows"), makeAny(sal_Int32(0)));
 
                     xResultSet = xStatement->executeQuery();
                     Reference< XColumnsSupplier >  xSupplyCols(xResultSet, UNO_QUERY);
@@ -381,12 +381,12 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt )
 //------------------------------------------------------------------------------
 IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
 {
-    ::rtl::OUString             sCommand, sFieldName,sURL;
+    OUString             sCommand, sFieldName,sURL;
     sal_Int32                   nCommandType = CommandType::COMMAND;
     Reference< XPropertySet >   xField;
     Reference< XConnection >    xConnection;
 
-    ::rtl::OUString sDatasouce = m_pImpl->aDropData.getDataSource();
+    OUString sDatasouce = m_pImpl->aDropData.getDataSource();
     if ( sDatasouce.isEmpty() && m_pImpl->aDropData.has(daConnectionResource) )
         m_pImpl->aDropData[daConnectionResource]    >>= sURL;
     m_pImpl->aDropData[daCommand]       >>= sCommand;
@@ -509,7 +509,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
 
             bDateNTimeCol = nPreferedType == SID_FM_TWOFIELDS_DATE_N_TIME;
             sal_uInt16 nColCount = bDateNTimeCol ? 2 : 1;
-            ::rtl::OUString sFieldService;
+            OUString sFieldService;
             while (nColCount--)
             {
                 if (bDateNTimeCol)
@@ -537,10 +537,10 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
         if (bDateNTimeCol)
         {
             String sTimePostfix( SVX_RES( RID_STR_POSTFIX_TIME ) );
-            xCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sTimePostfix ) ) );
+            xCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sTimePostfix ) ) );
 
             String sDatePostfix( SVX_RES( RID_STR_POSTFIX_DATE ) );
-            xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( ::rtl::OUString( sFieldName + sDatePostfix ) ) );
+            xSecondCol->setPropertyValue(FM_PROP_LABEL, makeAny( OUString( sFieldName + sDatePostfix ) ) );
         }
         else
             xCol->setPropertyValue(FM_PROP_LABEL, makeAny(sFieldName));
@@ -571,9 +571,9 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ )
                 sRealName += '_';
                 sRealName += sPurePostfix;
                 if (i)
-                    xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName)));
+                    xSecondCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName)));
                 else
-                    xCol->setPropertyValue(FM_PROP_NAME, makeAny(::rtl::OUString(sRealName)));
+                    xCol->setPropertyValue(FM_PROP_NAME, makeAny(OUString(sRealName)));
             }
         }
         else
@@ -794,7 +794,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
     PopupMenu* pControlMenu = rMenu.GetPopupMenu(SID_FM_CHANGECOL);
     delete pControlMenu;
 
-    ::rtl::OUString aFieldType;
+    OUString aFieldType;
     sal_Bool    bReplace = sal_False;
     InspectorAction eInspectorAction = eNone;
     Reference< XPropertySet > xColumnToInspect;
@@ -940,7 +940,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
             {
                 FormControlFactory factory( ::comphelper::getProcessServiceFactory() );
 
-                ::rtl::OUString sLabel = factory.getDefaultUniqueName_ByComponentType(
+                OUString sLabel = factory.getDefaultUniqueName_ByComponentType(
                     Reference< XNameAccess >( xCols, UNO_QUERY_THROW ), xNewCol );
                 xNewCol->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel ) );
                 xNewCol->setPropertyValue( FM_PROP_NAME, makeAny( sLabel ) );
@@ -1155,7 +1155,7 @@ void FmGridControl::DeleteSelectedRows()
             ::com::sun::star::util::URLTransformer::create(::comphelper::getProcessComponentContext()) );
         xTransformer->parseStrict( aUrl );
 
-        Reference< ::com::sun::star::frame::XDispatch >  xDispatch = xDispatcher->queryDispatch(aUrl, rtl::OUString(), 0);
+        Reference< ::com::sun::star::frame::XDispatch >  xDispatch = xDispatcher->queryDispatch(aUrl, OUString(), 0);
         Reference< ::com::sun::star::form::XConfirmDeleteListener >  xConfirm(xDispatch, UNO_QUERY);
         if (xConfirm.is())
         {
@@ -1608,7 +1608,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta
         Reference< ::com::sun::star::beans::XPropertySet > xCol;
         ::cppu::extractInterface(xCol, xColumns->getByIndex(i));
 
-        rtl::OUString aName(
+        OUString aName(
             comphelper::getString(xCol->getPropertyValue(FM_PROP_LABEL)));
 
         aWidth = xCol->getPropertyValue(FM_PROP_WIDTH);
@@ -1646,7 +1646,7 @@ void FmGridControl::InitColumnByField(
     DBG_ASSERT( _rxFieldsByNames == _rxFieldsByIndex, "FmGridControl::InitColumnByField: invalid container interfaces!" );
 
     // lookup the column which belongs to the control source
-    ::rtl::OUString sFieldName;
+    OUString sFieldName;
     _rxColumnModel->getPropertyValue( FM_PROP_CONTROLSOURCE ) >>= sFieldName;
     Reference< XPropertySet > xField;
     _rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField;
@@ -1698,13 +1698,13 @@ void FmGridControl::InitColumnByField(
     }
 
     // the control type is determined by the ColumnServiceName
-    static ::rtl::OUString s_sPropColumnServiceName( "ColumnServiceName" );
+    static OUString s_sPropColumnServiceName( "ColumnServiceName" );
     if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) )
         return;
 
     _pColumn->setModel( _rxColumnModel );
 
-    ::rtl::OUString sColumnServiceName;
+    OUString sColumnServiceName;
     _rxColumnModel->getPropertyValue( s_sPropColumnServiceName ) >>= sColumnServiceName;
 
     sal_Int32 nTypeId = getColumnTypeByModelName( sColumnServiceName );
@@ -1897,9 +1897,9 @@ Sequence< Any> FmGridControl::getSelectionBookmarks()
 // -----------------------------------------------------------------------------
 namespace
 {
-    ::rtl::OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const ::rtl::OUString& _sPropName)
+    OUString getColumnPropertyFromPeer(FmXGridPeer* _pPeer,sal_Int32 _nPosition,const OUString& _sPropName)
     {
-        ::rtl::OUString sRetText;
+        OUString sRetText;
         if ( _pPeer && _nPosition != -1)
         {
             Reference<XIndexContainer> xIndex = _pPeer->getColumns();
@@ -1915,9 +1915,9 @@ namespace
     }
 }
 // Object data and state ------------------------------------------------------
-::rtl::OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
+OUString FmGridControl::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
 {
-    ::rtl::OUString sRetText;
+    OUString sRetText;
     switch( _eObjType )
     {
         case ::svt::BBTYPE_BROWSEBOX:
@@ -1942,9 +1942,9 @@ namespace
 }
 // -----------------------------------------------------------------------------
 
-::rtl::OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
+OUString FmGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType _eObjType,sal_Int32 _nPosition ) const
 {
-    ::rtl::OUString sRetText;
+    OUString sRetText;
     switch( _eObjType )
     {
         case ::svt::BBTYPE_BROWSEBOX:
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index fba1ffcfa8d4..4211c26f7f3c 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -409,10 +409,10 @@ Sequence<sal_Int8> SAL_CALL FmXGridControl::getImplementationId(  ) throw(Runtim
 
 // XServiceInfo
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& ServiceName) throw()
+sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName) throw()
 {
     ::comphelper::StringSequence aSupported = getSupportedServiceNames();
-    const ::rtl::OUString * pArray = aSupported.getConstArray();
+    const OUString * pArray = aSupported.getConstArray();
     for( sal_Int32 i = 0; i < aSupported.getLength(); i++ )
         if( pArray[i] == ServiceName )
             return sal_True;
@@ -420,17 +420,17 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const ::rtl::OUString& Service
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FmXGridControl::getImplementationName() throw()
+OUString SAL_CALL FmXGridControl::getImplementationName() throw()
 {
-    return ::rtl::OUString("com.sun.star.form.FmXGridControl");
+    return OUString("com.sun.star.form.FmXGridControl");
 }
 
 //------------------------------------------------------------------------------
 ::comphelper::StringSequence SAL_CALL FmXGridControl::getSupportedServiceNames() throw()
 {
-    Sequence< ::rtl::OUString > aServiceNames(2);
+    Sequence< OUString > aServiceNames(2);
     aServiceNames[0] = FM_SUN_CONTROL_GRIDCONTROL;
-    aServiceNames[1] = ::rtl::OUString("com.sun.star.awt.UnoControl");
+    aServiceNames[1] = OUString("com.sun.star.awt.UnoControl");
     return aServiceNames;
 }
 
@@ -449,9 +449,9 @@ void SAL_CALL FmXGridControl::dispose() throw( RuntimeException )
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString FmXGridControl::GetComponentServiceName()
+OUString FmXGridControl::GetComponentServiceName()
 {
-    ::rtl::OUString aName("DBGrid");
+    OUString aName("DBGrid");
     return aName;
 }
 
@@ -501,7 +501,7 @@ FmXGridPeer* FmXGridControl::imp_CreatePeer(Window* pParent)
 void SAL_CALL FmXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit >& /*rToolkit*/, const Reference< ::com::sun::star::awt::XWindowPeer >& rParentPeer) throw( RuntimeException )
 {
     if ( !mxModel.is() )
-        throw DisposedException( ::rtl::OUString(), *this );
+        throw DisposedException( OUString(), *this );
 
     DBG_ASSERT(/*(0 == m_nPeerCreationLevel) && */!mbCreatingPeer, "FmXGridControl::createPeer : recursion!");
         // I think this should never assert, now that we're using the base class' mbCreatingPeer in addition to
@@ -791,7 +791,7 @@ void SAL_CALL FmXGridControl::setDesignMode(sal_Bool bOn) throw( RuntimeExceptio
 
         // prepare firing an event
         aModeChangeEvent.Source = *this;
-        aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString( "design" ) : ::rtl::OUString( "alive" );
+        aModeChangeEvent.NewMode = mbDesignMode ? OUString( "design" ) : OUString( "alive" );
     }
 
     // --- </mutex_lock> ---
@@ -855,7 +855,7 @@ void SAL_CALL FmXGridControl::removeContainerListener(const Reference< XContaine
 }
 
 //------------------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
+Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL FmXGridControl::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatchProvider >  xPeerProvider(getPeer(), UNO_QUERY);
     if (xPeerProvider.is())
@@ -982,7 +982,7 @@ Any SAL_CALL FmXGridControl::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoun
 
 // ::com::sun::star::util::XModeSelector
 //------------------------------------------------------------------------------
-void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
+void SAL_CALL FmXGridControl::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     if (!xPeer.is())
@@ -992,10 +992,10 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException )
+OUString SAL_CALL FmXGridControl::getMode() throw( RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
-    return xPeer.is() ? xPeer->getMode() : ::rtl::OUString();
+    return xPeer.is() ? xPeer->getMode() : OUString();
 }
 
 //------------------------------------------------------------------------------
@@ -1006,7 +1006,7 @@ void SAL_CALL FmXGridControl::setMode(const ::rtl::OUString& Mode) throw( NoSupp
 }
 
 //------------------------------------------------------------------------------
-sal_Bool SAL_CALL FmXGridControl::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
+sal_Bool SAL_CALL FmXGridControl::supportsMode(const OUString& Mode) throw( RuntimeException )
 {
     Reference< ::com::sun::star::util::XModeSelector >  xPeer(getPeer(), UNO_QUERY);
     return xPeer.is() ? xPeer->supportsMode(Mode) : sal_False;
@@ -1113,9 +1113,9 @@ void FmXGridPeer::columnChanged()
 //------------------------------------------------------------------
 namespace fmgridif
 {
-    const ::rtl::OUString getDataModeIdentifier()
+    const OUString getDataModeIdentifier()
     {
-        static ::rtl::OUString s_sDataModeIdentifier = ::rtl::OUString(  "DataMode"  );
+        static OUString s_sDataModeIdentifier = OUString(  "DataMode"  );
         return s_sDataModeIdentifier;
     }
 }
@@ -1423,7 +1423,7 @@ Sequence< Any > SAL_CALL FmXGridPeer::queryFieldData( sal_Int32 nRow, const Type
                 case TypeClass_STRING           :
                 {
                     String sText = aColumns[ nModelPos ]->GetCellText( xPaintRow, pGrid->getNumberFormatter() );
-                    pReturnArray[i] <<= ::rtl::OUString(sText);
+                    pReturnArray[i] <<= OUString(sText);
                 }
                 break;
                 // everything else is requested in the DatabaseVariant
@@ -1674,7 +1674,7 @@ Reference< XIndexContainer >  FmXGridPeer::getColumns() throw( RuntimeException
 //------------------------------------------------------------------------------
 void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
 {
-    static const ::rtl::OUString aPropsListenedTo[] =
+    static const OUString aPropsListenedTo[] =
     {
         OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY)
     };
@@ -1683,8 +1683,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
     // before adding a listener
     Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo();
     Property aPropDesc;
-    const ::rtl::OUString* pProps = aPropsListenedTo;
-    const ::rtl::OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] );
+    const OUString* pProps = aPropsListenedTo;
+    const OUString* pPropsEnd = pProps + sizeof( aPropsListenedTo ) / sizeof( aPropsListenedTo[ 0 ] );
     for (; pProps != pPropsEnd; ++pProps)
     {
         if ( xInfo->hasPropertyByName( *pProps ) )
@@ -1701,7 +1701,7 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
 {
     // the same props as in addColumnListeners ... linux has problems with global static UStrings, so
     // we have to do it this way ....
-    static ::rtl::OUString aPropsListenedTo[] =
+    static OUString aPropsListenedTo[] =
     {
         OUString(FM_PROP_LABEL), OUString(FM_PROP_WIDTH), OUString(FM_PROP_HIDDEN), OUString(FM_PROP_ALIGN), OUString(FM_PROP_FORMATKEY)
     };
@@ -1904,7 +1904,7 @@ void FmXGridPeer::elementRemoved(const ContainerEvent& evt) throw( RuntimeExcept
 }
 
 //------------------------------------------------------------------------------
-void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& Value) throw( RuntimeException )
+void FmXGridPeer::setProperty( const OUString& PropertyName, const Any& Value) throw( RuntimeException )
 {
     SolarMutexGuard aGuard;
 
@@ -1960,12 +1960,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) )
     {
-        ::rtl::OUString sHelpURL;
+        OUString sHelpURL;
         OSL_VERIFY( Value >>= sHelpURL );
         INetURLObject aHID( sHelpURL );
         if ( aHID.GetProtocol() == INET_PROT_HID )
             sHelpURL = aHID.GetURLPath();
-        pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
+        pGrid->SetHelpId( OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) );
     }
     else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) )
     {
@@ -2117,7 +2117,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext()
 }
 
 //------------------------------------------------------------------------------
-Any FmXGridPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException )
+Any FmXGridPeer::getProperty( const OUString& _rPropertyName ) throw( RuntimeException )
 {
     Any aProp;
     if (GetWindow())
@@ -2439,7 +2439,7 @@ Any FmXGridPeer::getByIndex(sal_Int32 _nIndex) throw( IndexOutOfBoundsException,
 
 // ::com::sun::star::util::XModeSelector
 //------------------------------------------------------------------------------
-void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
+void FmXGridPeer::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
 {
     if (!supportsMode(Mode))
         throw NoSupportException();
@@ -2460,7 +2460,7 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException
 }
 
 //------------------------------------------------------------------------------
-::rtl::OUString FmXGridPeer::getMode() throw( RuntimeException )
+OUString FmXGridPeer::getMode() throw( RuntimeException )
 {
     return m_aMode;
 }
@@ -2472,18 +2472,18 @@ void FmXGridPeer::setMode(const ::rtl::OUString& Mode) throw( NoSupportException
     if (!aModes.getLength())
     {
         aModes.realloc(2);
-        ::rtl::OUString* pModes = aModes.getArray();
-        pModes[0] = ::rtl::OUString(  "DataMode"  );
-        pModes[1] = ::rtl::OUString(  "FilterMode"  );
+        OUString* pModes = aModes.getArray();
+        pModes[0] = OUString(  "DataMode"  );
+        pModes[1] = OUString(  "FilterMode"  );
     }
     return aModes;
 }
 
 //------------------------------------------------------------------------------
-sal_Bool FmXGridPeer::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
+sal_Bool FmXGridPeer::supportsMode(const OUString& Mode) throw( RuntimeException )
 {
     ::comphelper::StringSequence aModes(getSupportedModes());
-    const ::rtl::OUString* pModes = aModes.getConstArray();
+    const OUString* pModes = aModes.getConstArray();
     for (sal_Int32 i = aModes.getLength(); i > 0; )
     {
         if (pModes[--i] == Mode)
@@ -2535,7 +2535,7 @@ void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
 }
 
 //------------------------------------------------------------------------------
-Reference< ::com::sun::star::frame::XDispatch >  FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
+Reference< ::com::sun::star::frame::XDispatch >  FmXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
 {
     Reference< ::com::sun::star::frame::XDispatch >  xResult;
 
@@ -2767,7 +2767,7 @@ Sequence< ::com::sun::star::util::URL>& FmXGridPeer::getSupportedURLs()
     static Sequence< ::com::sun::star::util::URL> aSupported;
     if (aSupported.getLength() == 0)
     {
-        static ::rtl::OUString sSupported[] = {
+        static OUString sSupported[] = {
             FMURL_RECORD_MOVEFIRST,
             FMURL_RECORD_MOVEPREV,
             FMURL_RECORD_MOVENEXT,
@@ -2808,7 +2808,7 @@ void FmXGridPeer::UpdateDispatches()
     Reference< ::com::sun::star::frame::XDispatch >  xNewDispatch;
     for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
-        xNewDispatch = queryDispatch(*pSupportedURLs, rtl::OUString(), 0);
+        xNewDispatch = queryDispatch(*pSupportedURLs, OUString(), 0);
         if (xNewDispatch != m_pDispatchers[i])
         {
             if (m_pDispatchers[i].is())
@@ -2851,7 +2851,7 @@ void FmXGridPeer::ConnectToDispatcher()
     for (sal_uInt16 i=0; i<aSupportedURLs.getLength(); ++i, ++pSupportedURLs)
     {
         m_pStateCache[i] = 0;
-        m_pDispatchers[i] = queryDispatch(*pSupportedURLs, rtl::OUString(), 0);
+        m_pDispatchers[i] = queryDispatch(*pSupportedURLs, OUString(), 0);
         if (m_pDispatchers[i].is())
         {
             m_pDispatchers[i]->addStatusListener((::com::sun::star::frame::XStatusListener*)this, *pSupportedURLs);
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 6c054e0a68f2..17b565f87fa3 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -30,7 +30,7 @@ const ::comphelper::StringSequence& getColumnTypes()
     static ::comphelper::StringSequence aColumnTypes(10);
     if (aColumnTypes.getConstArray()[0].isEmpty())
     {
-        ::rtl::OUString* pNames = aColumnTypes.getArray();
+        OUString* pNames = aColumnTypes.getArray();
         pNames[TYPE_CHECKBOX] = FM_COL_CHECKBOX;
         pNames[TYPE_COMBOBOX] = FM_COL_COMBOBOX;
         pNames[TYPE_CURRENCYFIELD] = FM_COL_CURRENCYFIELD;
@@ -49,16 +49,16 @@ const ::comphelper::StringSequence& getColumnTypes()
 // Vergleichen von PropertyInfo
 extern "C" int SAL_CALL NameCompare(const void* pFirst, const void* pSecond)
 {
-    return ((::rtl::OUString*)pFirst)->compareTo(*(::rtl::OUString*)pSecond);
+    return ((OUString*)pFirst)->compareTo(*(OUString*)pSecond);
 }
 
 namespace
 {
     //------------------------------------------------------------------------------
-    sal_Int32 lcl_findPos(const ::rtl::OUString& aStr, const Sequence< ::rtl::OUString>& rList)
+    sal_Int32 lcl_findPos(const OUString& aStr, const Sequence< OUString>& rList)
     {
-        const ::rtl::OUString* pStrList = rList.getConstArray();
-        ::rtl::OUString* pResult = (::rtl::OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(::rtl::OUString),
+        const OUString* pStrList = rList.getConstArray();
+        OUString* pResult = (OUString*) bsearch(&aStr, (void*)pStrList, rList.getLength(), sizeof(OUString),
             &NameCompare);
 
         if (pResult)
@@ -69,10 +69,10 @@ namespace
 }
 
 //------------------------------------------------------------------------------
-sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
+sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
 {
-    const ::rtl::OUString aModelPrefix("com.sun.star.form.component.");
-    const ::rtl::OUString aCompatibleModelPrefix("stardiv.one.form.component.");
+    const OUString aModelPrefix("com.sun.star.form.component.");
+    const OUString aCompatibleModelPrefix("stardiv.one.form.component.");
 
     sal_Int32 nTypeId = -1;
     if (aModelName == FM_COMPONENT_EDIT)
@@ -85,7 +85,7 @@ sal_Int32 getColumnTypeByModelName(const ::rtl::OUString& aModelName)
         DBG_ASSERT( (nPrefixPos != -1) ||   (nCompatiblePrefixPos != -1), "::getColumnTypeByModelName() : wrong servivce !");
 #endif
 
-        ::rtl::OUString aColumnType = (nPrefixPos != -1)
+        OUString aColumnType = (nPrefixPos != -1)
             ? aModelName.copy(aModelPrefix.getLength())
             : aModelName.copy(aCompatibleModelPrefix.getLength());
 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index ff983b6b894d..7dac3c29f184 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -397,7 +397,7 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle)
 
     m_aRecordText.SetText(XubString(SVX_RES(RID_STR_REC_TEXT)));
     m_aRecordOf.SetText(XubString(SVX_RES(RID_STR_REC_FROM_TEXT)));
-    m_aRecordCount.SetText(rtl::OUString('?'));
+    m_aRecordCount.SetText(OUString('?'));
 
     m_nDefaultWidth = ArrangeControls();
 
@@ -473,9 +473,9 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls()
     nX = sal::static_int_cast< sal_uInt16 >(nX + nTextWidth + aBorder.Width());
 
     // count an extra hairspace (U+200A) left and right
-    const rtl::OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000));
-    const rtl::OUString hairSpace(static_cast<sal_Unicode>(0x200A));
-    rtl::OUString textPattern(hairSpace);
+    const OUString sevenDigits(m_aAbsolute.CreateFieldText(6000000));
+    const OUString hairSpace(static_cast<sal_Unicode>(0x200A));
+    OUString textPattern(hairSpace);
     textPattern += sevenDigits;
     textPattern += hairSpace;
     nTextWidth = m_aAbsolute.GetTextWidth( textPattern );
@@ -695,7 +695,7 @@ void DbGridControl::NavigationBar::SetState(sal_uInt16 nWhich)
                 else
                     aText = m_aAbsolute.CreateFieldText(pParent->GetRowCount());
                 if(!pParent->m_bRecordCountFinal)
-                    aText += rtl::OUString(" *");
+                    aText += OUString(" *");
             }
             else
                 aText = String();
@@ -1455,7 +1455,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
         // retrieve the datebase of the Numberformatter
         try
         {
-            xSupplier->getNumberFormatSettings()->getPropertyValue(rtl::OUString("NullDate")) >>= m_aNullDate;
+            xSupplier->getNumberFormatSettings()->getPropertyValue(OUString("NullDate")) >>= m_aNullDate;
         }
         catch(Exception&)
         {
@@ -3488,7 +3488,7 @@ void DbGridControl::ShowColumn(sal_uInt16 nId)
 
     DeactivateCell();
 
-    ::rtl::OUString aName;
+    OUString aName;
     pColumn->getModel()->getPropertyValue(FM_PROP_LABEL) >>= aName;
     InsertDataColumn(nId, aName, CalcZoom(pColumn->m_nLastVisibleWidth), HIB_CENTER | HIB_VCENTER | HIB_CLICKABLE, nNewViewPos);
     pColumn->m_bHidden = sal_False;
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index 14976d972f97..fecc0e6f158f 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -48,7 +48,7 @@ namespace svx
         const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor );
         if ( SOT_FORMATSTR_ID_XFORMS == nFormatId )
         {
-            return SetString(rtl::OUString("XForms-Transferable"), _rFlavor);
+            return SetString(OUString("XForms-Transferable"), _rFlavor);
         }
         return sal_False;
     }