Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 17 insertions, 11 deletions

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index ee842e2326c6..192e57c21b91 100644..100755
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -112,9 +112,15 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
     aTmfPause.SetModifyHdl( LINK( this, SdStartPresentationDlg, ChangePauseHdl ) );
     aTmfPause.SetFormat( TIMEF_SEC );
 
+    aLbDias.SetAccessibleRelationLabeledBy( &aRbtAtDia );
+    aLbDias.SetAccessibleName(aRbtAtDia.GetText());
+    aLbCustomshow.SetAccessibleRelationLabeledBy( &aRbtCustomshow );
+    aTmfPause.SetAccessibleRelationLabeledBy( &aRbtAuto );
+    aTmfPause.SetAccessibleName(aRbtAuto.GetText());
+
     // Listbox mit Seitennamen fuellen
     rPageNames.First();
-    for( UINT16 i = 0;
+    for( sal_uInt16 i = 0;
          i < rPageNames.Count();
          i++ )
     {
@@ -124,7 +130,7 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
 
     if( pCustomShowList )
     {
-        USHORT nPosToSelect = (USHORT) pCustomShowList->GetCurPos();
+        sal_uInt16 nPosToSelect = (sal_uInt16) pCustomShowList->GetCurPos();
         SdCustomShow* pCustomShow;
         // Listbox mit CustomShows fuellen
         for( pCustomShow = (SdCustomShow*) pCustomShowList->First();
@@ -155,8 +161,8 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
     aCbxChangePage.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_CHANGE_PAGE ) ).GetValue() );
     aCbxAlwaysOnTop.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ALWAYS_ON_TOP ) ).GetValue() );
 
-    const BOOL  bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue();
-    const BOOL  bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue();
+    const sal_Bool  bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue();
+    const sal_Bool  bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue();
     const long  nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue();
 
     aTmfPause.SetTime( Time( 0, 0, nPause ) );
@@ -168,11 +174,11 @@ SdStartPresentationDlg::SdStartPresentationDlg( Window* pWindow,
     aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() );
 
     if( bWindow )
-        aRbtWindow.Check( TRUE );
+        aRbtWindow.Check( sal_True );
     else if( bEndless )
-        aRbtAuto.Check( TRUE );
+        aRbtAuto.Check( sal_True );
     else
-        aRbtStandard.Check( TRUE );
+        aRbtStandard.Check( sal_True );
 
     InitMonitorSettings();
 
@@ -233,7 +239,7 @@ void SdStartPresentationDlg::InitMonitorSettings()
             else
                 nSelected--;
 
-            maLBMonitor.SelectEntryPos( (USHORT)nSelected );
+            maLBMonitor.SelectEntryPos( (sal_uInt16)nSelected );
         }
     }
     catch( Exception& )
@@ -261,7 +267,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
     rAttr.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) );
     rAttr.Put( SfxBoolItem ( ATTR_PRESENT_SHOW_PAUSELOGO, aCbxAutoLogo.IsChecked() ) );
 
-    USHORT nPos = maLBMonitor.GetSelectEntryPos();
+    sal_uInt16 nPos = maLBMonitor.GetSelectEntryPos();
     if( nPos != LISTBOX_ENTRY_NOTFOUND )
         rAttr.Put( SfxInt32Item ( ATTR_PRESENT_DISPLAY, nPos + 1 ) );
 
@@ -299,8 +305,8 @@ IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG
 
     if( bWindow )
     {
-        aCbxAlwaysOnTop.Enable( FALSE );
-        aCbxAlwaysOnTop.Check( FALSE );
+        aCbxAlwaysOnTop.Enable( sal_False );
+        aCbxAlwaysOnTop.Check( sal_False );
     }
     else
         aCbxAlwaysOnTop.Enable();