[Libreoffice-commits] core.git: cui/source dbaccess/source sc/source sd/source sfx2/source svtools/source svx/source sw/source
Noel Grandin
noel at peralex.com
Thu May 8 05:55:49 PDT 2014
cui/source/dialogs/hangulhanjadlg.cxx | 2
cui/source/options/connpooloptions.cxx | 2
cui/source/options/fontsubs.cxx | 4 -
cui/source/options/optasian.cxx | 6 +-
cui/source/options/optbasic.cxx | 12 ++--
cui/source/options/optcolor.cxx | 4 -
cui/source/options/optctl.cxx | 15 ++---
cui/source/options/optfltr.cxx | 37 ++++++------
cui/source/options/optgdlg.cxx | 47 +++++++--------
cui/source/options/optgenrl.cxx | 2
cui/source/options/opthtml.cxx | 30 +++++-----
cui/source/options/optinet2.cxx | 18 +++---
cui/source/options/optjava.cxx | 4 -
cui/source/options/optjsearch.cxx | 38 ++++++------
cui/source/options/optmemory.cxx | 4 -
cui/source/options/optsave.cxx | 22 +++----
cui/source/options/optupdt.cxx | 4 -
cui/source/tabpages/autocdlg.cxx | 4 -
cui/source/tabpages/backgrnd.cxx | 6 +-
cui/source/tabpages/border.cxx | 8 +-
cui/source/tabpages/chardlg.cxx | 18 +++---
cui/source/tabpages/connect.cxx | 16 ++---
cui/source/tabpages/grfpage.cxx | 10 +--
cui/source/tabpages/measure.cxx | 20 +++---
cui/source/tabpages/page.cxx | 36 ++++++------
cui/source/tabpages/paragrph.cxx | 50 ++++++++--------
cui/source/tabpages/swpossizetabpage.cxx | 10 +--
cui/source/tabpages/textanim.cxx | 30 +++++-----
cui/source/tabpages/textattr.cxx | 20 +++---
cui/source/tabpages/tparea.cxx | 44 +++++++-------
cui/source/tabpages/tphatch.cxx | 10 +--
cui/source/tabpages/tpline.cxx | 24 ++++----
cui/source/tabpages/tplnedef.cxx | 14 ++--
cui/source/tabpages/tpshadow.cxx | 6 +-
cui/source/tabpages/transfrm.cxx | 12 ++--
dbaccess/source/ui/control/FieldDescControl.cxx | 2
dbaccess/source/ui/control/charsetlistbox.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4 -
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 10 +--
dbaccess/source/ui/dlg/adminpages.cxx | 6 +-
dbaccess/source/ui/dlg/advancedsettings.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 2
dbaccess/source/ui/dlg/generalpage.cxx | 6 +-
dbaccess/source/ui/inc/FieldControls.hxx | 8 +-
dbaccess/source/ui/misc/WCPage.cxx | 2
sc/source/ui/optdlg/tpcompatibility.cxx | 2
sc/source/ui/optdlg/tpdefaults.cxx | 2
sc/source/ui/optdlg/tpprint.cxx | 6 +-
sc/source/ui/optdlg/tpview.cxx | 66 +++++++++++-----------
sc/source/ui/pagedlg/areasdlg.cxx | 2
sc/source/ui/pagedlg/tptable.cxx | 8 +-
sd/source/ui/dlg/dlgfield.cxx | 8 +-
sd/source/ui/dlg/paragr.cxx | 6 +-
sd/source/ui/dlg/prntopts.cxx | 34 +++++------
sd/source/ui/dlg/tpaction.cxx | 2
sd/source/ui/dlg/tpoption.cxx | 32 +++++-----
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/mgetempl.cxx | 4 -
sfx2/source/dialog/printopt.cxx | 6 +-
svtools/source/brwbox/ebbcontrols.cxx | 6 +-
svtools/source/dialogs/addresstemplate.cxx | 2
svx/source/dialog/rubydialog.cxx | 4 -
svx/source/form/tbxform.cxx | 2
svx/source/sidebar/line/LinePropertyPanel.cxx | 10 +--
sw/source/ui/chrdlg/chardlg.cxx | 8 +-
sw/source/ui/chrdlg/numpara.cxx | 16 ++---
sw/source/ui/config/mailconfigpage.cxx | 10 +--
sw/source/ui/config/optload.cxx | 14 ++--
sw/source/ui/config/optpage.cxx | 44 +++++++-------
sw/source/ui/dbui/mmgreetingspage.cxx | 8 +-
sw/source/ui/fldui/flddb.cxx | 2
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddok.cxx | 8 +-
sw/source/ui/fldui/fldfunc.cxx | 10 +--
sw/source/ui/fldui/fldref.cxx | 10 +--
sw/source/ui/fldui/fldvar.cxx | 14 ++--
sw/source/ui/frmdlg/column.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 45 +++++++--------
sw/source/ui/misc/pggrid.cxx | 26 ++++----
sw/source/ui/table/tabledlg.cxx | 30 +++++-----
81 files changed, 541 insertions(+), 547 deletions(-)
New commits:
commit bf30c8b16d9ac9304a49020ec2d4f744d90abe26
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 8 14:53:29 2014 +0200
use new VCL IsValueChangedFromSaved method
follow to commit ff1a7a59434f5f793d4044aad615bcf78148e963
"RFC: add IsValueChangedFromSaved to VCL button and listbox"
Change-Id: If2e6d9e7c18590dc4abbc90362d7897ca2557dd6
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 03aedf3..699c67a 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -699,7 +699,7 @@ namespace svx
IMPL_LINK_NOARG(HangulHanjaConversionDialog, OnSuggestionModified)
{
- m_aFind.Enable( m_pPlayground->GetWordInputControl().GetSavedValue() != m_pPlayground->GetWordInputControl().GetText() );
+ m_aFind.Enable( m_pPlayground->GetWordInputControl().IsValueChangedFromSaved() );
bool bSameLen = m_pPlayground->GetWordInputControl().GetText().getLength() == m_pPlayground->GetCurrentText().getLength();
m_pPlayground->EnableButton( SvxCommonLinguisticControl::eChange, m_bDocumentMode && bSameLen );
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 6cc3fe6..fcb0ca9 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -373,7 +373,7 @@ namespace offapp
bool bModified = false;
// the enabled flag
- if (m_pEnablePooling->GetSavedValue() != TriState(m_pEnablePooling->IsChecked()))
+ if (m_pEnablePooling->IsValueChangedFromSaved())
{
_rSet.Put(SfxBoolItem(SID_SB_POOLING_ENABLED, m_pEnablePooling->IsChecked()), SID_SB_POOLING_ENABLED);
bModified = true;
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index b169718..868c6e1 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -173,11 +173,11 @@ bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
pConfig->Apply();
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
- if(m_pFontHeightLB->GetSavedValue() != m_pFontHeightLB->GetSelectEntryPos())
+ if(m_pFontHeightLB->IsValueChangedFromSaved())
officecfg::Office::Common::Font::SourceViewFont::FontHeight::set(
static_cast< sal_Int16 >(m_pFontHeightLB->GetSelectEntry().toInt32()),
batch);
- if(m_pNonPropFontsOnlyCB->GetSavedValue() != TriState(m_pNonPropFontsOnlyCB->IsChecked()))
+ if(m_pNonPropFontsOnlyCB->IsValueChangedFromSaved())
officecfg::Office::Common::Font::SourceViewFont::
NonProportionalFontsOnly::set(
m_pNonPropFontsOnlyCB->IsChecked(), batch);
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 7269d68..d79a954 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -162,7 +162,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
{
- if(m_pCharKerningRB->IsChecked() != m_pCharKerningRB->GetSavedValue())
+ if(m_pCharKerningRB->IsValueChangedFromSaved())
{
pImpl->aConfig.SetKerningWesternTextOnly(m_pCharKerningRB->IsChecked());
OUString sPunct(cIsKernAsianPunctuation);
@@ -175,8 +175,8 @@ bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
}
}
- if(m_pNoCompressionRB->IsChecked() != m_pNoCompressionRB->GetSavedValue() ||
- m_pPunctCompressionRB->IsChecked() != m_pPunctCompressionRB->GetSavedValue())
+ if(m_pNoCompressionRB->IsValueChangedFromSaved() ||
+ m_pPunctCompressionRB->IsValueChangedFromSaved())
{
sal_Int16 nSet = m_pNoCompressionRB->IsChecked() ? 0 :
m_pPunctCompressionRB->IsChecked() ? 1 : 2;
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index bd8c9bd..27a983c 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -71,14 +71,14 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
bool bModified = false;
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
- if( TriState(pAutocloseProcChk->IsChecked()) != pAutocloseProcChk->GetSavedValue() )
+ if( pAutocloseProcChk->IsValueChangedFromSaved() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch );
CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() );
bModified = true;
}
- if( TriState(pCodeCompleteChk->IsChecked()) != pCodeCompleteChk->GetSavedValue() )
+ if( pCodeCompleteChk->IsValueChangedFromSaved() )
{
//boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch );
@@ -86,28 +86,28 @@ bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
bModified = true;
}
- if( TriState(pUseExtendedTypesChk->IsChecked()) != pUseExtendedTypesChk->GetSavedValue() )
+ if( pUseExtendedTypesChk->IsValueChangedFromSaved() )
{
officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch );
CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() );
bModified = true;
}
- if( TriState(pAutocloseParenChk->IsChecked()) != pAutocloseParenChk->GetSavedValue() )
+ if( pAutocloseParenChk->IsValueChangedFromSaved() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() );
bModified = true;
}
- if( TriState(pAutocloseQuotesChk->IsChecked()) != pAutocloseQuotesChk->GetSavedValue() )
+ if( pAutocloseQuotesChk->IsValueChangedFromSaved() )
{
officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() );
bModified = true;
}
- if( TriState(pAutoCorrectChk->IsChecked()) != pAutoCorrectChk->GetSavedValue() )
+ if( pAutoCorrectChk->IsValueChangedFromSaved() )
{
officecfg::Office::BasicIDE::Autocomplete::AutoCorrect::set( pAutoCorrectChk->IsChecked(), batch );
CodeCompleteOptions::SetAutoCorrectOn( pAutoCorrectChk->IsChecked() );
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 435c54e..77108e8 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1057,7 +1057,7 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
{
//when the dialog is cancelled but the color scheme ListBox has been changed these
//changes need to be undone
- if(!bFillItemSetCalled && m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos())
+ if(!bFillItemSetCalled && m_pColorSchemeLB->IsValueChangedFromSaved())
{
OUString sOldScheme = m_pColorSchemeLB->GetEntry(m_pColorSchemeLB->GetSavedValue());
if(!sOldScheme.isEmpty())
@@ -1082,7 +1082,7 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
{
bFillItemSetCalled = true;
- if(m_pColorSchemeLB->GetSavedValue() != m_pColorSchemeLB->GetSelectEntryPos())
+ if(m_pColorSchemeLB->IsValueChangedFromSaved())
{
pColorConfig->SetModified();
pExtColorConfig->SetModified();
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index d743800..3d51979 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -73,29 +73,28 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
// Sequence checking
bool bChecked = m_pSequenceCheckingCB->IsChecked();
- if ( (bChecked ? 1 : 0) != m_pSequenceCheckingCB->GetSavedValue() )
+ if ( m_pSequenceCheckingCB->IsValueChangedFromSaved() )
{
aCTLOptions.SetCTLSequenceChecking( bChecked );
bModified = true;
}
bChecked = m_pRestrictedCB->IsChecked();
- if( (bChecked ? 1 : 0) != m_pRestrictedCB->GetSavedValue() )
+ if( m_pRestrictedCB->IsValueChangedFromSaved() )
{
aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked );
bModified = true;
}
bChecked = m_pTypeReplaceCB->IsChecked();
- if( (bChecked ? 1 : 0) != m_pTypeReplaceCB->GetSavedValue())
+ if( m_pTypeReplaceCB->IsValueChangedFromSaved())
{
aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked);
bModified = true;
}
bool bLogicalChecked = m_pMovementLogicalRB->IsChecked();
- bool bVisualChecked = m_pMovementVisualRB->IsChecked();
- if ( bLogicalChecked != m_pMovementLogicalRB->GetSavedValue() ||
- bVisualChecked != m_pMovementVisualRB->GetSavedValue() )
+ if ( m_pMovementLogicalRB->IsValueChangedFromSaved() ||
+ m_pMovementVisualRB->IsValueChangedFromSaved() )
{
SvtCTLOptions::CursorMovement eMovement =
bLogicalChecked ? SvtCTLOptions::MOVEMENT_LOGICAL : SvtCTLOptions::MOVEMENT_VISUAL;
@@ -103,9 +102,9 @@ bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
bModified = true;
}
- sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos();
- if ( nPos != m_pNumeralsLB->GetSavedValue() )
+ if ( m_pNumeralsLB->IsValueChangedFromSaved() )
{
+ sal_uInt16 nPos = m_pNumeralsLB->GetSelectEntryPos();
aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
bModified = true;
}
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index d732661..bf877b6 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -80,25 +80,24 @@ bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
{
SvtFilterOptions& rOpt = SvtFilterOptions::Get();
- bool bFlag;
- if( (aWBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicCodeCB->IsChecked()))
- rOpt.SetLoadWordBasicCode( bFlag );
- if( (aWBasicWbctblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicWbctblCB->IsChecked()))
- rOpt.SetLoadWordBasicExecutable( bFlag );
- if( (aWBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aWBasicStgCB->IsChecked()))
- rOpt.SetLoadWordBasicStorage( bFlag );
-
- if( (aEBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicCodeCB->IsChecked()))
- rOpt.SetLoadExcelBasicCode( bFlag );
- if( (aEBasicExectblCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicExectblCB->IsChecked()))
- rOpt.SetLoadExcelBasicExecutable( bFlag );
- if( (aEBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aEBasicStgCB->IsChecked()))
- rOpt.SetLoadExcelBasicStorage( bFlag );
-
- if( (aPBasicCodeCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicCodeCB->IsChecked()))
- rOpt.SetLoadPPointBasicCode( bFlag );
- if( (aPBasicStgCB->GetSavedValue() == TRISTATE_TRUE) != (bFlag = aPBasicStgCB->IsChecked()))
- rOpt.SetLoadPPointBasicStorage( bFlag );
+ if( aWBasicCodeCB->IsValueChangedFromSaved() )
+ rOpt.SetLoadWordBasicCode( aWBasicCodeCB->IsChecked() );
+ if( aWBasicWbctblCB->IsValueChangedFromSaved() )
+ rOpt.SetLoadWordBasicExecutable( aWBasicWbctblCB->IsChecked() );
+ if( aWBasicStgCB->IsValueChangedFromSaved() )
+ rOpt.SetLoadWordBasicStorage( aWBasicStgCB->IsChecked() );
+
+ if( aEBasicCodeCB->IsValueChangedFromSaved())
+ rOpt.SetLoadExcelBasicCode( aEBasicCodeCB->IsChecked() );
+ if( aEBasicExectblCB->IsValueChangedFromSaved())
+ rOpt.SetLoadExcelBasicExecutable( aEBasicExectblCB->IsChecked() );
+ if( aEBasicStgCB->IsValueChangedFromSaved())
+ rOpt.SetLoadExcelBasicStorage( aEBasicStgCB->IsChecked() );
+
+ if( aPBasicCodeCB->IsValueChangedFromSaved())
+ rOpt.SetLoadPPointBasicCode( aPBasicCodeCB->IsChecked() );
+ if( aPBasicStgCB->IsValueChangedFromSaved())
+ rOpt.SetLoadPPointBasicStorage( aPBasicStgCB->IsChecked() );
return false;
}
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index d8b42f0..ffa6f7e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -248,35 +248,34 @@ bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bool bModified = false;
SvtHelpOptions aHelpOptions;
- bool bChecked = m_pToolTipsCB->IsChecked();
- if ( bChecked != (m_pToolTipsCB->GetSavedValue() == TRISTATE_TRUE) )
- aHelpOptions.SetHelpTips( bChecked );
- bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() );
+ if ( m_pToolTipsCB->IsValueChangedFromSaved() )
+ aHelpOptions.SetHelpTips( m_pToolTipsCB->IsChecked() );
+ bool bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() );
if ( bChecked != (m_pExtHelpCB->GetSavedValue() == TRISTATE_TRUE) )
aHelpOptions.SetExtendedHelp( bChecked );
- if ( TriState(m_pFileDlgCB->IsChecked()) != m_pFileDlgCB->GetSavedValue() )
+ if ( m_pFileDlgCB->IsValueChangedFromSaved() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetUseSystemFileDialog( !m_pFileDlgCB->IsChecked() );
bModified = true;
}
- if ( TriState(m_pPrintDlgCB->IsChecked()) != m_pPrintDlgCB->GetSavedValue() )
+ if ( m_pPrintDlgCB->IsValueChangedFromSaved() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetUseSystemPrintDialog( !m_pPrintDlgCB->IsChecked() );
bModified = true;
}
- if ( TriState(m_pDocStatusCB->IsChecked()) != m_pDocStatusCB->GetSavedValue() )
+ if ( m_pDocStatusCB->IsValueChangedFromSaved() )
{
SvtPrintWarningOptions aPrintOptions;
aPrintOptions.SetModifyDocumentOnPrintingAllowed( m_pDocStatusCB->IsChecked() );
bModified = true;
}
- if ( TriState(m_pSaveAlwaysCB->IsChecked()) != m_pSaveAlwaysCB->GetSavedValue() )
+ if ( m_pSaveAlwaysCB->IsValueChangedFromSaved() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() );
@@ -732,26 +731,26 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& )
}
#if defined( UNX )
- if ( TriState(m_pFontAntiAliasing->IsChecked()) != m_pFontAntiAliasing->GetSavedValue() )
+ if ( m_pFontAntiAliasing->IsValueChangedFromSaved() )
{
pAppearanceCfg->SetFontAntiAliasing( m_pFontAntiAliasing->IsChecked() );
bAppearanceChanged = true;
}
- if ( m_pAAPointLimit->GetValue() != m_pAAPointLimit->GetSavedValue().toInt32() )
+ if ( m_pAAPointLimit->IsValueChangedFromSaved() )
{
pAppearanceCfg->SetFontAntialiasingMinPixelHeight( m_pAAPointLimit->GetValue() );
bAppearanceChanged = true;
}
#endif
- if ( TriState(m_pFontShowCB->IsChecked()) != m_pFontShowCB->GetSavedValue() )
+ if ( m_pFontShowCB->IsValueChangedFromSaved() )
{
aFontOpt.EnableFontWYSIWYG( m_pFontShowCB->IsChecked() );
bModified = true;
}
- if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue())
+ if(m_pMenuIconsLB->IsValueChangedFromSaved())
{
aMenuOpt.SetMenuIconsState(m_pMenuIconsLB->GetSelectEntryPos() == 0 ?
TRISTATE_INDET :
@@ -761,7 +760,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& )
bAppearanceChanged = true;
}
- if ( TriState(m_pFontHistoryCB->IsChecked()) != m_pFontHistoryCB->GetSavedValue() )
+ if ( m_pFontHistoryCB->IsValueChangedFromSaved() )
{
aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() );
bModified = true;
@@ -770,7 +769,7 @@ bool OfaViewTabPage::FillItemSet( SfxItemSet& )
// #i95644# if disabled, do not use value, see in ::Reset()
if(m_pUseHardwareAccell->IsEnabled())
{
- if(TriState(m_pUseHardwareAccell->IsChecked()) != m_pUseHardwareAccell->GetSavedValue())
+ if(m_pUseHardwareAccell->IsValueChangedFromSaved())
{
pCanvasSettings->EnabledHardwareAcceleration(m_pUseHardwareAccell->IsChecked());
bModified = true;
@@ -1195,7 +1194,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
if (
m_pCTLSupportCB->IsChecked() &&
(m_pCTLSupportCB->GetSavedValue() != TRISTATE_TRUE ||
- m_pComplexLanguageLB->GetSavedValue() != m_pComplexLanguageLB->GetSelectEntryPos())
+ m_pComplexLanguageLB->IsValueChangedFromSaved())
)
{
//sequence checking has to be switched on depending on the selected CTL language
@@ -1279,10 +1278,10 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
aCompatOpts.SetDefault( COMPATIBILITY_PROPERTYNAME_EXPANDWORDSPACE, !bNewCJK );
}
- if(m_pDecimalSeparatorCB->GetSavedValue() != TriState(m_pDecimalSeparatorCB->IsChecked()))
+ if(m_pDecimalSeparatorCB->IsValueChangedFromSaved())
pLangConfig->aSysLocaleOptions.SetDecimalSeparatorAsLocale(m_pDecimalSeparatorCB->IsChecked());
- if(m_pIgnoreLanguageChangeCB->GetSavedValue() != TriState(m_pIgnoreLanguageChangeCB->IsChecked()))
+ if(m_pIgnoreLanguageChangeCB->IsValueChangedFromSaved())
pLangConfig->aSysLocaleOptions.SetIgnoreLanguageChange(m_pIgnoreLanguageChangeCB->IsChecked());
// Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
@@ -1299,7 +1298,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
// locale default.
- if (m_pDatePatternsED->GetText() != m_pDatePatternsED->GetSavedValue())
+ if (m_pDatePatternsED->IsValueChangedFromSaved())
pLangConfig->aSysLocaleOptions.SetDatePatternsConfigString( m_pDatePatternsED->GetText());
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
@@ -1307,9 +1306,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
bool bCurrentDocCBChecked = m_pCurrentDocCB->IsChecked();
if(m_pCurrentDocCB->IsEnabled())
bLanguageCurrentDoc_Impl = bCurrentDocCBChecked;
- bool bCurrentDocCBChanged = bCurrentDocCBChecked != (m_pCurrentDocCB->GetSavedValue() == TRISTATE_TRUE);
+ bool bCurrentDocCBChanged = m_pCurrentDocCB->IsValueChangedFromSaved();
- bool bValChanged = m_pWesternLanguageLB->GetSavedValue() != m_pWesternLanguageLB->GetSelectEntryPos();
+ bool bValChanged = m_pWesternLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
LanguageType eSelectLang = m_pWesternLanguageLB->GetSelectLanguage();
@@ -1329,7 +1328,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
SID_ATTR_LANGUAGE));
}
}
- bValChanged = m_pAsianLanguageLB->GetSavedValue() != m_pAsianLanguageLB->GetSelectEntryPos();
+ bValChanged = m_pAsianLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
LanguageType eSelectLang = m_pAsianLanguageLB->GetSelectLanguage();
@@ -1349,7 +1348,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
SID_ATTR_CHAR_CJK_LANGUAGE));
}
}
- bValChanged = m_pComplexLanguageLB->GetSavedValue() != m_pComplexLanguageLB->GetSelectEntryPos();
+ bValChanged = m_pComplexLanguageLB->IsValueChangedFromSaved();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
LanguageType eSelectLang = m_pComplexLanguageLB->GetSelectLanguage();
@@ -1370,7 +1369,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
}
}
- if(m_pAsianSupportCB->GetSavedValue() != TriState(m_pAsianSupportCB->IsChecked()) )
+ if(m_pAsianSupportCB->IsValueChangedFromSaved() )
{
bool bChecked = m_pAsianSupportCB->IsChecked();
pLangConfig->aLanguageOptions.SetAll(bChecked);
@@ -1389,7 +1388,7 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
}
- if ( m_pCTLSupportCB->GetSavedValue() != TriState(m_pCTLSupportCB->IsChecked()) )
+ if ( m_pCTLSupportCB->IsValueChangedFromSaved() )
{
SvtSearchOptions aOpt;
aOpt.SetIgnoreDiacritics_CTL (true);
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 647d1fd..1cff7c1 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -395,7 +395,7 @@ bool SvxGeneralTabPage::GetAddress_Impl()
// modified?
for (unsigned i = 0; i != vFields.size(); ++i)
- if (vFields[i]->pEdit->GetSavedValue() != vFields[i]->pEdit->GetText())
+ if (vFields[i]->pEdit->IsValueChangedFromSaved())
return true;
return false;
}
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index a494e41..c6c724c 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -97,43 +97,43 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
bool OfaHtmlTabPage::FillItemSet( SfxItemSet& )
{
SvxHtmlOptions& rHtmlOpt = SvxHtmlOptions::Get();
- if(aSize1NF->GetSavedValue() != aSize1NF->GetText())
+ if(aSize1NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF->GetValue());
- if(aSize2NF->GetSavedValue() != aSize2NF->GetText())
+ if(aSize2NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF->GetValue());
- if(aSize3NF->GetSavedValue() != aSize3NF->GetText())
+ if(aSize3NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF->GetValue());
- if(aSize4NF->GetSavedValue() != aSize4NF->GetText())
+ if(aSize4NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF->GetValue());
- if(aSize5NF->GetSavedValue() != aSize5NF->GetText())
+ if(aSize5NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF->GetValue());
- if(aSize6NF->GetSavedValue() != aSize6NF->GetText())
+ if(aSize6NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF->GetValue());
- if(aSize7NF->GetSavedValue() != aSize7NF->GetText())
+ if(aSize7NF->IsValueChangedFromSaved())
rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF->GetValue());
- if(TriState(aNumbersEnglishUSCB->IsChecked()) != aNumbersEnglishUSCB->GetSavedValue())
+ if(aNumbersEnglishUSCB->IsValueChangedFromSaved())
rHtmlOpt.SetNumbersEnglishUS(aNumbersEnglishUSCB->IsChecked());
- if(TriState(aUnknownTagCB->IsChecked()) != aUnknownTagCB->GetSavedValue())
+ if(aUnknownTagCB->IsValueChangedFromSaved())
rHtmlOpt.SetImportUnknown(aUnknownTagCB->IsChecked());
- if(TriState(aIgnoreFontNamesCB->IsChecked()) != aIgnoreFontNamesCB->GetSavedValue())
+ if(aIgnoreFontNamesCB->IsValueChangedFromSaved())
rHtmlOpt.SetIgnoreFontFamily(aIgnoreFontNamesCB->IsChecked());
- if(aExportLB->GetSelectEntryPos() != aExportLB->GetSavedValue())
+ if(aExportLB->IsValueChangedFromSaved())
rHtmlOpt.SetExportMode(aPosToExportArr[aExportLB->GetSelectEntryPos()]);
- if(TriState(aStarBasicCB->IsChecked()) != aStarBasicCB->GetSavedValue())
+ if(aStarBasicCB->IsValueChangedFromSaved())
rHtmlOpt.SetStarBasic(aStarBasicCB->IsChecked());
- if(TriState(aStarBasicWarningCB->IsChecked()) != aStarBasicWarningCB->GetSavedValue())
+ if(aStarBasicWarningCB->IsValueChangedFromSaved())
rHtmlOpt.SetStarBasicWarning(aStarBasicWarningCB->IsChecked());
- if(TriState(aSaveGrfLocalCB->IsChecked()) != aSaveGrfLocalCB->GetSavedValue())
+ if(aSaveGrfLocalCB->IsValueChangedFromSaved())
rHtmlOpt.SetSaveGraphicsLocal(aSaveGrfLocalCB->IsChecked());
- if(TriState(aPrintExtensionCB->IsChecked()) != aPrintExtensionCB->GetSavedValue())
+ if(aPrintExtensionCB->IsValueChangedFromSaved())
rHtmlOpt.SetPrintLayoutExtension(aPrintExtensionCB->IsChecked());
if( aCharSetLB->GetSelectTextEncoding() != rHtmlOpt.GetTextEncoding() )
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 23851bd..8938483 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -399,7 +399,7 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
Reference< beans::XPropertySet > xPropertySet(m_xConfigurationUpdateAccess, UNO_QUERY_THROW );
sal_Int32 nSelPos = m_pProxyModeLB->GetSelectEntryPos();
- if(m_pProxyModeLB->GetSavedValue() != nSelPos)
+ if(m_pProxyModeLB->IsValueChangedFromSaved())
{
if( nSelPos == 1 )
{
@@ -412,43 +412,43 @@ bool SvxProxyTabPage::FillItemSet(SfxItemSet& )
bModified = true;
}
- if(m_pHttpProxyED->GetSavedValue() != m_pHttpProxyED->GetText())
+ if(m_pHttpProxyED->IsValueChangedFromSaved())
{
xPropertySet->setPropertyValue( aHttpProxyPN, makeAny(m_pHttpProxyED->GetText()));
bModified = true;
}
- if ( m_pHttpPortED->GetSavedValue() != m_pHttpPortED->GetText() )
+ if ( m_pHttpPortED->IsValueChangedFromSaved())
{
xPropertySet->setPropertyValue( aHttpPortPN, makeAny(m_pHttpPortED->GetText().toInt32()));
bModified = true;
}
- if( m_pHttpsProxyED->GetSavedValue() != m_pHttpsProxyED->GetText() )
+ if( m_pHttpsProxyED->IsValueChangedFromSaved() )
{
xPropertySet->setPropertyValue( aHttpsProxyPN, makeAny(m_pHttpsProxyED->GetText()) );
bModified = true;
}
- if ( m_pHttpsPortED->GetSavedValue() != m_pHttpsPortED->GetText() )
+ if ( m_pHttpsPortED->IsValueChangedFromSaved() )
{
xPropertySet->setPropertyValue( aHttpsPortPN, makeAny(m_pHttpsPortED->GetText().toInt32()) );
bModified = true;
}
- if( m_pFtpProxyED->GetSavedValue() != m_pFtpProxyED->GetText())
+ if( m_pFtpProxyED->IsValueChangedFromSaved())
{
xPropertySet->setPropertyValue( aFtpProxyPN, makeAny(m_pFtpProxyED->GetText()) );
bModified = true;
}
- if ( m_pFtpPortED->GetSavedValue() != m_pFtpPortED->GetText() )
+ if ( m_pFtpPortED->IsValueChangedFromSaved() )
{
xPropertySet->setPropertyValue( aFtpPortPN, makeAny(m_pFtpPortED->GetText().toInt32()));
bModified = true;
}
- if ( m_pNoProxyForED->GetSavedValue() != m_pNoProxyForED->GetText() )
+ if ( m_pNoProxyForED->IsValueChangedFromSaved() )
{
xPropertySet->setPropertyValue( aNoProxyDescPN, makeAny( m_pNoProxyForED->GetText()));
bModified = true;
@@ -1235,7 +1235,7 @@ SfxTabPage* SvxEMailTabPage::Create( Window* pParent, const SfxItemSet& rAttrSe
bool SvxEMailTabPage::FillItemSet( SfxItemSet& )
{
bool bMailModified = false;
- if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->GetSavedValue() != m_pMailerURLED->GetText())
+ if(!pImpl->aMailConfig.bROProgram && m_pMailerURLED->IsValueChangedFromSaved())
{
pImpl->aMailConfig.sProgram = m_pMailerURLED->GetText();
bMailModified = true;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 97d1609..b54f710 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -646,14 +646,14 @@ bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
{
bool bModified = false;
- if ( TriState(m_pExperimentalCB->IsChecked()) != m_pExperimentalCB->GetSavedValue() )
+ if ( m_pExperimentalCB->IsValueChangedFromSaved() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetExperimentalMode( m_pExperimentalCB->IsChecked() );
bModified = true;
}
- if ( TriState(m_pMacroCB->IsChecked()) != m_pMacroCB->GetSavedValue() )
+ if ( m_pMacroCB->IsValueChangedFromSaved() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetMacroRecorderMode( m_pMacroCB->IsChecked() );
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 54482d4..8fbf05f 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -225,133 +225,133 @@ bool SvxJSearchOptionsPage::FillItemSet( SfxItemSet& )
bool bNewVal, bChanged;
bNewVal = m_pMatchCase->IsChecked(); //! treat as equal uppercase/lowercase
- bChanged = bNewVal != (m_pMatchCase->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchCase->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchCase(!bNewVal );
bModified = true;
}
bNewVal = m_pMatchFullHalfWidth->IsChecked();
- bChanged = bNewVal != (m_pMatchFullHalfWidth->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchFullHalfWidth->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchFullHalfWidthForms( bNewVal );
bModified = true;
}
bNewVal = m_pMatchHiraganaKatakana->IsChecked();
- bChanged = bNewVal != (m_pMatchHiraganaKatakana->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchHiraganaKatakana->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchHiraganaKatakana( bNewVal );
bModified = true;
}
bNewVal = m_pMatchContractions->IsChecked();
- bChanged = bNewVal != (m_pMatchContractions->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchContractions->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchContractions( bNewVal );
bModified = true;
}
bNewVal = m_pMatchMinusDashChoon->IsChecked();
- bChanged = bNewVal != (m_pMatchMinusDashChoon->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchMinusDashChoon->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchMinusDashChoon( bNewVal );
bModified = true;
}
bNewVal = m_pMatchRepeatCharMarks->IsChecked();
- bChanged = bNewVal != (m_pMatchRepeatCharMarks->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchRepeatCharMarks->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchRepeatCharMarks( bNewVal );
bModified = true;
}
bNewVal = m_pMatchVariantFormKanji->IsChecked();
- bChanged = bNewVal != (m_pMatchVariantFormKanji->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchVariantFormKanji->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchVariantFormKanji( bNewVal );
bModified = true;
}
bNewVal = m_pMatchOldKanaForms->IsChecked();
- bChanged = bNewVal != (m_pMatchOldKanaForms->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchOldKanaForms->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchOldKanaForms( bNewVal );
bModified = true;
}
bNewVal = m_pMatchDiziDuzu->IsChecked();
- bChanged = bNewVal != (m_pMatchDiziDuzu->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchDiziDuzu->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchDiziDuzu( bNewVal );
bModified = true;
}
bNewVal = m_pMatchBavaHafa->IsChecked();
- bChanged = bNewVal != (m_pMatchBavaHafa->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchBavaHafa->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchBavaHafa( bNewVal );
bModified = true;
}
bNewVal = m_pMatchTsithichiDhizi->IsChecked();
- bChanged = bNewVal != (m_pMatchTsithichiDhizi->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchTsithichiDhizi->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchTsithichiDhizi( bNewVal );
bModified = true;
}
bNewVal = m_pMatchHyuiyuByuvyu->IsChecked();
- bChanged = bNewVal != (m_pMatchHyuiyuByuvyu->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchHyuiyuByuvyu->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchHyuiyuByuvyu( bNewVal );
bModified = true;
}
bNewVal = m_pMatchSesheZeje->IsChecked();
- bChanged = bNewVal != (m_pMatchSesheZeje->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchSesheZeje->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchSesheZeje( bNewVal );
bModified = true;
}
bNewVal = m_pMatchIaiya->IsChecked();
- bChanged = bNewVal != (m_pMatchIaiya->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchIaiya->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchIaiya( bNewVal );
bModified = true;
}
bNewVal = m_pMatchKiku->IsChecked();
- bChanged = bNewVal != (m_pMatchKiku->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchKiku->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetMatchKiku( bNewVal );
bModified = true;
}
bNewVal = m_pIgnorePunctuation->IsChecked();
- bChanged = bNewVal != (m_pIgnorePunctuation->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pIgnorePunctuation->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetIgnorePunctuation( bNewVal );
bModified = true;
}
bNewVal = m_pIgnoreWhitespace->IsChecked();
- bChanged = bNewVal != (m_pIgnoreWhitespace->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pIgnoreWhitespace->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetIgnoreWhitespace( bNewVal );
bModified = true;
}
bNewVal = m_pMatchProlongedSoundMark->IsChecked();
- bChanged = bNewVal != (m_pMatchProlongedSoundMark->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pMatchProlongedSoundMark->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetIgnoreProlongedSoundMark( bNewVal );
bModified = true;
}
bNewVal = m_pIgnoreMiddleDot->IsChecked();
- bChanged = bNewVal != (m_pIgnoreMiddleDot->GetSavedValue() == TRISTATE_TRUE);
+ bChanged = m_pIgnoreMiddleDot->IsValueChangedFromSaved();
if (bChanged)
{
aOpt.SetIgnoreMiddleDot( bNewVal );
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index f67f5b8..72bda7a 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -162,7 +162,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
boost::shared_ptr< comphelper::ConfigurationChanges > batch(
comphelper::ConfigurationChanges::create());
- if ( m_pUndoEdit->GetText() != m_pUndoEdit->GetSavedValue() )
+ if ( m_pUndoEdit->IsValueChangedFromSaved() )
officecfg::Office::Common::Undo::Steps::set(
m_pUndoEdit->GetValue(), batch);
@@ -196,7 +196,7 @@ bool OfaMemoryOptionsPage::FillItemSet( SfxItemSet& rSet )
batch->commit();
- if( TriState(m_pQuickLaunchCB->IsChecked()) != m_pQuickLaunchCB->GetSavedValue())
+ if( m_pQuickLaunchCB->IsValueChangedFromSaved())
{
rSet.Put(SfxBoolItem(SID_ATTR_QUICKLAUNCHER, m_pQuickLaunchCB->IsChecked()));
bModified = true;
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 5dd0866..59b95b5 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -242,69 +242,69 @@ bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
{
bool bModified = false;
SvtSaveOptions aSaveOpt;
- if(TriState(aLoadUserSettingsCB->IsChecked()) != aLoadUserSettingsCB->GetSavedValue())
+ if(aLoadUserSettingsCB->IsValueChangedFromSaved())
{
aSaveOpt.SetLoadUserSettings(aLoadUserSettingsCB->IsChecked());
}
- if ( TriState(aLoadDocPrinterCB->IsChecked()) != aLoadDocPrinterCB->GetSavedValue() )
+ if ( aLoadDocPrinterCB->IsValueChangedFromSaved() )
aSaveOpt.SetLoadDocumentPrinter( aLoadDocPrinterCB->IsChecked() );
- if ( aODFVersionLB->GetSelectEntryPos() != aODFVersionLB->GetSavedValue() )
+ if ( aODFVersionLB->IsValueChangedFromSaved() )
{
sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
}
- if ( TriState(aDocInfoCB->IsChecked()) != aDocInfoCB->GetSavedValue() )
+ if ( aDocInfoCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
aDocInfoCB->IsChecked() ) );
bModified |= true;
}
- if ( aBackupCB->IsEnabled() && TriState(aBackupCB->IsChecked()) != aBackupCB->GetSavedValue() )
+ if ( aBackupCB->IsEnabled() && aBackupCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
aBackupCB->IsChecked() ) );
bModified |= true;
}
- if ( TriState(aAutoSaveCB->IsChecked()) != aAutoSaveCB->GetSavedValue() )
+ if ( aAutoSaveCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
aAutoSaveCB->IsChecked() ) );
bModified |= true;
}
- if ( TriState(aWarnAlienFormatCB->IsChecked()) != aWarnAlienFormatCB->GetSavedValue() )
+ if ( aWarnAlienFormatCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
aWarnAlienFormatCB->IsChecked() ) );
bModified |= true;
}
- if ( aAutoSaveEdit->GetText() != aAutoSaveEdit->GetSavedValue() )
+ if ( aAutoSaveEdit->IsValueChangedFromSaved() )
{
rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
(sal_uInt16)aAutoSaveEdit->GetValue() ) );
bModified |= true;
}
- if ( TriState(aUserAutoSaveCB->IsChecked()) != aUserAutoSaveCB->GetSavedValue() )
+ if ( aUserAutoSaveCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
aUserAutoSaveCB->IsChecked() ) );
bModified |= true;
}
// save relatively
- if ( TriState(aRelativeFsysCB->IsChecked()) != aRelativeFsysCB->GetSavedValue() )
+ if ( aRelativeFsysCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
aRelativeFsysCB->IsChecked() ) );
bModified |= true;
}
- if ( TriState(aRelativeInetCB->IsChecked()) != aRelativeInetCB->GetSavedValue() )
+ if ( aRelativeInetCB->IsValueChangedFromSaved() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
aRelativeInetCB->IsChecked() ) );
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 014076c..1271310 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -164,7 +164,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
bool bValue;
sal_Int64 nValue;
- if( m_pAutoCheckCheckBox->GetSavedValue() != TriState(m_pAutoCheckCheckBox->IsChecked()) )
+ if( m_pAutoCheckCheckBox->IsValueChangedFromSaved() )
{
bValue = m_pAutoCheckCheckBox->IsChecked();
m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) );
@@ -194,7 +194,7 @@ bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
bModified = true;
}
- if( m_pAutoDownloadCheckBox->GetSavedValue() != TriState(m_pAutoDownloadCheckBox->IsChecked()) )
+ if( m_pAutoDownloadCheckBox->IsValueChangedFromSaved() )
{
bValue = m_pAutoDownloadCheckBox->IsChecked();
m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 987a642..5e41c3a 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 ea34a8a..110fc14 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 83b1f58..bf03f68 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 8dbe14e..f813c9a 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 fd2b449..8b32636 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 2a11e2c..252d7e7 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 8982ed8..853fe8f 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 740a905..e13fce1 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 50e257b..271065b 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 dadfe43..87ce9e5 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 4ec13e8..84cd104 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 d6e2776..aa5bf41 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 4dcd79b..b927c39 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 4925d61..c24bcbf 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 452fa7a..5365956 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 fc2768a..4d6de14 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 6e7ff1d..161d576 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 eef82e8..629085b 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() )
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list