Skip to content

C
core
Kaydet (Commit) 8b2f557e authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

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

üst 642bda0d
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 102 deletions
svx/source/customshapes/EnhancedCustomShape2d.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
// #i76201# // #i76201#
#include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx>
#include <rtl/strbuf.hxx>
#include <math.h> #include <math.h>
using namespace ::com::sun::star::uno; using namespace ::com::sun::star::uno;
...@@ -1711,9 +1711,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm ...@@ -1711,9 +1711,10 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm
case UNKNOWN : case UNKNOWN :
default : default :
{ {
ByteString aString( "CustomShapes::unknown PolyFlagValue :" ); rtl::OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
aString.Append( ByteString::CreateFromInt32( nCommand ) ); "CustomShapes::unknown PolyFlagValue :"));
OSL_FAIL( aString.GetBuffer() ); aString.append(static_cast<sal_Int32>(nCommand));
OSL_FAIL(aString.getStr());
} }
break; break;
#endif #endif
......
svx/source/fmcomp/trace.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "precompiled_svx.hxx" #include "precompiled_svx.hxx"
#include "trace.hxx" #include "trace.hxx"
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <rtl/strbuf.hxx>
#if defined(DBG_UTIL) #if defined(DBG_UTIL)
...@@ -47,18 +48,15 @@ Tracer::Tracer(const char* _pBlockDescription) ...@@ -47,18 +48,15 @@ Tracer::Tracer(const char* _pBlockDescription)
::osl::MutexGuard aGuard(s_aMapSafety); ::osl::MutexGuard aGuard(s_aMapSafety);
sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++; 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--) while (nIndent--)
sIndent += '\t'; sMessage.append('\t');
sMessage.append(m_sBlockDescription);
ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sMessage.append(RTL_CONSTASCII_STRINGPARAM(" {"));
sThread += '\t'; OSL_TRACE(sMessage.getStr());
ByteString sMessage(sThread);
sMessage += sIndent;
sMessage += m_sBlockDescription;
sMessage += " {";
OSL_TRACE(sMessage.GetBuffer());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -67,18 +65,15 @@ Tracer::~Tracer() ...@@ -67,18 +65,15 @@ Tracer::~Tracer()
::osl::MutexGuard aGuard(s_aMapSafety); ::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; 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--) while (nIndent--)
sIndent += '\t'; sMessage.append('\t');
sMessage.append(RTL_CONSTASCII_STRINGPARAM("} // "));
ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sMessage.append(m_sBlockDescription);
sThread += '\t'; OSL_TRACE(sMessage.getStr());
ByteString sMessage(sThread);
sMessage += sIndent;
sMessage += "} // ";
sMessage += m_sBlockDescription;
OSL_TRACE(sMessage.GetBuffer());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -87,19 +82,16 @@ void Tracer::TraceString(const char* _pMessage) ...@@ -87,19 +82,16 @@ void Tracer::TraceString(const char* _pMessage)
::osl::MutexGuard aGuard(s_aMapSafety); ::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; 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--) while (nIndent--)
sIndent += '\t'; sMessage.append('\t');
sMessage.append(m_sBlockDescription);
ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
sThread += '\t'; sMessage.append(_pMessage);
OSL_TRACE(sMessage.getStr());
ByteString sMessage(sThread);
sMessage += sIndent;
sMessage += m_sBlockDescription;
sMessage += ": ";
sMessage += _pMessage;
OSL_TRACE(sMessage.GetBuffer());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -108,19 +100,16 @@ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam) ...@@ -108,19 +100,16 @@ void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam)
::osl::MutexGuard aGuard(s_aMapSafety); ::osl::MutexGuard aGuard(s_aMapSafety);
sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; 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--) while (nIndent--)
sIndent += '\t'; sMessage.append('\t');
sMessage.append(m_sBlockDescription);
ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sMessage.append(RTL_CONSTASCII_STRINGPARAM(": "));
sThread += '\t'; sMessage.append(_pMessage);
OSL_TRACE(sMessage.getStr(), _pParam);
ByteString sMessage(sThread);
sMessage += sIndent;
sMessage += m_sBlockDescription;
sMessage += ": ";
sMessage += _pMessage;
OSL_TRACE(sMessage.GetBuffer(), _pParam);
} }
#endif #endif
......
svx/source/svdraw/svdedtv.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
#include "svx/svdstr.hrc" // Namen aus der Resource #include "svx/svdstr.hrc" // Namen aus der Resource
#include "svx/svdglob.hxx" // StringCache #include "svx/svdglob.hxx" // StringCache
#include <svx/e3dsceneupdater.hxx> #include <svx/e3dsceneupdater.hxx>
#include <rtl/strbuf.hxx>
// #i13033# // #i13033#
#include <clonelist.hxx> #include <clonelist.hxx>
...@@ -976,21 +977,23 @@ void SdrEditView::CopyMarkedObj() ...@@ -976,21 +977,23 @@ void SdrEditView::CopyMarkedObj()
if(0L != nCloneErrCnt) if(0L != nCloneErrCnt)
{ {
#ifdef DBG_UTIL #ifdef DBG_UTIL
ByteString aStr("SdrEditView::CopyMarkedObj(): Fehler beim Clonen "); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"SdrEditView::CopyMarkedObj(): Fehler beim Clonen "));
if(nCloneErrCnt == 1) if(nCloneErrCnt == 1)
{ {
aStr += "eines Zeichenobjekts."; aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
} }
else else
{ {
aStr += "von "; aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
aStr += ByteString::CreateFromInt32( nCloneErrCnt ); aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
aStr += " Zeichenobjekten."; aStr.append(RTL_CONSTASCII_STRINGPARAM(" Zeichenobjekten."));
} }
aStr += " Objektverbindungen werden nicht mitkopiert."; aStr.append(RTL_CONSTASCII_STRINGPARAM(
OSL_FAIL(aStr.GetBuffer()); " Objektverbindungen werden nicht mitkopiert."));
OSL_FAIL(aStr.getStr());
#endif #endif
} }
MarkListHasChanged(); MarkListHasChanged();
......
svx/source/svdraw/svdpage.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -68,6 +68,7 @@ ...@@ -68,6 +68,7 @@
#include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/contact/displayinfo.hxx>
#include <algorithm> #include <algorithm>
#include <svl/smplhint.hxx> #include <svl/smplhint.hxx>
#include <rtl/strbuf.hxx>
using namespace ::com::sun::star; using namespace ::com::sun::star;
...@@ -208,22 +209,24 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) ...@@ -208,22 +209,24 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
} }
} else { } else {
#ifdef DBG_UTIL #ifdef DBG_UTIL
ByteString aStr("SdrObjList::operator=(): Fehler beim Clonen "); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"SdrObjList::operator=(): Fehler beim Clonen "));
if(nCloneErrCnt == 1) if(nCloneErrCnt == 1)
{ {
aStr += "eines Zeichenobjekts."; aStr.append(RTL_CONSTASCII_STRINGPARAM("eines Zeichenobjekts."));
} }
else else
{ {
aStr += "von "; aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
aStr += ByteString::CreateFromInt32( nCloneErrCnt ); aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
aStr += " Zeichenobjekten."; 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 #endif
} }
} }
......
svx/source/svdraw/svdxcgv.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -63,6 +63,7 @@ ...@@ -63,6 +63,7 @@
// #i72535# // #i72535#
#include "fmobj.hxx" #include "fmobj.hxx"
#include <rtl/strbuf.hxx>
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
...@@ -445,22 +446,25 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL ...@@ -445,22 +446,25 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if(0L != nCloneErrCnt) if(0L != nCloneErrCnt)
{ {
#ifdef DBG_UTIL #ifdef DBG_UTIL
ByteString aStr("SdrExchangeView::Paste(): Fehler beim Clonen "); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"SdrExchangeView::Paste(): Fehler beim Clonen "));
if(nCloneErrCnt == 1) if(nCloneErrCnt == 1)
{ {
aStr += "eines Zeichenobjekts."; aStr.append(RTL_CONSTASCII_STRINGPARAM(
"eines Zeichenobjekts."));
} }
else else
{ {
aStr += "von "; aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
aStr += ByteString::CreateFromInt32( nCloneErrCnt ); aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
aStr += " Zeichenobjekten."; 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 #endif
} }
} }
...@@ -829,22 +833,25 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const ...@@ -829,22 +833,25 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
if(0L != nCloneErrCnt) if(0L != nCloneErrCnt)
{ {
#ifdef DBG_UTIL #ifdef DBG_UTIL
ByteString aStr("SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen "); rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
"SdrExchangeView::GetMarkedObjModel(): Fehler beim Clonen "));
if(nCloneErrCnt == 1) if(nCloneErrCnt == 1)
{ {
aStr += "eines Zeichenobjekts."; aStr.append(RTL_CONSTASCII_STRINGPARAM(
"eines Zeichenobjekts."));
} }
else else
{ {
aStr += "von "; aStr.append(RTL_CONSTASCII_STRINGPARAM("von "));
aStr += ByteString::CreateFromInt32( nCloneErrCnt ); aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
aStr += " Zeichenobjekten."; 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 #endif
} }
} }
......
svx/source/table/tablertfexporter.cxx
Dosyayı görüntüle @ 8b2f557e
...@@ -147,7 +147,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa ...@@ -147,7 +147,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
xRowSet->getPropertyValue( msSize ) >>= nRowHeight; 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_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(); const sal_Int32 nColCount = mxTable->getColumnCount();
for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ )
...@@ -157,29 +157,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa ...@@ -157,29 +157,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa
if( !xCell.is() ) if( !xCell.is() )
continue; continue;
/* mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(aColumnStart[nCol]).getStr();
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();
if ( (nCol & 0x0F) == 0x0F ) if ( (nCol & 0x0F) == 0x0F )
mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment