[Libreoffice-commits] core.git: 2 commits - cui/source sc/source

[Caolán McNamara (via logerrit)]

 cui/source/options/optgdlg.cxx |    4 ++--
 sc/source/ui/optdlg/tpcalc.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7d1803d346ce4bf57d95e84563253c592caf4b3c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 16:15:00 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 23 20:28:41 2019 +0200

    Resolves: tdf#127683 options dialog has a controller now
    
    Change-Id: I1143bb27f524960e44aa2cdb76f063a9b93d42be
    Reviewed-on: https://gerrit.libreoffice.org/79415
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1d95f8ab8720..657bd23ffb66 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1317,9 +1317,9 @@ bool OfaLanguagesTabPage::FillItemSet( SfxItemSet* rSet )
             // display info
             SolarMutexGuard aGuard;
             if (svtools::executeRestartDialog(
-                    comphelper::getProcessComponentContext(), GetFrameWeld(),
+                    comphelper::getProcessComponentContext(), GetDialogFrameWeld(),
                     svtools::RESTART_REASON_LANGUAGE_CHANGE))
-                GetParentDialog()->EndDialog(RET_OK);
+                GetDialogController()->response(RET_OK);
 
             // tell quickstarter to stop being a veto listener
 
commit 4e1ed8f321074d7f7f347badf44cf48e7931f99a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 23 16:57:01 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 23 20:28:15 2019 +0200

    config dialog uses a controller now
    
    Change-Id: I0341b0b51d638b5ea8f28d16dca87d50376873a4
    Reviewed-on: https://gerrit.libreoffice.org/79417
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 5a6f60337911..f38ef51c443a 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -184,7 +184,7 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs )
         if (svtools::executeRestartDialog(
                      comphelper::getProcessComponentContext(), GetFrameWeld(),
                      svtools::RESTART_REASON_THREADING))
-            GetParentDialog()->EndDialog(RET_OK);
+            GetDialogController()->response(RET_OK);
     }
     if ( *pLocalOptions != *pOldOptions )
     {