[Libreoffice-commits] core.git: sfx2/source

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/tabdlg.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 51f312c1366d815f8ccfd68931edba664866df09
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 2 09:49:43 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 2 11:45:11 2019 +0200

    Resolves: tdf#127198 assert on dialog from db wizard
    
    Change-Id: Ibc431b4f27d1bb5c848122ef0430b13c6a9dc45b
    Reviewed-on: https://gerrit.libreoffice.org/78384
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 7b6ef90e80bb..585db2f760e1 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -51,10 +51,11 @@ using namespace ::com::sun::star::uno;
 struct TabPageImpl
 {
     bool                        mbStandard;
-    SfxOkDialogController*      mpDialogController;
+    weld::DialogController*     mpDialogController;
+    SfxOkDialogController*      mpSfxDialogController;
     css::uno::Reference< css::frame::XFrame > mxFrame;
 
-    TabPageImpl() : mbStandard(false), mpDialogController(nullptr) {}
+    TabPageImpl() : mbStandard(false), mpDialogController(nullptr), mpSfxDialogController(nullptr) {}
 };
 
 struct Data_Impl
@@ -155,7 +156,8 @@ SfxTabPage::SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription,
                                : Application::CreateInterimBuilder(this, rUIXMLDescription))
     , m_xContainer(m_xBuilder->weld_container(rID))
 {
-    pImpl->mpDialogController = dynamic_cast<SfxOkDialogController*>(pParent.pController);
+    pImpl->mpDialogController = pParent.pController;
+    pImpl->mpSfxDialogController = dynamic_cast<SfxOkDialogController*>(pImpl->mpDialogController);
 }
 
 SfxTabPage::~SfxTabPage()
@@ -291,12 +293,13 @@ void SfxTabPage::ChangesApplied()
 
 void SfxTabPage::SetDialogController(SfxOkDialogController* pDialog)
 {
-    pImpl->mpDialogController = pDialog;
+    pImpl->mpSfxDialogController = pDialog;
+    pImpl->mpDialogController = pImpl->mpSfxDialogController;
 }
 
 SfxOkDialogController* SfxTabPage::GetDialogController() const
 {
-    return pImpl->mpDialogController;
+    return pImpl->mpSfxDialogController;
 }
 
 OString SfxTabPage::GetConfigId() const
@@ -318,8 +321,8 @@ weld::Window* SfxTabPage::GetDialogFrameWeld() const
 
 const SfxItemSet* SfxTabPage::GetDialogExampleSet() const
 {
-    if (pImpl->mpDialogController)
-        return pImpl->mpDialogController->GetExampleSet();
+    if (pImpl->mpSfxDialogController)
+        return pImpl->mpSfxDialogController->GetExampleSet();
     return nullptr;
 }