[Libreoffice-commits] .: 2 commits - sc/source
Caolán McNamara
caolan at kemper.freedesktop.org
Tue Aug 2 03:08:55 PDT 2011
sc/source/filter/html/htmlexp.cxx | 225 +++++++++++++++++++++++--------------
sc/source/filter/html/htmlexp2.cxx | 20 +--
sc/source/filter/inc/htmlexp.hxx | 4
sc/source/filter/rtf/rtfexp.cxx | 4
4 files changed, 155 insertions(+), 98 deletions(-)
New commits:
commit ed17ae66ad0335dee37d3255c2870a5d8de4293a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Jul 31 15:50:04 2011 +0100
ByteString::CreateFromInt32 -> rtl::OStringBuffer::append
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 8437e88..82d9d20 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -169,22 +169,22 @@ FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String&
}
-static ByteString lcl_getColGroupString( sal_Int32 nSpan, sal_Int32 nWidth )
+static rtl::OString lcl_getColGroupString(sal_Int32 nSpan, sal_Int32 nWidth)
{
- ByteString aByteStr = OOO_STRING_SVTOOLS_HTML_colgroup;
- aByteStr += ' ';
- if( nSpan > 1 )
- {
- aByteStr += OOO_STRING_SVTOOLS_HTML_O_span;
- aByteStr += "=\"";
- aByteStr += ByteString::CreateFromInt32( nSpan );
- aByteStr += "\" ";
- }
- aByteStr += OOO_STRING_SVTOOLS_HTML_O_width;
- aByteStr += "=\"";
- aByteStr += ByteString::CreateFromInt32( nWidth );
- aByteStr += '"';
- return aByteStr;
+ rtl::OStringBuffer aByteStr(OOO_STRING_SVTOOLS_HTML_colgroup);
+ aByteStr.append(' ');
+ if( nSpan > 1 )
+ {
+ aByteStr.append(OOO_STRING_SVTOOLS_HTML_O_span);
+ aByteStr.append(RTL_CONSTASCII_STRINGPARAM("=\""));
+ aByteStr.append(nSpan);
+ aByteStr.append(RTL_CONSTASCII_STRINGPARAM("\" "));
+ }
+ aByteStr.append(OOO_STRING_SVTOOLS_HTML_O_width);
+ aByteStr.append(RTL_CONSTASCII_STRINGPARAM("=\""));
+ aByteStr.append(nWidth);
+ aByteStr.append('"');
+ return aByteStr.makeStringAndClear();
}
@@ -453,7 +453,7 @@ void ScHTMLExport::WriteOverview()
{
pDoc->GetName( nTab, aStr );
rStrm << "<A HREF=\"#table"
- << ByteString::CreateFromInt32( nTab ).GetBuffer()
+ << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr()
<< "\">";
OUT_STR( aStr );
rStrm << "</A>";
@@ -715,7 +715,7 @@ void ScHTMLExport::WriteTables()
// Anker festlegen:
rStrm << "<A NAME=\"table"
- << ByteString::CreateFromInt32( nTab ).GetBuffer()
+ << rtl::OString::valueOf(static_cast<sal_Int32>(nTab)).getStr()
<< "\">";
TAG_ON( OOO_STRING_SVTOOLS_HTML_head1 );
OUT_STR( aStrOut );
@@ -740,10 +740,12 @@ void ScHTMLExport::WriteTables()
}
// <TABLE ...>
- ByteString aByteStrOut = OOO_STRING_SVTOOLS_HTML_table;
+ rtl::OStringBuffer aByteStrOut(OOO_STRING_SVTOOLS_HTML_table);
// FRAME=VOID, we do the styling of the cells in <TD>
- ((((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_frame) += "=\"") += OOO_STRING_SVTOOLS_HTML_TF_void) += '"';
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_frame).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(OOO_STRING_SVTOOLS_HTML_TF_void).append('"');
bTabHasGraphics = bTabAlignedLeft = false;
if ( bAll && pDrawLayer )
@@ -752,11 +754,16 @@ void ScHTMLExport::WriteTables()
// more <TABLE ...>
if ( bTabAlignedLeft )
- ((((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += "=\"") += OOO_STRING_SVTOOLS_HTML_AL_left) += '"';
+ {
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(OOO_STRING_SVTOOLS_HTML_AL_left).append('"');
+ }
// ALIGN=LEFT allow text and graphics to flow around
// CELLSPACING
- ((((aByteStrOut += ' ' ) += OOO_STRING_SVTOOLS_HTML_O_cellspacing ) += "=\"") +=
- ByteString::CreateFromInt32( nCellSpacing )) += '"';
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cellspacing).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(static_cast<sal_Int32>(nCellSpacing)).append('"');
// COLS=n
SCCOL nColCnt = 0;
SCCOL nCol;
@@ -765,14 +772,19 @@ void ScHTMLExport::WriteTables()
if ( !pDoc->ColHidden(nCol, nTab) )
++nColCnt;
}
- ((((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_cols) += "=\"") += ByteString::CreateFromInt32( nColCnt ))+='"';
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_cols).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(static_cast<sal_Int32>(nColCnt)).append('"');
// RULES=NONE, we do the styling of the cells in <TD>
- ((((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_rules) += "=\"") += OOO_STRING_SVTOOLS_HTML_TR_none)+='"';
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_rules).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(OOO_STRING_SVTOOLS_HTML_TR_none).append('"');
// BORDER=0, we do the styling of the cells in <TD>
- ((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_border) += "=\"0\"";
- IncIndent(1); TAG_ON_LF( aByteStrOut.GetBuffer() );
+ aByteStrOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_border).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"0\""));
+ IncIndent(1); TAG_ON_LF( aByteStrOut.makeStringAndClear().getStr() );
// --- <COLGROUP> ----
{
@@ -787,7 +799,7 @@ void ScHTMLExport::WriteTables()
{
if( nSpan != 0 )
{
- TAG_ON(lcl_getColGroupString(nSpan, nWidth).GetBuffer());
+ TAG_ON(lcl_getColGroupString(nSpan, nWidth).getStr());
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_colgroup );
}
nWidth = ToPixel( pDoc->GetColWidth( nCol, nTab ) );
@@ -799,7 +811,7 @@ void ScHTMLExport::WriteTables()
}
if( nSpan )
{
- TAG_ON(lcl_getColGroupString(nSpan, nWidth).GetBuffer());
+ TAG_ON(lcl_getColGroupString(nSpan, nWidth).getStr());
TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_colgroup );
}
}
@@ -856,10 +868,13 @@ void ScHTMLExport::WriteTables()
}
aGraphList.clear();
if ( bTabAlignedLeft )
- { // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT>
- aByteStrOut = OOO_STRING_SVTOOLS_HTML_linebreak;
- (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left;
- TAG_ON_LF( aByteStrOut.GetBuffer() );
+ {
+ // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT>
+ aByteStrOut.append(OOO_STRING_SVTOOLS_HTML_linebreak);
+ aByteStrOut.append(' ').
+ append(OOO_STRING_SVTOOLS_HTML_O_clear).append('=').
+ append(OOO_STRING_SVTOOLS_HTML_AL_left);
+ TAG_ON_LF( aByteStrOut.makeStringAndClear().getStr() );
}
}
diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx
index bdd74d7..47ccff0 100644
--- a/sc/source/filter/html/htmlexp2.cxx
+++ b/sc/source/filter/html/htmlexp2.cxx
@@ -52,6 +52,7 @@
#include "document.hxx"
#include "drwlayer.hxx"
#include "ftools.hxx"
+#include <rtl/strbuf.hxx>
using namespace com::sun::star;
@@ -138,18 +139,19 @@ void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab,
void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE )
{
SdrObject* pObject = pE->pObject;
- ByteString aOpt;
- (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_width) += '=') +=
- ByteString::CreateFromInt32( pE->aSize.Width() );
- (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += '=') +=
- ByteString::CreateFromInt32( pE->aSize.Height() );
+ rtl::OStringBuffer aBuf;
+ aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_width).append('=').
+ append(static_cast<sal_Int32>(pE->aSize.Width()));
+ aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).append('=').
+ append(static_cast<sal_Int32>(pE->aSize.Height()));
if ( pE->bInCell )
{
- (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_hspace) += '=') +=
- ByteString::CreateFromInt32( pE->aSpace.Width() );
- (((aOpt += ' ') += OOO_STRING_SVTOOLS_HTML_O_vspace) += '=') +=
- ByteString::CreateFromInt32( pE->aSpace.Height() );
+ aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_hspace).append('=').
+ append(static_cast<sal_Int32>(pE->aSpace.Width()));
+ aBuf.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_vspace).append('=').
+ append(static_cast<sal_Int32>(pE->aSpace.Height()));
}
+ rtl::OString aOpt = aBuf.makeStringAndClear();
switch ( pObject->GetObjIdentifier() )
{
case OBJ_GRAF:
diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx
index 30a580f..4fc7958 100644
--- a/sc/source/filter/rtf/rtfexp.cxx
+++ b/sc/source/filter/rtf/rtfexp.cxx
@@ -125,7 +125,7 @@ void ScRTFExport::WriteTab( SCTAB nTab )
void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
{
rStrm << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH << "30" << OOO_STRING_SVTOOLS_RTF_TRLEFT << "-30";
- rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << ByteString::CreateFromInt32( pDoc->GetRowHeight( nRow, nTab ) ).GetBuffer();
+ rStrm << OOO_STRING_SVTOOLS_RTF_TRRH << rtl::OString::valueOf(static_cast<sal_Int32>(pDoc->GetRowHeight(nRow, nTab))).getStr();
SCCOL nCol;
SCCOL nEndCol = aRange.aEnd.Col();
for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ )
@@ -156,7 +156,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow )
if ( pChar )
rStrm << pChar;
- rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( pCellX[nCol+1] ).GetBuffer();
+ rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << rtl::OString::valueOf(static_cast<sal_Int32>(pCellX[nCol+1])).getStr();
if ( (nCol & 0x0F) == 0x0F )
rStrm << sNewLine; // Zeilen nicht zu lang werden lassen
}
commit 63f08d79e0e21ea47aaae946ac49f24e9baea5c9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jul 29 23:25:38 2011 +0100
convert to rtl::OString[Buffer] and simplify
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index f334538..8437e88 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -101,6 +101,7 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <rtl/strbuf.hxx>
using ::editeng::SvxBorderLine;
@@ -220,18 +221,18 @@ static void lcl_AddStamp( String& rStr, const String& rName,
}
-static void lcl_AppendHTMLColorTripel( ByteString& rStr, const Color& rColor )
+static rtl::OString lcl_makeHTMLColorTriplet(const Color& rColor)
{
+ rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("\"#"));
// <font COLOR="#00FF40">hallo</font>
sal_Char buf[64];
sal_Char* p = buf;
-
- rStr += "\"#";
p += sprintf( p, "%02X", rColor.GetRed() );
p += sprintf( p, "%02X", rColor.GetGreen() );
p += sprintf( p, "%02X", rColor.GetBlue() );
- rStr += buf;
- rStr += '\"';
+ aStr.append(buf);
+ aStr.append('\"');
+ return aStr.makeStringAndClear();
}
//////////////////////////////////////////////////////////////////////////////
@@ -514,26 +515,37 @@ const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab )
}
-void ScHTMLExport::BorderToStyle( ByteString& rOut, const char* pBorderName,
- const SvxBorderLine* pLine, bool& bInsertSemicolon )
+rtl::OString ScHTMLExport::BorderToStyle(const char* pBorderName,
+ const SvxBorderLine* pLine, bool& bInsertSemicolon)
{
+ rtl::OStringBuffer aOut;
+
if ( pLine )
{
if ( bInsertSemicolon )
- rOut += "; ";
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("; "));
// which border
- ((rOut += "border-") += pBorderName) += ": ";
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("border-")).
+ append(pBorderName).append(RTL_CONSTASCII_STRINGPARAM(": "));
// thickness
int nWidth = pLine->GetWidth();
- int nPxWidth = ( nWidth > 0 )? std::max( int( nWidth / TWIPS_PER_PIXEL ), 1 ): 0;
- (rOut += ByteString::CreateFromInt32( nPxWidth )) += "px ";
+ int nPxWidth = (nWidth > 0) ?
+ std::max(int(nWidth / TWIPS_PER_PIXEL), 1) : 0;
+ aOut.append(static_cast<sal_Int32>(nPxWidth)).
+ append(RTL_CONSTASCII_STRINGPARAM("px "));
switch ( pLine->GetStyle() )
{
- case ::editeng::SOLID: rOut += "solid"; break;
- case ::editeng::DOTTED: rOut += "dotted"; break;
- case ::editeng::DASHED: rOut += "dashed"; break;
+ case ::editeng::SOLID:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("solid"));
+ break;
+ case ::editeng::DOTTED:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("dotted"));
+ break;
+ case ::editeng::DASHED:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("dashed"));
+ break;
case ::editeng::DOUBLE:
case ::editeng::THINTHICK_SMALLGAP:
case ::editeng::THINTHICK_MEDIUMGAP:
@@ -541,25 +553,36 @@ void ScHTMLExport::BorderToStyle( ByteString& rOut, const char* pBorderName,
case ::editeng::THICKTHIN_SMALLGAP:
case ::editeng::THICKTHIN_MEDIUMGAP:
case ::editeng::THICKTHIN_LARGEGAP:
- rOut += "double";
- break;
- case ::editeng::EMBOSSED: rOut += "ridge"; break;
- case ::editeng::ENGRAVED: rOut += "groove"; break;
- case ::editeng::OUTSET: rOut += "outset"; break;
- case ::editeng::INSET: rOut += "inset"; break;
- default: rOut += "hidden";
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("double"));
+ break;
+ case ::editeng::EMBOSSED:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("ridge"));
+ break;
+ case ::editeng::ENGRAVED:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("groove"));
+ break;
+ case ::editeng::OUTSET:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("outset"));
+ break;
+ case ::editeng::INSET:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("inset"));
+ break;
+ default:
+ aOut.append(RTL_CONSTASCII_STRINGPARAM("hidden"));
}
- rOut += " #";
+ aOut.append(RTL_CONSTASCII_STRINGPARAM(" #"));
// color
char hex[7];
snprintf( hex, 7, "%06x", static_cast< unsigned int >( pLine->GetColor().GetRGBColor() ) );
hex[6] = 0;
- rOut += hex;
+ aOut.append(hex);
bInsertSemicolon = true;
}
+
+ return aOut.makeStringAndClear();
}
void ScHTMLExport::WriteBody()
@@ -890,22 +913,26 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
if ( nScriptType == 0 )
nScriptType = aHTMLStyle.nDefaultScriptType;
-
- ByteString aStrTD = OOO_STRING_SVTOOLS_HTML_tabledata;
+ rtl::OStringBuffer aStrTD(OOO_STRING_SVTOOLS_HTML_tabledata);
// border of the cells
SvxBoxItem* pBorder = (SvxBoxItem*) pDoc->GetAttr( nCol, nRow, nTab, ATTR_BORDER );
if ( pBorder && (pBorder->GetTop() || pBorder->GetBottom() || pBorder->GetLeft() || pBorder->GetRight()) )
{
- ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_style) += "=\"";
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_style).
+ append(RTL_CONSTASCII_STRINGPARAM("=\""));
bool bInsertSemicolon = false;
- BorderToStyle( aStrTD, "top", pBorder->GetTop(), bInsertSemicolon );
- BorderToStyle( aStrTD, "bottom", pBorder->GetBottom(), bInsertSemicolon );
- BorderToStyle( aStrTD, "left", pBorder->GetLeft(), bInsertSemicolon );
- BorderToStyle( aStrTD, "right", pBorder->GetRight(), bInsertSemicolon );
-
- aStrTD += '"';
+ aStrTD.append(BorderToStyle("top", pBorder->GetTop(),
+ bInsertSemicolon));
+ aStrTD.append(BorderToStyle("bottom", pBorder->GetBottom(),
+ bInsertSemicolon));
+ aStrTD.append(BorderToStyle("left", pBorder->GetLeft(),
+ bInsertSemicolon));
+ aStrTD.append(BorderToStyle("right", pBorder->GetRight(),
+ bInsertSemicolon));
+
+ aStrTD.append('"');
}
const sal_Char* pChar;
@@ -924,7 +951,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
nC = rMergeAttr.GetColMerge();
if ( nC > 1 )
{
- (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_colspan) += '=') += ByteString::CreateFromInt32( nC );
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_colspan).
+ append('=').append(static_cast<sal_Int32>(nC));
nC = nC + nCol;
for ( jC=nCol, v=0; jC<nC; jC++ )
v += pDoc->GetColWidth( jC, nTab );
@@ -937,7 +965,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
nR = rMergeAttr.GetRowMerge();
if ( nR > 1 )
{
- (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_rowspan) += '=') += ByteString::CreateFromInt32( nR );
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_rowspan).
+ append('=').append(static_cast<sal_Int32>(nR));
nR += nRow;
v = pDoc->GetRowHeight( nRow, nR-1, nTab );
nHeightPixel = ToPixel( static_cast< sal_uInt16 >( v ) );
@@ -949,7 +978,11 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
nHeightPixel = ToPixel( pDoc->GetRowHeight( nRow, nTab ) );
if ( bTableDataHeight )
- ((((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_height) += "=\"") += ByteString::CreateFromInt32( nHeightPixel )) += '"';
+ {
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_height).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).
+ append(static_cast<sal_Int32>(nHeightPixel)).append('"');
+ }
const SvxFontItem& rFontItem = (const SvxFontItem&) pAttr->GetItem(
ScGlobal::GetScriptedWhichID( nScriptType, ATTR_FONT),
@@ -1021,7 +1054,8 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
default: pChar = OOO_STRING_SVTOOLS_HTML_AL_left; break;
}
- ((((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += "=\"") += pChar)+='"';
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).
+ append(RTL_CONSTASCII_STRINGPARAM("=\"")).append(pChar).append('"');
switch( rVerJustifyItem.GetValue() )
{
@@ -1032,12 +1066,16 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
default: pChar = NULL;
}
if ( pChar )
- (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') += pChar;
+ {
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_valign).
+ append('=').append(pChar);
+ }
if ( aHTMLStyle.aBackgroundColor != aBgColor )
{
- ((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_bgcolor) += '=';
- lcl_AppendHTMLColorTripel( aStrTD, aBgColor );
+ aStrTD.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_bgcolor).
+ append('=');
+ aStrTD.append(lcl_makeHTMLColorTriplet(aBgColor));
}
double fVal = 0.0;
@@ -1063,10 +1101,11 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
}
}
}
- HTMLOutFuncs::CreateTableDataOptionsValNum( aStrTD, bValueData, fVal,
- nFormat, *pFormatter, eDestEnc, &aNonConvertibleChars );
- TAG_ON( aStrTD.GetBuffer() );
+ aStrTD.append(HTMLOutFuncs::CreateTableDataOptionsValNum(bValueData, fVal,
+ nFormat, *pFormatter, eDestEnc, &aNonConvertibleChars));
+
+ TAG_ON(aStrTD.makeStringAndClear().getStr());
if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold );
if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic );
@@ -1075,17 +1114,18 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
if ( bSetFont )
{
- ByteString aStr = OOO_STRING_SVTOOLS_HTML_font;
+ rtl::OStringBuffer aStr(OOO_STRING_SVTOOLS_HTML_font);
if ( bSetFontName )
{
- ((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_face) += "=\"";
+ aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_face).
+ append(RTL_CONSTASCII_STRINGPARAM("=\""));
xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' );
if ( nFonts == 1 )
{
ByteString aTmpStr;
HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(),
aTmpStr, eDestEnc, &aNonConvertibleChars );
- aStr += aTmpStr;
+ aStr.append(aTmpStr);
}
else
{ // Fontliste, VCL: Semikolon als Separator, HTML: Komma
@@ -1096,17 +1136,17 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
HTMLOutFuncs::ConvertStringToHTML(
rList.GetToken( 0, ';', nPos ), aTmpStr, eDestEnc,
&aNonConvertibleChars );
- aStr += aTmpStr;
+ aStr.append(aTmpStr);
if ( j < nFonts-1 )
- aStr += ',';
+ aStr.append(',');
}
}
- aStr += '\"';
+ aStr.append('\"');
}
if ( nSetFontSizeNumber )
{
- (((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_size) += '=')
- += ByteString::CreateFromInt32( nSetFontSizeNumber );
+ aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_size).
+ append('=').append(static_cast<sal_Int32>(nSetFontSizeNumber));
}
if ( bSetFontColor )
{
@@ -1116,10 +1156,10 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
if ( aColor.GetColor() == COL_AUTO )
aColor.SetColor( COL_BLACK );
- ((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_color) += '=';
- lcl_AppendHTMLColorTripel( aStr, aColor );
+ aStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_color).
+ append('=').append(lcl_makeHTMLColorTriplet(aColor));
}
- TAG_ON( aStr.GetBuffer() );
+ TAG_ON(aStr.makeStringAndClear().getStr());
}
String aStrOut;
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index cc47baa..b43ade5 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -153,8 +153,8 @@ class ScHTMLExport : public ScExportBase
SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow );
- void BorderToStyle( ByteString& rOut, const char* pBorderName,
- const ::editeng::SvxBorderLine* pLine, bool& bInsertSemicolon );
+ rtl::OString BorderToStyle(const char* pBorderName,
+ const ::editeng::SvxBorderLine* pLine, bool& bInsertSemicolon);
sal_uInt16 GetFontSizeNumber( sal_uInt16 nHeight );
const char* GetFontSizeCss( sal_uInt16 nHeight );
More information about the Libreoffice-commits
mailing list