[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                  |    1 -
 patches/dev300/win32-monitor-fix.diff |   25 -------------------------
 2 files changed, 26 deletions(-)

New commits:
commit f6bfb9d970166e9819f56eb0628cd621639ff66d
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Aug 2 09:11:21 2010 +0200

    Remove upstreamed patch
    
    * patches/dev300/apply:
    * patches/dev300/win32-monitor-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7281f35..3fdde80 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1103,7 +1103,6 @@ novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
 novell-win32-installer-branding.diff
-win32-monitor-fix.diff, n#580562, thorsten
 
 # drop stuff that is needed only on Win9x
 novell-win32-drop-win9x.diff
diff --git a/patches/dev300/win32-monitor-fix.diff b/patches/dev300/win32-monitor-fix.diff
deleted file mode 100644
index 3585a7d..0000000
--- a/patches/dev300/win32-monitor-fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix handling of multiple monitors for win32
-
-From: Thorsten Behrens <tbehrens at novell.com>
-
-
----
-
- vcl/win/source/app/salinfo.cxx |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-
-diff --git vcl/win/source/app/salinfo.cxx vcl/win/source/app/salinfo.cxx
-index 1450739..63a6ecf 100644
---- vcl/win/source/app/salinfo.cxx
-+++ vcl/win/source/app/salinfo.cxx
-@@ -163,7 +163,8 @@ bool WinSalSystem::initMonitors()
-             std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount;
-             while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
-             {
--                if( (aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) == 0 ) // sort out non monitors
-+                if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
-+                    && !(aDev.StateFlags & DISPLAY_DEVICE_MIRRORING_DRIVER) ) // sort out non/disabled monitors
-                 {
-                     aDev.DeviceName[31] = 0;
-                     aDev.DeviceString[127] = 0;