diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-01-05 21:09:13 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2022-01-09 17:42:31 +0100 |
| commit | ea800e3bf861a6a6bf338e72cc55959d32b5af48 (patch) | |
| tree | 10593730c0510b4c5cd8a11738f0aceee83b2810 | |
| parent | Resolves: tdf#129745 don't override child help for application frames (diff) | |
| download | core-ea800e3bf861a6a6bf338e72cc55959d32b5af48.tar.gz core-ea800e3bf861a6a6bf338e72cc55959d32b5af48.zip | |
Resolves: tdf#146592 "Reset" to the current document properties
not those seen at the initial load of the TabPage
Change-Id: Ieba4c278a0a9b7fef3030d8462cb845c27dba9b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127961
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | sc/source/ui/optdlg/tpcalc.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 92570ea9653f..53517d81a0f0 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -82,12 +82,16 @@ std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( weld::Container* pPage, wel return std::make_unique<ScTpCalcOptions>( pPage, pController, *rAttrSet ); } -void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) +void ScTpCalcOptions::Reset(const SfxItemSet* rCoreAttrs) { sal_uInt16 d,m; sal_Int16 y; - *pLocalOptions = *pOldOptions; + pOldOptions.reset(new ScDocOptions( + static_cast<const ScTpCalcItem&>(rCoreAttrs->Get( + GetWhich(SID_SCDOCOPTIONS))).GetDocOptions())); + + *pLocalOptions = *pOldOptions; m_xBtnCase->set_active( !pLocalOptions->IsIgnoreCase() ); m_xBtnCase->set_sensitive( !officecfg::Office::Calc::Calculate::Other::CaseSensitive::isReadOnly() ); |