From 4258b82f79b1e1c1a5d6428bf6650b2694a953fb Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Sat, 12 Oct 2013 21:36:45 +0300
Subject: Simplify, and check _WIN32 instead of UNX

Change-Id: Id13d51388ecee3bee706510c2f22182e9e1f2d28
---
 sw/source/filter/html/htmlfly.cxx | 8 --------
 sw/source/filter/html/wrthtml.cxx | 6 +++---
 sw/source/filter/html/wrthtml.hxx | 6 +-----
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'sw/source/filter')

diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx
index 1b5871dabd0a..0004c9cbbeed 100644
--- a/sw/source/filter/html/htmlfly.cxx
+++ b/sw/source/filter/html/htmlfly.cxx
@@ -928,21 +928,13 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
 
         OString aIndMap, aIndArea;
         const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0;
-#if defined(UNX)
-        sal_Char aLF[2] = "\x00";
-#endif
 
         if( rHTMLWrt.bLFPossible )
         {
             rHTMLWrt.OutNewLine( sal_True );
             aIndMap = rHTMLWrt.GetIndentString();
             aIndArea = rHTMLWrt.GetIndentString(1);
-#if defined(UNX)
-            aLF[0]  = SwHTMLWriter::sNewLine;
-            pLF = aLF;
-#else
             pLF = SwHTMLWriter::sNewLine;
-#endif
             pIndArea = aIndArea.getStr();
             pIndMap = aIndMap.getStr();
         }
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx
index a2f8a6851b0f..c73eb04cf40c 100644
--- a/sw/source/filter/html/wrthtml.cxx
+++ b/sw/source/filter/html/wrthtml.cxx
@@ -80,10 +80,10 @@
 
 #define MAX_INDENT_LEVEL 20
 
-#if defined(UNX)
-const sal_Char SwHTMLWriter::sNewLine = '\012';
-#else
+#ifdef _WIN32
 const sal_Char SwHTMLWriter::sNewLine[] = "\015\012";
+#else
+const sal_Char SwHTMLWriter::sNewLine[] = "\012";
 #endif
 
 static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 66f368de7d41..5fb71bb81b5c 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -283,11 +283,7 @@ protected:
     sal_uLong WriteStream();
 
 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[];
 
     std::vector<String> aImgMapNames;     // geschriebene Image Maps
     std::set<String> aImplicitMarks;// implizite Stprungmarken
-- 
cgit