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 /cui/source/tabpages | |
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 'cui/source/tabpages')
-rw-r--r-- | cui/source/tabpages/autocdlg.cxx | 4 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/border.cxx | 8 | ||||
-rw-r--r-- | cui/source/tabpages/chardlg.cxx | 18 | ||||
-rw-r--r-- | cui/source/tabpages/connect.cxx | 16 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/measure.cxx | 20 | ||||
-rw-r--r-- | cui/source/tabpages/page.cxx | 36 | ||||
-rw-r--r-- | cui/source/tabpages/paragrph.cxx | 50 | ||||
-rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/textanim.cxx | 30 | ||||
-rw-r--r-- | cui/source/tabpages/textattr.cxx | 20 | ||||
-rw-r--r-- | cui/source/tabpages/tparea.cxx | 44 | ||||
-rw-r--r-- | cui/source/tabpages/tphatch.cxx | 10 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 24 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 14 | ||||
-rw-r--r-- | cui/source/tabpages/tpshadow.cxx | 6 | ||||
-rw-r--r-- | cui/source/tabpages/transfrm.cxx | 12 |
18 files changed, 169 insertions, 169 deletions
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 987a64274545..5e41c3a61d3e 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -1522,9 +1522,9 @@ bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet& ) } pAutoCorrect->SaveCplSttExceptList(eLang); } - if(TriState(m_pAutoAbbrevCB->IsChecked()) != m_pAutoAbbrevCB->GetSavedValue()) + if(m_pAutoAbbrevCB->IsValueChangedFromSaved()) pAutoCorrect->SetAutoCorrFlag( SaveWordCplSttLst, m_pAutoAbbrevCB->IsChecked()); - if(TriState(m_pAutoCapsCB->IsChecked()) != m_pAutoCapsCB->GetSavedValue()) + if(m_pAutoCapsCB->IsValueChangedFromSaved()) pAutoCorrect->SetAutoCorrFlag( SaveWordWrdSttLst, m_pAutoCapsCB->IsChecked()); return false; } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index ea34a8aeb6a5..110fc148254c 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -768,7 +768,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) SfxItemState eOldItemState = rCoreSet.GetItemState(nSlot, false); const SfxItemSet& rOldSet = GetItemSet(); - bool bGraphTransparencyChanged = bGraphTransparency && (m_pGraphTransMF->GetText() != m_pGraphTransMF->GetSavedValue()); + bool bGraphTransparencyChanged = bGraphTransparency && m_pGraphTransMF->IsValueChangedFromSaved(); if ( pOld ) { const SvxBrushItem& rOldItem = (const SvxBrushItem&)*pOld; @@ -922,7 +922,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } - if( m_pTblLBox->GetSavedValue() != m_pTblLBox->GetSelectEntryPos() ) + if( m_pTblLBox->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pTblLBox->GetSelectEntryPos() ) ); @@ -960,7 +960,7 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet& rCoreSet ) } } - if( m_pParaLBox->GetSavedValue() != m_pParaLBox->GetSelectEntryPos() ) + if( m_pParaLBox->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxUInt16Item( SID_BACKGRND_DESTINATION, m_pParaLBox->GetSelectEntryPos() ) ); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 83b1f5898a99..bf03f68796a3 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -660,10 +660,10 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet& rCoreAttrs ) rCoreAttrs, SID_ATTR_BORDER_INNER ); if ( !pOldBoxItem || - m_pLeftMF->GetText() != m_pLeftMF->GetSavedValue() || - m_pRightMF->GetText() != m_pRightMF->GetSavedValue() || - m_pTopMF->GetText() != m_pTopMF->GetSavedValue() || - m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() || + m_pLeftMF->IsValueChangedFromSaved() || + m_pRightMF->IsValueChangedFromSaved() || + m_pTopMF->IsValueChangedFromSaved() || + m_pBottomMF->IsValueChangedFromSaved() || nMinValue == m_pLeftMF->GetValue() || nMinValue == m_pRightMF->GetValue() || nMinValue == m_pTopMF->GetValue() || diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 8dbe14e1fffd..f813c9a37b6d 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -450,7 +450,7 @@ namespace FontInfo aFontInfo; OUString sFontName(_pFontNameLB->GetText()); bool bFontAvailable = _pFontList->IsAvailable( sFontName ); - if (bFontAvailable || _pFontNameLB->GetSavedValue() != sFontName) + if (bFontAvailable || _pFontNameLB->IsValueChangedFromSaved()) aFontInfo = _pFontList->Get( sFontName, _pFontStyleLB->GetText() ); else { @@ -2279,7 +2279,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) } if ( rOldSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE && - TriState(m_pIndividualWordsBtn->IsChecked()) == m_pIndividualWordsBtn->GetSavedValue() ) + ! m_pIndividualWordsBtn->IsValueChangedFromSaved() ) bChanged = false; if ( bChanged ) @@ -2366,7 +2366,7 @@ bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) //Relief nWhich = GetWhich(SID_ATTR_CHAR_RELIEF); - if(m_pReliefLB->GetSelectEntryPos() != m_pReliefLB->GetSavedValue()) + if(m_pReliefLB->IsValueChangedFromSaved()) { m_pReliefLB->SaveValue(); SvxCharReliefItem aRelief((FontRelief)m_pReliefLB->GetSelectEntryPos(), nWhich); @@ -3231,7 +3231,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) // Pair-Kerning nWhich = GetWhich( SID_ATTR_CHAR_AUTOKERN ); - if ( TriState(m_pPairKerningBtn->IsChecked()) != m_pPairKerningBtn->GetSavedValue() ) + if ( m_pPairKerningBtn->IsValueChangedFromSaved() ) { rSet.Put( SvxAutoKernItem( m_pPairKerningBtn->IsChecked(), nWhich ) ); bModified = true; @@ -3241,7 +3241,7 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) // Scale Width nWhich = GetWhich( SID_ATTR_CHAR_SCALEWIDTH ); - if ( m_pScaleWidthMF->GetText() != m_pScaleWidthMF->GetSavedValue() ) + if ( m_pScaleWidthMF->IsValueChangedFromSaved() ) { rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_pScaleWidthMF->GetValue(), nWhich ) ); bModified = true; @@ -3251,10 +3251,10 @@ bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet ) // Rotation nWhich = GetWhich( SID_ATTR_CHAR_ROTATED ); - if ( m_p0degRB->IsChecked() != m_p0degRB->GetSavedValue() || - m_p90degRB->IsChecked() != m_p90degRB->GetSavedValue() || - m_p270degRB->IsChecked() != m_p270degRB->GetSavedValue() || - TriState(m_pFitToLineCB->IsChecked()) != m_pFitToLineCB->GetSavedValue() ) + if ( m_p0degRB->IsValueChangedFromSaved() || + m_p90degRB->IsValueChangedFromSaved() || + m_p270degRB->IsValueChangedFromSaved() || + m_pFitToLineCB->IsValueChangedFromSaved() ) { SvxCharRotateItem aItem( 0, m_pFitToLineCB->IsChecked(), nWhich ); if (m_p90degRB->IsChecked()) diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index fd2b449fbc7a..8b32636848d4 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -312,49 +312,49 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) bool bModified = false; sal_Int32 nValue; - if( m_pMtrFldHorz1->GetText() != m_pMtrFldHorz1->GetSavedValue() ) + if( m_pMtrFldHorz1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHorz1, eUnit ); rAttrs.Put( SdrEdgeNode1HorzDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldHorz2->GetText() != m_pMtrFldHorz2->GetSavedValue() ) + if( m_pMtrFldHorz2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHorz2, eUnit ); rAttrs.Put( SdrEdgeNode2HorzDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldVert1->GetText() != m_pMtrFldVert1->GetSavedValue() ) + if( m_pMtrFldVert1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldVert1, eUnit ); rAttrs.Put( SdrEdgeNode1VertDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldVert2->GetText() != m_pMtrFldVert2->GetSavedValue() ) + if( m_pMtrFldVert2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldVert2, eUnit ); rAttrs.Put( SdrEdgeNode2VertDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldLine1->GetText() != m_pMtrFldLine1->GetSavedValue() ) + if( m_pMtrFldLine1->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine1, eUnit ); rAttrs.Put( SdrEdgeLine1DeltaItem( nValue ) ); bModified = true; } - if( m_pMtrFldLine2->GetText() != m_pMtrFldLine2->GetSavedValue() ) + if( m_pMtrFldLine2->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine2, eUnit ); rAttrs.Put( SdrEdgeLine2DeltaItem( nValue ) ); bModified = true; } - if( m_pMtrFldLine3->GetText() != m_pMtrFldLine3->GetSavedValue() ) + if( m_pMtrFldLine3->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLine3, eUnit ); rAttrs.Put( SdrEdgeLine3DeltaItem( nValue ) ); @@ -363,7 +363,7 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet& rAttrs) sal_Int32 nPos = m_pLbType->GetSelectEntryPos(); - if( nPos != m_pLbType->GetSavedValue() ) + if( m_pLbType->IsValueChangedFromSaved() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 2a11e2c50f87..252d7e744b9c 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -240,8 +240,8 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) { const SfxItemPool& rPool = *rSet.GetPool(); bool bModified = false; - if( m_pWidthMF->GetSavedValue() != m_pWidthMF->GetText() || - m_pHeightMF->GetSavedValue() != m_pHeightMF->GetText() ) + if( m_pWidthMF->IsValueChangedFromSaved() || + m_pHeightMF->IsValueChangedFromSaved() ) { sal_uInt16 nW = rPool.GetWhich( SID_ATTR_GRAF_FRMSIZE ); FieldUnit eUnit = MapToFieldUnit( rSet.GetPool()->GetMetric( nW )); @@ -259,9 +259,9 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) aSz = (const SvxSizeItem&)GetItemSet().Get( nW ); Size aTmpSz( aSz.GetSize() ); - if( m_pWidthMF->GetText() != m_pWidthMF->GetSavedValue() ) + if( m_pWidthMF->IsValueChangedFromSaved() ) aTmpSz.Width() = lcl_GetValue( *m_pWidthMF, eUnit ); - if( m_pHeightMF->GetText() != m_pHeightMF->GetSavedValue() ) + if( m_pHeightMF->IsValueChangedFromSaved() ) aTmpSz.Height() = lcl_GetValue( *m_pHeightMF, eUnit ); aSz.SetSize( aTmpSz ); m_pWidthMF->SaveValue(); @@ -290,7 +290,7 @@ bool SvxGrfCropPage::FillItemSet(SfxItemSet &rSet) delete pNew; } - if( m_pZoomConstRB->GetSavedValue() != m_pZoomConstRB->IsChecked() ) + if( m_pZoomConstRB->IsValueChangedFromSaved() ) { bModified |= 0 != rSet.Put( SfxBoolItem( rPool.GetWhich( SID_ATTR_GRAF_KEEP_ZOOM), m_pZoomConstRB->IsChecked() ) ); diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 8982ed8221b6..853fe8f0582f 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -425,35 +425,35 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) sal_Int32 nValue; TriState eState; - if( m_pMtrFldLineDist->GetText() != m_pMtrFldLineDist->GetSavedValue() ) + if( m_pMtrFldLineDist->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLineDist, eUnit ); rAttrs.Put( SdrMeasureLineDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldHelplineOverhang->GetText() != m_pMtrFldHelplineOverhang->GetSavedValue() ) + if( m_pMtrFldHelplineOverhang->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelplineOverhang, eUnit ); rAttrs.Put( SdrMeasureHelplineOverhangItem( nValue ) ); bModified = true; } - if( m_pMtrFldHelplineDist->GetText() != m_pMtrFldHelplineDist->GetSavedValue() ) + if( m_pMtrFldHelplineDist->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelplineDist, eUnit ); rAttrs.Put( SdrMeasureHelplineDistItem( nValue ) ); bModified = true; } - if( m_pMtrFldHelpline1Len->GetText() != m_pMtrFldHelpline1Len->GetSavedValue() ) + if( m_pMtrFldHelpline1Len->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelpline1Len, eUnit ); rAttrs.Put( SdrMeasureHelpline1LenItem( nValue ) ); bModified = true; } - if( m_pMtrFldHelpline2Len->GetText() != m_pMtrFldHelpline2Len->GetSavedValue() ) + if( m_pMtrFldHelpline2Len->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldHelpline2Len, eUnit ); rAttrs.Put( SdrMeasureHelpline2LenItem( nValue ) ); @@ -461,13 +461,13 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } eState = m_pTsbBelowRefEdge->GetState(); - if( eState != m_pTsbBelowRefEdge->GetSavedValue() ) + if( m_pTsbBelowRefEdge->IsValueChangedFromSaved() ) { rAttrs.Put( SdrMeasureBelowRefEdgeItem( TRISTATE_TRUE == eState ) ); bModified = true; } - if( m_pMtrFldDecimalPlaces->GetText() != m_pMtrFldDecimalPlaces->GetSavedValue() ) + if( m_pMtrFldDecimalPlaces->IsValueChangedFromSaved() ) { nValue = static_cast<sal_Int32>(m_pMtrFldDecimalPlaces->GetValue()); rAttrs.Put( @@ -477,21 +477,21 @@ bool SvxMeasurePage::FillItemSet( SfxItemSet& rAttrs) } eState = m_pTsbParallel->GetState(); - if( eState != m_pTsbParallel->GetSavedValue() ) + if( m_pTsbParallel->IsValueChangedFromSaved() ) { rAttrs.Put( SdrMeasureTextRota90Item( TRISTATE_FALSE == eState ) ); bModified = true; } eState = m_pTsbShowUnit->GetState(); - if( eState != m_pTsbShowUnit->GetSavedValue() ) + if( m_pTsbShowUnit->IsValueChangedFromSaved() ) { rAttrs.Put( SdrMeasureShowUnitItem( TRISTATE_TRUE == eState ) ); bModified = true; } sal_Int32 nPos = m_pLbUnit->GetSelectEntryPos(); - if( nPos != m_pLbUnit->GetSavedValue() ) + if( m_pLbUnit->IsValueChangedFromSaved() ) { if( nPos != LISTBOX_ENTRY_NOTFOUND ) { diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 740a905eb441..e13fce19ab3c 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -676,13 +676,13 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_ULSPACE ); SvxULSpaceItem aTopMargin( (const SvxULSpaceItem&)rOldSet.Get( nWhich ) ); - if ( m_pLeftMarginEdit->GetText() != m_pLeftMarginEdit->GetSavedValue() ) + if ( m_pLeftMarginEdit->IsValueChangedFromSaved() ) { aMargin.SetLeft( (sal_uInt16)GetCoreValue( *m_pLeftMarginEdit, eUnit ) ); bModified = true; } - if ( m_pRightMarginEdit->GetText() != m_pRightMarginEdit->GetSavedValue() ) + if ( m_pRightMarginEdit->IsValueChangedFromSaved() ) { aMargin.SetRight( (sal_uInt16)GetCoreValue( *m_pRightMarginEdit, eUnit ) ); bModified = true; @@ -701,13 +701,13 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) bool bMod = false; - if ( m_pTopMarginEdit->GetText() != m_pTopMarginEdit->GetSavedValue() ) + if ( m_pTopMarginEdit->IsValueChangedFromSaved() ) { aTopMargin.SetUpper( (sal_uInt16)GetCoreValue( *m_pTopMarginEdit, eUnit ) ); bMod = true; } - if ( m_pBottomMarginEdit->GetText() != m_pBottomMarginEdit->GetSavedValue() ) + if ( m_pBottomMarginEdit->IsValueChangedFromSaved() ) { aTopMargin.SetLower( (sal_uInt16)GetCoreValue( *m_pBottomMarginEdit, eUnit ) ); bMod = true; @@ -748,7 +748,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) if ( nOld != nPos || m_pPaperWidthEdit->IsValueModified() || m_pPaperHeightEdit->IsValueModified() || - bChecked != m_pLandscapeBtn->GetSavedValue() ) + m_pLandscapeBtn->IsValueChangedFromSaved() ) { Size aSize( GetCoreValue( *m_pPaperWidthEdit, eUnit ), GetCoreValue( *m_pPaperHeightEdit, eUnit ) ); @@ -763,7 +763,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) } else { - if ( nOld != nPos || bChecked != m_pLandscapeBtn->GetSavedValue() ) + if ( nOld != nPos || m_pLandscapeBtn->IsValueChangedFromSaved() ) { Size aSize( SvxPaperInfo::GetPaperSize( ePaper, (MapUnit)eUnit ) ); @@ -782,13 +782,13 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_PAGE ); SvxPageItem aPage( (const SvxPageItem&)rOldSet.Get( nWhich ) ); - bMod = m_pLayoutBox->GetSelectEntryPos() != m_pLayoutBox->GetSavedValue(); + bMod = m_pLayoutBox->IsValueChangedFromSaved(); if ( bMod ) aPage.SetPageUsage( ::PosToPageUsage_Impl( m_pLayoutBox->GetSelectEntryPos() ) ); - if ( bChecked != m_pLandscapeBtn->GetSavedValue() ) + if ( m_pLandscapeBtn->IsValueChangedFromSaved() ) { aPage.SetLandscape(bChecked); bMod = true; @@ -797,7 +797,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) //Get the NumType value nPos = m_pNumberFormatBox->GetSelectEntryPos(); sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)m_pNumberFormatBox->GetEntryData(nPos); - if ( nPos != m_pNumberFormatBox->GetSavedValue() ) + if ( m_pNumberFormatBox->IsValueChangedFromSaved() ) { aPage.SetNumType( (SvxNumType)nEntryData ); bMod = true; @@ -824,7 +824,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) { case SVX_PAGE_MODE_CENTER: { - if ( TriState(m_pHorzBox->IsChecked()) != m_pHorzBox->GetSavedValue() ) + if ( m_pHorzBox->IsValueChangedFromSaved() ) { SfxBoolItem aHorz( GetWhich( SID_ATTR_PAGE_EXT1 ), m_pHorzBox->IsChecked() ); @@ -832,7 +832,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) bModified = true; } - if ( TriState(m_pVertBox->IsChecked()) != m_pVertBox->GetSavedValue() ) + if ( m_pVertBox->IsValueChangedFromSaved() ) { SfxBoolItem aVert( GetWhich( SID_ATTR_PAGE_EXT2 ), m_pVertBox->IsChecked() ); @@ -855,7 +855,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) } if(m_pRegisterCB->IsVisible() && - (m_pRegisterCB->IsChecked() || m_pRegisterCB->GetSavedValue() != TriState(m_pRegisterCB->IsChecked()))) + (m_pRegisterCB->IsChecked() || m_pRegisterCB->IsValueChangedFromSaved())) { const SfxBoolItem& rRegItem = (const SfxBoolItem&)rOldSet.Get(SID_SWREGISTER_MODE); SfxBoolItem* pRegItem = (SfxBoolItem*)rRegItem.Clone(); @@ -873,7 +873,7 @@ bool SvxPageDescPage::FillItemSet( SfxItemSet& rSet ) } SvxFrameDirection eDirection = m_pTextFlowBox->GetSelectEntryValue(); - if( m_pTextFlowBox->IsVisible() && (eDirection != m_pTextFlowBox->GetSavedValue()) ) + if( m_pTextFlowBox->IsVisible() && m_pTextFlowBox->IsValueChangedFromSaved() ) { rSet.Put( SvxFrameDirectionItem( eDirection, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); bModified = true; @@ -1619,7 +1619,7 @@ bool SvxPageDescPage::IsPrinterRangeOverflow( long nValue = static_cast<long>(rField.GetValue()); if ( bCheck && ( nValue < nFirstMargin || nValue > nLastMargin ) && - rField.GetText() != rField.GetSavedValue() ) + rField.IsValueChangedFromSaved() ) { rField.SetValue( nValue < nFirstMargin ? nFirstMargin : nLastMargin ); bRet = true; @@ -1653,19 +1653,19 @@ void SvxPageDescPage::CheckMarginEdits( bool _bClear ) bool SvxPageDescPage::IsMarginOutOfRange() { bool bRet = ( ( ( !( pImpl->m_nPos & MARGIN_LEFT ) && - ( m_pLeftMarginEdit->GetText() != m_pLeftMarginEdit->GetSavedValue() ) ) && + m_pLeftMarginEdit->IsValueChangedFromSaved() ) && ( m_pLeftMarginEdit->GetValue() < nFirstLeftMargin || m_pLeftMarginEdit->GetValue() > nLastLeftMargin ) ) || ( ( !( pImpl->m_nPos & MARGIN_RIGHT ) && - ( m_pRightMarginEdit->GetText() != m_pRightMarginEdit->GetSavedValue() ) ) && + m_pRightMarginEdit->IsValueChangedFromSaved() ) && ( m_pRightMarginEdit->GetValue() < nFirstRightMargin || m_pRightMarginEdit->GetValue() > nLastRightMargin ) ) || ( ( !( pImpl->m_nPos & MARGIN_TOP ) && - ( m_pTopMarginEdit->GetText() != m_pTopMarginEdit->GetSavedValue() ) ) && + m_pTopMarginEdit->IsValueChangedFromSaved() ) && ( m_pTopMarginEdit->GetValue() < nFirstTopMargin || m_pTopMarginEdit->GetValue() > nLastTopMargin ) ) || ( ( !( pImpl->m_nPos & MARGIN_BOTTOM ) && - ( m_pBottomMarginEdit->GetText() != m_pBottomMarginEdit->GetSavedValue() ) ) && + m_pBottomMarginEdit->IsValueChangedFromSaved() ) && ( m_pBottomMarginEdit->GetValue() < nFirstBottomMargin || m_pBottomMarginEdit->GetValue() > nLastBottomMargin ) ) ); return bRet; diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 50e257b8f645..271065b76fe4 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -210,7 +210,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) sal_Int32 nPos = m_pLineDist->GetSelectEntryPos(); if ( LISTBOX_ENTRY_NOTFOUND != nPos && - ( nPos != m_pLineDist->GetSavedValue() || + ( m_pLineDist->IsValueChangedFromSaved() || m_pLineDistAtPercentBox->IsValueModified() || m_pLineDistAtMetricBox->IsValueModified() ) ) { @@ -256,7 +256,7 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) } if ( m_pTopDist->IsValueModified() || m_pBottomDist->IsValueModified() - || m_pContextualCB->GetSavedValue() != TriState(m_pContextualCB->IsChecked())) + || m_pContextualCB->IsValueChangedFromSaved()) { nWhich = GetWhich( SID_ATTR_ULSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); @@ -302,8 +302,8 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( m_pLeftIndent->IsValueModified() || m_pFLineIndent->IsValueModified() || - m_pRightIndent->IsValueModified() - || m_pAutoCB->GetSavedValue() != TriState(m_pAutoCB->IsChecked()) ) + m_pRightIndent->IsValueModified() || + m_pAutoCB->IsValueChangedFromSaved() ) { nWhich = GetWhich( SID_ATTR_LRSPACE ); SfxMapUnit eUnit = pPool->GetMetric( nWhich ); @@ -1083,8 +1083,8 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) { eAdjust = SVX_ADJUST_BLOCK; bAdj = !m_pJustify->GetSavedValue() || - TriState(m_pExpandCB->IsChecked()) != m_pExpandCB->GetSavedValue() || - m_pLastLineLB->GetSelectEntryPos() != m_pLastLineLB->GetSavedValue(); + m_pExpandCB->IsValueChangedFromSaved() || + m_pLastLineLB->IsValueChangedFromSaved(); bChecked = true; } sal_uInt16 _nWhich = GetWhich( SID_ATTR_PARA_ADJUST ); @@ -1121,12 +1121,12 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) rOutSet.Put( aAdj ); } } - if(TriState(m_pSnapToGridCB->IsChecked()) != m_pSnapToGridCB->GetSavedValue()) + if(m_pSnapToGridCB->IsValueChangedFromSaved()) { rOutSet.Put(SvxParaGridItem(m_pSnapToGridCB->IsChecked(), GetWhich( SID_ATTR_PARA_SNAPTOGRID ))); bModified = true; } - if(m_pVertAlignLB->GetSavedValue() != m_pVertAlignLB->GetSelectEntryPos()) + if(m_pVertAlignLB->IsValueChangedFromSaved()) { rOutSet.Put(SvxParaVertAlignItem(m_pVertAlignLB->GetSelectEntryPos(), GetWhich( SID_PARA_VERTALIGN ))); bModified = true; @@ -1135,7 +1135,7 @@ bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet ) if( m_pTextDirectionLB->IsVisible() ) { SvxFrameDirection eDir = m_pTextDirectionLB->GetSelectEntryValue(); - if( eDir != m_pTextDirectionLB->GetSavedValue() ) + if( m_pTextDirectionLB->IsValueChangedFromSaved() ) { rOutSet.Put( SvxFrameDirectionItem( eDir, GetWhich( SID_ATTR_FRAMEDIRECTION ) ) ); bModified = true; @@ -1331,7 +1331,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) const TriState eHyphenState = m_pHyphenBox->GetState(); const SfxPoolItem* pOld = GetOldItem( rOutSet, SID_ATTR_PARA_HYPHENZONE ); - if ( eHyphenState != m_pHyphenBox->GetSavedValue() || + if ( m_pHyphenBox->IsValueChangedFromSaved() || m_pExtHyphenBeforeBox->IsValueModified() || m_pExtHyphenAfterBox->IsValueModified() || m_pMaxHyphenEdit->IsValueModified() ) @@ -1349,7 +1349,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) if ( !pOld || !( *(SvxHyphenZoneItem*)pOld == aHyphen ) || - eHyphenState != m_pHyphenBox->GetSavedValue()) + m_pHyphenBox->IsValueChangedFromSaved()) { rOutSet.Put( aHyphen ); bModified = true; @@ -1377,9 +1377,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) _nWhich = GetWhich( SID_ATTR_PARA_MODEL ); OUString sPage; - if ( eState != m_pApplyCollBtn->GetSavedValue() || + if ( m_pApplyCollBtn->IsValueChangedFromSaved() || ( TRISTATE_TRUE == eState && - m_pApplyCollBox->GetSelectEntryPos() != m_pApplyCollBox->GetSavedValue() ) ) + m_pApplyCollBox->IsValueChangedFromSaved() ) ) { if ( eState == TRISTATE_TRUE ) { @@ -1412,9 +1412,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) SfxItemState eModelState = GetItemSet().GetItemState(SID_ATTR_PARA_MODEL, false); if ( (eModelState == SFX_ITEM_SET && TRISTATE_TRUE == m_pPageBreakBox->GetState()) || - eState != m_pPageBreakBox->GetSavedValue() || - m_pBreakTypeLB->GetSelectEntryPos() != m_pBreakTypeLB->GetSavedValue() || - m_pBreakPositionLB->GetSelectEntryPos() != m_pBreakPositionLB->GetSavedValue() ) + m_pPageBreakBox->IsValueChangedFromSaved() || + m_pBreakTypeLB->IsValueChangedFromSaved() || + m_pBreakPositionLB->IsValueChangedFromSaved() ) { const SvxFmtBreakItem rOldBreak( (const SvxFmtBreakItem&)GetItemSet().Get( _nWhich )); @@ -1463,7 +1463,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) _nWhich = GetWhich( SID_ATTR_PARA_SPLIT ); eState = m_pKeepTogetherBox->GetState(); - if ( eState != m_pKeepTogetherBox->GetSavedValue() ) + if ( m_pKeepTogetherBox->IsValueChangedFromSaved() ) { pOld = GetOldItem( rOutSet, SID_ATTR_PARA_SPLIT ); @@ -1479,7 +1479,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) _nWhich = GetWhich( SID_ATTR_PARA_KEEP ); eState = m_pKeepParaBox->GetState(); - if ( eState != m_pKeepParaBox->GetSavedValue() ) + if ( m_pKeepParaBox->IsValueChangedFromSaved() ) { // if the status has changed, putting is necessary rOutSet.Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) ); @@ -1490,14 +1490,14 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) _nWhich = GetWhich( SID_ATTR_PARA_WIDOWS ); eState = m_pWidowBox->GetState(); - if ( eState != m_pWidowBox->GetSavedValue() || + if ( m_pWidowBox->IsValueChangedFromSaved() || m_pWidowRowNo->IsValueModified() ) { SvxWidowsItem rItem( eState == TRISTATE_TRUE ? (sal_uInt8)m_pWidowRowNo->GetValue() : 0, _nWhich ); pOld = GetOldItem( rOutSet, SID_ATTR_PARA_WIDOWS ); - if ( eState != m_pWidowBox->GetSavedValue() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) + if ( m_pWidowBox->IsValueChangedFromSaved() || !pOld || !( *(const SvxWidowsItem*)pOld == rItem ) ) { rOutSet.Put( rItem ); bModified = true; @@ -1507,14 +1507,14 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet& rOutSet ) _nWhich = GetWhich( SID_ATTR_PARA_ORPHANS ); eState = m_pOrphanBox->GetState(); - if ( eState != m_pOrphanBox->GetSavedValue() || + if ( m_pOrphanBox->IsValueChangedFromSaved() || m_pOrphanRowNo->IsValueModified() ) { SvxOrphansItem rItem( eState == TRISTATE_TRUE ? (sal_uInt8)m_pOrphanRowNo->GetValue() : 0, _nWhich ); pOld = GetOldItem( rOutSet, SID_ATTR_PARA_ORPHANS ); - if ( eState != m_pOrphanBox->GetSavedValue() || + if ( m_pOrphanBox->IsValueChangedFromSaved() || !pOld || !( *(const SvxOrphansItem*)pOld == rItem ) ) { @@ -2151,7 +2151,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) { bool bRet = false; SfxItemPool* pPool = rSet.GetPool(); - if (m_pScriptSpaceCB->IsEnabled() && TriState(m_pScriptSpaceCB->IsChecked()) != m_pScriptSpaceCB->GetSavedValue()) + if (m_pScriptSpaceCB->IsEnabled() && m_pScriptSpaceCB->IsValueChangedFromSaved()) { SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( pPool->GetWhich(SID_ATTR_PARA_SCRIPTSPACE)).Clone(); @@ -2160,7 +2160,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) delete pNewItem; bRet = true; } - if (m_pHangingPunctCB->IsEnabled() && TriState(m_pHangingPunctCB->IsChecked()) != m_pHangingPunctCB->GetSavedValue()) + if (m_pHangingPunctCB->IsEnabled() && m_pHangingPunctCB->IsValueChangedFromSaved()) { SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( pPool->GetWhich(SID_ATTR_PARA_HANGPUNCTUATION)).Clone(); @@ -2169,7 +2169,7 @@ bool SvxAsianTabPage::FillItemSet( SfxItemSet& rSet ) delete pNewItem; bRet = true; } - if (m_pForbiddenRulesCB->IsEnabled() && TriState(m_pForbiddenRulesCB->IsChecked()) != m_pForbiddenRulesCB->GetSavedValue()) + if (m_pForbiddenRulesCB->IsEnabled() && m_pForbiddenRulesCB->IsValueChangedFromSaved()) { SfxBoolItem* pNewItem = (SfxBoolItem*)rSet.Get( pPool->GetWhich(SID_ATTR_PARA_FORBIDDEN_RULES)).Clone(); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index dadfe4346db2..87ce9e5f8363 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -736,7 +736,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) rSet.Put(SfxInt16Item(SID_ATTR_TRANSFORM_ANCHOR, nAnchor)); bModified = true; } - if ( m_pPositionCB->GetState() != m_pPositionCB->GetSavedValue() ) + if ( m_pPositionCB->IsValueChangedFromSaved() ) { if( m_pPositionCB->GetState() == TRISTATE_INDET ) rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_POS ); @@ -747,7 +747,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) bModified = true; } - if ( m_pSizeCB->GetState() != m_pSizeCB->GetSavedValue() ) + if ( m_pSizeCB->IsValueChangedFromSaved() ) { if ( m_pSizeCB->GetState() == TRISTATE_INDET ) rSet.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); @@ -814,7 +814,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) bModified = true; } } - if(m_pHoriMirrorCB->IsEnabled() && TriState(m_pHoriMirrorCB->IsChecked()) != m_pHoriMirrorCB->GetSavedValue()) + if(m_pHoriMirrorCB->IsEnabled() && m_pHoriMirrorCB->IsValueChangedFromSaved()) bModified |= 0 != rSet.Put(SfxBoolItem(SID_ATTR_TRANSFORM_HORI_MIRROR, m_pHoriMirrorCB->IsChecked())); if ( m_pVMap ) @@ -851,7 +851,7 @@ bool SvxSwPosSizeTabPage::FillItemSet( SfxItemSet& rSet) } // #i18732# - if(TriState(m_pFollowCB->IsChecked()) != m_pFollowCB->GetSavedValue()) + if(m_pFollowCB->IsValueChangedFromSaved()) { //Writer internal type - based on SfxBoolItem const SfxPoolItem* pItem = GetItem( rOldSet, SID_SW_FOLLOW_TEXT_FLOW); @@ -1097,7 +1097,7 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) if(pbHasChanged) { if(pCheckedButton) - *pbHasChanged = pCheckedButton->IsChecked() != pCheckedButton->GetSavedValue(); + *pbHasChanged = pCheckedButton->IsValueChangedFromSaved(); else *pbHasChanged = false; } diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 4ec13e89788e..84cd104103ad 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -341,17 +341,17 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // animation type nPos = m_pLbEffect->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && - nPos != m_pLbEffect->GetSavedValue() ) + m_pLbEffect->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAniKindItem( (SdrTextAniKind) nPos ) ); bModified = true; } // animation direction - if( m_pBtnUp->GetSavedValue() != TriState(m_pBtnUp->IsChecked()) || - m_pBtnLeft->GetSavedValue() != TriState(m_pBtnLeft->IsChecked()) || - m_pBtnRight->GetSavedValue() != TriState(m_pBtnRight->IsChecked()) || - m_pBtnDown->GetSavedValue() != TriState(m_pBtnDown->IsChecked()) ) + if( m_pBtnUp->IsValueChangedFromSaved() || + m_pBtnLeft->IsValueChangedFromSaved() || + m_pBtnRight->IsValueChangedFromSaved() || + m_pBtnDown->IsValueChangedFromSaved() ) { SdrTextAniDirection eValue = (SdrTextAniDirection) GetSelectedDirection(); rAttrs.Put( SdrTextAniDirectionItem( eValue ) ); @@ -360,7 +360,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // Start inside eState = m_pTsbStartInside->GetState(); - if( eState != m_pTsbStartInside->GetSavedValue() ) + if( m_pTsbStartInside->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAniStartInsideItem( TRISTATE_TRUE == eState ) ); bModified = true; @@ -368,7 +368,7 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // Stop inside eState = m_pTsbStopInside->GetState(); - if( eState != m_pTsbStopInside->GetSavedValue() ) + if( m_pTsbStopInside->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAniStopInsideItem( TRISTATE_TRUE == eState ) ); bModified = true; @@ -377,15 +377,15 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // quantity eState = m_pTsbEndless->GetState(); OUString aStr = m_pNumFldCount->GetText(); - if( eState != m_pTsbEndless->GetSavedValue() || - aStr != m_pNumFldCount->GetSavedValue() ) + if( m_pTsbEndless->IsValueChangedFromSaved() || + m_pNumFldCount->IsValueChangedFromSaved() ) { sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE /*#89844#*/ && m_pTsbEndless->IsEnabled()) bModified = true; else { - if( aStr != m_pNumFldCount->GetSavedValue() ) + if( m_pNumFldCount->IsValueChangedFromSaved() ) { nValue = m_pNumFldCount->GetValue(); bModified = true; @@ -398,15 +398,15 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // delay eState = m_pTsbAuto->GetState(); aStr = m_pMtrFldDelay->GetText(); - if( eState != m_pTsbAuto->GetSavedValue() || - aStr != m_pMtrFldDelay->GetSavedValue() ) + if( m_pTsbAuto->IsValueChangedFromSaved() || + m_pMtrFldDelay->IsValueChangedFromSaved() ) { sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE ) bModified = true; else { - if( aStr != m_pMtrFldDelay->GetSavedValue() ) + if( m_pMtrFldDelay->IsValueChangedFromSaved() ) { nValue = m_pMtrFldDelay->GetValue(); bModified = true; @@ -419,8 +419,8 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet& rAttrs) // step size eState = m_pTsbPixel->GetState(); aStr = m_pMtrFldAmount->GetText(); - if( eState != m_pTsbPixel->GetSavedValue() || - aStr != m_pMtrFldAmount->GetSavedValue() ) + if( m_pTsbPixel->IsValueChangedFromSaved() || + m_pMtrFldAmount->IsValueChangedFromSaved() ) { sal_Int64 nValue = 0; if( eState == TRISTATE_TRUE ) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index d6e2776c8b3f..aa5bf41a3114 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -331,62 +331,62 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet& rAttrs) sal_Int32 nValue; TriState eState; - if( m_pMtrFldLeft->GetText() != m_pMtrFldLeft->GetSavedValue() ) + if( m_pMtrFldLeft->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldLeft, eUnit ); rAttrs.Put( SdrTextLeftDistItem( nValue ) ); } - if( m_pMtrFldRight->GetText() != m_pMtrFldRight->GetSavedValue() ) + if( m_pMtrFldRight->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldRight, eUnit ); rAttrs.Put( SdrTextRightDistItem( nValue ) ); } - if( m_pMtrFldTop->GetText() != m_pMtrFldTop->GetSavedValue() ) + if( m_pMtrFldTop->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldTop, eUnit ); rAttrs.Put( SdrTextUpperDistItem( nValue ) ); } - if( m_pMtrFldBottom->GetText() != m_pMtrFldBottom->GetSavedValue() ) + if( m_pMtrFldBottom->IsValueChangedFromSaved() ) { nValue = GetCoreValue( *m_pMtrFldBottom, eUnit ); rAttrs.Put( SdrTextLowerDistItem( nValue ) ); } eState = m_pTsbAutoGrowHeight->GetState(); - if( eState != m_pTsbAutoGrowHeight->GetSavedValue() ) + if( m_pTsbAutoGrowHeight->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowWidth->GetState(); - if( eState != m_pTsbAutoGrowWidth->GetSavedValue() ) + if( m_pTsbAutoGrowWidth->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAutoGrowWidthItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbAutoGrowSize->GetState(); - if( eState != m_pTsbAutoGrowSize->GetSavedValue() ) + if( m_pTsbAutoGrowSize->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextAutoGrowHeightItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbWordWrapText->GetState(); - if( eState != m_pTsbWordWrapText->GetSavedValue() ) + if( m_pTsbWordWrapText->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbContour->GetState(); - if( eState != m_pTsbContour->GetSavedValue() ) + if( m_pTsbContour->IsValueChangedFromSaved() ) { rAttrs.Put( SdrTextContourFrameItem( TRISTATE_TRUE == eState ) ); } eState = m_pTsbFitToSize->GetState(); - if( eState != m_pTsbFitToSize->GetSavedValue() ) + if( m_pTsbFitToSize->IsValueChangedFromSaved() ) { SdrFitToSizeType eFTS; switch( eState ) diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 4dcd79b4e993..b927c39eef55 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -318,7 +318,7 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { // linear transparence sal_uInt16 nPos = (sal_uInt16)m_pMtrTransparent->GetValue(); - if(nPos != (sal_uInt16)m_pMtrTransparent->GetSavedValue().toInt32() || !bLinearActive) + if(m_pMtrTransparent->IsValueChangedFromSaved() || !bLinearActive) { XFillTransparenceItem aItem(nPos); SdrShadowTransparenceItem aShadowItem(nPos); @@ -336,13 +336,13 @@ bool SvxTransparenceTabPage::FillItemSet(SfxItemSet& rAttrs) { // transparence gradient, fill ItemSet from values if(!bGradActive - || (XGradientStyle)m_pLbTrgrGradientType->GetSelectEntryPos() != (XGradientStyle)m_pLbTrgrGradientType->GetSavedValue() - || (sal_uInt16)m_pMtrTrgrAngle->GetValue() != (sal_uInt16)m_pMtrTrgrAngle->GetSavedValue().toInt32() - || (sal_uInt16)m_pMtrTrgrCenterX->GetValue() != (sal_uInt16)m_pMtrTrgrCenterX->GetSavedValue().toInt32() - || (sal_uInt16)m_pMtrTrgrCenterY->GetValue() != (sal_uInt16)m_pMtrTrgrCenterY->GetSavedValue().toInt32() - || (sal_uInt16)m_pMtrTrgrBorder->GetValue() != (sal_uInt16)m_pMtrTrgrBorder->GetSavedValue().toInt32() - || (sal_uInt16)m_pMtrTrgrStartValue->GetValue() != (sal_uInt16)m_pMtrTrgrStartValue->GetSavedValue().toInt32() - || (sal_uInt16)m_pMtrTrgrEndValue->GetValue() != (sal_uInt16)m_pMtrTrgrEndValue->GetSavedValue().toInt32() ) + || m_pLbTrgrGradientType->IsValueChangedFromSaved() + || m_pMtrTrgrAngle->IsValueChangedFromSaved() + || m_pMtrTrgrCenterX->IsValueChangedFromSaved() + || m_pMtrTrgrCenterY->IsValueChangedFromSaved() + || m_pMtrTrgrBorder->IsValueChangedFromSaved() + || m_pMtrTrgrStartValue->IsValueChangedFromSaved() + || m_pMtrTrgrEndValue->IsValueChangedFromSaved() ) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)m_pMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)m_pMtrTrgrEndValue->GetValue() * 255) / 100); @@ -1017,7 +1017,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { _nPos = m_pLbColor->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND && - _nPos != m_pLbColor->GetSavedValue() ) + m_pLbColor->IsValueChangedFromSaved() ) { XFillColorItem aItem( m_pLbColor->GetSelectEntry(), m_pLbColor->GetSelectEntryColor() ); @@ -1047,7 +1047,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { _nPos = m_pLbGradient->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND && - _nPos != m_pLbGradient->GetSavedValue() ) + m_pLbGradient->IsValueChangedFromSaved() ) { XGradient aGradient = pGradientList->GetGradient( _nPos )->GetGradient(); OUString aString = m_pLbGradient->GetSelectEntry(); @@ -1078,7 +1078,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { _nPos = m_pLbHatching->GetSelectEntryPos(); if( _nPos != LISTBOX_ENTRY_NOTFOUND && - _nPos != m_pLbHatching->GetSavedValue() ) + m_pLbHatching->IsValueChangedFromSaved() ) { XHatch aHatching = pHatchingList->GetHatch( _nPos )->GetHatch(); OUString aString = m_pLbHatching->GetSelectEntry(); @@ -1094,7 +1094,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) rAttrs.Put( aItem ); nPos = m_pLbHatchBckgrdColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && - nPos != m_pLbHatchBckgrdColor->GetSavedValue() ) + m_pLbHatchBckgrdColor->IsValueChangedFromSaved() ) { XFillColorItem aFillColorItem( m_pLbHatchBckgrdColor->GetSelectEntry(), m_pLbHatchBckgrdColor->GetSelectEntryColor() ); @@ -1134,7 +1134,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { nPos = m_pLbBitmap->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && - nPos != m_pLbBitmap->GetSavedValue() ) + m_pLbBitmap->IsValueChangedFromSaved() ) { const XBitmapEntry* pXBitmapEntry = pBitmapList->GetBitmap(nPos); const OUString aString(m_pLbBitmap->GetSelectEntry()); @@ -1172,7 +1172,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) TriState eState = m_pTsbStepCount->GetState(); if( eState == TRISTATE_TRUE ) { - if( eState != m_pTsbStepCount->GetSavedValue() ) + if( m_pTsbStepCount->IsValueChangedFromSaved() ) bValueModified = true; } else @@ -1181,7 +1181,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( !m_pNumFldStepCount->GetText().isEmpty() ) { nValue = (sal_uInt16) m_pNumFldStepCount->GetValue(); - if( nValue != (sal_uInt16) m_pNumFldStepCount->GetSavedValue().toInt32() ) + if( m_pNumFldStepCount->IsValueChangedFromSaved() ) bValueModified = true; } } @@ -1200,7 +1200,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbTile->IsEnabled() ) { TriState eState = m_pTsbTile->GetState(); - if( eState != m_pTsbTile->GetSavedValue() ) + if( m_pTsbTile->IsValueChangedFromSaved() ) { XFillBmpTileItem aFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ); @@ -1216,7 +1216,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) if( m_pTsbStretch->IsEnabled() ) { TriState eState = m_pTsbStretch->GetState(); - if( eState != m_pTsbStretch->GetSavedValue() ) + if( m_pTsbStretch->IsValueChangedFromSaved() ) { XFillBmpStretchItem aFillBmpStretchItem( sal::static_int_cast< sal_Bool >( eState ) ); @@ -1235,7 +1235,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) //aTsbScale TriState eState = m_pTsbScale->GetState(); - if( eState != m_pTsbScale->GetSavedValue() || + if( m_pTsbScale->IsValueChangedFromSaved() || ( !m_pTsbScale->IsEnabled() && m_pTsbOriginal->IsEnabled() && m_pTsbScale->GetSavedValue() != TRISTATE_TRUE ) ) @@ -1339,8 +1339,8 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) OUString aMtrString = m_pMtrFldOffset->GetText(); if( ( !aMtrString.isEmpty() && aMtrString != m_pMtrFldOffset->GetSavedValue() ) || - m_pRbtRow->GetSavedValue() != m_pRbtRow->IsChecked() || - m_pRbtColumn->GetSavedValue() != m_pRbtColumn->IsChecked() ) + m_pRbtRow->IsValueChangedFromSaved() || + m_pRbtColumn->IsValueChangedFromSaved() ) { if( m_pRbtRow->IsChecked() ) { @@ -1398,7 +1398,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { OUString sMtrXOffset = m_pMtrFldXOffset->GetText(); if( !sMtrXOffset.isEmpty() && - sMtrXOffset != m_pMtrFldXOffset->GetSavedValue() ) + m_pMtrFldXOffset->IsValueChangedFromSaved() ) { XFillBmpPosOffsetXItem aFillBmpPosOffsetXItem( (sal_uInt16) m_pMtrFldXOffset->GetValue() ); pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETX ); @@ -1415,7 +1415,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet& rAttrs ) { OUString sMtrYOffset = m_pMtrFldYOffset->GetText(); if( !sMtrYOffset.isEmpty() && - sMtrYOffset != m_pMtrFldYOffset->GetSavedValue() ) + m_pMtrFldYOffset->IsValueChangedFromSaved() ) { XFillBmpPosOffsetYItem aFillBmpPosOffsetYItem( (sal_uInt16) m_pMtrFldYOffset->GetValue() ); pOld = GetOldItem( rAttrs, XATTR_FILLBMP_POSOFFSETY ); diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 4925d61142ed..c24bcbfbdb6e 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -230,11 +230,11 @@ int SvxHatchTabPage::DeactivatePage( SfxItemSet* _pSet ) long SvxHatchTabPage::CheckChanges_Impl() { - if( m_pMtrDistance->GetText() != m_pMtrDistance->GetSavedValue() || - m_pMtrAngle->GetText() != m_pMtrAngle->GetSavedValue() || - m_pLbLineType->GetSelectEntryPos() != m_pLbLineType->GetSavedValue() || - m_pLbLineColor->GetSelectEntryPos() != m_pLbLineColor->GetSavedValue() || - m_pLbHatchings->GetSelectEntryPos() != m_pLbHatchings->GetSavedValue() ) + if( m_pMtrDistance->IsValueChangedFromSaved() || + m_pMtrAngle->IsValueChangedFromSaved() || + m_pLbLineType->IsValueChangedFromSaved() || + m_pLbLineColor->IsValueChangedFromSaved() || + m_pLbHatchings->IsValueChangedFromSaved() ) { ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 452fa7a4c22b..536595696dd0 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -679,7 +679,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { nPos = m_pLbLineStyle->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && - nPos != m_pLbLineStyle->GetSavedValue() ) + m_pLbLineStyle->IsValueChangedFromSaved() ) { XLineStyleItem* pStyleItem = NULL; @@ -715,7 +715,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } // Line width // GetSavedValue() returns OUString! - if( m_pMtrLineWidth->GetText() != m_pMtrLineWidth->GetSavedValue() ) + if( m_pMtrLineWidth->IsValueChangedFromSaved() ) { XLineWidthItem aItem( GetCoreValue( *m_pMtrLineWidth, ePoolUnit ) ); pOld = GetOldItem( rAttrs, XATTR_LINEWIDTH ); @@ -726,7 +726,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } // Width line start - if( m_pMtrStartWidth->GetText() != m_pMtrStartWidth->GetSavedValue() ) + if( m_pMtrStartWidth->IsValueChangedFromSaved() ) { XLineStartWidthItem aItem( GetCoreValue( *m_pMtrStartWidth, ePoolUnit ) ); pOld = GetOldItem( rAttrs, XATTR_LINESTARTWIDTH ); @@ -737,7 +737,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } // Width line end - if( m_pMtrEndWidth->GetText() != m_pMtrEndWidth->GetSavedValue() ) + if( m_pMtrEndWidth->IsValueChangedFromSaved() ) { XLineEndWidthItem aItem( GetCoreValue( *m_pMtrEndWidth, ePoolUnit ) ); pOld = GetOldItem( rAttrs, XATTR_LINEENDWIDTH ); @@ -749,7 +749,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } // Line color - if( m_pLbColor->GetSelectEntryPos() != m_pLbColor->GetSavedValue() ) + if( m_pLbColor->IsValueChangedFromSaved() ) { XLineColorItem aItem( m_pLbColor->GetSelectEntry(), m_pLbColor->GetSelectEntryColor() ); pOld = GetOldItem( rAttrs, XATTR_LINECOLOR ); @@ -764,7 +764,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) { // Line start nPos = m_pLbStartStyle->GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbStartStyle->GetSavedValue() ) + if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbStartStyle->IsValueChangedFromSaved() ) { XLineStartItem* pItem = NULL; if( nPos == 0 ) @@ -781,7 +781,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } // Line end nPos = m_pLbEndStyle->GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != m_pLbEndStyle->GetSavedValue() ) + if( nPos != LISTBOX_ENTRY_NOTFOUND && m_pLbEndStyle->IsValueChangedFromSaved() ) { XLineEndItem* pItem = NULL; if( nPos == 0 ) @@ -801,7 +801,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // Centered line end TriState eState = m_pTsbCenterStart->GetState(); - if( eState != m_pTsbCenterStart->GetSavedValue() ) + if( m_pTsbCenterStart->IsValueChangedFromSaved() ) { XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); pOld = GetOldItem( rAttrs, XATTR_LINESTARTCENTER ); @@ -812,7 +812,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) } } eState = m_pTsbCenterEnd->GetState(); - if( eState != m_pTsbCenterEnd->GetSavedValue() ) + if( m_pTsbCenterEnd->IsValueChangedFromSaved() ) { XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); pOld = GetOldItem( rAttrs, XATTR_LINEENDCENTER ); @@ -825,7 +825,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // Transparency sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); - if( nVal != (sal_uInt16)m_pMtrTransparent->GetSavedValue().toInt32() ) + if( m_pMtrTransparent->IsValueChangedFromSaved() ) { XLineTransparenceItem aItem( nVal ); pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE ); @@ -838,7 +838,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // #116827# nPos = m_pLBEdgeStyle->GetSelectEntryPos(); - if( LISTBOX_ENTRY_NOTFOUND != nPos && nPos != m_pLBEdgeStyle->GetSavedValue() ) + if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBEdgeStyle->IsValueChangedFromSaved() ) { XLineJointItem* pNew = 0L; @@ -882,7 +882,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs ) // LineCaps nPos = m_pLBCapStyle->GetSelectEntryPos(); - if( LISTBOX_ENTRY_NOTFOUND != nPos && nPos != m_pLBCapStyle->GetSavedValue() ) + if( LISTBOX_ENTRY_NOTFOUND != nPos && m_pLBCapStyle->IsValueChangedFromSaved() ) { XLineCapItem* pNew = 0L; diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index fc2768aa536a..4d6de14752f4 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -206,13 +206,13 @@ void SvxLineDefTabPage::CheckChanges_Impl() // is here used to NOT lose changes //XDashStyle eXDS; - if( m_pNumFldNumber1->GetText() != m_pNumFldNumber1->GetSavedValue() || - m_pMtrLength1->GetText() != m_pMtrLength1->GetSavedValue() || - m_pLbType1->GetSelectEntryPos() != m_pLbType1->GetSavedValue() || - m_pNumFldNumber2->GetText() != m_pNumFldNumber2->GetSavedValue() || - m_pMtrLength2->GetText() != m_pMtrLength2->GetSavedValue() || - m_pLbType2->GetSelectEntryPos() != m_pLbType2->GetSavedValue() || - m_pMtrDistance->GetText() != m_pMtrDistance->GetSavedValue() ) + if( m_pNumFldNumber1->IsValueChangedFromSaved() || + m_pMtrLength1->IsValueChangedFromSaved() || + m_pLbType1->IsValueChangedFromSaved() || + m_pNumFldNumber2->IsValueChangedFromSaved() || + m_pMtrLength2->IsValueChangedFromSaved() || + m_pLbType2->IsValueChangedFromSaved() || + m_pMtrDistance->IsValueChangedFromSaved() ) { ResMgr& rMgr = CUI_MGR(); Image aWarningBoxImage = WarningBox::GetStandardImage(); diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 6e7ff1d73bb9..161d576d4d7d 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -252,7 +252,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) if( !bDisable ) { TriState eState = m_pTsbShowShadow->GetState(); - if( eState != m_pTsbShowShadow->GetSavedValue() ) + if( m_pTsbShowShadow->IsValueChangedFromSaved() ) { SdrShadowItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); pOld = GetOldItem( rAttrs, SDRATTR_SHADOW ); @@ -321,7 +321,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) // ShadowColor sal_Int32 nPos = m_pLbShadowColor->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && - nPos != m_pLbShadowColor->GetSavedValue() ) + m_pLbShadowColor->IsValueChangedFromSaved() ) { SdrShadowColorItem aItem(m_pLbShadowColor->GetSelectEntryColor()); pOld = GetOldItem( rAttrs, SDRATTR_SHADOWCOLOR ); @@ -334,7 +334,7 @@ bool SvxShadowTabPage::FillItemSet( SfxItemSet& rAttrs ) // transparency sal_uInt16 nVal = (sal_uInt16)m_pMtrTransparent->GetValue(); - if( nVal != (sal_uInt16)m_pMtrTransparent->GetSavedValue().toInt32() ) + if( m_pMtrTransparent->IsValueChangedFromSaved() ) { SdrShadowTransparenceItem aItem( nVal ); pOld = GetOldItem( rAttrs, SDRATTR_SHADOWTRANSPARENCE ); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index eef82e80323c..629085bfdb44 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -474,7 +474,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) bool bModified = false; OUString aStr = m_pMtrRadius->GetText(); - if( aStr != m_pMtrRadius->GetSavedValue() ) + if( m_pMtrRadius->IsValueChangedFromSaved() ) { Fraction aUIScale = pView->GetModel()->GetUIScale(); long nTmp = GetCoreValue( *m_pMtrRadius, ePoolUnit ); @@ -486,7 +486,7 @@ bool SvxSlantTabPage::FillItemSet(SfxItemSet& rAttrs) aStr = m_pMtrAngle->GetText(); - if( aStr != m_pMtrAngle->GetSavedValue() ) + if( m_pMtrAngle->IsValueChangedFromSaved() ) { sal_Int32 nValue = static_cast<sal_Int32>(m_pMtrAngle->GetValue()); rAttrs.Put( SfxInt32Item( SID_ATTR_TRANSFORM_SHEAR, nValue ) ); @@ -810,7 +810,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) bModified = true; } - if ( m_pTsbPosProtect->GetState() != m_pTsbPosProtect->GetSavedValue() ) + if ( m_pTsbPosProtect->IsValueChangedFromSaved() ) { if( m_pTsbPosProtect->GetState() == TRISTATE_INDET ) { @@ -852,7 +852,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) bModified = true; } - if ( m_pTsbSizeProtect->GetState() != m_pTsbSizeProtect->GetSavedValue() ) + if ( m_pTsbSizeProtect->IsValueChangedFromSaved() ) { if ( m_pTsbSizeProtect->GetState() == TRISTATE_INDET ) rOutAttrs.InvalidateItem( SID_ATTR_TRANSFORM_PROTECT_SIZE ); @@ -863,7 +863,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) bModified = true; } - if ( m_pTsbAutoGrowWidth->GetState() != m_pTsbAutoGrowWidth->GetSavedValue() ) + if ( m_pTsbAutoGrowWidth->IsValueChangedFromSaved() ) { if ( !m_pTsbAutoGrowWidth->IsTriStateEnabled() ) { @@ -877,7 +877,7 @@ bool SvxPositionSizeTabPage::FillItemSet( SfxItemSet& rOutAttrs ) bModified = true; } - if ( m_pTsbAutoGrowHeight->GetState() != m_pTsbAutoGrowHeight->GetSavedValue() ) + if ( m_pTsbAutoGrowHeight->IsValueChangedFromSaved() ) { if ( !m_pTsbAutoGrowHeight->IsTriStateEnabled() ) { |