sfx2/source/bastyp/frmhtmlw.cxx | 6 +++--- svl/source/numbers/zforlist.cxx | 22 +++++++--------------- svx/source/items/chrtitem.cxx | 3 --- sw/source/core/edit/edglss.cxx | 6 +++--- 4 files changed, 13 insertions(+), 24 deletions(-)
New commits: commit fcb0e1e97dc9f1f76cba1028f8fc2cf6943df9b3 Author: Tor Lillqvist <t...@collabora.com> Date: Sat Oct 12 21:28:23 2013 +0300 Test _WIN32 instead of UNX as it's Windows that is the special case Change-Id: I701ea390440023f1aac0debb48747a8f1a216972 diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx index 9e58d51..757d623 100644 --- a/sw/source/core/edit/edglss.cxx +++ b/sw/source/core/edit/edglss.cxx @@ -276,10 +276,10 @@ sal_Bool SwEditShell::GetSelectedText( String &rBuf, int nHndlParaBrk ) else if( IsSelFullPara() && GETSELTXT_PARABRK_TO_ONLYCR != nHndlParaBrk ) { -#if defined(UNX) - rBuf += '\012'; -#else +#ifdef _WIN32 rBuf += OUString("\015\012"); +#else + rBuf += '\012'; #endif } } commit bee2ff9817e096507bd268b62ac2b71a43803c22 Author: Tor Lillqvist <t...@collabora.com> Date: Sat Oct 12 21:25:54 2013 +0300 No idea why <wchar.h> would be needed here on non-Linux Unix Change-Id: Ic9fc0c7500336c4ecb4e6e46c9a7574d92235268 diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 2242b50..d0b38ee 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -19,9 +19,6 @@ #include <tools/stream.hxx> #include <basic/sbxvar.hxx> -#if defined UNX && !defined LINUX -#include <wchar.h> -#endif #include <rtl/math.hxx> #include <unotools/intlwrapper.hxx> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> commit cb8183d44c7dc40afd9fa86070adb96310e6fffd Author: Tor Lillqvist <t...@collabora.com> Date: Sat Oct 12 21:24:45 2013 +0300 Simplify and avoid use of UNX Change-Id: Ia1f718341858de57d0e417d079981d91968f912b diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 6c731e7..c672b5e 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -4434,25 +4434,17 @@ sal_Char NfCurrencyEntry::GetEuroSymbol( rtl_TextEncoding eTextEncoding ) { switch ( eTextEncoding ) { - case RTL_TEXTENCODING_MS_1252 : // WNT Ansi - case RTL_TEXTENCODING_ISO_8859_1 : // UNX for use with TrueType fonts + case RTL_TEXTENCODING_MS_1252 : + case RTL_TEXTENCODING_ISO_8859_1 : return '\x80'; - case RTL_TEXTENCODING_ISO_8859_15 : // UNX real + case RTL_TEXTENCODING_ISO_8859_15 : return '\xA4'; - case RTL_TEXTENCODING_IBM_850 : // OS2 + case RTL_TEXTENCODING_IBM_850 : return '\xD5'; - case RTL_TEXTENCODING_APPLE_ROMAN : // MAC + case RTL_TEXTENCODING_APPLE_ROMAN : return '\xDB'; - default: // default system -#if defined(WNT) - return '\x80'; -#elif defined(UNX) -// return '\xA4'; // #56121# 0xA4 would be correct for iso-8859-15 - return '\x80'; // but Windows code for the converted TrueType fonts -#else -#error EuroSymbol is what? - return '\x80'; -#endif + default: + return '\x80'; // Windows code for the converted TrueType fonts (whatever that means) } } commit eca81d9969e232b1236bc5020ab2b9304d5f4640 Author: Tor Lillqvist <t...@collabora.com> Date: Sat Oct 12 21:16:53 2013 +0300 Test _WIN32 instead of UNX as it's Windows that is the special case Change-Id: I66e6167df47ac3051d543490ff780bc09dedd82d diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index 4fa984c..fda2852 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -54,10 +54,10 @@ static sal_Char const sHTML_SC_yes[] = "YES"; static sal_Char const sHTML_SC_no[] = "NO"; static sal_Char const sHTML_MIME_text_html[] = "text/html; charset="; -#if defined(UNX) -const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012"; -#else +#ifdef _WIN32 const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\015\012"; +#else +const sal_Char SfxFrameHTMLWriter::sNewLine[] = "\012"; #endif void SfxFrameHTMLWriter::OutMeta( SvStream& rStrm, _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits