sc/source/filter/inc/expbase.hxx | 4 ----
sc/source/filter/rtf/expbase.cxx | 6 +++---
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 816a888643114a3a8ac07126c2cd710d318a5781
Author: Tor Lillqvist <t...@collabora.com>
Date: Sat Oct 12 21:07:40 2013 +0300
Test _WIN32 instead of UNX as it's Windows that is the special case
Change-Id: I6252f4737dbc297525792412e006b2ed0147a0d6
diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx
index 5123a19..92ebf3a 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 efa0fc0..f43adb3 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
