Kaydet (Commit) e9c0819e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Simplify, and check _WIN32 instead of UNX

Change-Id: I89f975faf65da56bab68b093f32dccad80d502ad
üst 4258b82f
...@@ -69,10 +69,10 @@ using namespace ::com::sun::star; ...@@ -69,10 +69,10 @@ using namespace ::com::sun::star;
using sw::mark::IMark; using sw::mark::IMark;
#if defined(UNX) #ifdef _WIN32
const sal_Char RtfExport::sNewLine = '\012';
#else
const sal_Char* const RtfExport::sNewLine = "\015\012"; const sal_Char* const RtfExport::sNewLine = "\015\012";
#else
const sal_Char* const RtfExport::sNewLine = "\012";
#endif #endif
// the default text encoding for the export, if it doesn't fit unicode will // the default text encoding for the export, if it doesn't fit unicode will
......
...@@ -144,11 +144,7 @@ public: ...@@ -144,11 +144,7 @@ public:
/// Destructor. /// Destructor.
virtual ~RtfExport(); virtual ~RtfExport();
#if defined(UNX) static const sal_Char* const sNewLine;
static const sal_Char sNewLine; // \012 or \015
#else
static const sal_Char* const sNewLine; // \015\012
#endif
rtl_TextEncoding eDefaultEncoding; rtl_TextEncoding eDefaultEncoding;
rtl_TextEncoding eCurrentEncoding; rtl_TextEncoding eCurrentEncoding;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment