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 /sd/source | |
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 'sd/source')
-rw-r--r-- | sd/source/ui/dlg/dlgfield.cxx | 8 | ||||
-rw-r--r-- | sd/source/ui/dlg/paragr.cxx | 6 | ||||
-rw-r--r-- | sd/source/ui/dlg/prntopts.cxx | 34 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpaction.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/dlg/tpoption.cxx | 32 |
5 files changed, 41 insertions, 41 deletions
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index c36c5ac548b4..921ce84dd584 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -61,9 +61,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() { SvxFieldData* pNewField = NULL; - if( m_pRbtFix->IsChecked() != m_pRbtFix->GetSavedValue() || - m_pRbtVar->IsChecked() != m_pRbtVar->GetSavedValue() || - m_pLbFormat->GetSelectEntryPos() != m_pLbFormat->GetSavedValue() ) + if( m_pRbtFix->IsValueChangedFromSaved() || + m_pRbtVar->IsValueChangedFromSaved() || + m_pLbFormat->IsValueChangedFromSaved() ) { if( pField->ISA( SvxDateField ) ) { @@ -311,7 +311,7 @@ SfxItemSet SdModifyFieldDlg::GetItemSet() { SfxItemSet aOutput( *maInputSet.GetPool(), EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL ); - if( m_pLbLanguage->GetSelectEntryPos() != m_pLbLanguage->GetSavedValue() ) + if( m_pLbLanguage->IsValueChangedFromSaved() ) { LanguageType eLangType = m_pLbLanguage->GetSelectLanguage(); SvxLanguageItem aItem( eLangType, EE_CHAR_LANGUAGE ); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 4afad9bcdc1f..d4cbe22c66de 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -92,9 +92,9 @@ const sal_uInt16* SdParagraphNumTabPage::GetRanges() bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { - if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() || - m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()|| - m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue()) + if(m_pNewStartCB->IsValueChangedFromSaved() || + m_pNewStartNumberCB->IsValueChangedFromSaved()|| + m_pNewStartNF->IsValueChangedFromSaved()) { mbModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 37b0671d8e93..50b41a220852 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -82,23 +82,23 @@ SdPrintOptions::~SdPrintOptions() bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { - if( m_pCbxDraw->GetSavedValue() != TriState(m_pCbxDraw->IsChecked()) || - m_pCbxNotes->GetSavedValue() != TriState(m_pCbxNotes->IsChecked()) || - m_pCbxHandout->GetSavedValue() != TriState(m_pCbxHandout->IsChecked()) || - m_pCbxOutline->GetSavedValue() != TriState(m_pCbxOutline->IsChecked()) || - m_pCbxDate->GetSavedValue() != TriState(m_pCbxDate->IsChecked()) || - m_pCbxTime->GetSavedValue() != TriState(m_pCbxTime->IsChecked()) || - m_pCbxPagename->GetSavedValue() != TriState(m_pCbxPagename->IsChecked()) || - m_pCbxHiddenPages->GetSavedValue() != TriState(m_pCbxHiddenPages->IsChecked()) || - m_pRbtPagesize->GetSavedValue() != m_pRbtPagesize->IsChecked() || - m_pRbtPagetile->GetSavedValue() != m_pRbtPagetile->IsChecked() || - m_pRbtBooklet->GetSavedValue() != m_pRbtBooklet->IsChecked() || - m_pCbxFront->GetSavedValue() != TriState(m_pCbxFront->IsChecked()) || - m_pCbxBack->GetSavedValue() != TriState(m_pCbxBack->IsChecked()) || - m_pCbxPaperbin->GetSavedValue() != TriState(m_pCbxPaperbin->IsChecked()) || - m_pRbtColor->GetSavedValue() != m_pRbtColor->IsChecked() || - m_pRbtGrayscale->GetSavedValue() != m_pRbtGrayscale->IsChecked() || - m_pRbtBlackWhite->GetSavedValue() != m_pRbtBlackWhite->IsChecked() ) + if( m_pCbxDraw->IsValueChangedFromSaved() || + m_pCbxNotes->IsValueChangedFromSaved() || + m_pCbxHandout->IsValueChangedFromSaved() || + m_pCbxOutline->IsValueChangedFromSaved() || + m_pCbxDate->IsValueChangedFromSaved() || + m_pCbxTime->IsValueChangedFromSaved() || + m_pCbxPagename->IsValueChangedFromSaved() || + m_pCbxHiddenPages->IsValueChangedFromSaved() || + m_pRbtPagesize->IsValueChangedFromSaved() || + m_pRbtPagetile->IsValueChangedFromSaved() || + m_pRbtBooklet->IsValueChangedFromSaved() || + m_pCbxFront->IsValueChangedFromSaved() || + m_pCbxBack->IsValueChangedFromSaved() || + m_pCbxPaperbin->IsValueChangedFromSaved() || + m_pRbtColor->IsValueChangedFromSaved() || + m_pRbtGrayscale->IsValueChangedFromSaved()|| + m_pRbtBlackWhite->IsValueChangedFromSaved()) { SdOptionsPrintItem aOptions( ATTR_OPTIONS_PRINT ); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d0c5a65301b3..e65398ba7f62 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -273,7 +273,7 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( m_pLbAction->GetSelectEntryCount() ) eCA = GetActualClickAction(); - if( m_pLbAction->GetSavedValue() != m_pLbAction->GetSelectEntryPos() ) + if( m_pLbAction->IsValueChangedFromSaved() ) { rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); bModified = true; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 454bd5fe2fb0..c8775db4fbd5 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -140,10 +140,10 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { bool bModified = false; - if( m_pCbxRuler->GetSavedValue() != TriState(m_pCbxRuler->IsChecked()) || - m_pCbxMoveOutline->GetSavedValue() != TriState(m_pCbxMoveOutline->IsChecked()) || - m_pCbxDragStripes->GetSavedValue() != TriState(m_pCbxDragStripes->IsChecked()) || - m_pCbxHandlesBezier->GetSavedValue() != TriState(m_pCbxHandlesBezier->IsChecked()) ) + if( m_pCbxRuler->IsValueChangedFromSaved() || + m_pCbxMoveOutline->IsValueChangedFromSaved() || + m_pCbxDragStripes->IsValueChangedFromSaved() || + m_pCbxHandlesBezier->IsValueChangedFromSaved() ) { SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT ); @@ -368,16 +368,16 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { bool bModified = false; - if( m_pCbxStartWithTemplate->GetSavedValue() != TriState(m_pCbxStartWithTemplate->IsChecked()) || - m_pCbxMarkedHitMovesAlways->GetSavedValue()!= TriState(m_pCbxMarkedHitMovesAlways->IsChecked()) || - m_pCbxQuickEdit->GetSavedValue() != TriState(m_pCbxQuickEdit->IsChecked()) || - m_pCbxPickThrough->GetSavedValue() != TriState(m_pCbxPickThrough->IsChecked()) || - m_pCbxMasterPageCache->GetSavedValue() != TriState(m_pCbxMasterPageCache->IsChecked()) || - m_pCbxCopy->GetSavedValue() != TriState(m_pCbxCopy->IsChecked()) || - m_pCbxEnableSdremote->GetSavedValue() != TriState(m_pCbxEnableSdremote->IsChecked()) || - m_pCbxEnablePresenterScreen->GetSavedValue()!= TriState(m_pCbxEnablePresenterScreen->IsChecked()) || - m_pCbxCompatibility->GetSavedValue() != TriState(m_pCbxCompatibility->IsChecked()) || - m_pCbxUsePrinterMetrics->GetSavedValue() != TriState(m_pCbxUsePrinterMetrics->IsChecked()) ) + if( m_pCbxStartWithTemplate->IsValueChangedFromSaved() || + m_pCbxMarkedHitMovesAlways->IsValueChangedFromSaved() || + m_pCbxQuickEdit->IsValueChangedFromSaved() || + m_pCbxPickThrough->IsValueChangedFromSaved() || + m_pCbxMasterPageCache->IsValueChangedFromSaved() || + m_pCbxCopy->IsValueChangedFromSaved() || + m_pCbxEnableSdremote->IsValueChangedFromSaved() || + m_pCbxEnablePresenterScreen->IsValueChangedFromSaved() || + m_pCbxCompatibility->IsValueChangedFromSaved() || + m_pCbxUsePrinterMetrics->IsValueChangedFromSaved() ) { SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC ); @@ -401,7 +401,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) // metric const sal_Int32 nMPos = m_pLbMetric->GetSelectEntryPos(); - if ( nMPos != m_pLbMetric->GetSavedValue() ) + if ( m_pLbMetric->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbMetric->GetEntryData( nMPos ); rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), @@ -410,7 +410,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) } // tabulator space - if( m_pMtrFldTabstop->GetText() != m_pMtrFldTabstop->GetSavedValue() ) + if( m_pMtrFldTabstop->IsValueChangedFromSaved() ) { sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); |