[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/optdlg/tpcalc.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 3399f4d95ec1e685bd48936f1131dd8c860aebf4
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 5 21:09:13 2022 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Jan 7 11:21:24 2022 +0100

    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/+/127959
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 4a491a1c5419..df8d827ef670 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -83,12 +83,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() );