|
Lines 220-227
Link Here
|
| 220 |
const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( "%1" ) ); |
220 |
const String sPlaceHolder( RTL_CONSTASCII_USTRINGPARAM( "%1" ) ); |
| 221 |
for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ ) |
221 |
for( sal_Int32 nDisplay = 0; nDisplay < mnMonitors; nDisplay++ ) |
| 222 |
{ |
222 |
{ |
| 223 |
String aName( nDisplay == nPrimaryIndex ? msPrimaryMonitor : msMonitor ); |
223 |
// The presenter screen was displayed on the bad monitor |
|
|
224 |
// s/nPrimaryIndex/nPrimaryIndex + 1/ helped |
| 225 |
String aName( nDisplay == nPrimaryIndex + 1 ? msPrimaryMonitor : msMonitor ); |
| 226 |
|
| 224 |
const String aNumber( String::CreateFromInt32( nDisplay + 1 ) ); |
227 |
const String aNumber( String::CreateFromInt32( nDisplay + 1 ) ); |
|
|
228 |
|
| 225 |
aName.SearchAndReplace( sPlaceHolder, aNumber ); |
229 |
aName.SearchAndReplace( sPlaceHolder, aNumber ); |
| 226 |
maLBMonitor.InsertEntry( aName ); |
230 |
maLBMonitor.InsertEntry( aName ); |
| 227 |
} |
231 |
} |
|
Lines 230-235
Link Here
|
| 230 |
maLBMonitor.InsertEntry( msAllMonitors ); |
234 |
maLBMonitor.InsertEntry( msAllMonitors ); |
| 231 |
|
235 |
|
| 232 |
sal_Int32 nSelected = ( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue(); |
236 |
sal_Int32 nSelected = ( ( const SfxInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue(); |
|
|
237 |
|
| 233 |
if( nSelected <= 0 ) |
238 |
if( nSelected <= 0 ) |
| 234 |
nSelected = nPrimaryIndex; |
239 |
nSelected = nPrimaryIndex; |
| 235 |
else |
240 |
else |