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

Simplify, and check _WIN32 instead of UNX

Change-Id: Id13d51388ecee3bee706510c2f22182e9e1f2d28
üst 246dda00
...@@ -928,21 +928,13 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, ...@@ -928,21 +928,13 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt,
OString aIndMap, aIndArea; OString aIndMap, aIndArea;
const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0; const sal_Char *pLF = 0, *pIndArea = 0, *pIndMap = 0;
#if defined(UNX)
sal_Char aLF[2] = "\x00";
#endif
if( rHTMLWrt.bLFPossible ) if( rHTMLWrt.bLFPossible )
{ {
rHTMLWrt.OutNewLine( sal_True ); rHTMLWrt.OutNewLine( sal_True );
aIndMap = rHTMLWrt.GetIndentString(); aIndMap = rHTMLWrt.GetIndentString();
aIndArea = rHTMLWrt.GetIndentString(1); aIndArea = rHTMLWrt.GetIndentString(1);
#if defined(UNX)
aLF[0] = SwHTMLWriter::sNewLine;
pLF = aLF;
#else
pLF = SwHTMLWriter::sNewLine; pLF = SwHTMLWriter::sNewLine;
#endif
pIndArea = aIndArea.getStr(); pIndArea = aIndArea.getStr();
pIndMap = aIndMap.getStr(); pIndMap = aIndMap.getStr();
} }
......
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
#define MAX_INDENT_LEVEL 20 #define MAX_INDENT_LEVEL 20
#if defined(UNX) #ifdef _WIN32
const sal_Char SwHTMLWriter::sNewLine = '\012';
#else
const sal_Char SwHTMLWriter::sNewLine[] = "\015\012"; const sal_Char SwHTMLWriter::sNewLine[] = "\015\012";
#else
const sal_Char SwHTMLWriter::sNewLine[] = "\012";
#endif #endif
static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] = static sal_Char sIndentTabs[MAX_INDENT_LEVEL+2] =
......
...@@ -283,11 +283,7 @@ protected: ...@@ -283,11 +283,7 @@ protected:
sal_uLong WriteStream(); sal_uLong WriteStream();
public: public:
#if defined(UNX) static const sal_Char sNewLine[];
static const sal_Char sNewLine; // nur \012 oder \015
#else
static const sal_Char sNewLine[]; // \015\012
#endif
std::vector<String> aImgMapNames; // geschriebene Image Maps std::vector<String> aImgMapNames; // geschriebene Image Maps
std::set<String> aImplicitMarks;// implizite Stprungmarken std::set<String> aImplicitMarks;// implizite Stprungmarken
......
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