diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-13 13:45:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-13 13:49:24 +0300 |
| commit | 6954aad4e5c99ce193d3dd60a43f6d41d7c0a87f (patch) | |
| tree | ffba0bee05b37a70311ae198281f420600e30127 /sw/source/filter/html/htmlfly.cxx | |
| parent | 8ede32d15735b78e3528107bfbcfb69e3beb7439 (diff) | |
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
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
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 ); } |