From 6954aad4e5c99ce193d3dd60a43f6d41d7c0a87f Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 13 Oct 2013 13:45:17 +0300 Subject: Reduce copypasta: Introduce SAL_NEWLINE_STRING and use it Contains the platform-dependent on-disk line separator ("\r\n" for Windows, "\n" otherwise, and yes, I assume an ASCII-based world). Use it instead of static constant char array fields, with ifdeffed initialisations, in various classes here and there. Change-Id: Ibea1f2cc1acfb8cc067c3892a41f73bf44f2c78a --- dbaccess/source/ui/inc/TokenWriter.hxx | 6 ---- dbaccess/source/ui/misc/TokenWriter.cxx | 46 +++++++++++++---------------- include/sal/config.h | 4 +++ include/sfx2/frmhtmlw.hxx | 1 - include/svtools/htmlout.hxx | 2 -- include/svtools/rtfout.hxx | 2 -- sc/source/filter/html/htmlexp.cxx | 10 +++---- sc/source/filter/html/htmlexp2.cxx | 2 +- sc/source/filter/inc/expbase.hxx | 3 -- sc/source/filter/rtf/expbase.cxx | 7 ----- sc/source/filter/rtf/rtfexp.cxx | 16 +++++----- sfx2/source/bastyp/frmhtmlw.cxx | 12 ++------ svtools/source/svhtml/htmlout.cxx | 20 +++++-------- svtools/source/svrtf/rtfout.cxx | 8 ----- svx/source/table/tablertfexporter.cxx | 12 ++++---- sw/source/filter/html/htmlatr.cxx | 2 +- sw/source/filter/html/htmlbas.cxx | 2 +- sw/source/filter/html/htmlfly.cxx | 7 ++--- sw/source/filter/html/htmlforw.cxx | 2 +- sw/source/filter/html/wrthtml.cxx | 8 +---- sw/source/filter/html/wrthtml.hxx | 2 -- sw/source/filter/ww8/rtfattributeoutput.cxx | 28 +++++++++--------- sw/source/filter/ww8/rtfexport.cxx | 20 +++++-------- sw/source/filter/ww8/rtfexport.hxx | 2 -- sw/source/filter/ww8/rtfsdrexport.cxx | 6 ++-- 25 files changed, 85 insertions(+), 145 deletions(-) diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index aeaeb79127c7..14f7b814b7e2 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -80,12 +80,6 @@ namespace dbaui sal_Int32 m_nCommandType; bool m_bNeedToReInitialize; -#if defined UNX - static const char sNewLine; -#else - static const char sNewLine[]; -#endif - ODatabaseExport* m_pReader; sal_Int32* m_pRowMarker; // if set, then copy only these rows rtl_TextEncoding m_eDestEnc; diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index ad2caefd755c..ef4b72b5a503 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -72,12 +72,6 @@ using namespace ::com::sun::star::awt; using namespace ::com::sun::star::util; using ::com::sun::star::frame::XModel; -#ifdef _WIN32 -const char ODatabaseImportExport::sNewLine[] = "\015\012"; -#else -const char ODatabaseImportExport::sNewLine = '\012'; -#endif - const static char sMyBegComment[] = ""; const static char sFontFamily[] = "font-family: "; @@ -388,7 +382,7 @@ sal_Bool ORTFImportExport::Write() SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" ); ODatabaseImportExport::Write(); (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_RTF; - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING; rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252; sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); @@ -419,7 +413,7 @@ sal_Bool ORTFImportExport::Write() (*m_pStream) << ';'; } (*m_pStream) << '}' ; - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; // write the rtf color table (*m_pStream) << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL << OOO_STRING_SVTOOLS_RTF_RED; m_pStream->WriteNumber(static_cast(aColor.GetRed())); @@ -429,7 +423,7 @@ sal_Bool ORTFImportExport::Write() m_pStream->WriteNumber(static_cast(aColor.GetBlue())); (*m_pStream) << ";\\red255\\green255\\blue255;\\red192\\green192\\blue192;}" - << ODatabaseImportExport::sNewLine; + << SAL_NEWLINE_STRING; static char const aTRRH[] = "\\trrh-270\\pard\\intbl"; static char const aFS[] = "\\fs20\\f0\\cf0\\cb2"; @@ -437,7 +431,7 @@ sal_Bool ORTFImportExport::Write() (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH; m_pStream->WriteNumber(static_cast(40)); - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; if(m_xObject.is()) { @@ -458,11 +452,11 @@ sal_Bool ORTFImportExport::Write() { (*m_pStream) << aCell1; m_pStream->WriteNumber(i*CELL_X); - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; } // column description - (*m_pStream) << '{' << ODatabaseImportExport::sNewLine; + (*m_pStream) << '{' << SAL_NEWLINE_STRING; (*m_pStream) << aTRRH; OString* pHorzChar = new OString[nCount]; @@ -493,7 +487,7 @@ sal_Bool ORTFImportExport::Write() pHorzChar[i-1] = pChar; // to avoid to always rummage in the ITEMSET later on - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; (*m_pStream) << '{'; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_QC; // column header always centered @@ -508,13 +502,13 @@ sal_Bool ORTFImportExport::Write() (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW; - (*m_pStream) << ODatabaseImportExport::sNewLine << '}'; - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING << '}'; + (*m_pStream) << SAL_NEWLINE_STRING; Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY); sal_Int32 k=1; @@ -553,7 +547,7 @@ sal_Bool ORTFImportExport::Write() delete [] pHorzChar; } - (*m_pStream) << '}' << ODatabaseImportExport::sNewLine; + (*m_pStream) << '}' << SAL_NEWLINE_STRING; (*m_pStream) << (sal_uInt8) 0; return ((*m_pStream).GetError() == SVSTREAM_OK); } @@ -565,7 +559,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ ++kk; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_TROWD << OOO_STRING_SVTOOLS_RTF_TRGAPH; m_pStream->WriteNumber(static_cast(40)); - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; static char const aCell2[] = "\\clbrdrl\\brdrs\\brdrcf2\\clbrdrt\\brdrs\\brdrcf2\\clbrdrb\\brdrs\\brdrcf2\\clbrdrr\\brdrs\\brdrcf2\\clshdng10000\\clcfpat1\\cellx"; static char const aTRRH[] = "\\trrh-270\\pard\\intbl"; @@ -574,7 +568,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ { (*m_pStream) << aCell2; m_pStream->WriteNumber(i*CELL_X); - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; } const sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight ); @@ -587,7 +581,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ (*m_pStream) << aTRRH; for ( sal_Int32 i=1; i <= _nColumnCount; ++i ) { - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; (*m_pStream) << '{'; (*m_pStream) << pHorzChar[i-1].getStr(); @@ -613,10 +607,10 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_ (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; (*m_pStream) << '}'; - (*m_pStream) << ODatabaseImportExport::sNewLine; + (*m_pStream) << SAL_NEWLINE_STRING; (*m_pStream) << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_INTBL; } - (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW << ODatabaseImportExport::sNewLine; + (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING; (*m_pStream) << '}'; } ++k; @@ -655,9 +649,9 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\ // Macros for HTML-Export #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag ) #define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( (*m_pStream), tag, sal_False ) -#define OUT_LF() (*m_pStream) << ODatabaseImportExport::sNewLine << GetIndentStr() -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ODatabaseImportExport::sNewLine << GetIndentStr()) +#define OUT_LF() (*m_pStream) << SAL_NEWLINE_STRING << GetIndentStr() +#define TAG_ON_LF( tag ) (TAG_ON( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XComponentContext >& _rM, @@ -683,7 +677,7 @@ sal_Bool OHTMLImportExport::Write() ODatabaseImportExport::Write(); if(m_xObject.is()) { - (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>' << ODatabaseImportExport::sNewLine << ODatabaseImportExport::sNewLine; + (*m_pStream) << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>' << SAL_NEWLINE_STRING << SAL_NEWLINE_STRING; TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html ); WriteHeader(); OUT_LF(); diff --git a/include/sal/config.h b/include/sal/config.h index bd2b833fae89..a7943a50210f 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -31,6 +31,7 @@ #define SAL_DLLEXTENSION ".dll" #define SAL_PATHSEPARATOR ';' #define SAL_PATHDELIMITER '\\' +#define SAL_NEWLINE_STRING "\r\n" #define SAL_CONFIGFILE( name ) name ".ini" #ifdef _MSC_VER @@ -58,6 +59,7 @@ #define SAL_DLLPREFIX "lib" #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' +#define SAL_NEWLINE_STRING "\n" #define SAL_CONFIGFILE( name ) name "rc" #endif @@ -67,6 +69,7 @@ #define SAL_DLLPREFIX "lib" #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' +#define SAL_NEWLINE_STRING "\n" #define SAL_CONFIGFILE( name ) name "rc" #endif @@ -79,6 +82,7 @@ #define SAL_DLLPREFIX "lib" #define SAL_PATHSEPARATOR ':' #define SAL_PATHDELIMITER '/' +#define SAL_NEWLINE_STRING "\n" #define SAL_CONFIGFILE( name ) name "rc" #endif diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx index 70847c37b2e7..cc5e7be79b31 100644 --- a/include/sfx2/frmhtmlw.hxx +++ b/include/sfx2/frmhtmlw.hxx @@ -41,7 +41,6 @@ namespace com { namespace sun { namespace star { class SFX2_DLLPUBLIC SfxFrameHTMLWriter { - SAL_DLLPRIVATE static const sal_Char sNewLine[]; SAL_DLLPRIVATE static void OutMeta( SvStream& rStrm, const sal_Char *pIndent, const OUString& rName, const OUString& rContent, sal_Bool bHTTPEquiv, diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 9b0c8fddce9b..cdb1c935f8be 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -51,8 +51,6 @@ struct SVT_DLLPUBLIC HTMLOutContext struct HTMLOutFuncs { - static const sal_Char sNewLine[]; - SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, OUString *pNonConvertableChars = 0 ); diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx index 7c38947f3448..6055e5cb6647 100644 --- a/include/svtools/rtfout.hxx +++ b/include/svtools/rtfout.hxx @@ -33,8 +33,6 @@ class SvStream; class SVT_DLLPUBLIC RTFOutFuncs { public: - static const sal_Char sNewLine[]; - static SvStream& Out_Char( SvStream&, sal_Unicode cChar, int *pUCMode, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 9063b51c74af..e161e0d857db 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -116,12 +116,12 @@ const sal_Char ScHTMLExport::sIndentSource[nIndentMax+1] = #define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) #define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, false ) #define OUT_STR( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars ) -#define OUT_LF() rStrm << ScExportBase::sNewLine << GetIndentStr() -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr()) +#define OUT_LF() rStrm << SAL_NEWLINE_STRING << GetIndentStr() +#define TAG_ON_LF( tag ) (TAG_ON( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << SAL_NEWLINE_STRING << GetIndentStr()) #define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) #define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \ - << sMyEndComment << ScExportBase::sNewLine \ + << sMyEndComment << SAL_NEWLINE_STRING \ << GetIndentStr()) #define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '=' @@ -317,7 +317,7 @@ Size ScHTMLExport::MMToPixel( const Size& rSize ) sal_uLong ScHTMLExport::Write() { rStrm << '<' << OOO_STRING_SVTOOLS_HTML_doctype << ' ' << OOO_STRING_SVTOOLS_HTML_doctype40 << '>' - << sNewLine << sNewLine; + << SAL_NEWLINE_STRING << SAL_NEWLINE_STRING; TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_html ); WriteHeader(); OUT_LF(); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index a5bce9c71e09..ad2e6b7a0901 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -233,7 +233,7 @@ void ScHTMLExport::WriteImage( OUString& rLinkName, const Graphic& rGrf, rLinkName ), eDestEnc ) << '\"'; if ( !rImgOptions.isEmpty() ) rStrm << rImgOptions.getStr(); - rStrm << '>' << sNewLine << GetIndentStr(); + rStrm << '>' << SAL_NEWLINE_STRING << GetIndentStr(); } } diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index 92ebf3aae6d4..4e957296cdb7 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -30,9 +30,6 @@ class ScFieldEditEngine; class ScExportBase { -public: - static const sal_Char sNewLine[]; - protected: SvStream& rStrm; diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index f43adb389c8e..eed1a785107a 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -24,13 +24,6 @@ //------------------------------------------------------------------ -#ifdef _WIN32 -const sal_Char ScExportBase::sNewLine[] = "\015\012"; -#else -const sal_Char ScExportBase::sNewLine[] = "\012"; -#endif - - ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index 14153c03fe0b..bb024e066293 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -69,7 +69,7 @@ ScRTFExport::~ScRTFExport() sal_uLong ScRTFExport::Write() { rStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF; - rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << sNewLine; + rStrm << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING; // Daten for ( SCTAB nTab = aRange.aStart.Tab(); nTab <= aRange.aEnd.Tab(); nTab++ ) @@ -79,14 +79,14 @@ sal_uLong ScRTFExport::Write() WriteTab( nTab ); } - rStrm << '}' << sNewLine; + rStrm << '}' << SAL_NEWLINE_STRING; return rStrm.GetError(); } void ScRTFExport::WriteTab( SCTAB nTab ) { - rStrm << '{' << sNewLine; + rStrm << '{' << SAL_NEWLINE_STRING; if ( pDoc->HasTable( nTab ) ) { memset( &pCellX[0], 0, (MAXCOL+2) * sizeof(sal_uLong) ); @@ -103,7 +103,7 @@ void ScRTFExport::WriteTab( SCTAB nTab ) WriteRow( nTab, nRow ); } } - rStrm << '}' << sNewLine; + rStrm << '}' << SAL_NEWLINE_STRING; } @@ -143,9 +143,9 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(pCellX[nCol+1]).getStr(); if ( (nCol & 0x0F) == 0x0F ) - rStrm << sNewLine; // Zeilen nicht zu lang werden lassen + rStrm << SAL_NEWLINE_STRING; // Zeilen nicht zu lang werden lassen } - rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine; + rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << SAL_NEWLINE_STRING; sal_uLong nStrmPos = rStrm.Tell(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) @@ -153,11 +153,11 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) WriteCell( nTab, nRow, nCol ); if ( rStrm.Tell() - nStrmPos > 255 ) { // Zeilen nicht zu lang werden lassen - rStrm << sNewLine; + rStrm << SAL_NEWLINE_STRING; nStrmPos = rStrm.Tell(); } } - rStrm << OOO_STRING_SVTOOLS_RTF_ROW << sNewLine; + rStrm << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING; } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index fda28524b0ec..107f8a9906be 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -54,12 +54,6 @@ static sal_Char const sHTML_SC_yes[] = "YES"; static sal_Char const sHTML_SC_no[] = "NO"; static sal_Char const sHTML_MIME_text_html[] = "text/html; charset="; -#ifdef _WIN32 -const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012"; -#else -const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012"; -#endif - void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, const sal_Char *pIndent, const OUString& rName, @@ -67,7 +61,7 @@ void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, rtl_TextEncoding eDestEnc, OUString *pNonConvertableChars ) { - rStrm << sNewLine; + rStrm << SAL_NEWLINE_STRING; if( pIndent ) rStrm << pIndent; @@ -102,7 +96,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, } // Titel (auch wenn er leer ist) - rStrm << sNewLine; + rStrm << SAL_NEWLINE_STRING; if( pIndent ) rStrm << pIndent; HTMLOutFuncs::Out_AsciiTag( rStrm, OOO_STRING_SVTOOLS_HTML_title ); @@ -120,7 +114,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL, const OUString& rTarget = i_xDocProps->getDefaultTarget(); if( !rTarget.isEmpty() ) { - rStrm << sNewLine; + rStrm << SAL_NEWLINE_STRING; if( pIndent ) rStrm << pIndent; diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index 5c0b1d8cc840..4ad0a8542711 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -31,12 +31,6 @@ #include #include "svl/urihelper.hxx" -#ifdef _WIN32 -const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012"; -#else -const sal_Char HTMLOutFuncs::sNewLine[] = "\012"; -#endif - #define TXTCONV_BUFFER_SIZE 20 HTMLOutContext::HTMLOutContext( rtl_TextEncoding eDestEnc ) @@ -841,12 +835,12 @@ SvStream& HTMLOutFuncs::OutScript( SvStream& rStrm, if( !rSource.isEmpty() || pSBLibrary || pSBModule ) { - rStrm << sNewLine; + rStrm << SAL_NEWLINE_STRING; if( JAVASCRIPT != eScriptType ) { rStrm << "" : "// -->") - << sNewLine; + << SAL_NEWLINE_STRING; } } diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 919a009a1ee1..703a24c82d5b 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -24,14 +24,6 @@ #include #include - -#ifdef _WIN32 -const sal_Char RTFOutFuncs::sNewLine[] = "\015\012"; -#else -const sal_Char RTFOutFuncs::sNewLine[] = "\012"; -#endif - - SvStream& RTFOutFuncs::Out_Char(SvStream& rStream, sal_Unicode c, int *pUCMode, rtl_TextEncoding eDestEnc, sal_Bool bWriteHelpFile) { diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index c003c12cd63a..c9c1de6bd333 100644 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -86,7 +86,7 @@ long HundMMToTwips( long nIn ) sal_uLong SdrTableRtfExporter::Write() { mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF; - mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine; + mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << SAL_NEWLINE_STRING; Reference< XTableColumns > xColumns( mxTable->getColumns() ); const sal_Int32 nColCount = xColumns->getCount(); @@ -125,7 +125,7 @@ sal_uLong SdrTableRtfExporter::Write() OSL_FAIL("SdrTableRtfExporter::Write(), exception caught!"); } - mrStrm << '}' << RTFOutFuncs::sNewLine; + mrStrm << '}' << SAL_NEWLINE_STRING; return mrStrm.GetError(); } @@ -147,9 +147,9 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa mrStrm << OOO_STRING_SVTOOLS_RTF_CELLX << OString::number(aColumnStart[nCol]).getStr(); if ( (nCol & 0x0F) == 0x0F ) - mrStrm << RTFOutFuncs::sNewLine; // Zeilen nicht zu lang werden lassen + mrStrm << SAL_NEWLINE_STRING; // Zeilen nicht zu lang werden lassen } - mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine; + mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << SAL_NEWLINE_STRING; sal_uLong nStrmPos = mrStrm.Tell(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) @@ -157,11 +157,11 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa WriteCell( nCol, nRow ); if ( mrStrm.Tell() - nStrmPos > 255 ) { - mrStrm << RTFOutFuncs::sNewLine; + mrStrm << SAL_NEWLINE_STRING; nStrmPos = mrStrm.Tell(); } } - mrStrm << OOO_STRING_SVTOOLS_RTF_ROW << RTFOutFuncs::sNewLine; + mrStrm << OOO_STRING_SVTOOLS_RTF_ROW << SAL_NEWLINE_STRING; } diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx index 41dd65880956..5dfa8bb854e2 100644 --- a/sw/source/filter/html/htmlatr.cxx +++ b/sw/source/filter/html/htmlatr.cxx @@ -645,7 +645,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt, // nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang // ausgeben rInfo.aToken = OString(); // kein End-Tag ausgeben - rWrt.Strm() << SwHTMLWriter::sNewLine; + rWrt.Strm() << SAL_NEWLINE_STRING; return; } diff --git a/sw/source/filter/html/htmlbas.cxx b/sw/source/filter/html/htmlbas.cxx index f691549fc51c..273a3d19fccf 100644 --- a/sw/source/filter/html/htmlbas.cxx +++ b/sw/source/filter/html/htmlbas.cxx @@ -301,7 +301,7 @@ void SwHTMLWriter::OutBasic() } const OUString& rModName = pModule->GetName(); - Strm() << SwHTMLWriter::sNewLine; // nicht einruecken! + Strm() << SAL_NEWLINE_STRING; // nicht einruecken! HTMLOutFuncs::OutScript( Strm(), GetBaseURL(), pModule->GetSource(), sLang, eType, aEmptyStr, &rLibName, &rModName, diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 0004c9cbbeed..2c03016018bf 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -927,14 +927,13 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, rHTMLWrt.aImgMapNames.push_back(aIMapName); OString aIndMap, aIndArea; - const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0; + const sal_Char *pIndArea = 0, *pIndMap = 0; if( rHTMLWrt.bLFPossible ) { rHTMLWrt.OutNewLine( sal_True ); aIndMap = rHTMLWrt.GetIndentString(); aIndArea = rHTMLWrt.GetIndentString(1); - pLF = SwHTMLWriter::sNewLine; pIndArea = aIndArea.getStr(); pIndMap = aIndMap.getStr(); } @@ -946,7 +945,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, HTMLOutFuncs::Out_ImageMap( rWrt.Strm(), rWrt.GetBaseURL(), aScaledIMap, aIMapName, aIMapEventTable, rHTMLWrt.bCfgStarBasic, - pLF, pIndArea, pIndMap, + SAL_NEWLINE_STRING, pIndArea, pIndMap, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } @@ -955,7 +954,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, HTMLOutFuncs::Out_ImageMap( rWrt.Strm(), rWrt.GetBaseURL(), *pIMap, aIMapName, aIMapEventTable, rHTMLWrt.bCfgStarBasic, - pLF, pIndArea, pIndMap, + SAL_NEWLINE_STRING, pIndArea, pIndMap, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); } diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 6917b8b805aa..5cf0ee3610c1 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -1304,7 +1304,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, while ( nPos != -1 ) { if( nPos ) - rWrt.Strm() << SwHTMLWriter::sNewLine; + rWrt.Strm() << SAL_NEWLINE_STRING; OUString aLine = sVal.getToken( 0, 0x0A, nPos ); HTMLOutFuncs::Out_String( rWrt.Strm(), aLine, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ); diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index c73eb04cf40c..612400fc56d3 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -80,12 +80,6 @@ #define MAX_INDENT_LEVEL 20 -#ifdef _WIN32 -const sal_Char SwHTMLWriter::sNewLine[] = "\015\012"; -#else -const sal_Char SwHTMLWriter::sNewLine[] = "\012"; -#endif - static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = "\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"; @@ -1248,7 +1242,7 @@ void SwHTMLWriter::OutNewLine( sal_Bool bCheck ) { if( !bCheck || (Strm().Tell()-nLastLFPos) > nIndentLvl ) { - Strm() << sNewLine; + Strm() << SAL_NEWLINE_STRING; nLastLFPos = Strm().Tell(); } diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx index 5fb71bb81b5c..e58939db2446 100644 --- a/sw/source/filter/html/wrthtml.hxx +++ b/sw/source/filter/html/wrthtml.hxx @@ -283,8 +283,6 @@ protected: sal_uLong WriteStream(); public: - static const sal_Char sNewLine[]; - std::vector aImgMapNames; // geschriebene Image Maps std::set aImplicitMarks;// implizite Stprungmarken std::set aNumRuleNames;// Names of exported num rules diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 198da0ad5d26..072d0a576c8a 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -308,7 +308,7 @@ void RtfAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTe m_bTblAfterCell = false; else { - aParagraph->append(m_rExport.sNewLine); + aParagraph->append(SAL_NEWLINE_STRING); aParagraph->append(OOO_STRING_SVTOOLS_RTF_PAR); aParagraph->append(' '); } @@ -328,7 +328,7 @@ void RtfAttributeOutput::EmptyParagraph() { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - m_rExport.Strm() << m_rExport.sNewLine << OOO_STRING_SVTOOLS_RTF_PAR << ' '; + m_rExport.Strm() << SAL_NEWLINE_STRING << OOO_STRING_SVTOOLS_RTF_PAR << ' '; } void RtfAttributeOutput::SectionBreaks(const SwTxtNode& rNode) @@ -403,7 +403,7 @@ void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool bSing void RtfAttributeOutput::EndRun() { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - m_aRun->append(m_rExport.sNewLine); + m_aRun->append(SAL_NEWLINE_STRING); m_aRun.appendAndClear(m_aRunText); if (!m_bSingleEmptyRun && m_bInRun) m_aRun->append('}'); @@ -1038,10 +1038,10 @@ void RtfAttributeOutput::FinishTableRowCell( ww8::WW8TableNodeInfoInner::Pointer void RtfAttributeOutput::StartStyles() { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - m_rExport.Strm() << m_rExport.sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL; + m_rExport.Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_COLORTBL; m_rExport.OutColorTable(); OSL_ENSURE(m_aStylesheet.getLength() == 0, "m_aStylesheet is not empty"); - m_aStylesheet.append(m_rExport.sNewLine); + m_aStylesheet.append(SAL_NEWLINE_STRING); m_aStylesheet.append('{'); m_aStylesheet.append(OOO_STRING_SVTOOLS_RTF_STYLESHEET); } @@ -1097,7 +1097,7 @@ void RtfAttributeOutput::EndStyle() m_aStylesheet.append(' '); m_aStylesheet.append(msfilter::rtfutil::OutString(m_rStyleName, m_rExport.eCurrentEncoding)); m_aStylesheet.append(";}"); - m_aStylesheet.append(m_rExport.sNewLine); + m_aStylesheet.append(SAL_NEWLINE_STRING); } void RtfAttributeOutput::StartStyleProperties( bool /*bParProp*/, sal_uInt16 /*nStyle*/ ) @@ -1308,7 +1308,7 @@ void RtfAttributeOutput::EndAbstractNumbering() SAL_INFO("sw.rtf", OSL_THIS_FUNC); m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_LISTID; - m_rExport.OutULong( m_nListId ) << '}' << m_rExport.sNewLine; + m_rExport.OutULong( m_nListId ) << '}' << SAL_NEWLINE_STRING; } void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel, @@ -1327,7 +1327,7 @@ void RtfAttributeOutput::NumberingLevel( sal_uInt8 nLevel, { SAL_INFO("sw.rtf", OSL_THIS_FUNC); - m_rExport.Strm() << m_rExport.sNewLine; + m_rExport.Strm() << SAL_NEWLINE_STRING; if( nLevel > 8 ) // RTF knows only 9 levels m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_SOUTLVL; @@ -1600,7 +1600,7 @@ void RtfAttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFrame, const Poi m_rExport.Strm() << '}'; // shpinst m_rExport.Strm() << '}'; // shp - m_rExport.Strm() << RtfExport::sNewLine; + m_rExport.Strm() << SAL_NEWLINE_STRING; } break; case sw::Frame::eGraphic: @@ -3394,9 +3394,9 @@ OString RtfAttributeOutput::WriteHex(const sal_uInt8* pData, sal_uInt32 nSize, S if (++nBreak == nLimit) { if (pStream) - (*pStream) << RtfExport::sNewLine; + (*pStream) << SAL_NEWLINE_STRING; else - aRet.append(RtfExport::sNewLine); + aRet.append(SAL_NEWLINE_STRING); nBreak = 0; } } @@ -3481,7 +3481,7 @@ static OString ExportPICT( const SwFlyFrmFmt* pFlyFrmFmt, const Size &rOrig, con aRet.append((sal_Int32)8); StripMetafileHeader(pGraphicAry, nSize); } - aRet.append(RtfExport::sNewLine); + aRet.append(SAL_NEWLINE_STRING); if (pStream) (*pStream) << aRet.makeStringAndClear().getStr(); if (pStream) @@ -3674,7 +3674,7 @@ void RtfAttributeOutput::FlyFrameGraphic( const SwFlyFrmFmt* pFlyFrmFmt, const S m_rExport.Strm() << '}'; } - m_rExport.Strm() << m_rExport.sNewLine; + m_rExport.Strm() << SAL_NEWLINE_STRING; } void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic, Size aSize) @@ -3687,7 +3687,7 @@ void RtfAttributeOutput::BulletDefinition(int /*nId*/, const Graphic& rGraphic, m_rExport.Strm() << OOO_STRING_SVTOOLS_RTF_PICHGOAL; m_rExport.OutULong(aSize.Height()); - m_rExport.Strm() << RtfExport::sNewLine; + m_rExport.Strm() << SAL_NEWLINE_STRING; const sal_uInt8* pGraphicAry = 0; SvMemoryStream aStream; if (GraphicConverter::Export(aStream, rGraphic, CVT_PNG) != ERRCODE_NONE) diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 73e132d301f1..db3e1ff0f675 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -69,12 +69,6 @@ using namespace ::com::sun::star; using sw::mark::IMark; -#ifdef _WIN32 -const sal_Char* const RtfExport::sNewLine = "\015\012"; -#else -const sal_Char* const RtfExport::sNewLine = "\012"; -#endif - // the default text encoding for the export, if it doesn't fit unicode will // be used #define DEF_ENCODING RTL_TEXTENCODING_ASCII_US @@ -280,7 +274,7 @@ void RtfExport::WriteRevTab() Strm() << msfilter::rtfutil::OutString(*pAuthor, eDefaultEncoding).getStr(); Strm() << ";}"; } - Strm() << '}' << sNewLine; + Strm() << '}' << SAL_NEWLINE_STRING; } void RtfExport::WriteHeadersFooters( sal_uInt8 nHeadFootFlags, @@ -376,7 +370,7 @@ sal_uLong RtfExport::ReplaceCr( sal_uInt8 ) void RtfExport::WriteFonts() { - Strm() << sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL; + Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_FONTTBL; maFontHelper.WriteFontTable( *m_pAttrOutput ); Strm() << '}'; } @@ -464,14 +458,14 @@ void RtfExport::WritePageDescTable() if( !nSize ) return; - Strm() << sNewLine; // a separator + Strm() << SAL_NEWLINE_STRING; bOutPageDescs = sal_True; Strm() << '{' << OOO_STRING_SVTOOLS_RTF_IGNORE << OOO_STRING_SVTOOLS_RTF_PGDSCTBL; for( sal_uInt16 n = 0; n < nSize; ++n ) { const SwPageDesc& rPageDesc = pDoc->GetPageDesc( n ); - Strm() << sNewLine << '{' << OOO_STRING_SVTOOLS_RTF_PGDSC; + Strm() << SAL_NEWLINE_STRING << '{' << OOO_STRING_SVTOOLS_RTF_PGDSC; OutULong( n ) << OOO_STRING_SVTOOLS_RTF_PGDSCUSE; OutULong( rPageDesc.ReadUseOn() ); @@ -486,7 +480,7 @@ void RtfExport::WritePageDescTable() OutULong( i ) << ' '; Strm() << msfilter::rtfutil::OutString( rPageDesc.GetName(), eDefaultEncoding).getStr() << ";}"; } - Strm() << '}' << sNewLine; + Strm() << '}' << SAL_NEWLINE_STRING; bOutPageDescs = sal_False; // reset table infos, otherwise the depth of the cells will be incorrect, @@ -520,7 +514,7 @@ void RtfExport::ExportDocument_Impl() WriteInfo(); // Default TabSize - Strm() << m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr() << sNewLine; + Strm() << m_pAttrOutput->m_aTabStop.makeStringAndClear().getStr() << SAL_NEWLINE_STRING; // Zoom ViewShell *pViewShell(pDoc->GetCurrentViewShell()); if (pViewShell && pViewShell->GetViewOptions()->GetZoomType() == SVX_ZOOM_PERCENT) @@ -697,7 +691,7 @@ void RtfExport::ExportDocument_Impl() Strm() << pOut; } - Strm() << sNewLine; + Strm() << SAL_NEWLINE_STRING; // Init sections m_pSections = new MSWordSections( *this ); diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index fe577dbb704e..3df1c40bb809 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -144,8 +144,6 @@ public: /// Destructor. virtual ~RtfExport(); - static const sal_Char* const sNewLine; - rtl_TextEncoding eDefaultEncoding; rtl_TextEncoding eCurrentEncoding; /// This is used by OutputFlyFrame_Impl() to control the written syntax diff --git a/sw/source/filter/ww8/rtfsdrexport.cxx b/sw/source/filter/ww8/rtfsdrexport.cxx index d3e30359db61..fafb82986a6e 100644 --- a/sw/source/filter/ww8/rtfsdrexport.cxx +++ b/sw/source/filter/ww8/rtfsdrexport.cxx @@ -367,7 +367,7 @@ void RtfSdrExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRe case ESCHER_Prop_fillBlip: { OStringBuffer aBuf; - aBuf.append('{').append(OOO_STRING_SVTOOLS_RTF_PICT).append(OOO_STRING_SVTOOLS_RTF_PNGBLIP).append(RtfExport::sNewLine); + aBuf.append('{').append(OOO_STRING_SVTOOLS_RTF_PICT).append(OOO_STRING_SVTOOLS_RTF_PNGBLIP).append(SAL_NEWLINE_STRING); int nHeaderSize = 25; // The first bytes are WW8-specific, we're only interested in the PNG aBuf.append(RtfAttributeOutput::WriteHex(it->pBuf + nHeaderSize, it->nPropSize - nHeaderSize)); aBuf.append('}'); @@ -456,7 +456,7 @@ void RtfSdrExport::impl_writeGraphic() RtfStringBuffer aBuf; aBuf->append('{').append(OOO_STRING_SVTOOLS_RTF_PICT).append(OOO_STRING_SVTOOLS_RTF_PNGBLIP); aBuf->append(OOO_STRING_SVTOOLS_RTF_PICW).append(sal_Int32(aMapped.Width())); - aBuf->append(OOO_STRING_SVTOOLS_RTF_PICH).append(sal_Int32(aMapped.Height())).append(RtfExport::sNewLine); + aBuf->append(OOO_STRING_SVTOOLS_RTF_PICH).append(sal_Int32(aMapped.Height())).append(SAL_NEWLINE_STRING); aBuf->append(RtfAttributeOutput::WriteHex(pGraphicAry, nSize)); aBuf->append('}'); m_aShapeProps.insert(std::pair("pib", aBuf.makeStringAndClear())); @@ -554,7 +554,7 @@ void RtfSdrExport::WriteOutliner(const OutlinerParaObject& rParaObj) nNextAttr = nEnd; aAttrIter.OutAttr( nAktPos ); - m_rAttrOutput.RunText().append('{').append(m_rAttrOutput.Styles().makeStringAndClear()).append(m_rExport.sNewLine); + m_rAttrOutput.RunText().append('{').append(m_rAttrOutput.Styles().makeStringAndClear()).append(SAL_NEWLINE_STRING); bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos ); if( !bTxtAtr ) { -- cgit