summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/sfx2/frmhtmlw.hxx12
-rw-r--r--include/svtools/htmlout.hxx25
-rw-r--r--sc/inc/filter.hxx2
-rw-r--r--sc/source/filter/html/htmlexp.cxx2
-rw-r--r--sc/source/filter/inc/ftools.hxx2
-rw-r--r--sc/source/filter/inc/htmlexp.hxx4
-rw-r--r--sc/source/ui/docshell/docsh.cxx2
-rw-r--r--sc/source/ui/docshell/impex.cxx2
-rw-r--r--sc/source/ui/inc/impex.hxx4
-rw-r--r--sfx2/source/bastyp/frmhtmlw.cxx6
-rw-r--r--svtools/source/svhtml/htmlout.cxx48
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.cxx2
-rw-r--r--sw/source/filter/html/wrthtml.hxx2
14 files changed, 57 insertions, 58 deletions
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index 3abdfbee3107..66590e74b070 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.hxx
@@ -46,12 +46,12 @@ class SFX2_DLLPUBLIC SfxFrameHTMLWriter
const sal_Char *pIndent, const String& rName,
const String& rContent, sal_Bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
SAL_DLLPRIVATE inline static void OutMeta( SvStream& rStrm,
const sal_Char *pIndent, const sal_Char *pName,
const String& rContent, sal_Bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
public:
static void Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
@@ -59,21 +59,21 @@ public:
::com::sun::star::document::XDocumentProperties>&,
const sal_Char *pIndent,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
static void Out_FrameDescriptor(
SvStream&, const String& rBaseURL, const com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet >& xSet,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
};
inline void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
const sal_Char *pIndent, const sal_Char *pName,
const String& rContent, sal_Bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
- String sTmp = OUString::createFromAscii(pName);
+ OUString sTmp = OUString::createFromAscii(pName);
OutMeta( rStrm, pIndent, sTmp, rContent, bHTTPEquiv, eDestEnc, pNonConvertableChars );
}
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index bc91591de49a..789ee1943617 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -28,7 +28,6 @@
class Color;
class ImageMap;
-class String;
class SvStream;
class SvxMacroTableDtor;
class SvNumberFormatter;
@@ -58,57 +57,57 @@ struct HTMLOutFuncs
static const sal_Char sNewLine[]; // \015\012
#endif
- SVT_DLLPUBLIC static OString ConvertStringToHTML( const String& sSrc,
+ SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_AsciiTag( SvStream&, const sal_Char* pStr,
sal_Bool bOn = sal_True,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252);
SVT_DLLPUBLIC static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
HTMLOutContext& rContext,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const OUString&,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 );
- SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const String&, const ImageMap&, const String&,
+ SVT_DLLPUBLIC static SvStream& Out_ImageMap( SvStream&, const OUString&, const ImageMap&, const OUString&,
const HTMLOutEvent *pEventTable,
sal_Bool bOutStarBasic,
const sal_Char *pDelim = 0,
const sal_Char *pIndentArea = 0,
const sal_Char *pIndentMap = 0,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
SVT_DLLPUBLIC static SvStream& FlushToAscii( SvStream&, HTMLOutContext& rContext );
SVT_DLLPUBLIC static SvStream& OutScript( SvStream& rStrm,
- const String& rBaseURL,
- const String& rSource,
+ const OUString& rBaseURL,
+ const OUString& rSource,
const OUString& rLanguage,
ScriptType eScriptType,
- const String& rSrc,
+ const OUString& rSrc,
const OUString *pSBLibrary = 0,
const OUString *pSBModule = 0,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
// der 3. Parameter ist ein Array von HTMLOutEvents, das mit einem
// nur aus 0 bestehen Eintrag terminiert ist.
SVT_DLLPUBLIC static SvStream& Out_Events( SvStream&, const SvxMacroTableDtor&,
const HTMLOutEvent*, sal_Bool bOutStarBasic,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0 );
+ OUString *pNonConvertableChars = 0 );
// <TD SDVAL="..." SDNUM="...">
SVT_DLLPUBLIC static OString CreateTableDataOptionsValNum(
sal_Bool bValue, double fVal, sal_uLong nFormat,
SvNumberFormatter& rFormatter,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
- String *pNonConvertableChars = 0);
+ OUString *pNonConvertableChars = 0);
};
#endif
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 9c28498cfd88..6ff8a89b83ca 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -110,7 +110,7 @@ class ScFormatFilterPlugin {
virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL ) = 0;
virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, bool bAll,
- const String& rStreamPath, String& rNonConvertibleChars ) = 0;
+ const String& rStreamPath, OUString& rNonConvertibleChars ) = 0;
virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest ) = 0;
virtual ScOrcusFilters* GetOrcusFilters() = 0;
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 18bc5299f6e6..091678b0010b 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -135,7 +135,7 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] =
FltError ScFormatFilterPluginImpl::ScExportHTML( SvStream& rStrm, const String& rBaseURL, ScDocument* pDoc,
const ScRange& rRange, const CharSet /*eNach*/, bool bAll,
- const String& rStreamPath, String& rNonConvertibleChars )
+ const String& rStreamPath, OUString& rNonConvertibleChars )
{
ScHTMLExport aEx( rStrm, rBaseURL, pDoc, rRange, bAll, rStreamPath );
FltError nErr = aEx.Write();
diff --git a/sc/source/filter/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx
index e89685c83aa9..9384d415cf87 100644
--- a/sc/source/filter/inc/ftools.hxx
+++ b/sc/source/filter/inc/ftools.hxx
@@ -306,7 +306,7 @@ public:
virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest,
sal_uInt32 nDifOption = SC_DIFOPT_EXCEL );
virtual FltError ScExportHTML( SvStream&, const String& rBaseURL, ScDocument*, const ScRange& rRange, const CharSet eDest, bool bAll,
- const String& rStreamPath, String& rNonConvertibleChars );
+ const String& rStreamPath, OUString& rNonConvertibleChars );
virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange& rRange, const CharSet eDest );
virtual ScOrcusFilters* GetOrcusFilters();
diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx
index 585f7a21a0b5..c33651cf1ea7 100644
--- a/sc/source/filter/inc/htmlexp.hxx
+++ b/sc/source/filter/inc/htmlexp.hxx
@@ -101,7 +101,7 @@ class ScHTMLExport : public ScExportBase
String aCId; // Content-Id fuer Mail-Export
OutputDevice* pAppWin; // fuer Pixelei
boost::scoped_ptr< std::map<String, String> > pFileNameMap; // fuer CopyLocalFileToINet
- String aNonConvertibleChars; // collect nonconvertible characters
+ OUString aNonConvertibleChars; // collect nonconvertible characters
rtl_TextEncoding eDestEnc;
SCTAB nUsedTables;
short nIndent;
@@ -158,7 +158,7 @@ public:
sal_Bool bAll, const String& aStreamPath );
virtual ~ScHTMLExport();
sal_uLong Write();
- const String& GetNonConvertibleChars() const
+ const OUString& GetNonConvertibleChars() const
{ return aNonConvertibleChars; }
};
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index fe9cdba01bf5..de153d101f25 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -2381,7 +2381,7 @@ sal_Bool ScDocShell::ConvertTo( SfxMedium &rMed )
ScImportExport aImExport( &aDocument );
aImExport.SetStreamPath( rMed.GetName() );
bRet = aImExport.ExportStream( *pStream, rMed.GetBaseURL( true ), SOT_FORMATSTR_ID_HTML );
- if ( bRet && aImExport.GetNonConvertibleChars().Len() )
+ if ( bRet && !aImExport.GetNonConvertibleChars().isEmpty() )
SetError( *new StringErrorInfo(
SCWARN_EXPORT_NONCONVERTIBLE_CHARS,
aImExport.GetNonConvertibleChars(),
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index a2312058b573..e2c67fad0363 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -2231,7 +2231,7 @@ class ScFormatFilterMissing : public ScFormatFilterPlugin {
virtual FltError ScExportDif( SvStream&, ScDocument*, const ScAddress&, const CharSet, sal_uInt32 ) RETURN_ERROR
virtual FltError ScExportDif( SvStream&, ScDocument*, const ScRange&, const CharSet, sal_uInt32 ) RETURN_ERROR
virtual FltError ScExportHTML( SvStream&, const String&, ScDocument*, const ScRange&, const CharSet, bool,
- const String&, String& ) RETURN_ERROR
+ const String&, OUString& ) RETURN_ERROR
virtual FltError ScExportRTF( SvStream&, ScDocument*, const ScRange&, const CharSet ) RETURN_ERROR
virtual ScOrcusFilters* GetOrcusFilters() { return NULL; }
diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx
index 2691b118bbf7..fef8300c3bda 100644
--- a/sc/source/ui/inc/impex.hxx
+++ b/sc/source/ui/inc/impex.hxx
@@ -52,7 +52,7 @@ class ScImportExport
ScDocument* pUndoDoc;
ScRange aRange;
String aStreamPath;
- String aNonConvertibleChars;
+ OUString aNonConvertibleChars;
sal_uLong nSizeLimit;
sal_Unicode cSep; // Separator
sal_Unicode cStr; // String Delimiter
@@ -147,7 +147,7 @@ public:
bool IsOverflowCell() const { return bOverflowCell; }
bool IsOverflow() const { return bOverflowRow || bOverflowCol || bOverflowCell; }
- const String& GetNonConvertibleChars() const { return aNonConvertibleChars; }
+ const OUString& GetNonConvertibleChars() const { return aNonConvertibleChars; }
bool IsApi() const { return mbApi; }
void SetApi( bool bApi ) { mbApi = bApi; }
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index dd46236c1365..9d4f891d8fb1 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -66,7 +66,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm,
const String& rName,
const String& rContent, sal_Bool bHTTPEquiv,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
rStrm << sNewLine;
if( pIndent )
@@ -89,7 +89,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
const uno::Reference<document::XDocumentProperties> & i_xDocProps,
const sal_Char *pIndent,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
const sal_Char *pCharSet =
rtl_getBestMimeCharsetFromTextEncoding( eDestEnc );
@@ -248,7 +248,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
void SfxFrameHTMLWriter::Out_FrameDescriptor(
SvStream& rOut, const String& rBaseURL, const uno::Reference < beans::XPropertySet >& xSet,
- rtl_TextEncoding eDestEnc, String *pNonConvertableChars )
+ rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars )
{
try
{
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 9afd1199314c..21d1ec8f513b 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -393,7 +393,7 @@ static const sal_Char *lcl_svhtml_GetEntityForChar( sal_Unicode c,
static OString lcl_ConvertCharToHTML( sal_Unicode c,
HTMLOutContext& rContext,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
OStringBuffer aDest;
DBG_ASSERT( RTL_TEXTENCODING_DONTKNOW != rContext.m_eDestEnc,
@@ -471,8 +471,8 @@ static OString lcl_ConvertCharToHTML( sal_Unicode c,
aDest.append('&').append('#').append(static_cast<sal_Int64>(c))
.append(';');
if( pNonConvertableChars &&
- STRING_NOTFOUND == pNonConvertableChars->Search( c ) )
- pNonConvertableChars->Append( c );
+ -1 == pNonConvertableChars->indexOf( c ) )
+ (*pNonConvertableChars) += OUString(c);
}
}
return aDest.makeStringAndClear();
@@ -502,14 +502,14 @@ static OString lcl_FlushToAscii( HTMLOutContext& rContext )
return aDest.makeStringAndClear();
}
-OString HTMLOutFuncs::ConvertStringToHTML( const String& rSrc,
- rtl_TextEncoding eDestEnc, String *pNonConvertableChars )
+OString HTMLOutFuncs::ConvertStringToHTML( const OUString& rSrc,
+ rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars )
{
HTMLOutContext aContext( eDestEnc );
OStringBuffer aDest;
- for( sal_uInt32 i=0UL, nLen = rSrc.Len(); i < nLen; i++ )
+ for( sal_Int32 i=0, nLen = rSrc.getLength(); i < nLen; i++ )
aDest.append(lcl_ConvertCharToHTML(
- rSrc.GetChar( (xub_StrLen)i ), aContext, pNonConvertableChars));
+ rSrc[i], aContext, pNonConvertableChars));
aDest.append(lcl_FlushToAscii(aContext));
return aDest.makeStringAndClear();
}
@@ -525,7 +525,7 @@ SvStream& HTMLOutFuncs::Out_AsciiTag( SvStream& rStream, const sal_Char *pStr,
SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c,
HTMLOutContext& rContext,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
OString sOut = lcl_ConvertCharToHTML( c, rContext, pNonConvertableChars );
rStream << sOut.getStr();
@@ -534,7 +534,7 @@ SvStream& HTMLOutFuncs::Out_Char( SvStream& rStream, sal_Unicode c,
SvStream& HTMLOutFuncs::Out_String( SvStream& rStream, const OUString& rOUStr,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
HTMLOutContext aContext( eDestEnc );
sal_Int32 nLen = rOUStr.getLength();
@@ -598,23 +598,23 @@ SvStream& HTMLOutFuncs::Out_Color( SvStream& rStream, const Color& rColor,
}
SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
- const String& rBaseURL,
+ const OUString& rBaseURL,
const ImageMap& rIMap,
- const String& rName,
+ const OUString& rName,
const HTMLOutEvent *pEventTable,
sal_Bool bOutStarBasic,
const sal_Char *pDelim,
const sal_Char *pIndentArea,
const sal_Char *pIndentMap,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
eDestEnc = osl_getThreadTextEncoding();
- const String& rOutName = rName.Len() ? rName : String(rIMap.GetName());
- DBG_ASSERT( rOutName.Len(), "Kein ImageMap-Name" );
- if( !rOutName.Len() )
+ const OUString& rOutName = !rName.isEmpty() ? rName : rIMap.GetName();
+ DBG_ASSERT( !rOutName.isEmpty(), "Kein ImageMap-Name" );
+ if( rOutName.isEmpty() )
return rStream;
OStringBuffer sOut;
@@ -781,15 +781,15 @@ SvStream& HTMLOutFuncs::Out_ImageMap( SvStream& rStream,
}
SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
- const String& rBaseURL,
- const String& rSource,
+ const OUString& rBaseURL,
+ const OUString& rSource,
const OUString& rLanguage,
ScriptType eScriptType,
- const String& rSrc,
+ const OUString& rSrc,
const OUString *pSBLibrary,
const OUString *pSBModule,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
if( RTL_TEXTENCODING_DONTKNOW == eDestEnc )
eDestEnc = osl_getThreadTextEncoding();
@@ -809,7 +809,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
sOut.append('\"');
}
- if( rSrc.Len() )
+ if( !rSrc.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_src).append("=\"");
rStrm << sOut.makeStringAndClear().getStr();
@@ -839,7 +839,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
rStrm << sOut.makeStringAndClear().getStr();
- if( rSource.Len() || pSBLibrary || pSBModule )
+ if( !rSource.isEmpty() || pSBLibrary || pSBModule )
{
rStrm << sNewLine;
@@ -870,7 +870,7 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm,
}
}
- if( rSource.Len() )
+ if( !rSource.isEmpty() )
{
// Wir schreiben das Modul mm ANSI-Zeichensatz, aber mit
// System-Zeilenumbruechen raus.
@@ -900,7 +900,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
const HTMLOutEvent *pEventTable,
sal_Bool bOutStarBasic,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
sal_uInt16 i=0;
while( pEventTable[i].pBasicName || pEventTable[i].pJavaName )
@@ -933,7 +933,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm,
OString HTMLOutFuncs::CreateTableDataOptionsValNum(
sal_Bool bValue,
double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter,
- rtl_TextEncoding eDestEnc, String* pNonConvertableChars)
+ rtl_TextEncoding eDestEnc, OUString* pNonConvertableChars)
{
OStringBuffer aStrTD;
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 8ed4041682d6..c2095140533c 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -84,7 +84,7 @@ static void lcl_html_outEvents( SvStream& rStrm,
const uno::Reference< form::XFormComponent > rFormComp,
sal_Bool bCfgStarBasic,
rtl_TextEncoding eDestEnc,
- String *pNonConvertableChars )
+ OUString *pNonConvertableChars )
{
uno::Reference< container::XChild > xChild( rFormComp, uno::UNO_QUERY );
uno::Reference< uno::XInterface > xParentIfc = xChild->getParent();
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index 97367e4cfbf1..93085c0c3198 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -436,7 +436,7 @@ sal_uLong SwHTMLWriter::WriteStream()
for( i=0; i<MAXLEVEL; i++ )
aBulletGrfs[i].Erase();
- aNonConvertableCharacters.Erase();
+ aNonConvertableCharacters = "";
if( bShowProgress )
::EndProgress( pDoc->GetDocShell() );
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index b2d1901991b1..a7aa3b7c1bde 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -303,7 +303,7 @@ public:
SwHTMLTxtFtns *pFootEndNotes;
String aCSS1Selector; // der Selektor eines Styles
- String aNonConvertableCharacters;
+ OUString aNonConvertableCharacters;
String aBulletGrfs[MAXLEVEL]; // die Grafiken fuer Listen
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > *pxFormComps; // die aktuelle Form
generated by cgit (git 2.34.1) at 2024-07-31 08:22:58 +0000