[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - cui/source cui/uiconfig

[Libreoffice Gerrit user]

 cui/source/options/optaboutconfig.cxx |    4 ++--
 cui/source/options/optaboutconfig.hxx |    2 +-
 cui/source/options/optjava.cxx        |    2 +-
 cui/uiconfig/ui/aboutconfigdialog.ui  |    1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 3853b2dc60d6fa39b66cb7d2e9d14fa37f4f7be7
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 19 11:12:17 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Nov 19 14:09:13 2018 +0100

    Resolves: tdf#121487 ::Execute called on "modeless" dialog
    
    that isn't really modeless
    
    Change-Id: I9a092622dc45a9a047ef805ed1e41fd9f036a7dc
    Reviewed-on: https://gerrit.libreoffice.org/63560
    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/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 0e26e06effeb..a9d884cdb411 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -142,7 +142,7 @@ Size CuiCustomMultilineEdit::GetOptimalSize() const
 }
 
 CuiAboutConfigTabPage::CuiAboutConfigTabPage( vcl::Window* pParent/*, const SfxItemSet& rItemSet*/ ) :
-    ModelessDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"),
+    ModalDialog( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui"),
     m_pPrefCtrl( get<SvSimpleTableContainer>("preferences") ),
     m_pResetBtn( get<PushButton>("reset") ),
     m_pEditBtn( get<PushButton>("edit") ),
@@ -195,7 +195,7 @@ void CuiAboutConfigTabPage::dispose()
     m_pEditBtn.clear();
     m_pSearchBtn.clear();
     m_pSearchEdit.clear();
-    ModelessDialog::dispose();
+    ModalDialog::dispose();
 }
 
 void CuiAboutConfigTabPage::InsertEntry(const OUString& rPropertyPath, const OUString& rProp, const OUString& rStatus,
diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx
index dcb6b6c0971a..7d10212ee11b 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -39,7 +39,7 @@ public:
     virtual Size GetOptimalSize() const override;
 };
 
-class CuiAboutConfigTabPage : public ModelessDialog
+class CuiAboutConfigTabPage : public ModalDialog
 {
 private:
     VclPtr<SvSimpleTableContainer> m_pPrefCtrl;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 81f93cb0136b..5f44c6d424f9 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -374,7 +374,7 @@ IMPL_LINK( SvxJavaOptionsPage, DialogClosedHdl, DialogClosedEvent*, pEvt, void )
 
 IMPL_LINK_NOARG( SvxJavaOptionsPage, ExpertConfigHdl_Impl, Button*, void )
 {
-    ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(this);
+    ScopedVclPtrInstance< CuiAboutConfigTabPage > pExpertConfigDlg(GetTabDialog());
     pExpertConfigDlg->Reset();//initialize and reset function
 
     if( RET_OK == pExpertConfigDlg->Execute() )
diff --git a/cui/uiconfig/ui/aboutconfigdialog.ui b/cui/uiconfig/ui/aboutconfigdialog.ui
index 34bfb4c8ae91..09e2e38bb242 100644
--- a/cui/uiconfig/ui/aboutconfigdialog.ui
+++ b/cui/uiconfig/ui/aboutconfigdialog.ui
@@ -7,6 +7,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="aboutconfigdialog|AboutConfig">Expert Configuration</property>
+    <property name="modal">True</property>
     <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
     <child internal-child="vbox">