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 | |
| parent | d15540c431587368d749b53074af25cf865e7a5f (diff) | |
use new VCL IsValueChangedFromSaved method
follow to commit ff1a7a59434f5f793d4044aad615bcf78148e963
"RFC: add IsValueChangedFromSaved to VCL button and listbox"
Change-Id: If2e6d9e7c18590dc4abbc90362d7897ca2557dd6
81 files changed, 541 insertions, 547 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 03aedf3d7631..699c67a47eb4 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 6cc3fe62d911..fcb0ca90288b 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 b169718e3b12..868c6e146cb1 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 7269d6892231..d79a954dceea 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 bd8c9bd3c5ab..27a983c6621b 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 435c54e25903..77108e8d26a9 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 d743800f615a..3d51979d507d 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 d732661dbdf2..bf877b692bac 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 d8b42f00f467..ffa6f7eec658 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 647d1fde3fb9..1cff7c16567d 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 a494e41227b1..c6c724cab33b 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 23851bd484a2..893848327919 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 97d1609c981d..b54f710b906d 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 54482d40048f..8fbf05f7c67b 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 f67f5b883b96..72bda7a569f7 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 5dd08661a907..59b95b50a8df 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 014076cb03f8..127131057620 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 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() ) { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 507e18b41b9f..b473fe3bb11a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -655,7 +655,7 @@ IMPL_LINK( OFieldDescControl, ChangeHdl, ListBox *, pListBox ) if ( !pActFieldDescr ) return 0; - if ( pListBox->GetSavedValue() != pListBox->GetSelectEntryPos() ) + if ( pListBox->IsValueChangedFromSaved() ) SetModified(true); // Special treatment for Boold fields diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index a068e7f56219..e1578d00839c 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -75,7 +75,7 @@ namespace dbaui bool CharSetListBox::StoreSelectedCharSet( SfxItemSet& _rSet, const sal_uInt16 _nItemId ) { bool bChangedSomething = false; - if ( GetSelectEntryPos() != GetSavedValue() ) + if ( IsValueChangedFromSaved() ) { OCharsetDisplay::const_iterator aFind = m_aCharSets.findDisplayName( GetSelectEntry() ); OSL_ENSURE( aFind != m_aCharSets.end(), "CharSetListBox::StoreSelectedCharSet: could not translate the selected character set!" ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 9792ce2c8096..573a8feafa65 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -282,7 +282,7 @@ namespace dbaui { bool bChangedSomething = false; - if (m_aUserName.GetText() != m_aUserName.GetSavedValue()) + if (m_aUserName.IsValueChangedFromSaved()) { _rSet.Put(SfxStringItem(DSID_USER, m_aUserName.GetText())); _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString())); diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index bf842f00ea8d..853e5cbe60c2 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -162,7 +162,7 @@ using namespace ::com::sun::star; fillString(_rSet,&m_aETBaseDN,DSID_CONN_LDAP_BASEDN, bChangedSomething); fillInt32(_rSet,&m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething); - if ( m_aETHostServer.GetText() != m_aETHostServer.GetSavedValue() ) + if ( m_aETHostServer.IsValueChangedFromSaved() ) { DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION)); ::dbaccess::ODsnTypeCollection* pCollection = NULL; @@ -738,7 +738,7 @@ using namespace ::com::sun::star; { bool bChangedSomething = false; - if (m_aETUserName.GetText() != m_aETUserName.GetSavedValue()) + if (m_aETUserName.IsValueChangedFromSaved()) { _rSet.Put(SfxStringItem(DSID_USER, m_aETUserName.GetText())); _rSet.Put(SfxStringItem(DSID_PASSWORD, OUString())); diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index bc8b7b2c7c68..08bd843652e1 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -378,7 +378,7 @@ namespace dbaui if ( ( m_nAvailableSections & TC_HEADER ) != 0 ) { - if( (m_aRowHeader.GetState() != m_aRowHeader.GetSavedValue()) ) + if( m_aRowHeader.IsValueChangedFromSaved() ) { rSet.Put(SfxBoolItem(DSID_TEXTFILEHEADER, m_aRowHeader.IsChecked())); bChangedSomething = true; @@ -387,23 +387,23 @@ namespace dbaui if ( ( m_nAvailableSections & TC_SEPARATORS ) != 0 ) { - if( m_aFieldSeparator.GetText() != m_aFieldSeparator.GetSavedValue() ) + if( m_aFieldSeparator.IsValueChangedFromSaved() ) { rSet.Put( SfxStringItem(DSID_FIELDDELIMITER, GetSeparator( m_aFieldSeparator, m_aFieldSeparatorList) ) ); bChangedSomething = true; } - if( m_aTextSeparator.GetText() != m_aTextSeparator.GetSavedValue() ) + if( m_aTextSeparator.IsValueChangedFromSaved() ) { rSet.Put( SfxStringItem(DSID_TEXTDELIMITER, GetSeparator( m_aTextSeparator, m_aTextSeparatorList) ) ); bChangedSomething = true; } - if( m_aDecimalSeparator.GetText() != m_aDecimalSeparator.GetSavedValue() ) + if( m_aDecimalSeparator.IsValueChangedFromSaved() ) { rSet.Put( SfxStringItem(DSID_DECIMALDELIMITER, m_aDecimalSeparator.GetText().copy(0, 1) ) ); bChangedSomething = true; } - if( m_aThousandsSeparator.GetText() != m_aThousandsSeparator.GetSavedValue() ) + if( m_aThousandsSeparator.IsValueChangedFromSaved() ) { rSet.Put( SfxStringItem(DSID_THOUSANDSDELIMITER, m_aThousandsSeparator.GetText().copy(0,1) ) ); bChangedSomething = true; diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 9c194c8b7254..24a66a4d1d54 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -193,7 +193,7 @@ namespace dbaui } void OGenericAdministrationPage::fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, sal_uInt16 _nID, bool& _bChangedSomething, bool _bRevertValue ) { - if ( (_pCheckBox != NULL ) && ( _pCheckBox->GetState() != _pCheckBox->GetSavedValue() ) ) + if ( _pCheckBox && _pCheckBox->IsValueChangedFromSaved() ) { bool bValue = _pCheckBox->IsChecked(); if ( _bRevertValue ) @@ -214,7 +214,7 @@ namespace dbaui } void OGenericAdministrationPage::fillInt32(SfxItemSet& _rSet, NumericField* _pEdit, sal_uInt16 _nID, bool& _bChangedSomething) { - if( (_pEdit != NULL) && (_pEdit->GetValue() != _pEdit->GetSavedValue().toInt32()) ) + if( _pEdit && _pEdit->IsValueChangedFromSaved() ) { _rSet.Put(SfxInt32Item(_nID, static_cast<sal_Int32>(_pEdit->GetValue()))); _bChangedSomething = true; @@ -222,7 +222,7 @@ namespace dbaui } void OGenericAdministrationPage::fillString(SfxItemSet& _rSet, Edit* _pEdit, sal_uInt16 _nID, bool& _bChangedSomething) { - if( (_pEdit != NULL) && (_pEdit->GetText() != _pEdit->GetSavedValue()) ) + if( _pEdit && _pEdit->IsValueChangedFromSaved() ) { _rSet.Put(SfxStringItem(_nID, _pEdit->GetText())); _bChangedSomething = true; diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 624c95180e59..288f94377d7f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -282,7 +282,7 @@ namespace dbaui // the non-boolean items if ( m_bHasBooleanComparisonMode ) { - if ( m_pBooleanComparisonMode->GetSelectEntryPos() != m_pBooleanComparisonMode->GetSavedValue() ) + if ( m_pBooleanComparisonMode->IsValueChangedFromSaved() ) { _rSet.Put( SfxInt32Item( DSID_BOOLEANCOMPARISON, m_pBooleanComparisonMode->GetSelectEntryPos() ) ); bChangedSomething = true; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 2afb25309438..16b192ef171e 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -644,7 +644,7 @@ namespace dbaui bChangedSomething |= m_aMySQLSettings.FillItemSet( _rSet ); - if ( m_aUserName.GetText() != m_aUserName.GetSavedValue() ) + if ( m_aUserName.IsValueChangedFromSaved() ) { _rSet.Put( SfxStringItem( DSID_USER, m_aUserName.GetText() ) ); _rSet.Put( SfxStringItem( DSID_PASSWORD, OUString())); diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 83d17bd1e91e..5f5ba276c58f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -473,7 +473,7 @@ namespace dbaui sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos(); OUString sURLPrefix = m_aURLPrefixes[ nEntry ]; - if ( m_pDatasourceType->GetSavedValue() != nEntry ) + if ( m_pDatasourceType->IsValueChangedFromSaved() ) { _rCoreAttrs.Put( SfxStringItem( DSID_CONNECTURL, sURLPrefix ) ); bChangedSomething = true; @@ -640,7 +640,7 @@ namespace dbaui } else if ( m_pRB_OpenExistingDatabase->IsChecked() ) { - if ( m_pRB_OpenExistingDatabase->GetSavedValue() != m_pRB_OpenExistingDatabase->IsChecked() ) + if ( m_pRB_OpenExistingDatabase->IsValueChangedFromSaved() ) bChangedSomething = true; // TODO @@ -652,7 +652,7 @@ namespace dbaui sal_uInt16 nEntry = m_pDatasourceType->GetSelectEntryPos(); OUString sURLPrefix = m_aURLPrefixes[nEntry]; - if ( ( m_pDatasourceType->GetSavedValue() != nEntry ) + if ( m_pDatasourceType->IsValueChangedFromSaved() || ( GetDatabaseCreationMode() != m_eOriginalCreationMode ) ) { diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 7f2e68a7d938..5584549871f6 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -36,7 +36,7 @@ namespace dbaui public: OPropColumnEditCtrl(Window* pParent, OUString& _rAllowedChars, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -54,7 +54,7 @@ namespace dbaui public: OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -70,7 +70,7 @@ namespace dbaui public: OPropNumericEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - virtual bool IsModified() const SAL_OVERRIDE { return GetText() != GetSavedValue(); } + virtual bool IsModified() const SAL_OVERRIDE { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } @@ -87,7 +87,7 @@ namespace dbaui public: OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nPosition = -1, WinBits nWinStyle = 0); - bool IsModified() const { return GetSelectEntryPos() != GetSavedValue(); } + bool IsModified() const { return IsValueChangedFromSaved(); } short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 8a7412786ff4..7107d165ac90 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -204,7 +204,7 @@ bool OCopyTable::LeavePage() } } - if ( m_edTableName.GetSavedValue() != m_edTableName.GetText() ) + if ( m_edTableName.IsValueChangedFromSaved() ) { // table exists and name has changed if ( m_pParent->getOperation() == CopyTableOperation::AppendData ) { diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index cb12ccd59420..17ceca431145 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -33,7 +33,7 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, const SfxItemSet &rCoreAt bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs) { bool bRet = false; - if (m_pLbKeyBindings->GetSavedValue() != m_pLbKeyBindings->GetSelectEntryPos()) + if (m_pLbKeyBindings->IsValueChangedFromSaved()) { rCoreAttrs.Put( SfxUInt16Item( diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index ecd3faf4a8d8..637c6614c517 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -48,7 +48,7 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet &rCoreSet) OUString aSheetPrefix = m_pEdSheetPrefix->GetText(); - if ( m_pEdNSheets->GetSavedValue() != m_pEdNSheets->GetText() + if ( m_pEdNSheets->IsValueChangedFromSaved() || m_pEdSheetPrefix->GetSavedValue() != aSheetPrefix ) { aOpt.SetInitTabCount( nTabCount ); diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 76358d62cbad..3890d4383c82 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -91,9 +91,9 @@ bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); - bool bSkipEmptyChanged = ( m_pSkipEmptyPagesCB->GetSavedValue() != TriState(m_pSkipEmptyPagesCB->IsChecked()) ); - bool bSelectedSheetsChanged = ( m_pSelectedSheetsCB->GetSavedValue() != TriState(m_pSelectedSheetsCB->IsChecked()) ); - bool bForceBreaksChanged = ( m_pForceBreaksCB->GetSavedValue() != TriState(m_pForceBreaksCB->IsChecked()) ); + bool bSkipEmptyChanged = m_pSkipEmptyPagesCB->IsValueChangedFromSaved(); + bool bSelectedSheetsChanged = m_pSelectedSheetsCB->IsValueChangedFromSaved(); + bool bForceBreaksChanged = m_pForceBreaksCB->IsValueChangedFromSaved(); if ( bSkipEmptyChanged || bSelectedSheetsChanged || bForceBreaksChanged ) { diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 4a2f758fa4aa..3c693ce6b6e8 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -109,36 +109,36 @@ SfxTabPage* ScTpContentOptions::Create( Window* pParent, bool ScTpContentOptions::FillItemSet( SfxItemSet& rCoreSet ) { bool bRet = false; - if( pFormulaCB ->GetSavedValue() != TriState(pFormulaCB ->IsChecked()) || - pNilCB ->GetSavedValue() != TriState(pNilCB ->IsChecked()) || - pAnnotCB ->GetSavedValue() != TriState(pAnnotCB ->IsChecked()) || - pValueCB ->GetSavedValue() != TriState(pValueCB ->IsChecked()) || - pAnchorCB ->GetSavedValue() != TriState(pAnchorCB ->IsChecked()) || - pClipMarkCB->GetSavedValue() != TriState(pClipMarkCB->IsChecked()) || - pObjGrfLB ->GetSavedValue() != pObjGrfLB ->GetSelectEntryPos() || - pDiagramLB ->GetSavedValue() != pDiagramLB ->GetSelectEntryPos() || - pDrawLB ->GetSavedValue() != pDrawLB ->GetSelectEntryPos() || - pGridLB ->GetSavedValue() != pGridLB->GetSelectEntryPos() || - pRowColHeaderCB->GetSavedValue() != TriState(pRowColHeaderCB->IsChecked()) || - pHScrollCB ->GetSavedValue() != TriState(pHScrollCB ->IsChecked()) || - pVScrollCB ->GetSavedValue() != TriState(pVScrollCB ->IsChecked()) || - pTblRegCB ->GetSavedValue() != TriState(pTblRegCB ->IsChecked()) || - pOutlineCB ->GetSavedValue() != TriState(pOutlineCB ->IsChecked()) || - pColorLB ->GetSavedValue() != pColorLB ->GetSelectEntryPos() || - pBreakCB ->GetSavedValue() != TriState(pBreakCB ->IsChecked()) || - pGuideLineCB ->GetSavedValue() != TriState(pGuideLineCB ->IsChecked())) + if( pFormulaCB ->IsValueChangedFromSaved() || + pNilCB ->IsValueChangedFromSaved() || + pAnnotCB ->IsValueChangedFromSaved() || + pValueCB ->IsValueChangedFromSaved() || + pAnchorCB ->IsValueChangedFromSaved() || + pClipMarkCB->IsValueChangedFromSaved() || + pObjGrfLB ->IsValueChangedFromSaved() || + pDiagramLB ->IsValueChangedFromSaved() || + pDrawLB ->IsValueChangedFromSaved() || + pGridLB ->IsValueChangedFromSaved() || + pRowColHeaderCB->IsValueChangedFromSaved() || + pHScrollCB ->IsValueChangedFromSaved() || + pVScrollCB ->IsValueChangedFromSaved() || + pTblRegCB ->IsValueChangedFromSaved() || + pOutlineCB ->IsValueChangedFromSaved() || + pColorLB ->IsValueChangedFromSaved() || + pBreakCB ->IsValueChangedFromSaved() || + pGuideLineCB ->IsValueChangedFromSaved()) { pLocalOptions->SetGridColor( pColorLB->GetSelectEntryColor(), pColorLB->GetSelectEntry() ); rCoreSet.Put(ScTpViewItem(SID_SCVIEWOPTIONS, *pLocalOptions)); bRet = true; } - if(pRangeFindCB->GetSavedValue() != TriState(pRangeFindCB->IsChecked())) + if(pRangeFindCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_RANGEFINDER, pRangeFindCB->IsChecked())); bRet = true; } - if(pSyncZoomCB->GetSavedValue() != TriState(pSyncZoomCB->IsChecked())) + if(pSyncZoomCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_OPT_SYNCZOOM, pSyncZoomCB->IsChecked())); bRet = true; @@ -427,7 +427,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) { bool bRet = true; const sal_Int32 nMPos = m_pUnitLB->GetSelectEntryPos(); - if ( nMPos != m_pUnitLB->GetSavedValue() ) + if ( m_pUnitLB->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pUnitLB->GetEntryData( nMPos ); rCoreSet.Put( SfxUInt16Item( SID_ATTR_METRIC, @@ -435,7 +435,7 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) bRet = true; } - if(m_pTabMF->GetText() != m_pTabMF->GetSavedValue()) + if(m_pTabMF->IsValueChangedFromSaved()) { rCoreSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, sal::static_int_cast<sal_uInt16>( m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)) ))); @@ -453,8 +453,8 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) nSet=LM_NEVER; } - if(m_pRequestRB->IsChecked() != m_pRequestRB->GetSavedValue() || - m_pNeverRB->IsChecked() != m_pNeverRB->GetSavedValue() ) + if(m_pRequestRB->IsValueChangedFromSaved() || + m_pNeverRB->IsValueChangedFromSaved() ) { if(pDoc) pDoc->SetLinkMode(nSet); @@ -463,56 +463,56 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet& rCoreSet ) SC_MOD()->SetAppOptions(aAppOptions); bRet = true; } - if(m_pAlignCB->GetSavedValue() != TriState(m_pAlignCB->IsChecked())) + if(m_pAlignCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_SELECTION, m_pAlignCB->IsChecked())); bRet = true; } - if(m_pAlignLB->GetSavedValue() != m_pAlignLB->GetSelectEntryPos()) + if(m_pAlignLB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxUInt16Item(SID_SC_INPUT_SELECTIONPOS, m_pAlignLB->GetSelectEntryPos())); bRet = true; } - if(m_pEditModeCB->GetSavedValue() != TriState(m_pEditModeCB->IsChecked())) + if(m_pEditModeCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_EDITMODE, m_pEditModeCB->IsChecked())); bRet = true; } - if(m_pFormatCB->GetSavedValue() != TriState(m_pFormatCB->IsChecked())) + if(m_pFormatCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_FMT_EXPAND, m_pFormatCB->IsChecked())); bRet = true; } - if(m_pExpRefCB->GetSavedValue() != TriState(m_pExpRefCB->IsChecked())) + if(m_pExpRefCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); bRet = true; } - if(m_pMarkHdrCB->GetSavedValue() != TriState(m_pMarkHdrCB->IsChecked())) + if(m_pMarkHdrCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_MARK_HEADER, m_pMarkHdrCB->IsChecked())); bRet = true; } - if(m_pTextFmtCB->GetSavedValue() != TriState(m_pTextFmtCB->IsChecked())) + if(m_pTextFmtCB->IsValueChangedFromSaved()) { rCoreSet.Put(SfxBoolItem(SID_SC_INPUT_TEXTWYSIWYG, m_pTextFmtCB->IsChecked())); bRet = true; } - if( m_pReplWarnCB->GetSavedValue() != TriState(m_pReplWarnCB->IsChecked()) ) + if( m_pReplWarnCB->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_REPLCELLSWARN, m_pReplWarnCB->IsChecked() ) ); bRet = true; } - if( m_pLegacyCellSelectionCB->GetSavedValue() != TriState(m_pLegacyCellSelectionCB->IsChecked()) ) + if( m_pLegacyCellSelectionCB->IsValueChangedFromSaved() ) { rCoreSet.Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, m_pLegacyCellSelectionCB->IsChecked() ) ); bRet = true; diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index a34adf63637e..3a12f2944204 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -315,7 +315,7 @@ void ScPrintAreasDlg::Impl_Reset() bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); - bool bDataChanged = (pEd->GetSavedValue() != aRangeStr); + bool bDataChanged = pEd->IsValueChangedFromSaved(); if ( !aRangeStr.isEmpty() && pEdPrintArea != pEd ) { diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 7a9aa96326de..e99f4566ca59 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -274,7 +274,7 @@ bool ScTablePage::FillItemSet( SfxItemSet& rCoreSet ) if ( WAS_DEFAULT(nWhichPageNo,rOldSet) && ( (!bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue()) || ( bUseValue && (bUseValue ? 1 : 0) == m_pBtnPageNo->GetSavedValue() - && m_pEdPageNo->GetText() == m_pEdPageNo->GetSavedValue() ) ) ) + && ! m_pEdPageNo->IsValueChangedFromSaved() ) ) ) { rCoreSet.ClearItem( nWhichPageNo ); } @@ -422,7 +422,7 @@ static bool lcl_PutScaleItem( sal_uInt16 nWhich, { bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || - (rEd.GetSavedValue() != rEd.GetText()) || + rEd.IsValueChangedFromSaved() || !WAS_DEFAULT( nWhich, rOldSet ); if( bDataChanged ) @@ -446,8 +446,8 @@ static bool lcl_PutScaleItem2( sal_uInt16 nWhich, sal_uInt16 nValue2 = (sal_uInt16)rEd2.GetValue(); bool bIsSel = (rListBox.GetSelectEntryPos() == nLBEntry); bool bDataChanged = (rListBox.GetSavedValue() != nLBEntry) || - (rEd1.GetSavedValue() != rEd1.GetText()) || - (rEd2.GetSavedValue() != rEd2.GetText()) || + rEd1.IsValueChangedFromSaved() || + rEd2.IsValueChangedFromSaved() || !WAS_DEFAULT( nWhich, rOldSet ); if( bDataChanged ) diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index c36c5ac548b4..921ce84dd584 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -61,9 +61,9 @@ SvxFieldData* SdModifyFieldDlg::GetField() { SvxFieldData* pNewField = NULL; - if( m_pRbtFix->IsChecked() != m_pRbtFix->GetSavedValue() || - m_pRbtVar->IsChecked() != m_pRbtVar->GetSavedValue() || - m_pLbFormat->GetSelectEntryPos() != m_pLbFormat->GetSavedValue() ) + if( m_pRbtFix->IsValueChangedFromSaved() || + m_pRbtVar->IsValueChangedFromSaved() || + m_pLbFormat->IsValueChangedFromSaved() ) { if( pField->ISA( SvxDateField ) ) { @@ -311,7 +311,7 @@ SfxItemSet SdModifyFieldDlg::GetItemSet() { SfxItemSet aOutput( *maInputSet.GetPool(), EE_CHAR_LANGUAGE, EE_CHAR_LANGUAGE_CTL ); - if( m_pLbLanguage->GetSelectEntryPos() != m_pLbLanguage->GetSavedValue() ) + if( m_pLbLanguage->IsValueChangedFromSaved() ) { LanguageType eLangType = m_pLbLanguage->GetSelectLanguage(); SvxLanguageItem aItem( eLangType, EE_CHAR_LANGUAGE ); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 4afad9bcdc1f..d4cbe22c66de 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -92,9 +92,9 @@ const sal_uInt16* SdParagraphNumTabPage::GetRanges() bool SdParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { - if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() || - m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()|| - m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue()) + if(m_pNewStartCB->IsValueChangedFromSaved() || + m_pNewStartNumberCB->IsValueChangedFromSaved()|| + m_pNewStartNF->IsValueChangedFromSaved()) { mbModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 37b0671d8e93..50b41a220852 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -82,23 +82,23 @@ SdPrintOptions::~SdPrintOptions() bool SdPrintOptions::FillItemSet( SfxItemSet& rAttrs ) { - if( m_pCbxDraw->GetSavedValue() != TriState(m_pCbxDraw->IsChecked()) || - m_pCbxNotes->GetSavedValue() != TriState(m_pCbxNotes->IsChecked()) || - m_pCbxHandout->GetSavedValue() != TriState(m_pCbxHandout->IsChecked()) || - m_pCbxOutline->GetSavedValue() != TriState(m_pCbxOutline->IsChecked()) || - m_pCbxDate->GetSavedValue() != TriState(m_pCbxDate->IsChecked()) || - m_pCbxTime->GetSavedValue() != TriState(m_pCbxTime->IsChecked()) || - m_pCbxPagename->GetSavedValue() != TriState(m_pCbxPagename->IsChecked()) || - m_pCbxHiddenPages->GetSavedValue() != TriState(m_pCbxHiddenPages->IsChecked()) || - m_pRbtPagesize->GetSavedValue() != m_pRbtPagesize->IsChecked() || - m_pRbtPagetile->GetSavedValue() != m_pRbtPagetile->IsChecked() || - m_pRbtBooklet->GetSavedValue() != m_pRbtBooklet->IsChecked() || - m_pCbxFront->GetSavedValue() != TriState(m_pCbxFront->IsChecked()) || - m_pCbxBack->GetSavedValue() != TriState(m_pCbxBack->IsChecked()) || - m_pCbxPaperbin->GetSavedValue() != TriState(m_pCbxPaperbin->IsChecked()) || - m_pRbtColor->GetSavedValue() != m_pRbtColor->IsChecked() || - m_pRbtGrayscale->GetSavedValue() != m_pRbtGrayscale->IsChecked() || - m_pRbtBlackWhite->GetSavedValue() != m_pRbtBlackWhite->IsChecked() ) + if( m_pCbxDraw->IsValueChangedFromSaved() || + m_pCbxNotes->IsValueChangedFromSaved() || + m_pCbxHandout->IsValueChangedFromSaved() || + m_pCbxOutline->IsValueChangedFromSaved() || + m_pCbxDate->IsValueChangedFromSaved() || + m_pCbxTime->IsValueChangedFromSaved() || + m_pCbxPagename->IsValueChangedFromSaved() || + m_pCbxHiddenPages->IsValueChangedFromSaved() || + m_pRbtPagesize->IsValueChangedFromSaved() || + m_pRbtPagetile->IsValueChangedFromSaved() || + m_pRbtBooklet->IsValueChangedFromSaved() || + m_pCbxFront->IsValueChangedFromSaved() || + m_pCbxBack->IsValueChangedFromSaved() || + m_pCbxPaperbin->IsValueChangedFromSaved() || + m_pRbtColor->IsValueChangedFromSaved() || + m_pRbtGrayscale->IsValueChangedFromSaved()|| + m_pRbtBlackWhite->IsValueChangedFromSaved()) { SdOptionsPrintItem aOptions( ATTR_OPTIONS_PRINT ); diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index d0c5a65301b3..e65398ba7f62 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -273,7 +273,7 @@ bool SdTPAction::FillItemSet( SfxItemSet& rAttrs ) if( m_pLbAction->GetSelectEntryCount() ) eCA = GetActualClickAction(); - if( m_pLbAction->GetSavedValue() != m_pLbAction->GetSelectEntryPos() ) + if( m_pLbAction->IsValueChangedFromSaved() ) { rAttrs.Put( SfxAllEnumItem( ATTR_ACTION, (sal_uInt16)eCA ) ); bModified = true; diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index 454bd5fe2fb0..c8775db4fbd5 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -140,10 +140,10 @@ bool SdTpOptionsContents::FillItemSet( SfxItemSet& rAttrs ) { bool bModified = false; - if( m_pCbxRuler->GetSavedValue() != TriState(m_pCbxRuler->IsChecked()) || - m_pCbxMoveOutline->GetSavedValue() != TriState(m_pCbxMoveOutline->IsChecked()) || - m_pCbxDragStripes->GetSavedValue() != TriState(m_pCbxDragStripes->IsChecked()) || - m_pCbxHandlesBezier->GetSavedValue() != TriState(m_pCbxHandlesBezier->IsChecked()) ) + if( m_pCbxRuler->IsValueChangedFromSaved() || + m_pCbxMoveOutline->IsValueChangedFromSaved() || + m_pCbxDragStripes->IsValueChangedFromSaved() || + m_pCbxHandlesBezier->IsValueChangedFromSaved() ) { SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT ); @@ -368,16 +368,16 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) { bool bModified = false; - if( m_pCbxStartWithTemplate->GetSavedValue() != TriState(m_pCbxStartWithTemplate->IsChecked()) || - m_pCbxMarkedHitMovesAlways->GetSavedValue()!= TriState(m_pCbxMarkedHitMovesAlways->IsChecked()) || - m_pCbxQuickEdit->GetSavedValue() != TriState(m_pCbxQuickEdit->IsChecked()) || - m_pCbxPickThrough->GetSavedValue() != TriState(m_pCbxPickThrough->IsChecked()) || - m_pCbxMasterPageCache->GetSavedValue() != TriState(m_pCbxMasterPageCache->IsChecked()) || - m_pCbxCopy->GetSavedValue() != TriState(m_pCbxCopy->IsChecked()) || - m_pCbxEnableSdremote->GetSavedValue() != TriState(m_pCbxEnableSdremote->IsChecked()) || - m_pCbxEnablePresenterScreen->GetSavedValue()!= TriState(m_pCbxEnablePresenterScreen->IsChecked()) || - m_pCbxCompatibility->GetSavedValue() != TriState(m_pCbxCompatibility->IsChecked()) || - m_pCbxUsePrinterMetrics->GetSavedValue() != TriState(m_pCbxUsePrinterMetrics->IsChecked()) ) + if( m_pCbxStartWithTemplate->IsValueChangedFromSaved() || + m_pCbxMarkedHitMovesAlways->IsValueChangedFromSaved() || + m_pCbxQuickEdit->IsValueChangedFromSaved() || + m_pCbxPickThrough->IsValueChangedFromSaved() || + m_pCbxMasterPageCache->IsValueChangedFromSaved() || + m_pCbxCopy->IsValueChangedFromSaved() || + m_pCbxEnableSdremote->IsValueChangedFromSaved() || + m_pCbxEnablePresenterScreen->IsValueChangedFromSaved() || + m_pCbxCompatibility->IsValueChangedFromSaved() || + m_pCbxUsePrinterMetrics->IsValueChangedFromSaved() ) { SdOptionsMiscItem aOptsItem( ATTR_OPTIONS_MISC ); @@ -401,7 +401,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) // metric const sal_Int32 nMPos = m_pLbMetric->GetSelectEntryPos(); - if ( nMPos != m_pLbMetric->GetSavedValue() ) + if ( m_pLbMetric->IsValueChangedFromSaved() ) { sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pLbMetric->GetEntryData( nMPos ); rAttrs.Put( SfxUInt16Item( GetWhich( SID_ATTR_METRIC ), @@ -410,7 +410,7 @@ bool SdTpOptionsMisc::FillItemSet( SfxItemSet& rAttrs ) } // tabulator space - if( m_pMtrFldTabstop->GetText() != m_pMtrFldTabstop->GetSavedValue() ) + if( m_pMtrFldTabstop->IsValueChangedFromSaved() ) { sal_uInt16 nWh = GetWhich( SID_ATTR_DEFTABSTOP ); SfxMapUnit eUnit = rAttrs.GetPool()->GetMetric( nWh ); diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 2d0b3d54952d..92471b699cb4 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -941,7 +941,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) bool bRet = false; if ( !bHandleDelete && bEnableUseUserData && - m_pUseUserDataCB->GetState() != m_pUseUserDataCB->GetSavedValue() && + m_pUseUserDataCB->IsValueChangedFromSaved() && GetTabDialog() && GetTabDialog()->GetExampleSet() ) { const SfxItemSet* pExpSet = GetTabDialog()->GetExampleSet(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index de85449ae102..0c6fa6cb132d 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -379,7 +379,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) // Set Filter if ( LISTBOX_ENTRY_NOTFOUND != nFilterIdx && - nFilterIdx != m_pFilterLb->GetSavedValue() && + m_pFilterLb->IsValueChangedFromSaved() && m_pFilterLb->IsEnabled() ) { bModified = true; @@ -389,7 +389,7 @@ bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet ) pStyle->SetMask( nMask ); } if(m_pAutoCB->IsVisible() && - TriState(m_pAutoCB->IsChecked()) != m_pAutoCB->GetSavedValue()) + m_pAutoCB->IsValueChangedFromSaved()) { rSet.Put(SfxBoolItem(SID_ATTR_AUTO_STYLE_UPDATE, m_pAutoCB->IsChecked())); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index a7c67bbeefb4..2cc667fd6913 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -122,12 +122,12 @@ bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet& /*rSet*/ ) bool bModified = false; - if( TriState(m_pPaperSizeCB->IsChecked()) != m_pPaperSizeCB->GetSavedValue()) + if( m_pPaperSizeCB->IsValueChangedFromSaved()) aWarnOptions.SetPaperSize(m_pPaperSizeCB->IsChecked()); - if( TriState(m_pPaperOrientationCB->IsChecked()) != m_pPaperOrientationCB->GetSavedValue() ) + if( m_pPaperOrientationCB->IsValueChangedFromSaved() ) aWarnOptions.SetPaperOrientation(m_pPaperOrientationCB->IsChecked()); - if( TriState(m_pTransparencyCB->IsChecked()) != m_pTransparencyCB->GetSavedValue() ) + if( m_pTransparencyCB->IsValueChangedFromSaved() ) aWarnOptions.SetTransparency( m_pTransparencyCB->IsChecked() ); ImplSaveControls( m_pPrinterOutputRB->IsChecked() ? &maPrinterOptions : &maPrintFileOptions ); diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 4b952c35f0d9..c1b865c6a27a 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -129,7 +129,7 @@ namespace svt bool ComboBoxCellController::IsModified() const { - return GetComboBox().GetSavedValue() != GetComboBox().GetText(); + return GetComboBox().IsValueChangedFromSaved(); } @@ -225,7 +225,7 @@ namespace svt bool ListBoxCellController::IsModified() const { - return GetListBox().GetSelectEntryPos() != GetListBox().GetSavedValue(); + return GetListBox().IsValueChangedFromSaved(); } @@ -353,7 +353,7 @@ namespace svt bool CheckBoxCellController::IsModified() const { - return GetCheckBox().GetSavedValue() != GetCheckBox().GetState(); + return GetCheckBox().IsValueChangedFromSaved(); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 1524eda16c3b..b3e0883a6828 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -1130,7 +1130,7 @@ void AssignmentPersistentData::Commit() IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, ComboBox*, _pBox) { - if (_pBox->GetSavedValue() != _pBox->GetText()) + if ( _pBox->IsValueChangedFromSaved() ) { if (_pBox == m_pDatasource) resetTables(); diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 674d5ba5ed3b..ec2daf383fd4 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -407,8 +407,8 @@ void SvxRubyDialog::GetRubyText() for(int i = 0; i < 8; i+=2) { if(aEditArr[i]->IsEnabled() && - (aEditArr[i]->GetText() != aEditArr[i]->GetSavedValue() || - aEditArr[i + 1]->GetText() != aEditArr[i + 1]->GetSavedValue())) + (aEditArr[i]->IsValueChangedFromSaved() || + aEditArr[i + 1]->IsValueChangedFromSaved())) { Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 5f8eeb719bab..fdcfef7fe87a 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -73,7 +73,7 @@ SvxFmAbsRecWin::~SvxFmAbsRecWin() void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) { - if ( _bForce || ( GetText() != GetSavedValue() ) ) + if ( _bForce || IsValueChangedFromSaved() ) { sal_Int64 nRecord = GetValue(); if (nRecord < GetMin() || nRecord > GetMax()) diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 39349ab6c225..0f8e8c74b526 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -699,7 +699,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) { const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); - if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBStyle->GetSavedValue()) + if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBStyle->IsValueChangedFromSaved()) { if(0 == nPos) { @@ -738,7 +738,7 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) { sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != mpLBStart->GetSavedValue() ) + if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() ) { XLineStartItem* pItem = NULL; if( nPos == 0 ) @@ -757,7 +757,7 @@ IMPL_LINK(LinePropertyPanel, ChangeStartHdl, void*, EMPTYARG) IMPL_LINK(LinePropertyPanel, ChangeEndHdl, void*, EMPTYARG) { sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); - if( nPos != LISTBOX_ENTRY_NOTFOUND && nPos != mpLBEnd->GetSavedValue() ) + if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() ) { XLineEndItem* pItem = NULL; if( nPos == 0 ) @@ -777,7 +777,7 @@ IMPL_LINK(LinePropertyPanel, ChangeEdgeStyleHdl, void*, EMPTYARG) { const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); - if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBEdgeStyle->GetSavedValue()) + if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBEdgeStyle->IsValueChangedFromSaved()) { XLineJointItem* pItem = 0; @@ -818,7 +818,7 @@ IMPL_LINK(LinePropertyPanel, ChangeCapStyleHdl, void*, EMPTYARG) { const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); - if(LISTBOX_ENTRY_NOTFOUND != nPos && nPos != mpLBCapStyle->GetSavedValue()) + if(LISTBOX_ENTRY_NOTFOUND != nPos && mpLBCapStyle->IsValueChangedFromSaved()) { XLineCapItem* pItem = 0; diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 93b4eecc1b34..ee145956bac5 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -249,9 +249,9 @@ bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) SwFmtINetFmt aINetFmt(sURL, m_pTargetFrmLB->GetText()); aINetFmt.SetName(m_pNameED->GetText()); - bModified |= m_pURLED->GetText() != m_pURLED->GetSavedValue(); + bModified |= m_pURLED->IsValueChangedFromSaved(); bModified |= m_pNameED->IsModified(); - bModified |= m_pTargetFrmLB->GetSavedValue() != m_pTargetFrmLB->GetText(); + bModified |= m_pTargetFrmLB->IsValueChangedFromSaved(); // set valid settings first OUString sEntry = m_pVisitedLB->GetSelectEntry(); @@ -265,10 +265,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet& rSet) if( pINetItem && !pINetItem->GetMacroTable().empty() ) aINetFmt.SetMacroTbl( &pINetItem->GetMacroTable() ); - if(m_pVisitedLB->GetSavedValue() != m_pVisitedLB->GetSelectEntryPos()) + if(m_pVisitedLB->IsValueChangedFromSaved()) bModified = true; - if(m_pNotVisitedLB->GetSavedValue() != m_pNotVisitedLB->GetSelectEntryPos()) + if(m_pNotVisitedLB->IsValueChangedFromSaved()) bModified = true; if(m_pTextED->IsModified()) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 90b49decb0e3..ab8bdac22bb5 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -105,7 +105,7 @@ const sal_uInt16* SwParagraphNumTabPage::GetRanges() bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) { - if( m_pOutlineLvLB->GetSelectEntryPos() != m_pOutlineLvLB->GetSavedValue()) + if( m_pOutlineLvLB->IsValueChangedFromSaved()) { const sal_uInt16 aOutlineLv = m_pOutlineLvLB->GetSelectEntryPos(); const SfxUInt16Item* pOldOutlineLv = (const SfxUInt16Item*)GetOldItem( rSet, SID_ATTR_PARA_OUTLINE_LEVEL); @@ -116,7 +116,7 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = true; } - if( m_pNumberStyleLB->GetSelectEntryPos() != m_pNumberStyleLB->GetSavedValue()) + if( m_pNumberStyleLB->IsValueChangedFromSaved()) { OUString aStyle; if(m_pNumberStyleLB->GetSelectEntryPos()) @@ -131,9 +131,9 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bModified = true; } } - if(m_pNewStartCB->GetState() != m_pNewStartCB->GetSavedValue() || - m_pNewStartNumberCB->GetState() != m_pNewStartNumberCB->GetSavedValue()|| - m_pNewStartNF->GetText() != m_pNewStartNF->GetSavedValue()) + if(m_pNewStartCB->IsValueChangedFromSaved() || + m_pNewStartNumberCB->IsValueChangedFromSaved()|| + m_pNewStartNF->IsValueChangedFromSaved()) { bModified = true; bool bNewStartChecked = TRISTATE_TRUE == m_pNewStartCB->GetState(); @@ -143,9 +143,9 @@ bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet ) bNumberNewStartChecked && bNewStartChecked ? (sal_uInt16)m_pNewStartNF->GetValue() : USHRT_MAX)); } - if(m_pCountParaCB->GetSavedValue() != m_pCountParaCB->GetState() || - m_pRestartParaCountCB->GetSavedValue() != m_pRestartParaCountCB->GetState() || - m_pRestartNF->GetSavedValue() != m_pRestartNF->GetText() ) + if(m_pCountParaCB->IsValueChangedFromSaved()|| + m_pRestartParaCountCB->IsValueChangedFromSaved() || + m_pRestartNF->IsValueChangedFromSaved() ) { SwFmtLineNumber aFmt; aFmt.SetStartValue( static_cast< sal_uLong >(m_pRestartParaCountCB->GetState() == TRISTATE_TRUE ? diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index a03676e5b395..2c60e5ea14fc 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -145,15 +145,15 @@ SfxTabPage* SwMailConfigPage::Create( Window* pParent, const SfxItemSet& rAttrS bool SwMailConfigPage::FillItemSet( SfxItemSet& /*rSet*/ ) { - if(m_pDisplayNameED->GetText() != m_pDisplayNameED->GetSavedValue()) + if(m_pDisplayNameED->IsValueChangedFromSaved()) m_pConfigItem->SetMailDisplayName(m_pDisplayNameED->GetText()); - if(m_pAddressED->GetText() != m_pAddressED->GetSavedValue()) + if(m_pAddressED->IsValueChangedFromSaved()) m_pConfigItem->SetMailAddress(m_pAddressED->GetText()); - if( m_pReplyToCB->GetSavedValue() != TriState(m_pReplyToCB->IsChecked())) + if( m_pReplyToCB->IsValueChangedFromSaved() ) m_pConfigItem->SetMailReplyTo(m_pReplyToCB->IsChecked()); - if(m_pReplyToED->GetText() != m_pReplyToED->GetSavedValue()) + if(m_pReplyToED->IsValueChangedFromSaved()) m_pConfigItem->SetMailReplyTo(m_pReplyToED->GetText()); - if(m_pServerED->GetText() != m_pServerED->GetSavedValue()) + if(m_pServerED->IsValueChangedFromSaved()) m_pConfigItem->SetMailServer(m_pServerED->GetText()); if(m_pPortNF->IsModified()) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 55f047129e6a..baf04a4400b8 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -141,8 +141,8 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) SwFldUpdateFlags eFldFlags = m_pAutoUpdateFields->IsChecked() ? m_pAutoUpdateCharts->IsChecked() ? AUTOUPD_FIELD_AND_CHARTS : AUTOUPD_FIELD_ONLY : AUTOUPD_OFF; - if(TriState(m_pAutoUpdateFields->IsChecked()) != m_pAutoUpdateFields->GetSavedValue() || - TriState(m_pAutoUpdateCharts->IsChecked()) != m_pAutoUpdateCharts->GetSavedValue()) + if(m_pAutoUpdateFields->IsValueChangedFromSaved() || + m_pAutoUpdateCharts->IsValueChangedFromSaved()) { pMod->ApplyFldUpdateFlags(eFldFlags); if(m_pWrtShell) @@ -165,7 +165,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) } const sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); - if ( nMPos != m_pMetricLB->GetSavedValue() ) + if ( m_pMetricLB->IsValueChangedFromSaved() ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); @@ -173,7 +173,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bRet = true; } - if(m_pTabMF->IsVisible() && m_pTabMF->GetText() != m_pTabMF->GetSavedValue()) + if(m_pTabMF->IsVisible() && m_pTabMF->IsValueChangedFromSaved()) { rSet.Put(SfxUInt16Item(SID_ATTR_DEFTABSTOP, (sal_uInt16)m_pTabMF->Denormalize(m_pTabMF->GetValue(FUNIT_TWIP)))); @@ -182,14 +182,14 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) bool bIsUseCharUnitFlag = m_pUseCharUnit->IsChecked(); SvtCJKOptions aCJKOptions; - bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled(); + bIsUseCharUnitFlag = bIsUseCharUnitFlag && aCJKOptions.IsAsianTypographyEnabled(); if( (bIsUseCharUnitFlag ? 1 : 0) != m_pUseCharUnit->GetSavedValue()) { rSet.Put(SfxBoolItem(SID_ATTR_APPLYCHARUNIT, bIsUseCharUnitFlag )); bRet = true; } - if (m_pWordCountED->GetText() != m_pWordCountED->GetSavedValue()) + if( m_pWordCountED->IsValueChangedFromSaved() ) { boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create()); @@ -199,7 +199,7 @@ bool SwLoadOptPage::FillItemSet( SfxItemSet& rSet ) } bool bIsSquaredPageModeFlag = m_pUseSquaredPageMode->IsChecked(); - if ( (bIsSquaredPageModeFlag ? 1 : 0) != m_pUseSquaredPageMode->GetSavedValue() ) + if ( m_pUseSquaredPageMode->IsValueChangedFromSaved() ) { pMod->ApplyDefaultPageMode( bIsSquaredPageModeFlag ); if ( m_pWrtShell ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 2740bf96fdff..6199f3c56db7 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -240,7 +240,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) sal_Int32 nMPos = m_pMetricLB->GetSelectEntryPos(); sal_Int32 nGlobalMetricPos = nMPos; - if ( nMPos != m_pMetricLB->GetSavedValue() ) + if ( m_pMetricLB->IsValueChangedFromSaved() ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pMetricLB->GetEntryData( nMPos ); @@ -249,7 +249,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) } nMPos = m_pHMetric->GetSelectEntryPos(); - if ( nMPos != m_pHMetric->GetSavedValue() || nMPos != nGlobalMetricPos ) + if ( m_pHMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pHMetric->GetEntryData( nMPos ); @@ -257,7 +257,7 @@ bool SwContentOptPage::FillItemSet(SfxItemSet& rSet) bRet = true; } nMPos = m_pVMetric->GetSelectEntryPos(); - if ( nMPos != m_pVMetric->GetSavedValue() || nMPos != nGlobalMetricPos ) + if ( m_pVMetric->IsValueChangedFromSaved() || nMPos != nGlobalMetricPos ) { // Double-Cast for VA3.0 const sal_uInt16 nFieldUnit = (sal_uInt16)(sal_IntPtr)m_pVMetric->GetEntryData( nMPos ); @@ -629,11 +629,11 @@ bool SwStdFontTabPage::FillItemSet( SfxItemSet& ) const OUString sLabel = pLabelBox->GetText(); const OUString sIdx = pIdxBox->GetText(); - bool bStandardHeightChanged = pStandardHeightLB->GetSavedValue() != pStandardHeightLB->GetText(); - bool bTitleHeightChanged = pTitleHeightLB->GetSavedValue() != pTitleHeightLB->GetText(); - bool bListHeightChanged = pListHeightLB->GetSavedValue() != pListHeightLB->GetText() && (!bListHeightDefault || !bSetListHeightDefault ); - bool bLabelHeightChanged = pLabelHeightLB->GetSavedValue() != pLabelHeightLB->GetText() && (!bLabelHeightDefault || !bSetLabelHeightDefault ); - bool bIndexHeightChanged = pIndexHeightLB->GetSavedValue() != pIndexHeightLB->GetText() && (!bIndexHeightDefault || !bSetIndexHeightDefault ); + bool bStandardHeightChanged = pStandardHeightLB->IsValueChangedFromSaved(); + bool bTitleHeightChanged = pTitleHeightLB->IsValueChangedFromSaved(); + bool bListHeightChanged = pListHeightLB->IsValueChangedFromSaved() && (!bListHeightDefault || !bSetListHeightDefault ); + bool bLabelHeightChanged = pLabelHeightLB->IsValueChangedFromSaved() && (!bLabelHeightDefault || !bSetLabelHeightDefault ); + bool bIndexHeightChanged = pIndexHeightLB->IsValueChangedFromSaved() && (!bIndexHeightDefault || !bSetIndexHeightDefault ); if(bNotDocOnly) { pFontConfig->SetFontStandard(sStandard, nFontGroup); @@ -1159,27 +1159,27 @@ bool SwTableOptionsTabPage::FillItemSet( SfxItemSet& ) if (pBorderCB->IsChecked()) aInsOpts.mnInsMode |= tabopts::DEFAULT_BORDER; - if (pHeaderCB->GetSavedValue() != pHeaderCB->GetState() || - pRepeatHeaderCB->GetSavedValue() != pRepeatHeaderCB->GetState() || - pDontSplitCB->GetSavedValue() != pDontSplitCB->GetState() || - pBorderCB->GetSavedValue() != pBorderCB->GetState()) + if (pHeaderCB->IsValueChangedFromSaved() || + pRepeatHeaderCB->IsValueChangedFromSaved() || + pDontSplitCB->IsValueChangedFromSaved() || + pBorderCB->IsValueChangedFromSaved()) { pModOpt->SetInsTblFlags(bHTMLMode, aInsOpts); } - if (pNumFormattingCB->GetSavedValue() != pNumFormattingCB->GetState()) + if (pNumFormattingCB->IsValueChangedFromSaved()) { pModOpt->SetInsTblFormatNum(bHTMLMode, pNumFormattingCB->IsChecked()); bRet = true; } - if (pNumFmtFormattingCB->GetSavedValue() != pNumFmtFormattingCB->GetState()) + if (pNumFmtFormattingCB->IsValueChangedFromSaved()) { pModOpt->SetInsTblChangeNumFormat(bHTMLMode, pNumFmtFormattingCB->IsChecked()); bRet = true; } - if (pNumAlignmentCB->GetSavedValue() != pNumAlignmentCB->GetState()) + if (pNumAlignmentCB->IsValueChangedFromSaved()) { pModOpt->SetInsTblAlignNum(bHTMLMode, pNumAlignmentCB->IsChecked()); bRet = true; @@ -1369,10 +1369,10 @@ bool SwShdwCrsrOptionsTabPage::FillItemSet( SfxItemSet& rSet ) if (m_pWrtShell) { m_pWrtShell->GetDoc()->set( IDocumentSettingAccess::MATH_BASELINE_ALIGNMENT, m_pMathBaselineAlignmentCB->IsChecked() ); - bRet |= TriState(m_pMathBaselineAlignmentCB->IsChecked()) != m_pMathBaselineAlignmentCB->GetSavedValue(); + bRet |= m_pMathBaselineAlignmentCB->IsValueChangedFromSaved(); } - if( TriState(m_pCrsrInProtCB->IsChecked()) != m_pCrsrInProtCB->GetSavedValue()) + if( m_pCrsrInProtCB->IsValueChangedFromSaved()) { rSet.Put(SfxBoolItem(FN_PARAM_CRSR_IN_PROTECTED, m_pCrsrInProtCB->IsChecked())); bRet = true; @@ -2246,9 +2246,9 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) bool bRet = false; SwModuleOptions *pOpt = SW_MOD()->GetModuleConfig(); - if( m_pAutoRB->IsChecked() != m_pAutoRB->GetSavedValue() || - m_pWordRB->IsChecked() != m_pWordRB->GetSavedValue() || - m_pCharRB->IsChecked() != m_pCharRB->GetSavedValue() ) + if( m_pAutoRB->IsValueChangedFromSaved() || + m_pWordRB->IsValueChangedFromSaved() || + m_pCharRB->IsValueChangedFromSaved() ) { SvxCompareMode eCmpMode = SVX_CMP_AUTO; @@ -2260,13 +2260,13 @@ bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet& ) bRet = true; } - if( TriState(m_pRsidCB->IsChecked()) != m_pRsidCB->GetSavedValue() ) + if( m_pRsidCB->IsValueChangedFromSaved() ) { pOpt->SetUseRsid( m_pRsidCB->IsChecked() ); bRet = true; } - if( TriState(m_pIgnoreCB->IsChecked()) != m_pIgnoreCB->GetSavedValue() ) + if( m_pIgnoreCB->IsValueChangedFromSaved() ) { pOpt->SetIgnorePieces( m_pIgnoreCB->IsChecked() ); bRet = true; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index ab7a5e1b062a..48a6db8a88a8 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -324,7 +324,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason { SwMailMergeConfigItem& rConfig = m_pWizard->GetConfigItem(); - if (m_pFemaleColumnLB->GetSelectEntryPos() != m_pFemaleColumnLB->GetSavedValue()) + if (m_pFemaleColumnLB->IsValueChangedFromSaved()) { const SwDBData& rDBData = rConfig.GetCurrentDBData(); Sequence< OUString> aAssignment = rConfig.GetColumnAssignment( rDBData ); @@ -333,7 +333,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::svt::WizardTypes::CommitPageReason aAssignment[MM_PART_GENDER] = m_pFemaleColumnLB->GetSelectEntry(); rConfig.SetColumnAssignment( rDBData, aAssignment ); } - if (m_pFemaleFieldCB->GetText() != m_pFemaleFieldCB->GetSavedValue()) + if (m_pFemaleFieldCB->IsValueChangedFromSaved()) rConfig.SetFemaleGenderValue(m_pFemaleFieldCB->GetText()); lcl_StoreGreetingsBox(*m_pFemaleLB, rConfig, SwMailMergeConfigItem::FEMALE); @@ -505,7 +505,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) rConfigItem.SetIndividualGreeting( m_aPersonalizedCB.IsChecked(), false); - if(m_aFemaleColumnLB.GetSelectEntryPos() != m_aFemaleColumnLB.GetSavedValue()) + if(m_aFemaleColumnLB.IsValueChangedFromSaved()) { const SwDBData& rDBData = rConfigItem.GetCurrentDBData(); Sequence< OUString> aAssignment = rConfigItem.GetColumnAssignment( rDBData ); @@ -518,7 +518,7 @@ IMPL_LINK_NOARG(SwMailBodyDialog, OKHdl) aAssignment[MM_PART_GENDER] = OUString(); rConfigItem.SetColumnAssignment( rDBData, aAssignment ); } - if(m_aFemaleFieldCB.GetText() != m_aFemaleFieldCB.GetSavedValue()) + if(m_aFemaleFieldCB.IsValueChangedFromSaved()) rConfigItem.SetFemaleGenderValue(m_aFemaleFieldCB.GetText()); EndDialog(RET_OK); diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 2fe526173002..966ab35e6481 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -236,7 +236,7 @@ bool SwFldDBPage::FillItemSet(SfxItemSet& ) bool bDBListBoxChanged = m_sOldDBName != sTempDBName || m_sOldTableName != sTempTableName || m_sOldColumnName != sTempColumnName; if (!IsFldEdit() || - m_pConditionED->GetSavedValue() != m_pConditionED->GetText() || + m_pConditionED->IsValueChangedFromSaved() || m_pValueED->GetSavedValue() != aVal || bDBListBoxChanged || m_nOldFormat != nFormat || m_nOldSubType != nSubType) diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 6334fc37b856..08564a5960f2 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -440,7 +440,7 @@ bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) nFormat = m_pFormatLB->GetFormat(); if (!IsFldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() || - nOldFormat != nFormat || m_pFixedCB->GetState() != m_pFixedCB->GetSavedValue() + nOldFormat != nFormat || m_pFixedCB->IsValueChangedFromSaved() || (DI_CUSTOM == nSubType && aName != m_sOldCustomFieldName )) { InsertFld(TYP_DOCINFOFLD, nSubType, aName, aEmptyOUStr, nFormat, diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index 27c125d8e33e..7b265d170c1d 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -621,10 +621,10 @@ bool SwFldDokPage::FillItemSet(SfxItemSet& ) if (!IsFldEdit() || nOldSel != m_pSelectionLB->GetSelectEntryPos() || nOldFormat != nFormat || - m_pFixedCB->GetState() != m_pFixedCB->GetSavedValue() || - m_pValueED->GetText() != m_pValueED->GetSavedValue() || - m_pLevelED->GetText() != m_pLevelED->GetSavedValue() || - m_pDateOffsetED->GetText() != m_pDateOffsetED->GetSavedValue()) + m_pFixedCB->IsValueChangedFromSaved() || + m_pValueED->IsValueChangedFromSaved() || + m_pLevelED->IsValueChangedFromSaved() || + m_pDateOffsetED->IsValueChangedFromSaved()) { InsertFld( nTypeId, nSubType, aEmptyOUStr, aVal, nFormat, ' ', m_pNumFormatLB->IsAutomaticLanguage() ); } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 400b5005350e..f4c476262bbf 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -562,11 +562,11 @@ bool SwFldFuncPage::FillItemSet(SfxItemSet& ) } if (!IsFldEdit() || - m_pNameED->GetSavedValue() != m_pNameED->GetText() || - m_pValueED->GetSavedValue() != m_pValueED->GetText() || - m_pCond1ED->GetSavedValue() != m_pCond1ED->GetText() || - m_pCond2ED->GetSavedValue() != m_pCond2ED->GetText() || - m_pListNameED->GetSavedValue() != m_pListNameED->GetText() || + m_pNameED->IsValueChangedFromSaved() || + m_pValueED->IsValueChangedFromSaved() || + m_pCond1ED->IsValueChangedFromSaved() || + m_pCond2ED->IsValueChangedFromSaved() || + m_pListNameED->IsValueChangedFromSaved() || bDropDownLBChanged || nOldFormat != nFormat) { diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 87daaac6c63e..af5582a306ff 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -929,11 +929,11 @@ bool SwFldRefPage::FillItemSet(SfxItemSet& ) } if (!IsFldEdit() || bModified || - m_pNameED->GetSavedValue() != m_pNameED->GetText() || - m_pValueED->GetSavedValue() != m_pValueED->GetText() || - m_pTypeLB->GetSavedValue() != m_pTypeLB->GetSelectEntryPos() || - m_pSelectionLB->GetSavedValue() != m_pSelectionLB->GetSelectEntryPos() || - m_pFormatLB->GetSavedValue() != m_pFormatLB->GetSelectEntryPos()) + m_pNameED->IsValueChangedFromSaved() || + m_pValueED->IsValueChangedFromSaved() || + m_pTypeLB->IsValueChangedFromSaved() || + m_pSelectionLB->IsValueChangedFromSaved() || + m_pFormatLB->IsValueChangedFromSaved()) { InsertFld( nTypeId, nSubType, aName, aVal, nFormat ); } diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index 4e4ae2f3dc82..24b0b8fab082 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1203,14 +1203,14 @@ bool SwFldVarPage::FillItemSet(SfxItemSet& ) } if (!IsFldEdit() || - m_pNameED->GetSavedValue() != m_pNameED->GetText() || - m_pValueED->GetSavedValue() != m_pValueED->GetText() || - m_pSelectionLB->GetSavedValue() != m_pSelectionLB->GetSelectEntryPos() || - m_pFormatLB->GetSavedValue() != m_pFormatLB->GetSelectEntryPos() || + m_pNameED->IsValueChangedFromSaved() || + m_pValueED->IsValueChangedFromSaved() || + m_pSelectionLB->IsValueChangedFromSaved() || + m_pFormatLB->IsValueChangedFromSaved() || nOldFormat != m_pNumFormatLB->GetFormat() || - m_pInvisibleCB->GetState() != m_pInvisibleCB->GetSavedValue() || - m_pChapterLevelLB->GetSavedValue() != m_pChapterLevelLB->GetSelectEntryPos() || - m_pSeparatorED->GetSavedValue() != m_pSeparatorED->GetText()) + m_pInvisibleCB->IsValueChangedFromSaved() || + m_pChapterLevelLB->IsValueChangedFromSaved() || + m_pSeparatorED->IsValueChangedFromSaved()) { InsertFld( nTypeId, nSubType, aName, aVal, nFormat, cSeparator, m_pNumFormatLB->IsAutomaticLanguage() ); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 3e1d5aa59fcd..d32551aef89a 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -657,7 +657,7 @@ bool SwColumnPage::FillItemSet(SfxItemSet &rSet) if( m_pTextDirectionLB->IsVisible()) { const sal_Int32 nPos = m_pTextDirectionLB->GetSelectEntryPos(); - if ( nPos != m_pTextDirectionLB->GetSavedValue() ) + if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { sal_uInt32 nDirection = (sal_uInt32)(sal_IntPtr)m_pTextDirectionLB->GetEntryData( nPos ); rSet.Put( SvxFrameDirectionItem( (SvxFrameDirection)nDirection, RES_FRAMEDIR)); diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 8242c6d7cfa1..9a9cc62cc57b 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -1057,8 +1057,8 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aHoriOrient.SetRelationOrient( eRel ); aHoriOrient.SetPosToggle(m_pMirrorPagesCB->IsChecked()); - bool bMod = m_pAtHorzPosED->GetText() != m_pAtHorzPosED->GetSavedValue(); - bMod |= m_pMirrorPagesCB->GetState() != m_pMirrorPagesCB->GetSavedValue(); + bool bMod = m_pAtHorzPosED->IsValueChangedFromSaved(); + bMod |= m_pMirrorPagesCB->IsValueChangedFromSaved(); if ( eHOri == text::HoriOrientation::NONE && (bNew || (bAtHorzPosModified || bMod) || nOldH != eHOri ) ) @@ -1092,7 +1092,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) aVertOrient.SetVertOrient ( eVOri); aVertOrient.SetRelationOrient( eRel ); - bool bMod = m_pAtVertPosED->GetText() != m_pAtVertPosED->GetSavedValue(); + bool bMod = m_pAtVertPosED->IsValueChangedFromSaved(); if ( eVOri == text::VertOrientation::NONE && ( bNew || (bAtVertPosModified || bMod) || nOldV != eVOri) ) @@ -1148,8 +1148,8 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } bool bValueModified = (m_aWidthED.IsValueModified() || m_aHeightED.IsValueModified()); - bool bCheckChanged = (m_pRelWidthCB->GetSavedValue() != TriState(m_pRelWidthCB->IsChecked()) - || m_pRelHeightCB->GetSavedValue() != TriState(m_pRelHeightCB->IsChecked())); + bool bCheckChanged = m_pRelWidthCB->IsValueChangedFromSaved() + || m_pRelHeightCB->IsValueChangedFromSaved(); bool bLegalValue = !(!rOldSize.GetWidth () && !rOldSize.GetHeight() && m_aWidthED .GetValue() == m_aWidthED .GetMin() && @@ -1183,20 +1183,20 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) } if( !IsInGraficMode() ) { - if( m_pAutoHeightCB->GetState() != m_pAutoHeightCB->GetSavedValue() ) + if( m_pAutoHeightCB->IsValueChangedFromSaved() ) { SwFrmSize eFrmSize = m_pAutoHeightCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetHeightSizeType() ) aSz.SetHeightSizeType(eFrmSize); } - if( m_pAutoWidthCB->GetState() != m_pAutoWidthCB->GetSavedValue() ) + if( m_pAutoWidthCB->IsValueChangedFromSaved() ) { SwFrmSize eFrmSize = m_pAutoWidthCB->IsChecked()? ATT_MIN_SIZE : ATT_FIX_SIZE; if( eFrmSize != aSz.GetWidthSizeType() ) aSz.SetWidthSizeType( eFrmSize ); } } - if( !bFormat && m_pFixedRatioCB->GetSavedValue() != TriState(m_pFixedRatioCB->IsChecked())) + if( !bFormat && m_pFixedRatioCB->IsValueChangedFromSaved() ) bRet |= 0 != rSet.Put(SfxBoolItem(FN_KEEP_ASPECT_RATIO, m_pFixedRatioCB->IsChecked())); pOldItem = GetOldItem(rSet, RES_FRM_SIZE); @@ -1211,7 +1211,7 @@ bool SwFrmPage::FillItemSet(SfxItemSet &rSet) bRet |= 0 != rSet.Put( aSz ); } - if(TriState(m_pFollowTextFlowCB->IsChecked()) != m_pFollowTextFlowCB->GetSavedValue()) + if(m_pFollowTextFlowCB->IsValueChangedFromSaved()) { bRet |= 0 != rSet.Put(SwFmtFollowTextFlow(m_pFollowTextFlowCB->IsChecked())); } @@ -2487,11 +2487,11 @@ void SwGrfExtPage::ActivatePage(const SfxItemSet& rSet) bool SwGrfExtPage::FillItemSet( SfxItemSet &rSet ) { bool bModified = false; - if ( m_pMirrorHorzBox->GetSavedValue() != TriState(m_pMirrorHorzBox->IsChecked()) || - m_pMirrorVertBox->GetSavedValue() != TriState(m_pMirrorVertBox->IsChecked()) || - m_pAllPagesRB->GetSavedValue() != m_pAllPagesRB->IsChecked() || - m_pLeftPagesRB->GetSavedValue() != m_pLeftPagesRB->IsChecked() || - m_pRightPagesRB->GetSavedValue() != m_pRightPagesRB->IsChecked()) + if ( m_pMirrorHorzBox->IsValueChangedFromSaved() || + m_pMirrorVertBox->IsValueChangedFromSaved() || + m_pAllPagesRB->IsValueChangedFromSaved() || + m_pLeftPagesRB->IsValueChangedFromSaved() || + m_pRightPagesRB->IsValueChangedFromSaved() ) { bModified = true; @@ -3047,9 +3047,9 @@ void SwFrmAddPage::Reset(const SfxItemSet &rSet ) bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) { bool bRet = false; - if (pNameED->GetText() != pNameED->GetSavedValue()) + if (pNameED->IsValueChangedFromSaved()) bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_NAME, pNameED->GetText())); - if (pAltNameED->GetText() != pAltNameED->GetSavedValue()) + if (pAltNameED->IsValueChangedFromSaved()) bRet |= 0 != rSet.Put(SfxStringItem(FN_SET_FRM_ALT_NAME, pAltNameED->GetText())); const SfxPoolItem* pOldItem; @@ -3061,18 +3061,17 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) aProt != *pOldItem ) bRet |= 0 != rSet.Put( aProt); - bool bChecked; - if ( (bChecked = pEditInReadonlyCB->IsChecked()) != (pEditInReadonlyCB->GetSavedValue() == 1) ) - bRet |= 0 != rSet.Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, bChecked)); + if ( pEditInReadonlyCB->IsValueChangedFromSaved() ) + bRet |= 0 != rSet.Put( SwFmtEditInReadonly( RES_EDIT_IN_READONLY, pEditInReadonlyCB->IsChecked())); - if ( (bChecked = pPrintFrameCB->IsChecked()) != (pPrintFrameCB->GetSavedValue() == 1) ) - bRet |= 0 != rSet.Put( SvxPrintItem( RES_PRINT, bChecked)); + if ( pPrintFrameCB->IsValueChangedFromSaved() ) + bRet |= 0 != rSet.Put( SvxPrintItem( RES_PRINT, pPrintFrameCB->IsChecked())); // textflow if( pTextFlowLB->IsVisible() ) { sal_Int32 nPos = pTextFlowLB->GetSelectEntryPos(); - if( nPos != pTextFlowLB->GetSavedValue() ) + if( pTextFlowLB->IsValueChangedFromSaved() ) { sal_uInt16 nData = (sal_uInt16)(sal_IntPtr)pTextFlowLB->GetEntryData( nPos ); bRet |= 0 != rSet.Put( SvxFrameDirectionItem( @@ -3104,7 +3103,7 @@ bool SwFrmAddPage::FillItemSet(SfxItemSet &rSet) } } - if(m_pVertAlignLB->GetSelectEntryPos() != m_pVertAlignLB->GetSavedValue()) + if(m_pVertAlignLB->IsValueChangedFromSaved()) { SdrTextVertAdjust nAdjust; switch(m_pVertAlignLB->GetSelectEntryPos()) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 96c7669d5fc0..a0539e93ae6b 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -161,20 +161,18 @@ SfxTabPage *SwTextGridPage::Create(Window *pParent, const SfxItemSet &rSet) bool SwTextGridPage::FillItemSet(SfxItemSet &rSet) { bool bRet = false; - if(m_pNoGridRB->GetSavedValue() != m_pNoGridRB->IsChecked()|| - m_pLinesGridRB->GetSavedValue() != m_pLinesGridRB->IsChecked()|| - m_pLinesPerPageNF->GetSavedValue().toInt32() - != m_pLinesPerPageNF->GetValue()|| - m_pTextSizeMF->GetSavedValue().toInt32() != m_pTextSizeMF->GetValue()|| - m_pCharsPerLineNF->GetSavedValue().toInt32() - != m_pCharsPerLineNF->GetValue()|| - m_pSnapToCharsCB->GetSavedValue() != TriState(m_pSnapToCharsCB->IsChecked()) || - m_pRubySizeMF->GetSavedValue().toInt32() != m_pRubySizeMF->GetValue()|| - m_pCharWidthMF->GetSavedValue().toInt32() != m_pCharWidthMF->GetValue()|| - m_pRubyBelowCB->GetSavedValue() != TriState(m_pRubyBelowCB->IsChecked())|| - m_pDisplayCB->GetSavedValue() != TriState(m_pDisplayCB->IsChecked())|| - m_pPrintCB->GetSavedValue() != TriState(m_pPrintCB->IsChecked())|| - m_pColorLB->GetSavedValue() != m_pColorLB->GetSelectEntryPos()) + if(m_pNoGridRB->IsValueChangedFromSaved() || + m_pLinesGridRB->IsValueChangedFromSaved() || + m_pLinesPerPageNF->IsValueChangedFromSaved() || + m_pTextSizeMF->IsValueChangedFromSaved() || + m_pCharsPerLineNF->IsValueChangedFromSaved() || + m_pSnapToCharsCB->IsValueChangedFromSaved() || + m_pRubySizeMF->IsValueChangedFromSaved() || + m_pCharWidthMF->IsValueChangedFromSaved() || + m_pRubyBelowCB->IsValueChangedFromSaved() || + m_pDisplayCB->IsValueChangedFromSaved() || + m_pPrintCB->IsValueChangedFromSaved() || + m_pColorLB->IsValueChangedFromSaved()) { PutGridItem(rSet); bRet = true; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 9c4dce4dcbb0..62a9bb6c3187 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -390,8 +390,8 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) if(bModified) { - if( m_pBottomMF->GetText() != m_pBottomMF->GetSavedValue() || - m_pTopMF->GetText() != m_pTopMF->GetSavedValue() ) + if( m_pBottomMF->IsValueChangedFromSaved() || + m_pTopMF->IsValueChangedFromSaved() ) { SvxULSpaceItem aULSpace(RES_UL_SPACE); aULSpace.SetUpper( m_pTopMF->Denormalize(m_pTopMF->GetValue( FUNIT_TWIP ))); @@ -400,7 +400,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) } } - if(m_pNameED->GetText() != m_pNameED->GetSavedValue()) + if(m_pNameED->IsValueChangedFromSaved()) { rCoreSet.Put(SfxStringItem( FN_PARAM_TABLE_NAME, m_pNameED->GetText())); bModified = true; @@ -409,7 +409,7 @@ bool SwFormatTablePage::FillItemSet( SfxItemSet& rCoreSet ) if( m_pTextDirectionLB->IsVisible() ) { const sal_Int32 nPos = m_pTextDirectionLB->GetSelectEntryPos(); - if ( nPos != m_pTextDirectionLB->GetSavedValue() ) + if ( m_pTextDirectionLB->IsValueChangedFromSaved() ) { const sal_uInt32 nDirection = (sal_uInt32)(sal_uIntPtr)m_pTextDirectionLB->GetEntryData( nPos ); @@ -616,7 +616,7 @@ int SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) SwTwips lRight = static_cast< SwTwips >(m_aRightMF.DenormalizePercent(m_aRightMF.GetValue( FUNIT_TWIP ))); if( m_aLeftMF.GetText() != m_aLeftMF.GetSavedValue() || - m_aRightMF.GetText() != m_aRightMF.GetSavedValue() ) + m_aRightMF.GetText() != m_aRightMF.GetSavedValue() ) { pTblData->SetWidthChanged(); pTblData->SetLeftSpace( lLeft); @@ -1326,19 +1326,19 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) bool bModified = false; //Repeat Heading - if(TriState(m_pHeadLineCB->IsChecked()) != m_pHeadLineCB->GetSavedValue() || - OUString::number( static_cast< sal_Int32 >(m_pRepeatHeaderNF->GetValue()) ) != m_pRepeatHeaderNF->GetSavedValue() ) + if(m_pHeadLineCB->IsValueChangedFromSaved() || + m_pRepeatHeaderNF->IsValueChangedFromSaved() ) { bModified |= 0 != rSet.Put( SfxUInt16Item(FN_PARAM_TABLE_HEADLINE, m_pHeadLineCB->IsChecked()? sal_uInt16(m_pRepeatHeaderNF->GetValue()) : 0 )); } - if(TriState(m_pKeepCB->IsChecked()) != m_pKeepCB->GetSavedValue()) + if(m_pKeepCB->IsValueChangedFromSaved()) bModified |= 0 != rSet.Put( SvxFmtKeepItem( m_pKeepCB->IsChecked(), RES_KEEP)); - if(TriState(m_pSplitCB->IsChecked()) != m_pSplitCB->GetSavedValue()) + if(m_pSplitCB->IsValueChangedFromSaved()) bModified |= 0 != rSet.Put( SwFmtLayoutSplit( m_pSplitCB->IsChecked())); - if(TriState(m_pSplitRowCB->IsChecked()) != m_pSplitRowCB->GetSavedValue()) + if(m_pSplitRowCB->IsValueChangedFromSaved()) bModified |= 0 != rSet.Put( SwFmtRowSplit( m_pSplitRowCB->IsChecked())); const SvxFmtBreakItem* pBreak = (const SvxFmtBreakItem*)GetOldItem( rSet, RES_BREAK ); @@ -1350,7 +1350,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) bool bPageItemPut = false; if ( bState != (m_pPageCollCB->GetSavedValue() == 1) || ( bState && - m_pPageCollLB->GetSelectEntryPos() != m_pPageCollLB->GetSavedValue() ) + m_pPageCollLB->IsValueChangedFromSaved() ) || (m_pPageNoNF->IsEnabled() && m_pPageNoNF->IsValueModified()) ) { OUString sPage; @@ -1374,8 +1374,8 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) if ( !bPageItemPut && ( bState != (m_pPageCollCB->GetSavedValue() == 1) || bIsChecked != (m_pPgBrkCB->GetSavedValue() ==1) || - m_pPgBrkBeforeRB->IsChecked() != m_pPgBrkBeforeRB->GetSavedValue() || - m_pPgBrkRB->IsChecked() != m_pPgBrkRB->GetSavedValue() )) + m_pPgBrkBeforeRB->IsValueChangedFromSaved() || + m_pPgBrkRB->IsValueChangedFromSaved() )) { SvxFmtBreakItem aBreak( (const SvxFmtBreakItem&)GetItemSet().Get( RES_BREAK ) ); @@ -1410,7 +1410,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) } } - if(m_pTextDirectionLB->GetSelectEntryPos() != m_pTextDirectionLB->GetSavedValue()) + if(m_pTextDirectionLB->IsValueChangedFromSaved()) { bModified |= 0 != rSet.Put( SvxFrameDirectionItem( @@ -1418,7 +1418,7 @@ bool SwTextFlowPage::FillItemSet( SfxItemSet& rSet ) , FN_TABLE_BOX_TEXTORIENTATION)); } - if(m_pVertOrientLB->GetSelectEntryPos() != m_pVertOrientLB->GetSavedValue()) + if(m_pVertOrientLB->IsValueChangedFromSaved()) { sal_uInt16 nOrient = USHRT_MAX; switch(m_pVertOrientLB->GetSelectEntryPos()) |