diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-05-30 16:48:20 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-05-30 19:31:52 +0100 |
| commit | 834eed7992c6b549bbd06fbbe6473bafc777c8e1 (patch) | |
| tree | f727c0be568472c0b2a98511f3ddc042acf8a26b /sd/source/ui/dlg/present.cxx | |
| parent | f3aa2a45b4f014aa7631bffa3ac07b2332f80677 (diff) | |
sdext: cleanup presenter screen handling pwrt. naming
Change-Id: I9400ca0a704cfdeb7f333be704ec5690bedcf0c6
Diffstat (limited to 'sd/source/ui/dlg/present.cxx')
| -rw-r--r-- | sd/source/ui/dlg/present.cxx | 12 |
1 files changed, 6 insertions, 6 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--; |