ByteString::CreateFromInt32->rtl::OString[Buffer]

6 files changed, 83 insertions, 102 deletions

diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 4a62898b3d8a..c660efd855f6 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -66,7 +66,7 @@
 
 // #i76201#
 #include <basegfx/polygon/b2dpolygontools.hxx>
-
+#include <rtl/strbuf.hxx>
 #include <math.h>
 
 using namespace ::com::sun::star::uno;
@@ -1711,9 +1711,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
                 case UNKNOWN :
                 default :
                 {
-                    ByteString aString( "CustomShapes::unknown PolyFlagValue :" );
-                    aString.Append( ByteString::CreateFromInt32( nCommand ) );
-                    OSL_FAIL( aString.GetBuffer() );
+                    rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
+                        "CustomShapes::unknown PolyFlagValue :"));
+                    aString.append(static_cast<sal_Int32>(nCommand));
+                    OSL_FAIL(aString.getStr());
                 }
                 break;
 #endif
diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx
index 09979f1a1400..f95711f64a1c 100644
--- a/svx/source/fmcomp/trace.cxx
+++ b/svx/source/fmcomp/trace.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_svx.hxx"
 #include "trace.hxx"
 #include <tools/debug.hxx>
+#include <rtl/strbuf.hxx>
 
 #if defined(DBG_UTIL)
 
@@ -47,18 +48,15 @@ Tracer::Tracer(const char* _pBlockDescription)
     ::osl::MutexGuard aGuard(s_aMapSafety);
     sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++;
 
-    ByteString sIndent;
+    rtl::OStringBuffer sMessage;
+    sMessage.append(static_cast<sal_Int32>(
+        ::osl::Thread::getCurrentIdentifier()));
+    sMessage.append('\t');
     while (nIndent--)
-        sIndent += '\t';
-
-    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
-    sThread += '\t';
-
-    ByteString sMessage(sThread);
-    sMessage += sIndent;
-    sMessage += m_sBlockDescription;
-    sMessage += " {";
-    OSL_TRACE(sMessage.GetBuffer());
+        sMessage.append('\t');
+    sMessage.append(m_sBlockDescription);
+    sMessage.append(RTL_CONSTASCII_STRINGPARAM(" {"));
+    OSL_TRACE(sMessage.getStr());
 }
 
 //------------------------------------------------------------------------------
@@ -67,18 +65,15 @@ Tracer::~Tracer()
     ::osl::MutexGuard aGuard(s_aMapSafety);
     sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
-    ByteString sIndent;
+    rtl::OStringBuffer sMessage;
+    sMessage.append(static_cast<sal_Int32>(
+        ::osl::Thread::getCurrentIdentifier()));
+    sMessage.append('\t');
     while (nIndent--)
-        sIndent += '\t';
-
-    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
-    sThread += '\t';
-
-    ByteString sMessage(sThread);
-    sMessage += sIndent;
-    sMessage += "} // ";
-    sMessage += m_sBlockDescription;
-    OSL_TRACE(sMessage.GetBuffer());
+        sMessage.append('\t');
+    sMessage.append(RTL_CONSTASCII_STRINGPARAM("} // "));
+    sMessage.append(m_sBlockDescription);
+    OSL_TRACE(sMessage.getStr());
 }
 
 //------------------------------------------------------------------------------
@@ -87,19 +82,16 @@ void Tracer::TraceString(const char* _pMessage)
     ::osl::MutexGuard aGuard(s_aMapSafety);
     sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
-    ByteString sIndent;
+    rtl::OStringBuffer sMessage;
+    sMessage.append(static_cast<sal_Int32>(
+        ::osl::Thread::getCurrentIdentifier()));
+    sMessage.append('\t');
     while (nIndent--)
