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

28 files changed, 233 insertions, 234 deletions

diff --git a/uui/source/fltdlg.cxx b/uui/source/fltdlg.cxx
index adab1d918a81..76a89243ee00 100644
--- a/uui/source/fltdlg.cxx
+++ b/uui/source/fltdlg.cxx
@@ -181,7 +181,7 @@ class StringCalculator : public ::cppu::WeakImplHelper1< ::com::sun::star::util:
         {
         }
 
-        sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& sString ) throw( ::com::sun::star::uno::RuntimeException )
+        sal_Int32 SAL_CALL queryStringWidth( const OUString& sString ) throw( ::com::sun::star::uno::RuntimeException )
         {
             return (sal_Int32)(m_pDevice->GetTextWidth(String(sString)));
         }
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx
index 2068ee80b77c..50e4d078b111 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -60,7 +60,7 @@ void
 executeLoginDialog(
     Window * pParent,
     LoginErrorInfo & rInfo,
-    rtl::OUString const & rRealm)
+    OUString const & rRealm)
     SAL_THROW((uno::RuntimeException))
 {
     try
@@ -190,7 +190,7 @@ handleAuthenticationRequest_(
     ucb::AuthenticationRequest const & rRequest,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations,
-    const rtl::OUString & rURL)
+    const OUString & rURL)
     SAL_THROW((uno::RuntimeException))
 {
     uno::Reference< task::XInteractionRetry > xRetry;
@@ -275,7 +275,7 @@ handleAuthenticationRequest_(
                             && xSupplyAuthentication->canSetUserName());
     executeLoginDialog(pParent,
                        aInfo,
-                       rRequest.HasRealm ? rRequest.Realm : rtl::OUString());
+                       rRequest.HasRealm ? rRequest.Realm : OUString());
     switch (aInfo.GetResult())
     {
     case ERRCODE_BUTTON_OK:
@@ -327,8 +327,8 @@ handleAuthenticationRequest_(
               {
                   if (!aPwContainerHelper.addRecord(
                           !rURL.isEmpty() ? rURL : rRequest.ServerName,
-                          rtl::OUString(), // empty u/p -> sys creds
-                          uno::Sequence< rtl::OUString >(),
+                          OUString(), // empty u/p -> sys creds
+                          uno::Sequence< OUString >(),
                           xIH,
                           ePreferredRememberMode
                               == ucb::RememberAuthentication_PERSISTENT))
@@ -342,8 +342,8 @@ handleAuthenticationRequest_(
               {
                   if (!aPwContainerHelper.addRecord(
                           !rURL.isEmpty() ? rURL : rRequest.ServerName,
-                          rtl::OUString(), // empty u/p -> sys creds
-                          uno::Sequence< rtl::OUString >(),
+                          OUString(), // empty u/p -> sys creds
+                          uno::Sequence< OUString >(),
                           xIH,
                           false /* SESSION */))
                   {
@@ -355,7 +355,7 @@ handleAuthenticationRequest_(
           // Empty user name can not be valid:
           else if (aInfo.GetUserName().Len() != 0)
           {
-              uno::Sequence< rtl::OUString >
+              uno::Sequence< OUString >
                   aPassList(aInfo.GetAccount().Len() == 0 ? 1 : 2);
               aPassList[0] = aInfo.GetPassword();
               if (aInfo.GetAccount().Len() != 0)
@@ -411,7 +411,7 @@ executeMasterPasswordDialog(
     task::PasswordRequestMode nMode)
         SAL_THROW((uno::RuntimeException))
 {
-    rtl::OString aMaster;
+    OString aMaster;
     try
     {
         SolarMutexGuard aGuard;
@@ -423,7 +423,7 @@ executeMasterPasswordDialog(
                 new MasterPasswordCreateDialog(pParent, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
-            aMaster = rtl::OUStringToOString(
+            aMaster = OUStringToOString(
                 xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8);
         }
         else
@@ -432,7 +432,7 @@ executeMasterPasswordDialog(
                 new MasterPasswordDialog(pParent, nMode, xManager.get()));
             rInfo.SetResult(xDialog->Execute()
                 == RET_OK ? ERRCODE_BUTTON_OK : ERRCODE_BUTTON_CANCEL);
-            aMaster = rtl::OUStringToOString(
+            aMaster = OUStringToOString(
                 xDialog->GetMasterPassword(), RTL_TEXTENCODING_UTF8);
         }
     }
@@ -452,7 +452,7 @@ executeMasterPasswordDialog(
                       32,
                       1000);
 
-    rtl::OUStringBuffer aBuffer;
+    OUStringBuffer aBuffer;
     for (int i = 0; i < RTL_DIGEST_LENGTH_MD5; ++i)
     {
         aBuffer.append(static_cast< sal_Unicode >('a' + (aKey[i] >> 4)));
@@ -507,7 +507,7 @@ executePasswordDialog(
     Window * pParent,
     LoginErrorInfo & rInfo,
     task::PasswordRequestMode nMode,
-    ::rtl::OUString aDocName,
+    OUString aDocName,
     bool bMSCryptoMode,
     bool bIsPasswordToModify,
     bool bIsSimplePasswordRequest )
@@ -569,7 +569,7 @@ handlePasswordRequest_(
     task::PasswordRequestMode nMode,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations,
-    ::rtl::OUString aDocumentName,
+    OUString aDocumentName,
     bool bMSCryptoMode,
     bool bIsPasswordToModify,
     bool bIsSimplePasswordRequest = false )
@@ -647,7 +647,7 @@ UUIInteractionHelper::handleAuthenticationRequest(
                                      m_xContext,
                                      aAuthenticationRequest,
                                      rRequest->getContinuations(),
-                                     rtl::OUString());
+                                     OUString());
         return true;
     }
     return false;
@@ -680,7 +680,7 @@ UUIInteractionHelper::handlePasswordRequest(
     Window * pParent = getParentProperty();
     task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER;
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations = rRequest->getContinuations();
-    ::rtl::OUString aDocumentName;
+    OUString aDocumentName;
     bool bMSCryptoMode          = false;
     bool bIsPasswordToModify    = false;
 
@@ -745,7 +745,7 @@ UUIInteractionHelper::handlePasswordRequest(
         handlePasswordRequest_(getParentProperty(),
                                aPasswordRequest.Mode,
                                rRequest->getContinuations(),
-                               rtl::OUString(),
+                               OUString(),
                                false /* bool bMSCryptoMode */,
                                false /* bool bIsPasswordToModify */,
                                true  /* bool bIsSimplePasswordRequest */ );
diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx
index 3827f0af7482..3208d23eba6a 100644
--- a/uui/source/iahndl-errorhandler.cxx
+++ b/uui/source/iahndl-errorhandler.cxx
@@ -44,8 +44,8 @@ sal_uInt16
 executeErrorDialog(
     Window * pParent,
     task::InteractionClassification eClassification,
-    rtl::OUString const & rContext,
-    rtl::OUString const & rMessage,
+    OUString const & rContext,
+    OUString const & rMessage,
     WinBits nButtonMask)
     SAL_THROW((uno::RuntimeException))
 {
@@ -132,12 +132,12 @@ void
 UUIInteractionHelper::handleErrorHandlerRequest(
     task::InteractionClassification eClassification,
     ErrCode nErrorCode,
-    std::vector< rtl::OUString > const & rArguments,
+    std::vector< OUString > const & rArguments,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations,
     bool bObtainErrorStringOnly,
     bool & bHasErrorString,
-    rtl::OUString & rErrorString)
+    OUString & rErrorString)
         SAL_THROW((uno::RuntimeException))
 {
     if (bObtainErrorStringOnly)
@@ -147,7 +147,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             return;
     }
 
-    rtl::OUString aMessage;
+    OUString aMessage;
     {
         enum Source { SOURCE_DEFAULT, SOURCE_CNT, SOURCE_SVX, SOURCE_UUI };
         static char const * const aManager[4] = { "ofa", "cnt", "svx", "uui" };
@@ -250,7 +250,7 @@ UUIInteractionHelper::handleErrorHandlerRequest(
             return;
 
         //TODO! remove this backwards compatibility?
-        rtl::OUString aContext(getContextProperty());
+        OUString aContext(getContextProperty());
         if (aContext.isEmpty() && nErrorCode != 0)
         {
             SolarMutexGuard aGuard;
diff --git a/uui/source/iahndl-filter.cxx b/uui/source/iahndl-filter.cxx
index dba372861772..d631d0479025 100644
--- a/uui/source/iahndl-filter.cxx
+++ b/uui/source/iahndl-filter.cxx
@@ -47,9 +47,9 @@ namespace {
 void
 executeFilterDialog(
     Window                    * pParent ,
-    rtl::OUString       const & rURL    ,
+    OUString       const & rURL    ,
     uui::FilterNameList const & rFilters,
-    rtl::OUString             & rFilter )
+    OUString             & rFilter )
        SAL_THROW((uno::RuntimeException))
 {
     try
@@ -73,7 +73,7 @@ executeFilterDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-            rtl::OUString("out of memory"),
+            OUString("out of memory"),
             uno::Reference< uno::XInterface >());
     }
 }
@@ -106,7 +106,7 @@ handleNoSuchFilterRequest_(
     try
     {
         xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext(
-                                  ::rtl::OUString( "com.sun.star.document.FilterFactory"), xContext ),
+                                  OUString( "com.sun.star.document.FilterFactory"), xContext ),
                               uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -136,7 +136,7 @@ handleNoSuchFilterRequest_(
     //            out by using DocumentService property later!
     uno::Reference< container::XEnumeration > xFilters
         = xFilterContainer->createSubSetEnumerationByQuery(
-            ::rtl::OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
+            OUString( "_query_all:sort_prop=uiname:iflags=1:eflags=143360"));
     while (xFilters->hasMoreElements())
     {
         try
@@ -145,9 +145,9 @@ handleNoSuchFilterRequest_(
             uui::FilterNamePair             aPair;
 
             aPair.sInternal = lProps.getUnpackedValueOrDefault(
-                rtl::OUString("Name"), ::rtl::OUString());
+                OUString("Name"), OUString());
             aPair.sUI       = lProps.getUnpackedValueOrDefault(
-                 rtl::OUString("UIName"), ::rtl::OUString());
+                 OUString("UIName"), OUString());
             if ( (!aPair.sInternal.Len()) || (!aPair.sUI.Len() ) )
             {
                continue;
@@ -173,7 +173,7 @@ handleNoSuchFilterRequest_(
     }
 
     // let the user select the right filter
-    rtl::OUString sSelectedFilter;
+    OUString sSelectedFilter;
     executeFilterDialog( pParent,
                          rRequest.URL,
                          lNames,
@@ -212,7 +212,7 @@ handleAmbigousFilterRequest_(
     try
     {
         xFilterContainer.set( xContext->getServiceManager()->createInstanceWithContext(
-            ::rtl::OUString( "com.sun.star.document.FilterFactory"), xContext ),
+            OUString( "com.sun.star.document.FilterFactory"), xContext ),
             uno::UNO_QUERY );
     }
     catch ( uno::Exception & )
@@ -239,7 +239,7 @@ handleAmbigousFilterRequest_(
         {
             if( lProps[nStep].Name.compareToAscii("UIName") == 0 )
             {
-                ::rtl::OUString sTemp;
+                OUString sTemp;
                 lProps[nStep].Value >>= sTemp;
                 aPair.sUI       = sTemp;
                 aPair.sInternal = rRequest.SelectedFilter;
@@ -261,7 +261,7 @@ handleAmbigousFilterRequest_(
         {
             if( lProps[nStep].Name.compareToAscii("UIName") == 0 )
             {
-                ::rtl::OUString sTemp;
+                OUString sTemp;
                 lProps[nStep].Value >>= sTemp;
                 aPair.sUI       = sTemp;
                 aPair.sInternal = rRequest.DetectedFilter;
@@ -279,7 +279,7 @@ handleAmbigousFilterRequest_(
         }
         else
         {
-            rtl::OUString sFilter;
+            OUString sFilter;
             executeFilterDialog( pParent,
                                  rRequest.URL,
                                  lNames,
@@ -312,7 +312,7 @@ handleFilterOptionsRequest_(
     try
     {
         xFilterCFG.set( xContext->getServiceManager()->createInstanceWithContext(
-                            ::rtl::OUString( "com.sun.star.document.FilterFactory" ), xContext ),
+                            OUString( "com.sun.star.document.FilterFactory" ), xContext ),
                         uno::UNO_QUERY );
     }
     catch ( uno::Exception const & )
@@ -323,12 +323,12 @@ handleFilterOptionsRequest_(
     {
         try
         {
-            ::rtl::OUString aFilterName;
+            OUString aFilterName;
             sal_Int32 nPropCount = rRequest.rProperties.getLength();
             for( sal_Int32 ind = 0; ind < nPropCount; ++ind )
             {
                 if( rRequest.rProperties[ind].Name.equals(
-                        ::rtl::OUString("FilterName")) )
+                        OUString("FilterName")) )
                 {
                     rRequest.rProperties[ind].Value >>= aFilterName;
                     break;
@@ -343,9 +343,9 @@ handleFilterOptionsRequest_(
                      nProperty < nPropertyCount;
                      ++nProperty )
                     if( aProps[nProperty].Name.equals(
-                            ::rtl::OUString("UIComponent")) )
+                            OUString("UIComponent")) )
                     {
-                        ::rtl::OUString aServiceName;
+                        OUString aServiceName;
                         aProps[nProperty].Value >>= aServiceName;
                         if( !aServiceName.isEmpty() )
                         {
diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx
index 4c1953199d5e..d969e2553592 100644
--- a/uui/source/iahndl-ioexceptions.cxx
+++ b/uui/source/iahndl-ioexceptions.cxx
@@ -31,8 +31,8 @@ namespace {
 
 bool
 getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments,
-                         rtl::OUString const & rKey,
-                         rtl::OUString * pValue)
+                         OUString const & rKey,
+                         OUString * pValue)
     SAL_THROW(())
 {
     for (sal_Int32 i = 0; i < rArguments.getLength(); ++i)
@@ -40,7 +40,7 @@ getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments,
         beans::PropertyValue aProperty;
         if ((rArguments[i] >>= aProperty) && aProperty.Name == rKey)
         {
-            rtl::OUString aValue;
+            OUString aValue;
             if (aProperty.Value >>= aValue)
             {
                 if (pValue)
@@ -54,7 +54,7 @@ getStringRequestArgument(uno::Sequence< uno::Any > const & rArguments,
 
 bool
 getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments,
-                       rtl::OUString const & rKey,
+                       OUString const & rKey,
                        bool * pValue)
     SAL_THROW(())
 {
@@ -77,7 +77,7 @@ getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments,
 
 bool
 getResourceNameRequestArgument(uno::Sequence< uno::Any > const & rArguments,
-                               rtl::OUString * pValue)
+                               OUString * pValue)
     SAL_THROW(())
 {
     if (!getStringRequestArgument(rArguments, "Uri",  pValue))
@@ -97,7 +97,7 @@ UUIInteractionHelper::handleInteractiveIOException(
         uno::Reference< task::XInteractionRequest > const & rRequest,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
     SAL_THROW((uno::RuntimeException))
 {
     uno::Any aAnyRequest(rRequest->getRequest());
@@ -112,7 +112,7 @@ UUIInteractionHelper::handleInteractiveIOException(
             aRequestArguments = aAugmentedIoException.Arguments;
 
         ErrCode nErrorCode;
-        std::vector< rtl::OUString > aArguments;
+        std::vector< OUString > aArguments;
         static ErrCode const
             aErrorCode[ucb::IOErrorCode_WRONG_VERSION + 1][2]
             = { { ERRCODE_IO_ABORT, ERRCODE_UUI_IO_ABORT }, // ABORT
@@ -212,7 +212,7 @@ UUIInteractionHelper::handleInteractiveIOException(
 
         case ucb::IOErrorCode_DEVICE_NOT_READY:
             {
-                rtl::OUString aArgUri;
+                OUString aArgUri;
                 if (getResourceNameRequestArgument(aRequestArguments,
                                                    &aArgUri))
                 {
@@ -236,8 +236,8 @@ UUIInteractionHelper::handleInteractiveIOException(
 
         case ucb::IOErrorCode_DIFFERENT_DEVICES:
             {
-                rtl::OUString aArgVolume;
-                rtl::OUString aArgOtherVolume;
+                OUString aArgVolume;
+                OUString aArgOtherVolume;
                 if (getStringRequestArgument(aRequestArguments, "Volume", &aArgVolume)
                     && getStringRequestArgument(aRequestArguments, "OtherVolume",
                         &aArgOtherVolume))
@@ -254,11 +254,11 @@ UUIInteractionHelper::handleInteractiveIOException(
 
         case ucb::IOErrorCode_NOT_EXISTING:
             {
-                rtl::OUString aArgUri;
+                OUString aArgUri;
                 if (getResourceNameRequestArgument(aRequestArguments,
                            &aArgUri))
                 {
-                    rtl::OUString aResourceType;
+                    OUString aResourceType;
                     getStringRequestArgument(aRequestArguments, "ResourceType",
                                             &aResourceType);
                     nErrorCode = aResourceType == "volume"
@@ -275,7 +275,7 @@ UUIInteractionHelper::handleInteractiveIOException(
 
         default:
             {
-                rtl::OUString aArgUri;
+                OUString aArgUri;
                 if (getResourceNameRequestArgument(aRequestArguments,
                                                    &aArgUri))
                 {
diff --git a/uui/source/iahndl-locking.cxx b/uui/source/iahndl-locking.cxx
index cc392512da28..291d3825fed1 100644
--- a/uui/source/iahndl-locking.cxx
+++ b/uui/source/iahndl-locking.cxx
@@ -57,8 +57,8 @@ namespace {
 void
 handleLockedDocumentRequest_(
     Window * pParent,
-    const ::rtl::OUString& aDocumentURL,
-    const ::rtl::OUString& aInfo,
+    const OUString& aDocumentURL,
+    const OUString& aInfo,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations,
     sal_uInt16 nMode )
@@ -79,8 +79,8 @@ handleLockedDocumentRequest_(
         if (!xManager.get())
             return;
 
-        ::rtl::OUString aMessage;
-        std::vector< rtl::OUString > aArguments;
+        OUString aMessage;
+        std::vector< OUString > aArguments;
         aArguments.push_back( aDocumentURL );
 
         sal_Int32 nResult = RET_CANCEL;
diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx
index c81aefc4a86e..922d587d62f8 100644
--- a/uui/source/iahndl-ssl.cxx
+++ b/uui/source/iahndl-ssl.cxx
@@ -61,7 +61,7 @@ getContentPart( const String& _rRawString )
     int i = 0;
     while ( aIDs[i] )
     {
-        String sPartId = rtl::OUString::createFromAscii( aIDs[i++] );
+        String sPartId = OUString::createFromAscii( aIDs[i++] );
         xub_StrLen nContStart = _rRawString.Search( sPartId );
         if ( nContStart != STRING_NOTFOUND )
         {
@@ -77,10 +77,10 @@ getContentPart( const String& _rRawString )
 
 bool
 isDomainMatch(
-              rtl::OUString hostName, uno::Sequence< ::rtl::OUString > certHostNames)
+              OUString hostName, uno::Sequence< OUString > certHostNames)
 {
     for ( int i = 0; i < certHostNames.getLength(); i++){
-        ::rtl::OUString element = certHostNames[i];
+        OUString element = certHostNames[i];
 
        if (element.isEmpty())
            continue;
@@ -91,7 +91,7 @@ isDomainMatch(
        if ( 0 == element.indexOf( '*' ) &&
                  hostName.getLength() >= element.getLength()  )
        {
-           rtl::OUString cmpStr = element.copy( 1 );
+           OUString cmpStr = element.copy( 1 );
            if ( hostName.matchIgnoreAsciiCase(
                     cmpStr, hostName.getLength() - cmpStr.getLength()) )
                return true;
@@ -101,12 +101,12 @@ isDomainMatch(
     return false;
 }
 
-rtl::OUString
+OUString
 getLocalizedDatTimeStr(
     uno::Reference< uno::XComponentContext> const & xContext,
     util::DateTime const & rDateTime )
 {
-    rtl::OUString aDateTimeStr;
+    OUString aDateTimeStr;
     Date  aDate( Date::EMPTY );
     Time  aTime( Time::EMPTY );
 
@@ -123,7 +123,7 @@ getLocalizedDatTimeStr(
 
     pNumberFormatter->GetOutputString(
         aDate - *pNullDate, nFormat, aTmpStr, &pColor );
-    aDateTimeStr = aTmpStr + rtl::OUString(" ");
+    aDateTimeStr = aTmpStr + OUString(" ");
 
     nFormat = pNumberFormatter->GetStandardFormat( NUMBERFORMAT_TIME, eUILang );
     pNumberFormatter->GetOutputString(
@@ -152,9 +152,9 @@ executeUnknownAuthDialog(
                                    xManager.get()));
 
         // Get correct resource string
-        rtl::OUString aMessage;
+        OUString aMessage;
 
-        std::vector< rtl::OUString > aArguments;
+        std::vector< OUString > aArguments;
         aArguments.push_back( getContentPart( rXCert->getSubjectName()) );
 
         if (xManager.get())
@@ -174,7 +174,7 @@ executeUnknownAuthDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-                  rtl::OUString("out of memory"),
+                  OUString("out of memory"),
                   uno::Reference< uno::XInterface >());
     }
 }
@@ -185,7 +185,7 @@ executeSSLWarnDialog(
     uno::Reference< uno::XComponentContext > const & xContext,
     const uno::Reference< security::XCertificate >& rXCert,
     sal_Int32 const & failure,
-    const rtl::OUString & hostName )
+    const OUString & hostName )
     SAL_THROW((uno::RuntimeException))
 {
     try
@@ -200,8 +200,8 @@ executeSSLWarnDialog(
                               xManager.get()));
 
         // Get correct resource string
-        rtl::OUString aMessage_1;
-        std::vector< rtl::OUString > aArguments_1;
+        OUString aMessage_1;
+        std::vector< OUString > aArguments_1;
 
         switch( failure )
         {
@@ -237,7 +237,7 @@ executeSSLWarnDialog(
                 xDialog->setDescription1Text( aMessage_1 );
             }
 
-            rtl::OUString aTitle;
+            OUString aTitle;
             ErrorResource(aResId).getString(
                 ERRCODE_AREA_UUI_UNKNOWNAUTH + failure + TITLE, aTitle);
             xDialog->SetText( aTitle );
@@ -248,7 +248,7 @@ executeSSLWarnDialog(
     catch (std::bad_alloc const &)
     {
         throw uno::RuntimeException(
-                  rtl::OUString("out of memory"),
+                  OUString("out of memory"),
                   uno::Reference< uno::XInterface >());
     }
 }
@@ -286,7 +286,7 @@ handleCertificateValidationRequest_(
     for (sal_Int32 i = 0 ; i < extensions.getLength(); i++){
         uno::Reference< security::XCertificateExtension >element = extensions[i];
 
-        rtl::OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength());
+        OString aId ( (const sal_Char *)element->getExtensionId().getArray(), element->getExtensionId().getLength());
         if (aId.equals(OID_SUBJECT_ALTERNATIVE_NAME))
         {
            uno::Reference< security::XSanExtension > sanExtension ( element, uno::UNO_QUERY );
@@ -295,8 +295,8 @@ handleCertificateValidationRequest_(
         }
     }
 
-    ::rtl::OUString certHostName = getContentPart( rRequest.Certificate->getSubjectName() );
-    uno::Sequence< ::rtl::OUString > certHostNames(altNames.getLength() + 1);
+    OUString certHostName = getContentPart( rRequest.Certificate->getSubjectName() );
+    uno::Sequence< OUString > certHostNames(altNames.getLength() + 1);
 
     certHostNames[0] = certHostName;
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 2d6fb19bebc3..77fa9baa2587 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -122,7 +122,7 @@ public:
     }
     uno::Reference< task::XInteractionRequest > m_rRequest;
     bool                                        bHandled;
-    beans::Optional< rtl::OUString >            m_aResult;
+    beans::Optional< OUString >            m_aResult;
 };
 
 } /* namespace */
@@ -158,7 +158,7 @@ UUIInteractionHelper::handlerequest(
     UUIInteractionHelper* pUUI
         = static_cast< UUIInteractionHelper * >(pInteractionHelper);
     bool bDummy = false;
-    rtl::OUString aDummy;
+    OUString aDummy;
     pHND->bHandled
         = pUUI->handleRequest_impl(pHND->m_rRequest, false, bDummy, aDummy);
     pHND->set();
@@ -192,7 +192,7 @@ UUIInteractionHelper::handleRequest(
     else
     {
         bool bDummy = false;
-        rtl::OUString aDummy;
+        OUString aDummy;
         return handleRequest_impl(rRequest, false, bDummy, aDummy);
     }
 }
@@ -208,13 +208,13 @@ UUIInteractionHelper::getstringfromrequest(
     return 0;
 }
 
-beans::Optional< rtl::OUString >
+beans::Optional< OUString >
 UUIInteractionHelper::getStringFromRequest_impl(
     uno::Reference< task::XInteractionRequest > const & rRequest)
     SAL_THROW((uno::RuntimeException))
 {
     bool bSuccess = false;
-    rtl::OUString aMessage;
+    OUString aMessage;
     handleRequest_impl(rRequest, true, bSuccess, aMessage);
 
     OSL_ENSURE(bSuccess ||
@@ -223,10 +223,10 @@ UUIInteractionHelper::getStringFromRequest_impl(
                "Interaction request is a candidate for a string representation."
                "Please implement!");
 
-    return beans::Optional< rtl::OUString >(bSuccess, aMessage);
+    return beans::Optional< OUString >(bSuccess, aMessage);
 }
 
-beans::Optional< rtl::OUString >
+beans::Optional< OUString >
 UUIInteractionHelper::getStringFromRequest(
     uno::Reference< task::XInteractionRequest > const & rRequest)
     SAL_THROW((uno::RuntimeException))
@@ -254,10 +254,10 @@ UUIInteractionHelper::getStringFromRequest(
         return getStringFromRequest_impl(rRequest);
 }
 
-::rtl::OUString
+OUString
 UUIInteractionHelper::replaceMessageWithArguments(
-    ::rtl::OUString aMessage,
-    std::vector< rtl::OUString > const & rArguments )
+    OUString aMessage,
+    std::vector< OUString > const & rArguments )
 {
     for (sal_Int32 i = 0;;)
     {
@@ -271,8 +271,8 @@ UUIInteractionHelper::replaceMessageWithArguments(
                 = aMessage.getStr()[i + RTL_CONSTASCII_LENGTH("$(ARG")];
             if (c >= '1' && c <= '2')
             {
-                std::vector< rtl::OUString >::size_type nIndex
-                    = static_cast< std::vector< rtl::OUString >::size_type >(
+                std::vector< OUString >::size_type nIndex
+                    = static_cast< std::vector< OUString >::size_type >(
                         c - '1');
                 if (nIndex < rArguments.size())
                 {
@@ -338,16 +338,16 @@ UUIInteractionHelper::tryOtherInteractionHandler(
 namespace
 {
     // .................................................................................................................
-    static bool lcl_matchesRequest( const Any& i_rRequest, const ::rtl::OUString& i_rTypeName, const ::rtl::OUString& i_rPropagation )
+    static bool lcl_matchesRequest( const Any& i_rRequest, const OUString& i_rTypeName, const OUString& i_rPropagation )
     {
         const ::com::sun::star::uno::TypeDescription aTypeDesc( i_rTypeName );
         const typelib_TypeDescription* pTypeDesc = aTypeDesc.get();
         if ( !pTypeDesc || !pTypeDesc->pWeakRef )
         {
 #if OSL_DEBUG_LEVEL > 0
-            ::rtl::OStringBuffer aMessage;
+            OStringBuffer aMessage;
             aMessage.append( "no type found for '" );
-            aMessage.append( ::rtl::OUStringToOString( i_rTypeName, RTL_TEXTENCODING_UTF8 ) );
+            aMessage.append( OUStringToOString( i_rTypeName, RTL_TEXTENCODING_UTF8 ) );
             aMessage.append( "'" );
             OSL_FAIL( aMessage.makeStringAndClear().getStr() );
 #endif
@@ -364,7 +364,7 @@ namespace
 }
 
 // ---------------------------------------------------------------------------------------------------------------------
-bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionRequest >& i_rRequest, const ::rtl::OUString& i_rServiceName ) const
+bool UUIInteractionHelper::handleCustomRequest( const Reference< XInteractionRequest >& i_rRequest, const OUString& i_rServiceName ) const
 {
     try
     {
@@ -407,29 +407,29 @@ bool UUIInteractionHelper::handleTypedHandlerImplementations( Reference< XIntera
     ) );
 
     // loop through all registered implementations
-    const Sequence< ::rtl::OUString > aRegisteredHandlers( aConfigRoot.getNodeNames() );
-    const ::rtl::OUString* pHandlerName = aRegisteredHandlers.getConstArray();
-    const ::rtl::OUString* pHandlersEnd = aRegisteredHandlers.getConstArray() + aRegisteredHandlers.getLength();
+    const Sequence< OUString > aRegisteredHandlers( aConfigRoot.getNodeNames() );
+    const OUString* pHandlerName = aRegisteredHandlers.getConstArray();
+    const OUString* pHandlersEnd = aRegisteredHandlers.getConstArray() + aRegisteredHandlers.getLength();
     for ( ; pHandlerName != pHandlersEnd; ++pHandlerName )
     {
         const ::utl::OConfigurationNode aHandlerNode( aConfigRoot.openNode( *pHandlerName ) );
         const ::utl::OConfigurationNode aTypesNode( aHandlerNode.openNode( "HandledRequestTypes" ) );
 
         // loop through all the types which the current handler is registered for
-        const Sequence< ::rtl::OUString > aHandledTypes( aTypesNode.getNodeNames() );
-        const ::rtl::OUString* pType = aHandledTypes.getConstArray();
-        const ::rtl::OUString* pTypesEnd = aHandledTypes.getConstArray() + aHandledTypes.getLength();
+        const Sequence< OUString > aHandledTypes( aTypesNode.getNodeNames() );
+        const OUString* pType = aHandledTypes.getConstArray();
+        const OUString* pTypesEnd = aHandledTypes.getConstArray() + aHandledTypes.getLength();
         for ( ; pType != pTypesEnd; ++pType )
         {
             // the UNO type is the node name
             ::utl::OConfigurationNode aType( aTypesNode.openNode( *pType ) );
             // and there's a child denoting how the responsibility propagates
-            ::rtl::OUString sPropagation;
+            OUString sPropagation;
             OSL_VERIFY( aType.getNodeValue( "Propagation" ) >>= sPropagation );
             if ( lcl_matchesRequest( aRequest, *pType, sPropagation ) )
             {
                 // retrieve the service/implementation name of the handler
-                ::rtl::OUString sServiceName;
+                OUString sServiceName;
                 OSL_VERIFY( aHandlerNode.getNodeValue( "ServiceName" ) >>= sServiceName );
                 // cache the information who feels responsible for requests of this type
                 m_aTypedCustomHandlers[ aRequest.getValueTypeName() ] = sServiceName;
@@ -447,7 +447,7 @@ UUIInteractionHelper::handleRequest_impl(
     uno::Reference< task::XInteractionRequest > const & rRequest,
     bool bObtainErrorStringOnly,
     bool & bHasErrorString,
-    rtl::OUString & rErrorString)
+    OUString & rErrorString)
     SAL_THROW((uno::RuntimeException))
 {
     try
@@ -461,16 +461,16 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aModSizeException )
         {
             ErrCode nErrorCode = ERRCODE_UUI_IO_MODULESIZEEXCEEDED;
-            std::vector< rtl::OUString > aArguments;
-            uno::Sequence< rtl::OUString > sModules
+            std::vector< OUString > aArguments;
+            uno::Sequence< OUString > sModules
                 = aModSizeException.Names;
             if ( sModules.getLength() )
             {
-                rtl::OUString aName;
+                OUString aName;
                 for ( sal_Int32 index=0; index< sModules.getLength(); ++index )
                 {
                     if ( index )
-                        aName = aName + rtl::OUString( ',' ) + sModules[index];
+                        aName = aName + OUString( ',' ) + sModules[index];
                     else
                         aName = sModules[index]; // 1st name
                 }
@@ -490,7 +490,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aNCException)
         {
             ErrCode nErrorCode = ERRCODE_UUI_IO_TARGETALREADYEXISTS;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
 
             if( !aNCException.Name.isEmpty() )
             {
@@ -512,7 +512,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aUORequest)
         {
             ErrCode nErrorCode = ERRCODE_UUI_IO_UNSUPPORTEDOVERWRITE;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
 
             uno::Reference< task::XInteractionApprove > xApprove;
             uno::Reference< task::XInteractionDisapprove > xDisapprove;
@@ -541,7 +541,7 @@ UUIInteractionHelper::handleRequest_impl(
         ucb::InteractiveAppException aAppException;
         if (aAnyRequest >>= aAppException)
         {
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             handleErrorHandlerRequest( aAppException.Classification,
                                        aAppException.Code,
                                        aArguments,
@@ -556,7 +556,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aNetworkException)
         {
             ErrCode nErrorCode;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             ucb::InteractiveNetworkOffLineException aOffLineException;
             ucb::InteractiveNetworkResolveNameException aResolveNameException;
             ucb::InteractiveNetworkConnectException aConnectException;
@@ -602,8 +602,8 @@ UUIInteractionHelper::handleRequest_impl(
         {
             sal_Int32 nMedium = 0;
             aWrongMediumException.Medium >>= nMedium;
-            std::vector< rtl::OUString > aArguments;
-            aArguments.push_back(rtl::OUString::valueOf(nMedium + 1));
+            std::vector< OUString > aArguments;
+            aArguments.push_back(OUString::valueOf(nMedium + 1));
             handleErrorHandlerRequest(aWrongMediumException.Classification,
                                       ERRCODE_UUI_WRONGMEDIUM,
                                       aArguments,
@@ -618,7 +618,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aWrongJavaVersionException)
         {
             ErrCode nErrorCode;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             if (aWrongJavaVersionException.DetectedVersion.isEmpty())
                 if (aWrongJavaVersionException.LowestSupportedVersion.isEmpty())
                     nErrorCode = ERRCODE_UUI_WRONGJAVA;
@@ -656,7 +656,7 @@ UUIInteractionHelper::handleRequest_impl(
                 ? ERRCODE_UUI_CONFIGURATION_BROKENDATA_WITHREMOVE
                 : ERRCODE_UUI_CONFIGURATION_BROKENDATA_NOREMOVE;
 
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back(aMergeRecoveryRequest.ErrorLayerId);
 
             handleErrorHandlerRequest(task::InteractionClassification_ERROR,
@@ -676,11 +676,11 @@ UUIInteractionHelper::handleRequest_impl(
         {
             const ErrCode nErrorCode = ERRCODE_UUI_CONFIGURATION_BACKENDMISSING;
 
-            rtl::OUString aStratum = aStratumCreationException.StratumData;
+            OUString aStratum = aStratumCreationException.StratumData;
             if (aStratum.isEmpty())
                 aStratum = aStratumCreationException.StratumService;
 
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back(aStratum);
 
             handleErrorHandlerRequest(task::InteractionClassification_ERROR,
@@ -699,7 +699,7 @@ UUIInteractionHelper::handleRequest_impl(
             const ErrCode nErrorCode =
                 ERRCODE_UUI_INVALID_XFORMS_SUBMISSION_DATA;
 
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
 
             handleErrorHandlerRequest(task::InteractionClassification_QUERY,
                                       nErrorCode,
@@ -716,7 +716,7 @@ UUIInteractionHelper::handleRequest_impl(
         {
             ErrCode nErrorCode = aLLException.SelfOwned
                 ? ERRCODE_UUI_LOCKING_LOCKED_SELF : ERRCODE_UUI_LOCKING_LOCKED;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back( aLLException.Url );
 
             handleErrorHandlerRequest( aLLException.Classification,
@@ -733,7 +733,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aLNLException)
         {
             ErrCode nErrorCode = ERRCODE_UUI_LOCKING_NOT_LOCKED;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back( aLNLException.Url );
 
             handleErrorHandlerRequest( aLNLException.Classification,
@@ -750,7 +750,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aLLEException)
         {
             ErrCode nErrorCode = ERRCODE_UUI_LOCKING_LOCK_EXPIRED;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back( aLLEException.Url );
 
             handleErrorHandlerRequest( aLLEException.Classification,
@@ -766,7 +766,7 @@ UUIInteractionHelper::handleRequest_impl(
         document::BrokenPackageRequest aBrokenPackageRequest;
         if (aAnyRequest >>= aBrokenPackageRequest)
         {
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
 
             if( !aBrokenPackageRequest.aName.isEmpty() )
                 aArguments.push_back( aBrokenPackageRequest.aName );
@@ -785,7 +785,7 @@ UUIInteractionHelper::handleRequest_impl(
             // Sucky special handling for xlsx macro filter warning
             if ( (sal_uInt32)ERRCODE_SFX_VBASIC_CANTSAVE_STORAGE == (sal_uInt32)aErrorCodeRequest.ErrCode)
             {
-                std::vector< rtl::OUString > aArguments;
+                std::vector< OUString > aArguments;
                 handleErrorHandlerRequest( task::InteractionClassification_WARNING,
                                        ERRCODE_UUI_IO_WARN_CANTSAVE_MACROS,
                                        aArguments,
@@ -820,7 +820,7 @@ UUIInteractionHelper::handleRequest_impl(
         if (aAnyRequest >>= aCannotActivateFactoryException)
         {
             ErrCode nErrorCode = ERRCODE_UUI_CANNOT_ACTIVATE_FACTORY;
-            std::vector< rtl::OUString > aArguments;
+            std::vector< OUString > aArguments;
             aArguments.push_back( aCannotActivateFactoryException.Message );
 
             handleErrorHandlerRequest( task::InteractionClassification_ERROR,
@@ -941,7 +941,7 @@ UUIInteractionHelper::getInteractionHandlerList(
         uno::Reference< lang::XMultiServiceFactory > xConfigProv =
             configuration::theDefaultProvider::get( m_xContext );
 
-        rtl::OUStringBuffer aFullPath;
+        OUStringBuffer aFullPath;
         aFullPath.appendAscii(
             "/org.openoffice.ucb.InteractionHandler/InteractionHandlers" );
 
@@ -966,8 +966,8 @@ UUIInteractionHelper::getInteractionHandlerList(
                     "config access does not implement XNameAccess"),
                 uno::Reference< uno::XInterface >());
 
-        uno::Sequence< rtl::OUString > aElems = xNameAccess->getElementNames();
-        const rtl::OUString* pElems = aElems.getConstArray();
+        uno::Sequence< OUString > aElems = xNameAccess->getElementNames();
+        const OUString* pElems = aElems.getConstArray();
         sal_Int32 nCount = aElems.getLength();
 
         if ( nCount > 0 )
@@ -983,7 +983,7 @@ UUIInteractionHelper::getInteractionHandlerList(
             // Iterate over children.
             for ( sal_Int32 n = 0; n < nCount; ++n )
             {
-                rtl::OUStringBuffer aElemBuffer;
+                OUStringBuffer aElemBuffer;
                 aElemBuffer.appendAscii( "['" );
                 aElemBuffer.append( pElems[ n ] );
 
@@ -992,10 +992,10 @@ UUIInteractionHelper::getInteractionHandlerList(
                     InteractionHandlerData aInfo;
 
                     // Obtain service name.
-                    rtl::OUStringBuffer aKeyBuffer = aElemBuffer;
+                    OUStringBuffer aKeyBuffer = aElemBuffer;
                     aKeyBuffer.appendAscii( "']/ServiceName" );
 
-                    rtl::OUString aValue;
+                    OUString aValue;
                     if ( !( xHierNameAccess->getByHierarchicalName(
                                 aKeyBuffer.makeStringAndClear() ) >>= aValue ) )
                     {
@@ -1047,7 +1047,7 @@ UUIInteractionHelper::getParentXWindow() const
     return m_xWindowParam;
 }
 
-rtl::OUString
+OUString
 UUIInteractionHelper::getContextProperty()
     SAL_THROW(())
 {
@@ -1068,8 +1068,8 @@ namespace {
 sal_uInt16
 executeMessageBox(
     Window * pParent,
-    rtl::OUString const & rTitle,
-    rtl::OUString const & rMessage,
+    OUString const & rTitle,
+    OUString const & rMessage,
     WinBits nButtonMask )
     SAL_THROW((uno::RuntimeException))
 {
@@ -1101,9 +1101,9 @@ executeMessageBox(
 }
 
 NameClashResolveDialogResult executeSimpleNameClashResolveDialog( Window *pParent,
-                                                                  rtl::OUString const & rTargetFolderURL,
-                                                                  rtl::OUString const & rClashingName,
-                                                                  rtl::OUString & rProposedNewName,
+                                                                  OUString const & rTargetFolderURL,
+                                                                  OUString const & rClashingName,
+                                                                  OUString & rProposedNewName,
                                                                   bool bAllowOverwrite )
 {
     boost::scoped_ptr< ResMgr > xManager( ResMgr::CreateResMgr( "uui" ) );
@@ -1146,7 +1146,7 @@ UUIInteractionHelper::handleNameClashResolveRequest(
         "NameClashResolveRequest must contain SupplyName continuation" );
 
     NameClashResolveDialogResult eResult = ABORT;
-    rtl::OUString aProposedNewName( rRequest.ProposedNewName );
+    OUString aProposedNewName( rRequest.ProposedNewName );
 
     eResult = executeSimpleNameClashResolveDialog( getParentProperty(),
                     rRequest.TargetFolderURL,
@@ -1182,7 +1182,7 @@ UUIInteractionHelper::handleGenericErrorRequest(
         task::XInteractionContinuation > > const & rContinuations,
     bool bObtainErrorStringOnly,
     bool & bHasErrorString,
-    rtl::OUString & rErrorString)
+    OUString & rErrorString)
     SAL_THROW((uno::RuntimeException))
 {
     if (bObtainErrorStringOnly)
@@ -1243,9 +1243,9 @@ UUIInteractionHelper::handleGenericErrorRequest(
 
 void
 UUIInteractionHelper::handleMacroConfirmRequest(
-    const ::rtl::OUString& aDocumentURL,
+    const OUString& aDocumentURL,
     const uno::Reference< embed::XStorage >& xZipStorage,
-    const ::rtl::OUString& aDocumentVersion,
+    const OUString& aDocumentVersion,
     const uno::Sequence< security::DocumentSignatureInformation > aSignInfo,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations )
@@ -1355,12 +1355,12 @@ UUIInteractionHelper::handleFutureDocumentVersionUpdateRequest(
 
 void
 UUIInteractionHelper::handleBrokenPackageRequest(
-    std::vector< rtl::OUString > const & rArguments,
+    std::vector< OUString > const & rArguments,
     uno::Sequence< uno::Reference< task::XInteractionContinuation > > const &
         rContinuations,
     bool bObtainErrorStringOnly,
     bool & bHasErrorString,
-    rtl::OUString & rErrorString)
+    OUString & rErrorString)
     SAL_THROW((uno::RuntimeException))
 {
     if (bObtainErrorStringOnly)
@@ -1387,7 +1387,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
     else
         return;
 
-    ::rtl::OUString aMessage;
+    OUString aMessage;
     {
         SolarMutexGuard aGuard;
         boost::scoped_ptr< ResMgr > xManager(ResMgr::CreateResMgr("uui"));
@@ -1452,7 +1452,7 @@ UUIInteractionHelper::handleBrokenPackageRequest(
 //=========================================================================
 
 bool
-ErrorResource::getString(ErrCode nErrorCode, rtl::OUString &rString)
+ErrorResource::getString(ErrCode nErrorCode, OUString &rString)
     const SAL_THROW(())
 {
     ResId aResId(static_cast< sal_uInt16 >(nErrorCode & ERRCODE_RES_MASK),
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index 8abe1fcb4b20..d1c553df1802 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -70,10 +70,10 @@ struct InteractionHandlerData
 {
     /** The UNO service name to use to instanciate the content provider.
      */
-    rtl::OUString ServiceName;
+    OUString ServiceName;
 
     InteractionHandlerData() {};
-    InteractionHandlerData(const rtl::OUString & rService)
+    InteractionHandlerData(const OUString & rService)
     : ServiceName( rService ){}
 };
 
@@ -81,7 +81,7 @@ typedef std::vector< InteractionHandlerData > InteractionHandlerDataList;
 
 typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > Continuations;
 
-typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >    StringHashMap;
+typedef ::boost::unordered_map< OUString, OUString, OUStringHash >    StringHashMap;
 
 //============================================================================
 class UUIInteractionHelper
@@ -116,17 +116,17 @@ public:
             com::sun::star::task::XInteractionRequest > const & rRequest)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
-    com::sun::star::beans::Optional< rtl::OUString >
+    com::sun::star::beans::Optional< OUString >
     getStringFromRequest(
         com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest > const & rRequest)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     // Helper.
-    static ::rtl::OUString
+    static OUString
     replaceMessageWithArguments(
-        ::rtl::OUString aMessage,
-            std::vector< rtl::OUString > const & rArguments );
+        OUString aMessage,
+            std::vector< OUString > const & rArguments );
 
     ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
     getORB() const
@@ -138,13 +138,13 @@ private:
             com::sun::star::task::XInteractionRequest > const & rRequest,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     static long
     handlerequest(void* pHandleData, void* pInteractionHandler);
 
-    com::sun::star::beans::Optional< rtl::OUString >
+    com::sun::star::beans::Optional< OUString >
     getStringFromRequest_impl(
         com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest > const & rRequest)
@@ -161,7 +161,7 @@ private:
     getParentXWindow() const
         SAL_THROW(());
 
-    rtl::OUString
+    OUString
     getContextProperty()
         SAL_THROW(());
 
@@ -198,7 +198,7 @@ private:
             com::sun::star::task::XInteractionRequest > const & rRequest,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     bool
@@ -256,14 +256,14 @@ private:
     handleErrorHandlerRequest(
         com::sun::star::task::InteractionClassification eClassification,
         ErrCode nErrorCode,
-        std::vector< rtl::OUString > const & rArguments,
+        std::vector< OUString > const & rArguments,
         com::sun::star::uno::Sequence<
             com::sun::star::uno::Reference<
                 com::sun::star::task::XInteractionContinuation > > const &
                     rContinuations,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     void
@@ -275,15 +275,15 @@ private:
                     rContinuations,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
         SAL_THROW((com::sun::star::uno::RuntimeException));
 
     void
     handleMacroConfirmRequest(
-        const ::rtl::OUString& aDocumentURL,
+        const OUString& aDocumentURL,
         const ::com::sun::star::uno::Reference<
             ::com::sun::star::embed::XStorage >& xZipStorage,
-        const ::rtl::OUString& aDocumentVersion,
+        const OUString& aDocumentVersion,
         const ::com::sun::star::uno::Sequence<
             ::com::sun::star::security::DocumentSignatureInformation >
                 aSignInfo,
@@ -305,14 +305,14 @@ private:
 
     void
     handleBrokenPackageRequest(
-        std::vector< rtl::OUString > const & rArguments,
+        std::vector< OUString > const & rArguments,
         ::com::sun::star::uno::Sequence<
             ::com::sun::star::uno::Reference<
                 ::com::sun::star::task::XInteractionContinuation > > const &
                     rContinuations,
         bool bObtainErrorStringOnly,
         bool & bHasErrorString,
-        rtl::OUString & rErrorString)
+        OUString & rErrorString)
         SAL_THROW((::com::sun::star::uno::RuntimeException));
 
     bool handleLockedDocumentRequest(
@@ -332,7 +332,7 @@ private:
 
     bool    handleCustomRequest(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& i_rRequest,
-                const ::rtl::OUString& i_rServiceName
+                const OUString& i_rServiceName
             ) const;
 };
 
@@ -343,7 +343,7 @@ public:
 
     inline ~ErrorResource() SAL_THROW(()) { FreeResource(); }
 
-    bool getString(ErrCode nErrorCode, rtl::OUString &rString) const
+    bool getString(ErrCode nErrorCode, OUString &rString) const
         SAL_THROW(());
 };
 
diff --git a/uui/source/interactionhandler.cxx b/uui/source/interactionhandler.cxx
index bb5177e9c103..a6bbb280f7a5 100644
--- a/uui/source/interactionhandler.cxx
+++ b/uui/source/interactionhandler.cxx
@@ -38,17 +38,17 @@ UUIInteractionHandler::~UUIInteractionHandler()
     delete m_pImpl;
 }
 
-rtl::OUString SAL_CALL UUIInteractionHandler::getImplementationName()
+OUString SAL_CALL UUIInteractionHandler::getImplementationName()
     throw (uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii(m_aImplementationName);
+    return OUString::createFromAscii(m_aImplementationName);
 }
 
 sal_Bool SAL_CALL
-UUIInteractionHandler::supportsService(rtl::OUString const & rServiceName)
+UUIInteractionHandler::supportsService(OUString const & rServiceName)
     throw (uno::RuntimeException)
 {
-    uno::Sequence< rtl::OUString >
+    uno::Sequence< OUString >
     aNames(getSupportedServiceNames_static());
     for (sal_Int32 i = 0; i < aNames.getLength(); ++i)
         if (aNames[i] == rServiceName)
@@ -56,7 +56,7 @@ UUIInteractionHandler::supportsService(rtl::OUString const & rServiceName)
     return false;
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
 UUIInteractionHandler::getSupportedServiceNames()
     throw (uno::RuntimeException)
 {
@@ -76,7 +76,7 @@ UUIInteractionHandler::initialize(
     // in Parent and Context values; for backwards compatibility, keep support
     // for a PropertyValue sequence, too:
     uno::Reference< awt::XWindow > xWindow;
-    rtl::OUString aContext;
+    OUString aContext;
     if (!((rArguments.getLength() == 1 && (rArguments[0] >>= xWindow)) ||
           (rArguments.getLength() == 2 && (rArguments[0] >>= xWindow) &&
            (rArguments[1] >>= aContext))))
diff --git a/uui/source/interactionhandler.hxx b/uui/source/interactionhandler.hxx
index c044fb48091c..a8d759554803 100644
--- a/uui/source/interactionhandler.hxx
+++ b/uui/source/interactionhandler.hxx
@@ -35,7 +35,7 @@ class UUIInteractionHandler:
 public:
     static char const m_aImplementationName[];
 
-    static com::sun::star::uno::Sequence< rtl::OUString >
+    static com::sun::star::uno::Sequence< OUString >
     getSupportedServiceNames_static();
 
     static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
@@ -59,14 +59,14 @@ private:
 
     virtual ~UUIInteractionHandler() SAL_THROW(());
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &
+    virtual sal_Bool SAL_CALL supportsService(OUString const &
                           rServiceName)
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw (com::sun::star::uno::RuntimeException);
 
diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx
index aa25574c4873..a5d67b921f1f 100644
--- a/uui/source/logindlg.cxx
+++ b/uui/source/logindlg.cxx
@@ -244,8 +244,8 @@ LoginDialog::LoginDialog
 (
     Window* pParent,
     sal_uInt16 nFlags,
-    const rtl::OUString& rServer,
-    const rtl::OUString& rRealm,
+    const OUString& rServer,
+    const OUString& rRealm,
     ResMgr* pResMgr
 ) :
 
diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx
index 2c3fc64888bd..71d6fbf2fc55 100644
--- a/uui/source/logindlg.hxx
+++ b/uui/source/logindlg.hxx
@@ -73,7 +73,7 @@ class LoginDialog : public ModalDialog
 
 public:
     LoginDialog( Window* pParent, sal_uInt16 nFlags,
-                 const rtl::OUString& rServer, const rtl::OUString &rRealm,
+                 const OUString& rServer, const OUString &rRealm,
                  ResMgr * pResMgr );
     virtual ~LoginDialog();
 
diff --git a/uui/source/nameclashdlg.cxx b/uui/source/nameclashdlg.cxx
index 444a327c47ec..20c8bad93c03 100644
--- a/uui/source/nameclashdlg.cxx
+++ b/uui/source/nameclashdlg.cxx
@@ -32,7 +32,7 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
     if ( &maBtnRename == pBtn )
     {
         nRet = (long) RENAME;
-        rtl::OUString aNewName = maEDNewName.GetText();
+        OUString aNewName = maEDNewName.GetText();
         if ( ( aNewName == maNewName ) || aNewName.isEmpty() )
         {
             ErrorBox aError( NULL, WB_OK, maSameName );
@@ -51,9 +51,9 @@ IMPL_LINK( NameClashDialog, ButtonHdl_Impl, PushButton *, pBtn )
 
 // -----------------------------------------------------------------------
 NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
-                                  rtl::OUString const & rTargetFolderURL,
-                                  rtl::OUString const & rClashingName,
-                                  rtl::OUString const & rProposedNewName,
+                                  OUString const & rTargetFolderURL,
+                                  OUString const & rClashingName,
+                                  OUString const & rProposedNewName,
                                   bool bAllowOverwrite )
     : ModalDialog( pParent, ResId( DLG_SIMPLE_NAME_CLASH, *pResMgr ) ),
     maFTMessage            ( this, ResId( FT_FILE_EXISTS_WARNING, *pResMgr ) ),
@@ -82,7 +82,7 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
         maBtnOverwrite.Hide();
     }
 
-    rtl::OUString aPath;
+    OUString aPath;
     if ( osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( rTargetFolderURL, aPath ) )
         aPath = rTargetFolderURL;
 
diff --git a/uui/source/nameclashdlg.hxx b/uui/source/nameclashdlg.hxx
index ed3588cd8584..362622a8bf35 100644
--- a/uui/source/nameclashdlg.hxx
+++ b/uui/source/nameclashdlg.hxx
@@ -37,18 +37,18 @@ class NameClashDialog : public ModalDialog
     PushButton    maBtnRename;
     CancelButton  maBtnCancel;
     HelpButton    maBtnHelp;
-    rtl::OUString maSameName;
-    rtl::OUString maNewName;
+    OUString maSameName;
+    OUString maNewName;
 
     DECL_LINK( ButtonHdl_Impl, PushButton * );
 
 public:
     NameClashDialog( Window* pParent, ResMgr* pResMgr,
-                     rtl::OUString const & rTargetFolderURL,
-                     rtl::OUString const & rClashingName,
-                     rtl::OUString const & rProposedNewName,
+                     OUString const & rTargetFolderURL,
+                     OUString const & rClashingName,
+                     OUString const & rProposedNewName,
                      bool bAllowOverwrite );
-    rtl::OUString getNewName() const { return maNewName; }
+    OUString getNewName() const { return maNewName; }
 };
 
 #endif // UUI_COOKIEDG_HXX
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index bbf192d02b18..ffa48d012a12 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -44,7 +44,7 @@ namespace uui
 {
 
 NewerVersionWarningDialog::NewerVersionWarningDialog(
-    Window* pParent, const ::rtl::OUString& rVersion, ResMgr& rResMgr ) :
+    Window* pParent, const OUString& rVersion, ResMgr& rResMgr ) :
 
     ModalDialog( pParent, ResId( RID_DLG_NEWER_VERSION_WARNING, rResMgr ) ),
 
@@ -93,7 +93,7 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
             if ( !sNotifyURL.isEmpty() )
             {
                 xSystemShell->execute(
-                    sNotifyURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+                    sNotifyURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
             }
         }
         else
@@ -127,7 +127,7 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
                     xDispatchProvider = uno::Reference < frame::XDispatchProvider > ( xDesktop, uno::UNO_QUERY );
 
                 uno::Reference< frame::XDispatch > xDispatch =
-                    xDispatchProvider->queryDispatch( aURL, rtl::OUString(), 0 );
+                    xDispatchProvider->queryDispatch( aURL, OUString(), 0 );
                 if ( xDispatch.is() )
                     xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() );
             }
diff --git a/uui/source/newerverwarn.hxx b/uui/source/newerverwarn.hxx
index 77f43be3cb4b..f724ce056687 100644
--- a/uui/source/newerverwarn.hxx
+++ b/uui/source/newerverwarn.hxx
@@ -36,7 +36,7 @@ namespace uui
         PushButton      m_aUpdateBtn;
         CancelButton    m_aLaterBtn;
 
-        ::rtl::OUString m_sVersion;
+        OUString m_sVersion;
 
         DECL_LINK(UpdateHdl, void *);
         DECL_LINK(LaterHdl, void *);
@@ -44,7 +44,7 @@ namespace uui
         void            InitButtonWidth();
 
     public:
-        NewerVersionWarningDialog( Window* pParent, const ::rtl::OUString& rVersion, ResMgr& rResMgr );
+        NewerVersionWarningDialog( Window* pParent, const OUString& rVersion, ResMgr& rResMgr );
         ~NewerVersionWarningDialog();
     };
 } // namespace uui
diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx
index cc3d5894f8fa..1ee48589f9b9 100644
--- a/uui/source/passwordcontainer.cxx
+++ b/uui/source/passwordcontainer.cxx
@@ -119,7 +119,7 @@ bool PasswordContainerHelper::handleAuthenticationRequest(
     ucb::AuthenticationRequest const & rRequest,
     uno::Reference< ucb::XInteractionSupplyAuthentication > const &
         xSupplyAuthentication,
-    rtl::OUString const & rURL,
+    OUString const & rURL,
     uno::Reference< task::XInteractionHandler2 > const & xIH )
         SAL_THROW((uno::RuntimeException))
 {
@@ -143,7 +143,7 @@ bool PasswordContainerHelper::handleAuthenticationRequest(
     {
         // Runtime / Persistent info avail for current auth request?
 
-        rtl::OUString aResult = m_xPasswordContainer->findUrl(
+        OUString aResult = m_xPasswordContainer->findUrl(
             rURL.isEmpty() ? rRequest.ServerName : rURL );
         if ( !aResult.isEmpty() )
         {
@@ -222,9 +222,9 @@ bool PasswordContainerHelper::handleAuthenticationRequest(
 
 //=========================================================================
 bool PasswordContainerHelper::addRecord(
-    rtl::OUString const & rURL,
-    rtl::OUString const & rUsername,
-    uno::Sequence< rtl::OUString > const & rPasswords,
+    OUString const & rURL,
+    OUString const & rUsername,
+    uno::Sequence< OUString > const & rPasswords,
     uno::Reference< task::XInteractionHandler2 > const & xIH,
     bool bPersist )
         SAL_THROW((uno::RuntimeException))
@@ -294,7 +294,7 @@ PasswordContainerInteractionHandler::~PasswordContainerInteractionHandler()
 //=========================================================================
 
 // virtual
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
 PasswordContainerInteractionHandler::getImplementationName()
     throw ( uno::RuntimeException )
 {
@@ -305,11 +305,11 @@ PasswordContainerInteractionHandler::getImplementationName()
 // virtual
 sal_Bool SAL_CALL
 PasswordContainerInteractionHandler::supportsService(
-        const ::rtl::OUString& ServiceName )
+        const OUString& ServiceName )
     throw ( uno::RuntimeException )
 {
-    uno::Sequence< rtl::OUString > aSNL = getSupportedServiceNames();
-    const rtl::OUString * pArray = aSNL.getConstArray();
+    uno::Sequence< OUString > aSNL = getSupportedServiceNames();
+    const OUString * pArray = aSNL.getConstArray();
     for ( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
     {
         if ( pArray[ i ] == ServiceName )
@@ -320,7 +320,7 @@ PasswordContainerInteractionHandler::supportsService(
 
 //=========================================================================
 // virtual
-uno::Sequence< ::rtl::OUString > SAL_CALL
+uno::Sequence< OUString > SAL_CALL
 PasswordContainerInteractionHandler::getSupportedServiceNames()
     throw ( uno::RuntimeException )
 {
@@ -376,7 +376,7 @@ PasswordContainerInteractionHandler::handleInteractionRequest(
     if ( !( aAnyRequest >>= aAuthenticationRequest ) )
         return false;
 
-    rtl::OUString aURL;
+    OUString aURL;
     ucb::URLAuthenticationRequest aURLAuthenticationRequest;
     if ( aAnyRequest >>= aURLAuthenticationRequest )
         aURL = aURLAuthenticationRequest.URL;
diff --git a/uui/source/passwordcontainer.hxx b/uui/source/passwordcontainer.hxx
index 03bdc56aacdb..ee410e9e8daa 100644
--- a/uui/source/passwordcontainer.hxx
+++ b/uui/source/passwordcontainer.hxx
@@ -88,7 +88,7 @@ public:
         com::sun::star::uno::Reference<
             com::sun::star::ucb::XInteractionSupplyAuthentication > const &
                 xSupplyAuthentication,
-        rtl::OUString const & rURL,
+        OUString const & rURL,
         com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionHandler2 > const & xIH )
     SAL_THROW( (com::sun::star::uno::RuntimeException) );
@@ -120,9 +120,9 @@ public:
             False, otherwise.
 
     */
-    bool addRecord( rtl::OUString const & rURL,
-                    rtl::OUString const & rUsername,
-                    com::sun::star::uno::Sequence< rtl::OUString > const &
+    bool addRecord( OUString const & rURL,
+                    OUString const & rUsername,
+                    com::sun::star::uno::Sequence< OUString > const &
                     rPasswords,
                     com::sun::star::uno::Reference<
                         com::sun::star::task::XInteractionHandler2 > const & xIH,
@@ -149,14 +149,14 @@ public:
     virtual ~PasswordContainerInteractionHandler();
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw ( com::sun::star::uno::RuntimeException );
 
     virtual sal_Bool SAL_CALL
-    supportsService( const ::rtl::OUString& ServiceName )
+    supportsService( const OUString& ServiceName )
         throw ( com::sun::star::uno::RuntimeException );
 
-    virtual com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw ( com::sun::star::uno::RuntimeException );
 
@@ -172,10 +172,10 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     // Non-UNO interfaces
-    static rtl::OUString
+    static OUString
     getImplementationName_Static();
 
-    static com::sun::star::uno::Sequence< rtl::OUString >
+    static com::sun::star::uno::Sequence< OUString >
     getSupportedServiceNames_Static();
 
     static com::sun::star::uno::Reference<
diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx
index 1ebc8b58d627..74b12981e7dd 100644
--- a/uui/source/passworddlg.cxx
+++ b/uui/source/passworddlg.cxx
@@ -42,7 +42,7 @@ PasswordDialog::PasswordDialog(
     Window* _pParent,
     task::PasswordRequestMode nDlgMode,
     ResMgr * pResMgr,
-    rtl::OUString& aDocURL,
+    OUString& aDocURL,
     bool bOpenToModify,
     bool bIsSimplePasswordRequest )
 
@@ -64,13 +64,13 @@ PasswordDialog::PasswordDialog(
     {
         const sal_uInt16 nOpenToModifyErrStrId = bOpenToModify ? STR_ERROR_PASSWORD_TO_MODIFY_WRONG : STR_ERROR_PASSWORD_TO_OPEN_WRONG;
         const sal_uInt16 nErrStrId = bIsSimplePasswordRequest ? STR_ERROR_SIMPLE_PASSWORD_WRONG : nOpenToModifyErrStrId;
-        rtl::OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString());
+        OUString aErrorMsg(ResId(nErrStrId, *pResourceMgr).toString());
         ErrorBox aErrorBox( GetParent(), WB_OK, aErrorMsg );
         aErrorBox.Execute();
     }
 
     // default settings for enter password or reenter passwd...
-    rtl::OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString());
+    OUString aTitle(ResId(STR_TITLE_ENTER_PASSWORD, *pResourceMgr).toString());
     aFTConfirmPassword.Hide();
     aEDConfirmPassword.Hide();
     aFTConfirmPassword.Enable( sal_False );
diff --git a/uui/source/passworddlg.hxx b/uui/source/passworddlg.hxx
index 6187d39a8997..5646016e8ecd 100644
--- a/uui/source/passworddlg.hxx
+++ b/uui/source/passworddlg.hxx
@@ -47,7 +47,7 @@ class PasswordDialog : public ModalDialog
     DECL_LINK(OKHdl_Impl, void *);
 
 public:
-    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, ::rtl::OUString& aDocURL,
+    PasswordDialog( Window* pParent, ::com::sun::star::task::PasswordRequestMode nDlgMode, ResMgr * pResMgr, OUString& aDocURL,
             bool bOpenToModify = false, bool bIsSimplePasswordRequest = false );
 
     void            SetMinLen( sal_uInt16 nMin ) { nMinLen = nMin; }
diff --git a/uui/source/requeststringresolver.cxx b/uui/source/requeststringresolver.cxx
index ea00c4d785d7..77642f4bc957 100644
--- a/uui/source/requeststringresolver.cxx
+++ b/uui/source/requeststringresolver.cxx
@@ -36,19 +36,19 @@ UUIInteractionRequestStringResolver::~UUIInteractionRequestStringResolver()
     delete m_pImpl;
 }
 
-rtl::OUString SAL_CALL
+OUString SAL_CALL
 UUIInteractionRequestStringResolver::getImplementationName()
     throw (star::uno::RuntimeException)
 {
-    return rtl::OUString::createFromAscii(m_aImplementationName);
+    return OUString::createFromAscii(m_aImplementationName);
 }
 
 sal_Bool SAL_CALL
 UUIInteractionRequestStringResolver::supportsService(
-        rtl::OUString const & rServiceName)
+        OUString const & rServiceName)
     throw (star::uno::RuntimeException)
 {
-    star::uno::Sequence< rtl::OUString >
+    star::uno::Sequence< OUString >
         aNames(getSupportedServiceNames_static());
     for (sal_Int32 i = 0; i < aNames.getLength(); ++i)
         if (aNames[i] == rServiceName)
@@ -56,14 +56,14 @@ UUIInteractionRequestStringResolver::supportsService(
     return false;
 }
 
-star::uno::Sequence< rtl::OUString > SAL_CALL
+star::uno::Sequence< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getSupportedServiceNames()
     throw (star::uno::RuntimeException)
 {
     return getSupportedServiceNames_static();
 }
 
-star::beans::Optional< rtl::OUString > SAL_CALL
+star::beans::Optional< OUString > SAL_CALL
 UUIInteractionRequestStringResolver::getStringFromInformationalRequest(
     const star::uno::Reference<
         star::task::XInteractionRequest >& Request )
diff --git a/uui/source/requeststringresolver.hxx b/uui/source/requeststringresolver.hxx
index a476c560f0ac..377d2c0b5934 100644
--- a/uui/source/requeststringresolver.hxx
+++ b/uui/source/requeststringresolver.hxx
@@ -35,7 +35,7 @@ class UUIInteractionRequestStringResolver:
 public:
     static char const m_aImplementationName[];
 
-    static com::sun::star::uno::Sequence< rtl::OUString >
+    static com::sun::star::uno::Sequence< OUString >
     getSupportedServiceNames_static();
 
     static com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
@@ -60,18 +60,18 @@ private:
 
     virtual ~UUIInteractionRequestStringResolver() SAL_THROW(());
 
-    virtual rtl::OUString SAL_CALL getImplementationName()
+    virtual OUString SAL_CALL getImplementationName()
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual sal_Bool SAL_CALL supportsService(rtl::OUString const &
+    virtual sal_Bool SAL_CALL supportsService(OUString const &
                           rServiceName)
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL
+    virtual com::sun::star::uno::Sequence< OUString > SAL_CALL
     getSupportedServiceNames()
         throw (com::sun::star::uno::RuntimeException);
 
-    virtual com::sun::star::beans::Optional< rtl::OUString > SAL_CALL
+    virtual com::sun::star::beans::Optional< OUString > SAL_CALL
     getStringFromInformationalRequest(
         const com::sun::star::uno::Reference<
             com::sun::star::task::XInteractionRequest >& Request )
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx
index 8ad4e22f632c..aeaf423be667 100644
--- a/uui/source/secmacrowarnings.cxx
+++ b/uui/source/secmacrowarnings.cxx
@@ -324,7 +324,7 @@ void MacroWarning::FitControls()
 }
 
 void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage >& rxStore,
-                               const ::rtl::OUString& aODFVersion,
+                               const OUString& aODFVersion,
                                const css::uno::Sequence< security::DocumentSignatureInformation >& rInfos )
 {
     mxStore = rxStore;
@@ -333,7 +333,7 @@ void MacroWarning::SetStorage( const css::uno::Reference < css::embed::XStorage
     if( mxStore.is() && nCnt > 0 )
     {
         mpInfos = &rInfos;
-        rtl::OUString aCN_Id("CN");
+        OUString aCN_Id("CN");
         String      s;
         s = GetContentPart( rInfos[ 0 ].Signer->getSubjectName(), aCN_Id );
 
@@ -353,7 +353,7 @@ void MacroWarning::SetCertificate( const css::uno::Reference< css::security::XCe
     mxCert = _rxCert;
     if( mxCert.is() )
     {
-        rtl::OUString aCN_Id("CN");
+        OUString aCN_Id("CN");
         String  s;
         s = GetContentPart( mxCert->getSubjectName(), aCN_Id );
         maSignsFI.SetText( s );
diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx
index b10a2bfb24b4..cd6a0cd79cbe 100644
--- a/uui/source/secmacrowarnings.hxx
+++ b/uui/source/secmacrowarnings.hxx
@@ -43,7 +43,7 @@ private:
 
     cssu::Reference< css::security::XCertificate >  mxCert;
     cssu::Reference< css::embed::XStorage >         mxStore;
-    ::rtl::OUString                                 maODFVersion;
+    OUString                                 maODFVersion;
     const cssu::Sequence< css::security::DocumentSignatureInformation >*    mpInfos;
 
     FixedImage          maSymbolImg;
@@ -80,7 +80,7 @@ public:
     void    SetDocumentURL( const String& rDocURL );
 
     void    SetStorage( const cssu::Reference < css::embed::XStorage >& rxStore,
-                        const ::rtl::OUString& aODFVersion,
+                        const OUString& aODFVersion,
                         const cssu::Sequence< css::security::DocumentSignatureInformation >& _rInfos );
     void    SetCertificate( const cssu::Reference< css::security::XCertificate >& _rxCert );
 };
diff --git a/uui/source/services.cxx b/uui/source/services.cxx
index 4001c6c66cb4..4c9145b44f19 100644
--- a/uui/source/services.cxx
+++ b/uui/source/services.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 
-using ::rtl::OUString;
 
 
 extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL uui_component_getFactory(sal_Char const * pImplName,
diff --git a/uui/source/sslwarndlg.hxx b/uui/source/sslwarndlg.hxx
index 43363ca1f863..f5e5a122541d 100644
--- a/uui/source/sslwarndlg.hxx
+++ b/uui/source/sslwarndlg.hxx
@@ -61,7 +61,7 @@ private:
 
     Window* getParent() { return m_pParent; };
 
-    void setDescription1Text( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); };
+    void setDescription1Text( const OUString &aText ) { m_aLabel1.SetText( aText ); };
 };
 
 #endif // UUI_SSLWARN_HXX
diff --git a/uui/source/unknownauthdlg.hxx b/uui/source/unknownauthdlg.hxx
index 46a08e78ac48..90d50edc7389 100644
--- a/uui/source/unknownauthdlg.hxx
+++ b/uui/source/unknownauthdlg.hxx
@@ -63,7 +63,7 @@ private:
 
     Window* getParent() { return m_pParent; };
 
-    void setDescriptionText( const rtl::OUString &aText ) { m_aLabel1.SetText( aText ); };
+    void setDescriptionText( const OUString &aText ) { m_aLabel1.SetText( aText ); };
 
 };