diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-12 21:07:40 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-12 21:07:40 +0300 |
| commit | 816a888643114a3a8ac07126c2cd710d318a5781 (patch) | |
| tree | d71234c1c654b1ceee8de0c9977e903521f83bdf /sc | |
| parent | 0937d07cd5bbdc68fcae8127149ffa6c813d3a97 (diff) | |
Test _WIN32 instead of UNX as it's Windows that is the special case
Change-Id: I6252f4737dbc297525792412e006b2ed0147a0d6
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/inc/expbase.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/rtf/expbase.cxx | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index 5123a19dc513..92ebf3aae6d4 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -31,11 +31,7 @@ class ScFieldEditEngine; class ScExportBase { public: -#if defined UNX - static const sal_Char sNewLine; -#else static const sal_Char sNewLine[]; -#endif protected: diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index efa0fc048cb6..f43adb389c8e 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -24,10 +24,10 @@ //------------------------------------------------------------------ -#if defined(UNX) -const sal_Char ScExportBase::sNewLine = '\012'; -#else +#ifdef _WIN32 const sal_Char ScExportBase::sNewLine[] = "\015\012"; +#else +const sal_Char ScExportBase::sNewLine[] = "\012"; #endif |