-        sIndent += '\t';
-
-    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
-    sThread += '\t';
-
-    ByteString sMessage(sThread);
-    sMessage += sIndent;
-    sMessage += m_sBlockDescription;
-    sMessage += ": ";
-    sMessage += _pMessage;
-    OSL_TRACE(sMessage.GetBuffer());
+        sMessage.append('\t');
+    sMessage.append(m_sBlockDescription);
+    sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
+    sMessage.append(_pMessage);
+    OSL_TRACE(sMessage.getStr());
 }
 
 //------------------------------------------------------------------------------
@@ -108,19 +100,16 @@ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
     ::osl::MutexGuard aGuard(s_aMapSafety);
     sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ];
 
-    ByteString sIndent;
+    rtl::OStringBuffer sMessage;
+    sMessage.append(static_cast<sal_Int32>(
+        ::osl::Thread::getCurrentIdentifier()));
+    sMessage.append('\t');
     while (nIndent--)
-        sIndent += '\t';
-
-    ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) );
-    sThread += '\t';
-
-    ByteString sMessage(sThread);
-    sMessage += sIndent;
-    sMessage += m_sBlockDescription;
-    sMessage += ": ";
-    sMessage += _pMessage;
-    OSL_TRACE(sMessage.GetBuffer(), _pParam);
+        sMessage.append('\t');
+    sMessage.append(m_sBlockDescription);
+    sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
+    sMessage.append(_pMessage);
+    OSL_TRACE(sMessage.getStr(), _pParam);
 }
 #endif
 
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index f5ada616c0f8..abf0661ac235 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -44,6 +44,7 @@
 #include "svx/svdstr.hrc"   // Namen aus der Resource
 #include "svx/svdglob.hxx"  // StringCache
 #include <svx/e3dsceneupdater.hxx>
+#include <rtl/strbuf.hxx>
 
 // #i13033#
 #include <clonelist.hxx>
@@ -976,21 +977,23 @@ void SdrEditView::CopyMarkedObj()
     if(0L != nCloneErrCnt)
     {
 #ifdef DBG_UTIL
-        ByteString aStr("SdrEditView::CopyMarkedObj(): Fehler beim Clonen ");
+        rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+            "SdrEditView::CopyMarkedObj(): Fehler beim Clonen "));
 
         if(nCloneErrCnt == 1)
         {
-            aStr += "eines Zeichenobjekts.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
         }
         else
         {
-            aStr += "von ";
-            aStr += ByteString::CreateFromInt32( nCloneErrCnt );
-            aStr += " Zeichenobjekten.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+            aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+            aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
         }
 
-        aStr += " Objektverbindungen werden nicht mitkopiert.";
-        OSL_FAIL(aStr.GetBuffer());
+        aStr.append(RTL_CONSTASCII_STRINGPARAM(
+            " Objektverbindungen werden nicht mitkopiert."));
+        OSL_FAIL(aStr.getStr());
 #endif
     }
     MarkListHasChanged();
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 4343948ebac9..70deda899fdf 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -68,6 +68,7 @@
 #include <svx/sdr/contact/displayinfo.hxx>
 #include <algorithm>
 #include <svl/smplhint.hxx>
+#include <rtl/strbuf.hxx>
 
 using namespace ::com::sun::star;
 
@@ -208,22 +209,24 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
         }
     } else {
 #ifdef DBG_UTIL
-        ByteString aStr("SdrObjList::operator=(): Fehler beim Clonen ");
+        rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+            "SdrObjList::operator=(): Fehler beim Clonen "));
 
         if(nCloneErrCnt == 1)
         {
-            aStr += "eines Zeichenobjekts.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
         }
         else
         {
-            aStr += "von ";
-            aStr += ByteString::CreateFromInt32( nCloneErrCnt );
-            aStr += " Zeichenobjekten.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+            aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+            aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
         }
 
-        aStr += " Objektverbindungen werden nicht mitkopiert.";
+        aStr.append(RTL_CONSTASCII_STRINGPARAM(
+            " Objektverbindungen werden nicht mitkopiert."));
 
-        OSL_FAIL(aStr.GetBuffer());
+        OSL_FAIL(aStr.getStr());
 #endif
     }
 }
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index e815fa9c0e2a..761b062e3160 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -63,6 +63,7 @@
 
 // #i72535#
 #include "fmobj.hxx"
+#include <rtl/strbuf.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -445,22 +446,25 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
         if(0L != nCloneErrCnt)
         {
 #ifdef DBG_UTIL
-            ByteString aStr("SdrExchangeView::Paste(): Fehler beim Clonen ");
+            rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                "SdrExchangeView::Paste(): Fehler beim Clonen "));
 
             if(nCloneErrCnt == 1)
             {
-                aStr += "eines Zeichenobjekts.";
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(
+                    "eines Zeichenobjekts."));
             }
             else
             {
-                aStr += "von ";
-                aStr += ByteString::CreateFromInt32( nCloneErrCnt );
-                aStr += " Zeichenobjekten.";
+                aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+                aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
             }
 
-            aStr += " Objektverbindungen werden nicht mitkopiert.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM(
+                " Objektverbindungen werden nicht mitkopiert."));
 
-            OSL_FAIL(aStr.GetBuffer());
+            OSL_FAIL(aStr.getStr());
 #endif
         }
     }
@@ -829,22 +833,25 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
         if(0L != nCloneErrCnt)
         {
 #ifdef DBG_UTIL
-            ByteString aStr("SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen ");
+            rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
+                "SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen "));
 
             if(nCloneErrCnt == 1)
             {
-                aStr += "eines Zeichenobjekts.";
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(
+                    "eines Zeichenobjekts."));
             }
             else
             {
-                aStr += "von ";
-                aStr += ByteString::CreateFromInt32( nCloneErrCnt );
-                aStr += " Zeichenobjekten.";
+                aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
+                aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
+                aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
             }
 
-            aStr += " Objektverbindungen werden nicht mitkopiert.";
+            aStr.append(RTL_CONSTASCII_STRINGPARAM(
+                " Objektverbindungen werden nicht mitkopiert."));
 
-            OSL_FAIL(aStr.GetBuffer());
+            OSL_FAIL(aStr.getStr());
 #endif
         }
     }
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 2155d855a3e6..2c57e501278a 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -147,7 +147,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
     xRowSet->getPropertyValue( msSize ) >>= nRowHeight;
 
     mrStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
-    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << ByteString::CreateFromInt32( nRowHeight ).GetBuffer();
+    mrStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(nRowHeight).getStr();
 
     const sal_Int32 nColCount = mxTable->getColumnCount();
     for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
@@ -157,29 +157,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
         if( !xCell.is() )
             continue;
 
-/*
-        const sal_Bool bIsMerged = xCell->isMerged();
-        const sal_Int32 nRowSpan = xCell->getRowSpan();
-        const sal_Int32 nColSpan = xCell->getColumnSpan();
-
-        const sal_Char* pChar;
-
-        if( !bIsMerged && ((nRowSpan > 1) || (nColSpan > 1)) )
-            mrStrm << OOO_STRING_SVTOOLS_RTF_CLMGF; // The first cell in a range of table cells to be merged.
-
-        SdrTextVertAdjust eVAdj = xCell->GetTextVerticalAdjust();
-        switch( eVAdj )
-        {
-            case SVX_VER_JUSTIFY_TOP:       pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT;   break;
-            case SVX_VER_JUSTIFY_CENTER:    pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC;   break;
-            case SVX_VER_JUSTIFY_BOTTOM:    pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB;   break;
-            case SVX_VER_JUSTIFY_STANDARD:  pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB;   break;  //! Bottom
-            default:                        pChar = NULL;           break;
-        }
-        if ( pChar )
-            mrStrm << pChar;
-*/
-        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( aColumnStart[nCol] ).GetBuffer();
+        mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(aColumnStart[nCol]).getStr();
         if ( (nCol & 0x0F) == 0x0F )
             mrStrm << RTFOutFuncs::sNewLine;        // Zeilen nicht zu lang werden lassen
     }