diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-10-12 20:13:48 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-10-12 20:34:54 +0300 |
commit | b11f257d9b6927a7df1f2a3f03405e045a1beec6 (patch) | |
tree | 4d58b604c0c97ccdc301a6dd53d3511764fdfa34 /include | |
parent | 610681b97aca28c4c40c3462875cd47105442a21 (diff) |
Test _WIN32 instead of UNX as it's Win32 that is the special case here
Change-Id: Ic729eab62109d854122fa5c6b7b4dc163088dd04
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/htmlout.hxx | 6 | ||||
-rw-r--r-- | include/svtools/rtfout.hxx | 6 |
2 files changed, 2 insertions, 10 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, |