This fixes some breakage of my own creation in the PresenterConsole
display switcher button:
Review appreciated :-)
Thanks,
Michael.
--
michael.meeks@suse.com <><, Pseudo Engineer, itinerant idiot
From d2b711ecb47e0a0701a1a72896a3148417820a84 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@suse.com>
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
Context
- [PATCH-3-6] fdo#52152 fix display switcher snafu ... · Michael Meeks
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.