summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/svtools/htmlout.hxx6
-rw-r--r--include/svtools/rtfout.hxx6
-rw-r--r--svtools/source/svhtml/htmlout.cxx6
-rw-r--r--svtools/source/svrtf/rtfout.cxx6
4 files changed, 8 insertions, 16 deletions
diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx
index 789ee1943617..9b0c8fddce9b 100644
--- a/include/svtools/htmlout.hxx
+++ b/include/svtools/htmlout.hxx
@@ -51,11 +51,7 @@ struct SVT_DLLPUBLIC HTMLOutContext
struct HTMLOutFuncs
{
-#if defined(UNX)
- static const sal_Char sNewLine; // nur \012 oder \015
-#else
- static const sal_Char sNewLine[]; // \015\012
-#endif
+ static const sal_Char sNewLine[];
SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,
diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx
index 9258053b35a3..7c38947f3448 100644
--- a/include/svtools/rtfout.hxx
+++ b/include/svtools/rtfout.hxx
@@ -33,11 +33,7 @@ class SvStream;
class SVT_DLLPUBLIC RTFOutFuncs
{
public:
-#if defined(UNX)
- static const sal_Char sNewLine; // nur \012 oder \015
-#else
- static const sal_Char sNewLine[]; // \015\012
-#endif
+ static const sal_Char sNewLine[];
static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
int *pUCMode,
diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index b633e7064ec7..5c0b1d8cc840 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.cxx
@@ -31,10 +31,10 @@
#include <svtools/imappoly.hxx>
#include "svl/urihelper.hxx"
-#if defined(UNX)
-const sal_Char HTMLOutFuncs::sNewLine = '\012';
-#else
+#ifdef _WIN32
const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
+#else
+const sal_Char HTMLOutFuncs::sNewLine[] = "\012";
#endif
#define TXTCONV_BUFFER_SIZE 20
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 5272fe1506c5..919a009a1ee1 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -25,10 +25,10 @@
#include <svtools/rtfout.hxx>
-#if defined(UNX)
-const sal_Char RTFOutFuncs::sNewLine = '\012';
-#else
+#ifdef _WIN32
const sal_Char RTFOutFuncs::sNewLine[] = "\015\012";
+#else
+const sal_Char RTFOutFuncs::sNewLine[] = "\012";
#endif