[Libreoffice-commits] core.git: 2 commits - include/svx include/tools

[Tor Lillqvist]

 include/svx/svdmodel.hxx |    8 +-------
 include/tools/stream.hxx |    2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 22481c65ff2019dcfb03d9fe58e6ad2574b759fd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:44:45 2013 +0300

    Avoid git grep match for "UNX" in comment
    
    Change-Id: Ie8dde0810a3953a03ef6cfdcfaa24445ee45de5a

diff --git a/include/tools/stream.hxx b/include/tools/stream.hxx
index b051e9a..1bc3f2a 100644
--- a/include/tools/stream.hxx
+++ b/include/tools/stream.hxx
@@ -48,7 +48,7 @@ typedef sal_uInt16 StreamMode;
 // file i/o
 #define STREAM_NOCREATE                 0x0004  ///< 1 == Dont create file
 #define STREAM_TRUNC                    0x0008  ///< Truncate _existing_ file to zero length
-#define STREAM_COPY_ON_SYMLINK          0x0010  ///< copy-on-write for symlinks (UNX)
+#define STREAM_COPY_ON_SYMLINK          0x0010  ///< copy-on-write for symlinks (Unix)
 
 #define STREAM_READWRITEBITS            (STREAM_READ | STREAM_WRITE | \
                                          STREAM_NOCREATE | STREAM_TRUNC)
commit 55ed54021b9c59d3e642ca93fcf4412fe2951102
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Oct 12 20:41:42 2013 +0300

    Unicode is Unocode on all platforms
    
    Change-Id: Iea8065f8d0f8e305cf2b1f56ba7ddd4189306ad2

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index c8ed6c2..03efa04 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -45,13 +45,7 @@ class OutputDevice;
 #include <rtl/ref.hxx>
 #include <deque>
 
-#if defined(UNX) || defined(WNT)
-#define DEGREE_CHAR ((sal_Unicode)176)   /* 0xB0 = Ansi */
-#endif
-
-#ifndef DEGREE_CHAR
-#error unbekannte Plattrorm
-#endif
+#define DEGREE_CHAR ((sal_Unicode)0x00B0)   /* U+00B0 DEGREE SIGN */
 
 class SdrOutliner;
 class SdrLayerAdmin;