diff options
Diffstat (limited to 'sw/source/ui/table/convert.cxx')
-rw-r--r-- | sw/source/ui/table/convert.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 8be2bbdbb498..da3ad666fd64 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -96,13 +96,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()) @@ -184,12 +184,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()); @@ -207,10 +207,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); @@ -233,7 +233,7 @@ IMPL_LINK( SwConvertTableDlg, AutoFmtHdl, PushButton*, pButton ) SwAbstractDialogFactory* pFact = swui::GetFactory(); DBG_ASSERT(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); DBG_ASSERT(pDlg, "Dialogdiet fail!"); if( RET_OK == pDlg->Execute()) pDlg->FillAutoFmtOfIndex( pTAutoFmt ); @@ -249,7 +249,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() ); |