diff options
author | Noel Grandin <noel@peralex.com> | 2014-05-08 14:53:29 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-08 14:55:12 +0200 |
commit | bf30c8b16d9ac9304a49020ec2d4f744d90abe26 (patch) | |
tree | 0296cec9ca0729874ed1a1963af9f1311366c326 /sc | |
parent | d15540c431587368d749b53074af25cf865e7a5f (diff) |
use new VCL IsValueChangedFromSaved method
follow to commit ff1a7a59434f5f793d4044aad615bcf78148e963
"RFC: add IsValueChangedFromSaved to VCL button and listbox"
Change-Id: If2e6d9e7c18590dc4abbc90362d7897ca2557dd6
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/optdlg/tpcompatibility.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpdefaults.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpprint.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/optdlg/tpview.cxx | 66 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/areasdlg.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/pagedlg/tptable.cxx | 8 |
6 files changed, 43 insertions, 43 deletions
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index cb12ccd59420..17ceca431145 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -33,7 +33,7 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) { bool bRet = false; - if (m_pLbKeyBindings->GetSavedValue() != m_pLbKeyBindings->GetSelectEntryPos()) + if (m_pLbKeyBindings->IsValueChangedFromSaved()) { rCoreAttrs.Put( SfxUInt16Item( diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index ecd3faf4a8d8..637c6614c517 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -48,7 +48,7 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) OUString aSheetPrefix = m_pEdSheetPrefix->GetText(); - if ( m_pEdNSheets->GetSavedValue() != m_pEdNSheets->GetText() + if ( m_pEdNSheets->IsValueChangedFromSaved() || m_pEdSheetPrefix->GetSavedValue() != aSheetPrefix ) { aOpt.SetInitTabCount( nTabCount ); diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 76358d62cbad..3890d4383c82 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -91,9 +91,9 @@ bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); - bool bSkipEmptyChanged = ( m_pSkipEmptyPagesCB->GetSavedValue() != TriState(m_pSkipEmptyPagesCB->IsChecked()) ); - bool bSelectedSheetsChanged = ( m_pSelectedSheetsCB->GetSavedValue() != TriState(m_pSelectedSheetsCB->IsChecked()) ); - bool bForceBreaksChanged = ( m_pForceBreaksCB->GetSavedValue() != TriState(m_pForceBreaksCB->IsChecked()) ); + bool bSkipEmptyChanged = m_pSkipEmptyPagesCB->IsValueChangedFromSaved(); + bool bSelectedSheetsChanged = m_pSelectedSheetsCB->IsValueChangedFromSaved(); + bool bForceBreaksChanged = m_pForceBreaksCB->IsValueChangedFromSaved(); if ( bSkipEmptyChanged || bSelectedSheetsChanged || bForceBreaksChanged ) { diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4a2f758fa4aa..3c693ce6b6e8 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -109,36 +109,36 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { bool bRet = false; - if( pFormulaCB ->GetSavedValue() != TriState(pFormulaCB ->IsChecked()) || - pNilCB ->GetSavedValue() != TriState(pNilCB ->IsChecked()) || - pAnnotCB ->GetSavedValue() != TriState(pAnnotCB ->IsChecked()) || - pValueCB ->GetSavedValue() != TriState(pValueCB ->IsChecked()) || - pAnchorCB ->GetSavedValue() != TriState(pAnchorCB ->IsChecked()) || - pClipMarkCB->GetSavedValue() != TriState(pClipMarkCB->IsChecked()) || - pObjGrfLB ->GetSavedValue() != pObjGrfLB ->GetSelectEntryPos() || - pDiagramLB ->GetSavedValue() != pDiagramLB ->GetSelectEntryPos() || - pDrawLB ->GetSavedValue() != pDrawLB ->GetSelectEntryPos() || - pGridLB ->GetSavedValue() != pGridLB->GetSelectEntryPos() || - pRowColHeaderCB->GetSavedValue() != TriState(pRowColHeaderCB->IsChecked()) || - pHScrollCB ->GetSavedValue() != TriState(pHScrollCB ->IsChecked()) || - pVScrollCB ->GetSavedValue() != TriState(pVScrollCB ->IsChecked()) || - pTblRegCB ->GetSavedValue() != TriState(pTblRegCB ->IsChecked()) || - pOutlineCB ->GetSavedValue() != TriState(pOutlineCB ->IsChecked()) || - pColorLB ->GetSavedValue() != pColorLB ->GetSelectEntryPos() || - pBreakCB ->GetSavedValue() != TriState(pBreakCB ->IsChecked()) || - pGuideLineCB ->GetSavedValue() != TriState(pGuideLineCB ->IsChecked())) + if( pFormulaCB ->IsValueChangedFromSaved() || + pNilCB ->IsValueChangedFromSaved() || + pAnnotCB ->IsValueChangedFromSaved() || + pValueCB ->IsValueChangedFromSaved() || + pAnchorCB ->IsValueChangedFromSaved() || + pClipMarkCB->IsValueChangedFromSaved() || + pObjGrfLB ->IsValueChangedFromSaved() || + pDiagramLB ->IsValueChangedFromSaved() || + pDrawLB ->IsValueChangedFromSaved() || + pGridLB ->IsValueChangedFromSaved() || + pRowColHeaderCB->IsValueChangedFromSaved() || + pHScrollCB ->IsValueChangedFromSaved() || + pVScrollCB ->IsValueChangedFromSaved() || + pTblRegCB ->IsValueChangedFromSaved() || + pOutlineCB ->IsValueChangedFromSaved() || + pColorLB ->IsValueChangedFromSaved() || + pBreakCB ->IsValueChangedFromSaved() || + pGuideLineCB ->IsValueChangedFromSaved()) { pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(), pColorLB->GetSelectEntry() ); rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); bRet = true; } - if(pRangeFindCB->GetSavedValue() != TriState(pRangeFindCB->IsChecked())) + if(pRangeFindCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); bRet = true; } - if(pSyncZoomCB->GetSavedValue() != TriState(pSyncZoomCB->IsChecked())) + if(pSyncZoomCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); bRet = true; @@ -427,7 +427,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { bool bRet = true; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); - if ( nMPos != m_pUnitLB->GetSavedValue() ) + if ( m_pUnitLB->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos ); rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC, @@ -435,7 +435,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) bRet = true; } - if(m_pTabMF->GetText() != m_pTabMF->GetSavedValue()) + if(m_pTabMF->IsValueChangedFromSaved()) { rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) ))); @@ -453,8 +453,8 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) nSet=LM_NEVER; } - if(m_pRequestRB->IsChecked() != m_pRequestRB->GetSavedValue() || - m_pNeverRB->IsChecked() != m_pNeverRB->GetSavedValue() ) + if(m_pRequestRB->IsValueChangedFromSaved() || + m_pNeverRB->IsValueChangedFromSaved() ) { if(pDoc) pDoc->SetLinkMode(nSet); @@ -463,56 +463,56 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) SC_MOD()->SetAppOptions(aAppOptions); bRet = true; } - if(m_pAlignCB->GetSavedValue() != TriState(m_pAlignCB->IsChecked())) + if(m_pAlignCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); bRet = true; } - if(m_pAlignLB->GetSavedValue() != m_pAlignLB->GetSelectEntryPos()) + if(m_pAlignLB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); bRet = true; } - if(m_pEditModeCB->GetSavedValue() != TriState(m_pEditModeCB->IsChecked())) + if(m_pEditModeCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); bRet = true; } - if(m_pFormatCB->GetSavedValue() != TriState(m_pFormatCB->IsChecked())) + if(m_pFormatCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); bRet = true; } - if(m_pExpRefCB->GetSavedValue() != TriState(m_pExpRefCB->IsChecked())) + if(m_pExpRefCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); bRet = true; } - if(m_pMarkHdrCB->GetSavedValue() != TriState(m_pMarkHdrCB->IsChecked())) + if(m_pMarkHdrCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); bRet = true; } - if(m_pTextFmtCB->GetSavedValue() != TriState(m_pTextFmtCB->IsChecked())) + if(m_pTextFmtCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); bRet = true; } - if( m_pReplWarnCB->GetSavedValue() != TriState(m_pReplWarnCB->IsChecked()) ) + if( m_pReplWarnCB->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); bRet = true; } - if( m_pLegacyCellSelectionCB->GetSavedValue() != TriState(m_pLegacyCellSelectionCB->IsChecked()) ) + if( m_pLegacyCellSelectionCB->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); bRet = true; diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index a34adf63637e..3a12f2944204 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -315,7 +315,7 @@ void ScPrintAreasDlg::Impl_Reset() bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); - bool bDataChanged = (pEd->GetSavedValue() != aRangeStr); + bool bDataChanged = pEd->IsValueChangedFromSaved(); if ( !aRangeStr.isEmpty() && pEdPrintArea != pEd ) { diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 7a9aa96326de..e99f4566ca59 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -274,7 +274,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) if ( WAS_DEFAULT(nWhichPageNo,rOldSet) && ( (!bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue()) || ( bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue() - && m_pEdPageNo->GetText() == m_pEdPageNo->GetSavedValue() ) ) ) + && ! m_pEdPageNo->IsValueChangedFromSaved() ) ) ) { rCoreSet.ClearItem( nWhichPageNo ); } @@ -422,7 +422,7 @@ static bool lcl_PutScaleItem( sal_uInt16 nWhich, { bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || - (rEd.GetSavedValue() != rEd.GetText()) || + rEd.IsValueChangedFromSaved() || !WAS_DEFAULT( nWhich, rOldSet ); if( bDataChanged ) @@ -446,8 +446,8 @@ static bool lcl_PutScaleItem2( sal_uInt16 nWhich, sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue(); bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || - (rEd1.GetSavedValue() != rEd1.GetText()) || - (rEd2.GetSavedValue() != rEd2.GetText()) || + rEd1.IsValueChangedFromSaved() || + rEd2.IsValueChangedFromSaved() || !WAS_DEFAULT( nWhich, rOldSet ); if( bDataChanged ) |