From 973b47a336b239cc92f1789013d28e5bd55f859f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 19 Feb 2014 12:30:34 +0100 Subject: unotools: sal_Bool -> bool Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97 --- sw/source/ui/table/rowht.cxx | 2 +- sw/source/ui/table/tabledlg.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sw/source/ui/table') diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx index 9fec8f0bea1d..76ae477e78bd 100644 --- a/sw/source/ui/table/rowht.cxx +++ b/sw/source/ui/table/rowht.cxx @@ -41,7 +41,7 @@ void SwTableHeightDlg::Apply() SwTwips nHeight = static_cast< SwTwips >(m_pHeightEdit->Denormalize(m_pHeightEdit->GetValue(FUNIT_TWIP))); SwFmtFrmSize aSz(ATT_FIX_SIZE, 0, nHeight); - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoHeightCB->IsChecked() ? + SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked() ? ATT_MIN_SIZE : ATT_FIX_SIZE; if(eFrmSize != aSz.GetHeightSizeType()) { diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index e53054859e89..124a5153d4dd 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1352,19 +1352,19 @@ sal_Bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) bool bModified = false; // Repeat Heading - if(m_pHeadLineCB->IsChecked() != m_pHeadLineCB->GetSavedValue() || + if(TriState(m_pHeadLineCB->IsChecked()) != m_pHeadLineCB->GetSavedValue() || OUString::number( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() ) { bModified |= 0 != rSet.Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); } - if(m_pKeepCB->IsChecked() != m_pKeepCB->GetSavedValue()) + if(TriState(m_pKeepCB->IsChecked()) != m_pKeepCB->GetSavedValue()) bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); - if(m_pSplitCB->IsChecked() != m_pSplitCB->GetSavedValue()) + if(TriState(m_pSplitCB->IsChecked()) != m_pSplitCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); - if(m_pSplitRowCB->IsChecked() != m_pSplitRowCB->GetSavedValue()) + if(TriState(m_pSplitRowCB->IsChecked()) != m_pSplitRowCB->GetSavedValue()) bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); -- cgit