[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sdext/source

[Fridrich Strba]

 sdext/source/presenter/PresenterScreen.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9f4ebaa5a0b299eb0637f7910632b04191b211c0
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Mon Jul 16 14:16:41 2012 +0100

    fdo#521512 - fix presenter console display switching
    
    The new, clearer names for external displays need to be in-sync.
    
    Change-Id: Id78d359b08f956579e9226d00515cd959d81a17f
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index f89af70..3581fb3 100644
--- 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.