mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test _WIN32 instead of UNX as it's Win32 that is the special case here

Browse Source 
Change-Id: Ic729eab62109d854122fa5c6b7b4dc163088dd04
This commit is contained in:
Tor Lillqvist
2013-10-12 20:13:48 +03:00
parent 610681b97a
commit b11f257d9b
4 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/svtools/htmlout.hxx
View File

@@ -51,11 +51,7 @@ struct SVT_DLLPUBLIC HTMLOutContext
struct HTMLOutFuncs
{
#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[];
SVT_DLLPUBLIC static OString ConvertStringToHTML( const OUString& sSrc,
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252,

6
include/svtools/rtfout.hxx
View File

@@ -33,11 +33,7 @@ class SvStream;
class SVT_DLLPUBLIC RTFOutFuncs
{
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[];
static SvStream& Out_Char( SvStream&, sal_Unicode cChar,
int *pUCMode,

6
svtools/source/svhtml/htmlout.cxx
View File

@@ -31,10 +31,10 @@
#include <svtools/imappoly.hxx>
#include "svl/urihelper.hxx"
#if defined(UNX)
const sal_Char HTMLOutFuncs::sNewLine = '\012';
#else
#ifdef _WIN32
const sal_Char HTMLOutFuncs::sNewLine[] = "\015\012";
#else
const sal_Char HTMLOutFuncs::sNewLine[] = "\012";
#endif
#define TXTCONV_BUFFER_SIZE 20

6
svtools/source/svrtf/rtfout.cxx
View File

@@ -25,10 +25,10 @@
#include <svtools/rtfout.hxx>
#if defined(UNX)
const sal_Char RTFOutFuncs::sNewLine = '\012';
#else
#ifdef _WIN32
const sal_Char RTFOutFuncs::sNewLine[] = "\015\012";
#else
const sal_Char RTFOutFuncs::sNewLine[] = "\012";
#endif