[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - vcl/win

[Tor Lillqvist]

 vcl/win/inc/saldata.hxx          |    4 ++--
 vcl/win/source/app/salinst.cxx   |    2 --
 vcl/win/source/gdi/winlayout.cxx |    2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit bf5cc7d19dbf1e1d39a3abd11bccfe6c089ba1fa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 19:58:25 2011 +0200

    chmod -x

diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx
old mode 100755
new mode 100644
diff --git a/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h
old mode 100755
new mode 100644
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/ase.cur b/vcl/win/source/src/ase.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asn.cur b/vcl/win/source/src/asn.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asne.cur b/vcl/win/source/src/asne.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asns.cur b/vcl/win/source/src/asns.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asnswe.cur b/vcl/win/source/src/asnswe.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asnw.cur b/vcl/win/source/src/asnw.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/ass.cur b/vcl/win/source/src/ass.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asse.cur b/vcl/win/source/src/asse.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/assw.cur b/vcl/win/source/src/assw.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/asw.cur b/vcl/win/source/src/asw.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/aswe.cur b/vcl/win/source/src/aswe.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/chain.cur b/vcl/win/source/src/chain.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/chainnot.cur b/vcl/win/source/src/chainnot.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/timemove.cur b/vcl/win/source/src/timemove.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/src/timesize.cur b/vcl/win/source/src/timesize.cur
old mode 100755
new mode 100644
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
old mode 100755
new mode 100644
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
old mode 100755
new mode 100644
commit 38739e9bad07f00f9d0ca6d6dce759da8cc5ade1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Mar 16 19:56:45 2011 +0200

    The WIN_BOOL/ULONG dance no longer needed

diff --git a/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx
index 326bda2..bcae786 100755
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/win/inc/saldata.hxx
@@ -161,8 +161,8 @@ struct SalShlData
     UINT                    mnWheelScrollLines;     // WheelScrollLines
     UINT                    mnWheelScrollChars;     // WheelScrollChars
     UINT                    mnWheelMsgId;           // Wheel-Message-Id fuer W95
-    WIN_BOOL                mbWXP;                  // Windows XP
-    WIN_BOOL                mbWPrinter;             // true: use unicode printer functions
+    BOOL                    mbWXP;                  // Windows XP
+    BOOL                    mbWPrinter;             // true: use unicode printer functions
                                                     // false: use anis compat printer functions
     OSVERSIONINFO           maVersionInfo;
 };
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 28cdbea..136773f 100755
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -68,12 +68,10 @@
 #pragma warning( disable: 4917 )
 #endif
 
-#define ULONG WIN_ULONG
 #include <GdiPlus.h>
 #include <GdiPlusEnums.h>
 #include <GdiPlusColor.h>
 #include <Shlobj.h>
-#undef ULONG
 
 #if defined _MSC_VER
 #pragma warning(pop)
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index da1e7be..93e7b22 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -58,11 +58,9 @@
 
 #define USE_UNISCRIBE
 #ifdef USE_UNISCRIBE
-#define ULONG WIN_ULONG
 #include <Usp10.h>
 #include <ShLwApi.h>
 #include <winver.h>
-#undef ULONG
 #endif // USE_UNISCRIBE
 
 #include <boost/unordered_map.hpp>