sdext: cleanup presenter screen handling pwrt. naming

Change-Id: I9400ca0a704cfdeb7f333be704ec5690bedcf0c6

5 files changed, 11 insertions, 11 deletions

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index b83cad717bba..3aea637d29c8 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -90,7 +90,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
                 rOutAttrs               ( rInAttrs ),
                 mnMonitors              ( 0 ),
 
-                msPrimaryMonitor( SdResId(STR_PRIMARY_MONITOR ) ),
+                msExternalMonitor( SdResId(STR_EXTERNAL_MONITOR ) ),
                 msMonitor( SdResId( STR_MONITOR ) ),
                 msAllMonitors( SdResId( STR_ALL_MONITORS ) )
 {
@@ -200,14 +200,14 @@ void SdStartPresentationDlg::InitMonitorSettings()
         else
         {
             sal_Bool bUnifiedDisplay = false;
-            sal_Int32 nPrimaryIndex = 0;
+            sal_Int32 nExternalIndex = 0;
             Reference< XPropertySet > xMonProps( xMultiMon, UNO_QUERY );
             if( xMonProps.is() ) try
             {
                 const OUString sPropName1( "IsUnifiedDisplay" );
                 xMonProps->getPropertyValue( sPropName1 ) >>= bUnifiedDisplay;
-                const OUString sPropName2( "DefaultDisplay" );
-                xMonProps->getPropertyValue( sPropName2 ) >>= nPrimaryIndex;
+                const OUString sPropName2( "ExternalDisplay" );
+                xMonProps->getPropertyValue( sPropName2 ) >>= nExternalIndex;
             }
             catch( Exception& )
             {
@@ -216,7 +216,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
             const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( "%1" ) );
             for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ )
             {
-                String aName( nDisplay == nPrimaryIndex ? msPrimaryMonitor : msMonitor );
+                String aName( nDisplay == nExternalIndex ? msExternalMonitor : msMonitor );
                 const String aNumber( String::CreateFromInt32( nDisplay + 1 ) );
                 aName.SearchAndReplace( sPlaceHolder, aNumber );
                 maLBMonitor.InsertEntry( aName );
@@ -227,7 +227,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
 
             sal_Int32 nSelected = ( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue();
             if( nSelected <= 0 )
-                nSelected = nPrimaryIndex;
+                nSelected = nExternalIndex;
             else
                 nSelected--;
 
diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src
index 6ee3fd86540f..3f3888f89c16 100644
--- a/sd/source/ui/dlg/present.src
+++ b/sd/source/ui/dlg/present.src
@@ -274,9 +274,9 @@ ModalDialog DLG_START_PRESENTATION
         ClipChildren = TRUE;
     };
 
-    String STR_PRIMARY_MONITOR
+    String STR_EXTERNAL_MONITOR
     {
-        Text [ en-US ] = "Display %1 (primary)";
+        Text [ en-US ] = "Display %1 (external)";
     };
 
     String STR_MONITOR
diff --git a/sd/source/ui/inc/present.hrc b/sd/source/ui/inc/present.hrc
index fc4d3b68d9f4..1d028beaddc7 100644
--- a/sd/source/ui/inc/present.hrc
+++ b/sd/source/ui/inc/present.hrc
@@ -59,7 +59,7 @@
 #define FT_MONITOR 10
 #define LB_MONITOR 11
 
-#define STR_PRIMARY_MONITOR 1
+#define STR_EXTERNAL_MONITOR 1
 #define STR_MONITOR 2
 #define STR_ALL_MONITORS 3
 
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index e02f75d93d1a..2a19777b6eef 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -81,7 +81,7 @@ private:
     const SfxItemSet&   rOutAttrs;
     sal_Int32           mnMonitors;
 
-    String              msPrimaryMonitor;
+    String              msExternalMonitor;
     String              msMonitor;
     String              msAllMonitors;
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index ffd8cef911d8..ad9fbfb1c1aa 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -1298,7 +1298,7 @@ sal_Int32 SlideShow::GetDisplay()
             Reference<XPropertySet> xMonitorProperties(
                 xFactory->createInstance( "com.sun.star.awt.DisplayAccess" ),
                 UNO_QUERY_THROW);
-            xMonitorProperties->getPropertyValue("DefaultDisplay") >>= nDisplay;
+            xMonitorProperties->getPropertyValue("ExternalDisplay") >>= nDisplay;
         }
         catch( Exception& )
         {