3 files changed, 20 insertions, 20 deletions

diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx
index 26d688f3534c..422f50064f56 100644
--- a/sc/source/ui/collab/sccollaboration.cxx
+++ b/sc/source/ui/collab/sccollaboration.cxx
@@ -47,12 +47,12 @@ void ScCollaboration::SaveAndSendFile( TpContact* pContact ) const
     OUString aTmpPath = utl::TempFile::CreateTempName();
     aTmpPath += ".ods";
 
-    rtl::OUString aFileURL;
+    OUString aFileURL;
     ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL );
 
     ::comphelper::MediaDescriptor aDescriptor;
     // some issue with hyperlinks:
-    aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= ::rtl::OUString();
+    aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
     try {
         css::uno::Reference< css::document::XDocumentRecovery > xDocRecovery(
                     mpScDocShell->GetBaseModel(), css::uno::UNO_QUERY_THROW);
diff --git a/sc/source/ui/collab/sendfunc.cxx b/sc/source/ui/collab/sendfunc.cxx
index a02cf54d09b5..44f7795873aa 100644
--- a/sc/source/ui/collab/sendfunc.cxx
+++ b/sc/source/ui/collab/sendfunc.cxx
@@ -69,10 +69,10 @@ struct ProtocolError {
 };
 
 class ScChangeOpReader {
-    std::vector< rtl::OUString > maArgs;
+    std::vector< OUString > maArgs;
 
 public:
-    ScChangeOpReader( const rtl::OUString &rString)
+    ScChangeOpReader( const OUString &rString)
     {
         // will need to handle escaping etc.
         // Surely someone else wrote this before ! [!?]
@@ -127,28 +127,28 @@ public:
     }
     ~ScChangeOpReader() {}
 
-    rtl::OUString getMethod()
+    OUString getMethod()
     {
         return maArgs[0];
     }
 
     size_t getArgCount() { return maArgs.size(); }
 
-    rtl::OUString getString( sal_Int32 n )
+    OUString getString( sal_Int32 n )
     {
         if (n > 0 && (size_t)n < getArgCount() )
         {
-            rtl::OUString aUStr( maArgs[ n ] );
+            OUString aUStr( maArgs[ n ] );
             ScGlobal::EraseQuotes( aUStr );
             return aUStr;
         } else
-            return rtl::OUString();
+            return OUString();
     }
 
     ScAddress getAddress( sal_Int32 n )
     {
         ScAddress aAddr;
-        rtl::OUString aToken( getString( n ) );
+        OUString aToken( getString( n ) );
         aAddr.Parse( aToken );
         return aAddr;
     }
@@ -186,7 +186,7 @@ public:
 // method name ';' then arguments ; separated
 class ScChangeOpWriter
 {
-    rtl::OUStringBuffer aMessage;
+    OUStringBuffer aMessage;
     void appendSeparator()
     {
         aMessage.append( sal_Unicode( ';' ) );
@@ -199,12 +199,12 @@ public:
         appendSeparator();
     }
 
-    void appendString( const rtl::OUString &rStr )
+    void appendString( const OUString &rStr )
     {
         if ( rStr.indexOf( sal_Unicode( '"' ) ) >= 0 ||
              rStr.indexOf( sal_Unicode( ';' ) ) >= 0 )
         {
-            rtl::OUString aQuoted( rStr );
+            OUString aQuoted( rStr );
             ScGlobal::AddQuotes( aQuoted, sal_Unicode( '"' ) );
             aMessage.append( aQuoted );
         }
@@ -215,7 +215,7 @@ public:
 
     void appendAddress( const ScAddress &rPos )
     {
-        rtl::OUString aStr;
+        OUString aStr;
         rPos.Format( aStr, SCA_VALID );
         aMessage.append( aStr );
         appendSeparator();
@@ -249,16 +249,16 @@ public:
         appendSeparator();
     }
 
-    rtl::OString toString()
+    OString toString()
     {
-        return rtl::OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 );
+        return OUStringToOString( aMessage.toString(), RTL_TEXTENCODING_UTF8 );
     }
 };
 
-void ScDocFuncSend::RecvMessage( const rtl::OString &rString )
+void ScDocFuncSend::RecvMessage( const OString &rString )
 {
     try {
-        ScChangeOpReader aReader( rtl::OUString( rString.getStr(),
+        ScChangeOpReader aReader( OUString( rString.getStr(),
                                                  rString.getLength(),
                                                  RTL_TEXTENCODING_UTF8 ) );
         // FIXME: have some hash to enumeration mapping here
@@ -352,10 +352,10 @@ sal_Bool ScDocFuncSend::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& r
 
     o_rbNumFmtSet = false;
 
-    if ( rtl::OUString( rText ) == "saveme" )
+    if ( OUString( rText ) == "saveme" )
         mpCollaboration->SaveAndSendFile( NULL );
 
-    if ( rtl::OUString( rText ) == "contacts" )
+    if ( OUString( rText ) == "contacts" )
         mpCollaboration->DisplayContacts();
 
     return true; // needs some code auditing action
diff --git a/sc/source/ui/collab/sendfunc.hxx b/sc/source/ui/collab/sendfunc.hxx
index fa2d1fcee4a1..6efeb2562e33 100644
--- a/sc/source/ui/collab/sendfunc.hxx
+++ b/sc/source/ui/collab/sendfunc.hxx
@@ -22,7 +22,7 @@ class ScDocFuncSend : public ScDocFunc
     ScCollaboration*    mpCollaboration;
 
     friend class ScCollaboration;
-    void                RecvMessage( const rtl::OString &rString );
+    void                RecvMessage( const OString &rString );
     void                SendMessage( ScChangeOpWriter &rOp );
 public:
     // FIXME: really ScDocFunc should be an abstract base, so