1 files changed, 14 insertions, 12 deletions
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 9e3d7235af..fc70f5f79b 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -97,13 +97,13 @@ void SwConvertTableDlg::GetValues(  sal_Unicode& rDelim,
     }
 
 
-    USHORT nInsMode = 0;
+    sal_uInt16 nInsMode = 0;
     if (aBorderCB.IsChecked())
         nInsMode |= tabopts::DEFAULT_BORDER;
     if (aHeaderCB.IsChecked())
         nInsMode |= tabopts::HEADLINE;
     if (aRepeatHeaderCB.IsEnabled() && aRepeatHeaderCB.IsChecked())
-        rInsTblOpts.mnRowsToRepeat = USHORT( aRepeatHeaderNF.GetValue() );
+        rInsTblOpts.mnRowsToRepeat = sal_uInt16( aRepeatHeaderNF.GetValue() );
     else
         rInsTblOpts.mnRowsToRepeat = 0;
     if (!aDontSplitCB.IsChecked())
@@ -154,6 +154,8 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     pTAutoFmt( 0 ),
     pShell( &rView.GetWrtShell() )
 {
+    aOtherEd.SetAccessibleName(String(SW_RES(STR_SYMBOL)));
+    aOtherEd.SetAccessibleRelationLabeledBy(&aOtherBtn);
     FreeResource();
     if(nSaveButtonState > -1)
     {
@@ -185,12 +187,12 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     else
     {
         //Einfuege-Optionen verstecken
-        aHeaderCB		   .Show(FALSE);
-        aRepeatHeaderCB	   .Show(FALSE);
-        aDontSplitCB	   .Show(FALSE);
-        aBorderCB		   .Show(FALSE);
-        aOptionsFL         .Show(FALSE);
-        aRepeatHeaderCombo.Show(FALSE);
+        aHeaderCB		   .Show(sal_False);
+        aRepeatHeaderCB	   .Show(sal_False);
+        aDontSplitCB	   .Show(sal_False);
+        aBorderCB		   .Show(sal_False);
+        aOptionsFL         .Show(sal_False);
+        aRepeatHeaderCombo.Show(sal_False);
 
         //Groesse anpassen
         Size aSize(GetSizePixel());
@@ -208,10 +210,10 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
 
     const SwModuleOptions* pModOpt = SW_MOD()->GetModuleConfig();
 
-    BOOL bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
+    sal_Bool bHTMLMode = 0 != (::GetHtmlMode(rView.GetDocShell())&HTMLMODE_ON);
 
     SwInsertTableOptions aInsOpts = pModOpt->GetInsTblFlags(bHTMLMode);
-    USHORT nInsTblFlags = aInsOpts.mnInsMode;
+    sal_uInt16 nInsTblFlags = aInsOpts.mnInsMode;
 
     aHeaderCB.Check( 0 != (nInsTblFlags & tabopts::HEADLINE) );
     aRepeatHeaderCB.Check(aInsOpts.mnRowsToRepeat > 0);
@@ -234,7 +236,7 @@ IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton )
     SwAbstractDialogFactory* pFact = swui::GetFactory();
     OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
 
-    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton, pShell, DLG_AUTOFMT_TABLE, FALSE, pTAutoFmt);
+    AbstractSwAutoFormatDlg* pDlg = pFact->CreateSwAutoFormatDlg(pButton, pShell, DLG_AUTOFMT_TABLE, sal_False, pTAutoFmt);
     OSL_ENSURE(pDlg, "Dialogdiet fail!");
     if( RET_OK == pDlg->Execute())
         pDlg->FillAutoFmtOfIndex( pTAutoFmt );
@@ -250,7 +252,7 @@ IMPL_LINK( SwConvertTableDlg, BtnHdl, Button*, pButton )
     {
         if( aKeepColumn.IsEnabled() )
             aKeepColumn.SaveValue();
-        aKeepColumn.Check( TRUE );
+        aKeepColumn.Check( sal_True );
     }
     aKeepColumn.Enable( aTabBtn.IsChecked() );
     aOtherEd.Enable( aOtherBtn.IsChecked() );