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

[Thorsten Behrens]

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

New commits:
commit ed8a3ca8e9f72759572752fb318ba6c10cf28569
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue May 11 11:53:00 2010 +0200

    Fix monitor detection for win32
    
    * patches/dev300/apply: added below patch
    * patches/dev300/win32-monitor-fix.diff: weed out inactive monitors
      in vcl, to avoid e.g. external, but disconnected screens to
      receive presenter screen. Fixes n#580562.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index aca4c02..87f3f29 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1302,6 +1302,7 @@ 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
new file mode 100644
index 0000000..3585a7d
--- /dev/null
+++ b/patches/dev300/win32-monitor-fix.diff
@@ -0,0 +1,25 @@
+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;