strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simply this and return a new string

Browse source
This commit is contained in:
Caolán McNamara 2011-07-29 23:22:28 +01:00
parent a480f2fa06
commit 2769f2d061
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
svtools/inc/svtools/htmlout.hxx
View file

@ -32,6 +32,7 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
#include <rtl/textenc.h>
#include <rtl/string.hxx>
#include <svl/macitem.hxx>
class Color;
@ -113,11 +114,11 @@ struct HTMLOutFuncs
String *pNonConvertableChars = 0 );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static ByteString& CreateTableDataOptionsValNum( ByteString& aStrTD,
SVT_DLLPUBLIC static rtl::OString CreateTableDataOptionsValNum(
sal_Bool bValue, double fVal, sal_uLong nFormat,
SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
String *pNonConvertableChars = 0 );
String *pNonConvertableChars = 0);
SVT_DLLPUBLIC static sal_Bool PrivateURLToInternalImg( String& rURL );
};

32
svtools/source/svhtml/htmlout.cxx
View file

@ -44,10 +44,6 @@
#include <svtools/imappoly.hxx>
#include "svl/urihelper.hxx"
#ifndef RTL_CONSTASCII_STRINGPARAM
#define RTL_CONSTASCII_STRINGPARAM( c ) c, sizeof(c)-1
#endif
#if defined(UNX)
const sal_Char HTMLOutFuncs::sNewLine = '\012';
#else
@ -939,25 +935,32 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
return rStrm;
}
ByteString& HTMLOutFuncs::CreateTableDataOptionsValNum( ByteString& aStrTD,
rtl::OString HTMLOutFuncs::CreateTableDataOptionsValNum(
sal_Bool bValue,
double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc, String* pNonConvertableChars )
rtl_TextEncoding eDestEnc, String* pNonConvertableChars)
{
rtl::OStringBuffer aStrTD;
if ( bValue )
{
// printf / scanf ist zu ungenau
String aValStr;
rFormatter.GetInputLineString( fVal, 0, aValStr );
ByteString sTmp( aValStr, eDestEnc );
((((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_SDval) += "=\"") += sTmp) += '\"';
aStrTD.append(' ').
append(OOO_STRING_SVTOOLS_HTML_O_SDval).
append(RTL_CONSTASCII_STRINGPARAM("=\"")).
append(sTmp).append('\"');
}
if ( bValue || nFormat )
{
((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_SDnum) += "=\"";
(aStrTD += ByteString::CreateFromInt32(
Application::GetSettings().GetLanguage() ))
+= ';'; // Language fuer Format 0
aStrTD.append(' ').
append(OOO_STRING_SVTOOLS_HTML_O_SDnum).
append(RTL_CONSTASCII_STRINGPARAM("=\"")).
append(static_cast<sal_Int32>(
Application::GetSettings().GetLanguage())).
append(';'); // Language fuer Format 0
if ( nFormat )
{
ByteString aNumStr;
@ -971,11 +974,12 @@ ByteString& HTMLOutFuncs::CreateTableDataOptionsValNum( ByteString& aStrTD,
}
else
nLang = LANGUAGE_SYSTEM;
((aStrTD += ByteString::CreateFromInt32(nLang)) += ';') += aNumStr;
aStrTD.append(static_cast<sal_Int32>(nLang)).append(';').
append(aNumStr);
}
aStrTD += '\"';
aStrTD.append('\"');
}
return aStrTD;
return aStrTD.makeStringAndClear();
}
sal_Bool HTMLOutFuncs::PrivateURLToInternalImg( String& rURL )