rtl::O(U)String -> O(U)String

Change-Id: I45f5a8407b57c06a7cb0dad25c7ac5879711488d

3 files changed, 28 insertions, 30 deletions

diff --git a/starmath/source/ooxmlexport.cxx b/starmath/source/ooxmlexport.cxx
index 846863032e34..d1970dc4ff8e 100644
--- a/starmath/source/ooxmlexport.cxx
+++ b/starmath/source/ooxmlexport.cxx
@@ -203,7 +203,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/)
     }
     m_pSerializer->startElementNS( XML_m, XML_t, FSNS( XML_xml, XML_space ), "preserve", FSEND );
     SmTextNode* pTemp=(SmTextNode* )pNode;
-    SAL_INFO( "starmath.ooxml", "Text:" << rtl::OUStringToOString( pTemp->GetText(), RTL_TEXTENCODING_UTF8 ).getStr());
+    SAL_INFO( "starmath.ooxml", "Text:" << OUStringToOString( pTemp->GetText(), RTL_TEXTENCODING_UTF8 ).getStr());
     for(xub_StrLen i=0;i<pTemp->GetText().Len();i++)
     {
 #if 0
@@ -224,7 +224,7 @@ void SmOoxmlExport::HandleText( const SmNode* pNode, int /*nLevel*/)
         *pS << sal_uInt8(nFace+128); //typeface
 #endif
         sal_uInt16 nChar = pTemp->GetText().GetChar(i);
-        m_pSerializer->writeEscaped( rtl::OUString( SmTextNode::ConvertSymbolToUnicode(nChar)));
+        m_pSerializer->writeEscaped( OUString( SmTextNode::ConvertSymbolToUnicode(nChar)));
 
 #if 0
         //Mathtype can only have these sort of character
@@ -329,8 +329,8 @@ void SmOoxmlExport::HandleAttribute( const SmAttributNode* pNode, int nLevel )
         {
             m_pSerializer->startElementNS( XML_m, XML_acc, FSEND );
             m_pSerializer->startElementNS( XML_m, XML_accPr, FSEND );
-            rtl::OString value = rtl::OUStringToOString(
-                rtl::OUString( pNode->Attribute()->GetToken().cMathChar ), RTL_TEXTENCODING_UTF8 );
+            OString value = OUStringToOString(
+                OUString( pNode->Attribute()->GetToken().cMathChar ), RTL_TEXTENCODING_UTF8 );
             m_pSerializer->singleElementNS( XML_m, XML_chr, FSNS( XML_m, XML_val ), value.getStr(), FSEND );
             m_pSerializer->endElementNS( XML_m, XML_accPr );
             m_pSerializer->startElementNS( XML_m, XML_e, FSEND );
@@ -408,13 +408,13 @@ void SmOoxmlExport::HandleRoot( const SmRootNode* pNode, int nLevel )
     m_pSerializer->endElementNS( XML_m, XML_rad );
 }
 
-static rtl::OString mathSymbolToString( const SmNode* node )
+static OString mathSymbolToString( const SmNode* node )
 {
     assert( node->GetType() == NMATH );
     const SmTextNode* txtnode = static_cast< const SmTextNode* >( node );
     assert( txtnode->GetText().Len() == 1 );
     sal_Unicode chr = SmTextNode::ConvertSymbolToUnicode( txtnode->GetText().GetChar( 0 ));
-    return rtl::OUStringToOString( rtl::OUString( chr ), RTL_TEXTENCODING_UTF8 );
+    return OUStringToOString( OUString( chr ), RTL_TEXTENCODING_UTF8 );
 }
 
 void SmOoxmlExport::HandleOperator( const SmOperNode* pNode, int nLevel )
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index 1b28266b5375..0ca2d0573a77 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -35,8 +35,6 @@
 
 using namespace oox;
 using namespace oox::formulaimport;
-using rtl::OUString;
-using rtl::OUStringBuffer;
 
 /*
 The primary internal data structure for the formula is the text representation
diff --git a/starmath/source/ooxmlimport.hxx b/starmath/source/ooxmlimport.hxx
index dc6816f5402e..bdb83482c57f 100644
--- a/starmath/source/ooxmlimport.hxx
+++ b/starmath/source/ooxmlimport.hxx
@@ -41,30 +41,30 @@ class SmOoxmlImport
 {
 public:
     SmOoxmlImport( oox::formulaimport::XmlStream& stream );
-    rtl::OUString ConvertToStarMath();
+    OUString ConvertToStarMath();
 private:
-    rtl::OUString handleStream();
-    rtl::OUString handleAcc();
-    rtl::OUString handleBar();
-    rtl::OUString handleBox();
-    rtl::OUString handleBorderBox();
-    rtl::OUString handleD();
-    rtl::OUString handleEqArr();
-    rtl::OUString handleF();
-    rtl::OUString handleFunc();
+    OUString handleStream();
+    OUString handleAcc();
+    OUString handleBar();
+    OUString handleBox();
+    OUString handleBorderBox();
+    OUString handleD();
+    OUString handleEqArr();
+    OUString handleF();
+    OUString handleFunc();
     enum LimLowUpp_t { LimLow, LimUpp };
-    rtl::OUString handleLimLowUpp( LimLowUpp_t limlowupp );
-    rtl::OUString handleGroupChr();
-    rtl::OUString handleM();
-    rtl::OUString handleNary();
-    rtl::OUString handleR();
-    rtl::OUString handleRad();
-    rtl::OUString handleSpre();
-    rtl::OUString handleSsub();
-    rtl::OUString handleSsubsup();
-    rtl::OUString handleSsup();
-    rtl::OUString readOMathArg();
-    rtl::OUString readOMathArgInElement( int token );
+    OUString handleLimLowUpp( LimLowUpp_t limlowupp );
+    OUString handleGroupChr();
+    OUString handleM();
+    OUString handleNary();
+    OUString handleR();
+    OUString handleRad();
+    OUString handleSpre();
+    OUString handleSsub();
+    OUString handleSsubsup();
+    OUString handleSsup();
+    OUString readOMathArg();
+    OUString readOMathArgInElement( int token );
     oox::formulaimport::XmlStream& stream;
 };