This fixes some breakage of my own creation in the PresenterConsole
display switcher button:
Review appreciated :-)
Thanks,
Michael.
--
[email protected] <><, Pseudo Engineer, itinerant idiot
>From d2b711ecb47e0a0701a1a72896a3148417820a84 Mon Sep 17 00:00:00 2001
From: Michael Meeks <[email protected]>
Date: Mon, 16 Jul 2012 14:16:41 +0100
Subject: [PATCH] fdo#521512 - fix presenter console display switching
The new, clearer names for external displays need to be in-sync.
Change-Id: Id78d359b08f956579e9226d00515cd959d81a17f
---
sdext/source/presenter/PresenterScreen.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
mode change 100755 => 100644 sdext/source/presenter/PresenterScreen.cxx
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
old mode 100755
new mode 100644
index 44bb023..669815c
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -440,10 +440,10 @@ void PresenterScreen::SwitchMonitors()
return;
// Adapt that display number to be the 'default' setting of 0 if it matches
- sal_Int32 nDefaultDisplay = 0;
+ sal_Int32 nExternalDisplay = 0;
Reference<beans::XPropertySet> xDisplayProperties = GetDisplayAccess();
- xDisplayProperties->getPropertyValue(A2S("DefaultDisplay")) >>= nDefaultDisplay;
- if (nNewScreen == nDefaultDisplay)
+ xDisplayProperties->getPropertyValue(A2S("ExternalDisplay")) >>= nExternalDisplay;
+ if (nNewScreen == nExternalDisplay)
nNewScreen = 0; // screen zero is best == the primary display
else
nNewScreen++; // otherwise we store screens offset by one.
--
1.7.7
_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
