diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-12 21:40:17 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-12 21:40:17 +0300 |
| commit | e9c0819e60631efbb5057c60c64431e8a1946efd (patch) | |
| tree | 06453c81c7b335b5c32d47ffc758a44246551d3b | |
| parent | 4258b82f79b1e1c1a5d6428bf6650b2694a953fb (diff) | |
Simplify, and check _WIN32 instead of UNX
Change-Id: I89f975faf65da56bab68b093f32dccad80d502ad
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexport.hxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx index 76a762978a8e..73e132d301f1 100644 --- a/sw/source/filter/ww8/rtfexport.cxx +++ b/sw/source/filter/ww8/rtfexport.cxx @@ -69,10 +69,10 @@ using namespace ::com::sun::star; using sw::mark::IMark; -#if defined(UNX) -const sal_Char RtfExport::sNewLine = '\012'; -#else +#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 diff --git a/sw/source/filter/ww8/rtfexport.hxx b/sw/source/filter/ww8/rtfexport.hxx index fb08b9d59263..fe577dbb704e 100644 --- a/sw/source/filter/ww8/rtfexport.hxx +++ b/sw/source/filter/ww8/rtfexport.hxx @@ -144,11 +144,7 @@ public: /// Destructor. virtual ~RtfExport(); -#if defined(UNX) - static const sal_Char sNewLine; // \012 or \015 -#else - static const sal_Char* const sNewLine; // \015\012 -#endif + static const sal_Char* const sNewLine; rtl_TextEncoding eDefaultEncoding; rtl_TextEncoding eCurrentEncoding; |