Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().

7 files changed, 7 insertions, 8 deletions

diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx
index a3e53ddd9589..0a4bd3c267a4 100644
--- a/sc/source/core/data/cell.cxx
+++ b/sc/source/core/data/cell.cxx
@@ -1016,7 +1016,7 @@ void ScFormulaCell::GetFormula( String& rFormula, const FormulaGrammar::Grammar
 {
     rtl::OUStringBuffer rBuffer( rFormula );
     GetFormula( rBuffer, eGrammar );
-    rFormula = rBuffer;
+    rFormula = rBuffer.makeStringAndClear();
 }
 
 void ScFormulaCell::GetResultDimensions( SCSIZE& rCols, SCSIZE& rRows )
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index c7d7d9b1d92c..1a484ef65bf4 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5211,7 +5211,7 @@ void ScCompiler::CreateStringFromIndex(rtl::OUStringBuffer& rBuffer,FormulaToken
             ;   // nothing
     }
     if ( aBuffer.getLength() )
-        rBuffer.append(aBuffer);
+        rBuffer.append(aBuffer.makeStringAndClear());
     else
         rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
 }
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 15aaee4d5317..bcfd95aaf200 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -508,8 +508,7 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm )
 {
     OUString sId = msTarget.getLength() ? rStrm.addRelation( rStrm.GetCurrentStream()->getOutputStream(),
             XclXmlUtils::ToOUString( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink" ),
-            msTarget,
-            XclXmlUtils::ToOUString( "External" ) ) : OUString();
+            msTarget, true ) : OUString();
     rStrm.GetCurrentStream()->singleElement( XML_hyperlink,
             XML_ref,                XclXmlUtils::ToOString( maScPos ).getStr(),
             FSNS( XML_r, XML_id ),  sId.getLength()
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index b83affe01ad6..c93748926853 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -978,7 +978,7 @@ sax_fastparser::FSHelperPtr XclXmlUtils::WriteFontData( sax_fastparser::FSHelper
                 // OOXTODO: XML_theme,      index into <clrScheme/>
                 // OOXTODO: XML_tint,       double
                 FSEND );
-    lcl_WriteValue( pStream, XML_sz,         OString::valueOf( (double) (rFontData.mnHeight / 20.0) ) );  // Twips->Pt
+    lcl_WriteValue( pStream, XML_sz,         OString::valueOf( (double) (rFontData.mnHeight / 20.0) ).getStr() );  // Twips->Pt
     lcl_WriteValue( pStream, XML_u,          bHaveUnderline ? pUnderline : NULL );
     lcl_WriteValue( pStream, XML_vertAlign,  bHaveVertAlign ? pVertAlign : NULL );
 
diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx
index 2b752f7aec83..b4ca250a70e1 100644
--- a/sc/source/filter/xml/xmlconti.cxx
+++ b/sc/source/filter/xml/xmlconti.cxx
@@ -104,7 +104,7 @@ void ScXMLContentContext::Characters( const ::rtl::OUString& rChars )
 
 void ScXMLContentContext::EndElement()
 {
-    sValue.append(sOUText);
+    sValue.append(sOUText.toString());
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index a1d52140b79d..e484fcd75699 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -4782,7 +4782,7 @@ sal_Bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, sal_Bool bApi )
                 // relative Referenzen Excel-konform auf die linke Spalte anpassen:
                 pData->UpdateSymbol(aContent, ScAddress( nStartCol, nOutRow, nTab ));
                 aFormula = '=';
-                aFormula += aContent;
+                aFormula += aContent.toString();
                 pDoc->PutCell( nStartCol,nOutRow,nTab, new ScStringCell( aName ) );
                 pDoc->PutCell( nEndCol  ,nOutRow,nTab, new ScStringCell( aFormula ) );
                 ++nOutRow;
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index 1e5733a9ddb7..0e30cabcf002 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -416,7 +416,7 @@ void ScNameDlg::CalcCurTableAssign( String& aAssign, ScRangeData* pRangeData )
     {
         rtl::OUStringBuffer sBuffer;
         pRangeData->UpdateSymbol( sBuffer, maCursorPos );
-        aAssign = sBuffer;
+        aAssign = sBuffer.makeStringAndClear();
     }
     else
     {