diff options
Diffstat (limited to 'sw/source/ui')
-rw-r--r-- | sw/source/ui/config/mailconfigpage.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/config/optload.cxx | 4 | ||||
-rw-r--r-- | sw/source/ui/config/optpage.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 18 | ||||
-rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/pggrid.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/table/rowht.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 8 | ||||
-rw-r--r-- | sw/source/ui/utlui/uitool.cxx | 2 |
9 files changed, 27 insertions, 27 deletions
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 705c6890bfdb..4d7a3d0a16b2 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -150,7 +150,7 @@ sal_Bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); if(m_pAddressED->GetText() != m_pAddressED->GetSavedValue()) m_pConfigItem->SetMailAddress(m_pAddressED->GetText()); - if( m_pReplyToCB->GetSavedValue() != m_pReplyToCB->IsChecked()) + if( m_pReplyToCB->GetSavedValue() != TriState(m_pReplyToCB->IsChecked())) m_pConfigItem->SetMailReplyTo(m_pReplyToCB->IsChecked()); if(m_pReplyToED->GetText() != m_pReplyToED->GetSavedValue()) m_pConfigItem->SetMailReplyTo(m_pReplyToED->GetText()); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 57b03f38d892..9560716b4c91 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -140,8 +140,8 @@ sal_Bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ? m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF; - if(m_pAutoUpdateFields->IsChecked() != m_pAutoUpdateFields->GetSavedValue() || - m_pAutoUpdateCharts->IsChecked() != m_pAutoUpdateCharts->GetSavedValue()) + if(TriState(m_pAutoUpdateFields->IsChecked()) != m_pAutoUpdateFields->GetSavedValue() || + TriState(m_pAutoUpdateCharts->IsChecked()) != m_pAutoUpdateCharts->GetSavedValue()) { pMod->ApplyFldUpdateFlags(eFldFlags); if(m_pWrtShell) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index e31dd1c51e1f..0856e16b25f4 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -1368,10 +1368,10 @@ sal_Bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if (m_pWrtShell) { m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); - bRet |= m_pMathBaselineAlignmentCB->IsChecked() != m_pMathBaselineAlignmentCB->GetSavedValue(); + bRet |= TriState(m_pMathBaselineAlignmentCB->IsChecked()) != m_pMathBaselineAlignmentCB->GetSavedValue(); } - if( m_pCrsrInProtCB->IsChecked() != m_pCrsrInProtCB->GetSavedValue()) + if( TriState(m_pCrsrInProtCB->IsChecked()) != m_pCrsrInProtCB->GetSavedValue()) { rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); bRet = true; @@ -2268,13 +2268,13 @@ sal_Bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) bRet = sal_True; } - if( m_pRsidCB->IsChecked() != m_pRsidCB->GetSavedValue() ) + if( TriState(m_pRsidCB->IsChecked()) != m_pRsidCB->GetSavedValue() ) { pOpt->SetUseRsid( m_pRsidCB->IsChecked() ); bRet = sal_True; } - if( m_pIgnoreCB->IsChecked() != m_pIgnoreCB->GetSavedValue() ) + if( TriState(m_pIgnoreCB->IsChecked()) != m_pIgnoreCB->GetSavedValue() ) { pOpt->SetIgnorePieces( m_pIgnoreCB->IsChecked() ); bRet = sal_True; diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 224477e1c4fa..b96e3774af35 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1170,8 +1170,8 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } bool bValueModified = (m_aWidthED.IsValueModified() || m_aHeightED.IsValueModified()); - bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != m_pRelWidthCB->IsChecked() - || m_pRelHeightCB->GetSavedValue() != m_pRelHeightCB->IsChecked()); + bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != TriState(m_pRelWidthCB->IsChecked()) + || m_pRelHeightCB->GetSavedValue() != TriState(m_pRelHeightCB->IsChecked())); bool bLegalValue = !(!rOldSize.GetWidth () && !rOldSize.GetHeight() && m_aWidthED .GetValue() == m_aWidthED .GetMin() && @@ -1195,7 +1195,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) else aSz.SetHeightPercent(0); - if (m_pFixedRatioCB->IsChecked() && (m_pRelWidthCB->IsChecked() ^ m_pRelHeightCB->IsChecked())) + if (m_pFixedRatioCB->IsChecked() && (m_pRelWidthCB->IsChecked() != m_pRelHeightCB->IsChecked())) { if (m_pRelWidthCB->IsChecked()) aSz.SetHeightPercent(0xff); @@ -1207,18 +1207,18 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) { if( m_pAutoHeightCB->GetState() != m_pAutoHeightCB->GetSavedValue() ) { - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoHeightCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; + SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetHeightSizeType() ) aSz.SetHeightSizeType(eFrmSize); } if( m_pAutoWidthCB->GetState() != m_pAutoWidthCB->GetSavedValue() ) { - SwFrmSize eFrmSize = (SwFrmSize) m_pAutoWidthCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; + SwFrmSize eFrmSize = m_pAutoWidthCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetWidthSizeType() ) aSz.SetWidthSizeType( eFrmSize ); } } - if( !bFormat && m_pFixedRatioCB->GetSavedValue() != m_pFixedRatioCB->IsChecked()) + if( !bFormat && m_pFixedRatioCB->GetSavedValue() != TriState(m_pFixedRatioCB->IsChecked())) bRet |= 0 != rSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); pOldItem = GetOldItem(rSet, RES_FRM_SIZE); @@ -1233,7 +1233,7 @@ sal_Bool SwFrmPage::FillItemSet(SfxItemSet &rSet) bRet |= 0 != rSet.Put( aSz ); } - if(m_pFollowTextFlowCB->IsChecked() != m_pFollowTextFlowCB->GetSavedValue()) + if(TriState(m_pFollowTextFlowCB->IsChecked()) != m_pFollowTextFlowCB->GetSavedValue()) { bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); } @@ -2521,8 +2521,8 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) sal_Bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) { sal_Bool bModified = sal_False; - if ( m_pMirrorHorzBox->GetSavedValue() != m_pMirrorHorzBox->IsChecked() || - m_pMirrorVertBox->GetSavedValue() != m_pMirrorVertBox->IsChecked() || + if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) || + m_pMirrorVertBox->GetSavedValue() != TriState(m_pMirrorVertBox->IsChecked()) || m_pAllPagesRB->GetSavedValue() != m_pAllPagesRB->IsChecked() || m_pLeftPagesRB->GetSavedValue() != m_pLeftPagesRB->IsChecked() || m_pRightPagesRB->GetSavedValue() != m_pRightPagesRB->IsChecked()) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 89939caf7a0a..cd4aaf8234a0 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -362,7 +362,7 @@ sal_Bool SwWrapTabPage::FillItemSet(SfxItemSet &rSet) if ( bDrawMode ) { - sal_Bool bChecked = m_pWrapTransparentCB->IsChecked() & m_pWrapTransparentCB->IsEnabled(); + sal_Bool bChecked = m_pWrapTransparentCB->IsChecked() && m_pWrapTransparentCB->IsEnabled(); if (m_pWrapTransparentCB->GetSavedValue() != bChecked) bModified |= 0 != rSet.Put(SfxInt16Item(FN_DRAW_WRAP_DLG, bChecked ? 0 : 1)); } diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 03f226ac3059..d526fdbd2f5e 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -167,12 +167,12 @@ sal_Bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) m_pTextSizeMF->GetSavedValue().toInt32() != m_pTextSizeMF->GetValue()|| m_pCharsPerLineNF->GetSavedValue().toInt32() != m_pCharsPerLineNF->GetValue()|| - m_pSnapToCharsCB->GetSavedValue() != m_pSnapToCharsCB->IsChecked() || + m_pSnapToCharsCB->GetSavedValue() != TriState(m_pSnapToCharsCB->IsChecked()) || m_pRubySizeMF->GetSavedValue().toInt32() != m_pRubySizeMF->GetValue()|| m_pCharWidthMF->GetSavedValue().toInt32() != m_pCharWidthMF->GetValue()|| - m_pRubyBelowCB->GetSavedValue() != m_pRubyBelowCB->IsChecked()|| - m_pDisplayCB->GetSavedValue() != m_pDisplayCB->IsChecked()|| - m_pPrintCB->GetSavedValue() != m_pPrintCB->IsChecked()|| + m_pRubyBelowCB->GetSavedValue() != TriState(m_pRubyBelowCB->IsChecked())|| + m_pDisplayCB->GetSavedValue() != TriState(m_pDisplayCB->IsChecked())|| + m_pPrintCB->GetSavedValue() != TriState(m_pPrintCB->IsChecked())|| m_pColorLB->GetSavedValue() != m_pColorLB->GetSelectEntryPos()) { PutGridItem(rSet); 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())); diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx index 1b9309eda652..55e4adb9d086 100644 --- a/sw/source/ui/utlui/uitool.cxx +++ b/sw/source/ui/utlui/uitool.cxx @@ -768,7 +768,7 @@ OUString GetAppLangDateTimeString( const DateTime& rDT ) { const SvtSysLocale aSysLocale; const LocaleDataWrapper& rAppLclData = aSysLocale.GetLocaleData(); - OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, sal_False, sal_False ); + OUString sRet = rAppLclData.getDate( rDT ) + " " + rAppLclData.getTime( rDT, false, false ); return sRet; } |