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

[Jan-Marek Glogowski (via logerrit)]

 cui/source/options/optgdlg.cxx    |   16 ++++++++--------
 cui/uiconfig/ui/optgeneralpage.ui |    1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 1ab2395355d61e705a251c6eb8bdc870cc20e785
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sun Jul 14 12:15:04 2019 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sun Jul 14 17:40:55 2019 +0200

    Fix welded general option page
    
    * replace the wrong m_xFileDlgFrame with m_xPrintDlgFrame
      (some search and replace error, I guess)
    * set filedlgframe's visibility to True, so hiding actually works
    
    Change-Id: I5f77f3930096acd885bf8c2fbbf798d6f1b110db
    Reviewed-on: https://gerrit.libreoffice.org/75574
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1ff24bd88405..91d3077c15f0 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -281,21 +281,21 @@ OfaMiscTabPage::OfaMiscTabPage(TabPageParent pParent, const SfxItemSet& rSet)
 {
     if (!lcl_HasSystemFilePicker())
         m_xFileDlgFrame->hide();
+    else if (SvtMiscOptions().IsUseSystemFileDialogReadOnly())
+    {
+        m_xFileDlgROImage->show();
+        m_xFileDlgCB->set_sensitive(false);
+    }
+
 #if ! ENABLE_GTK
-    m_xFileDlgFrame->hide();
+    m_xPrintDlgFrame->hide();
 #else
     if (!SvtMiscOptions().IsExperimentalMode())
     {
-        m_xFileDlgFrame->hide();
+        m_xPrintDlgFrame->hide();
     }
 #endif
 
-    if (m_xFileDlgCB->get_visible() && SvtMiscOptions().IsUseSystemFileDialogReadOnly())
-    {
-        m_xFileDlgROImage->show();
-        m_xFileDlgCB->set_sensitive(false);
-    }
-
     m_xQuickLaunchCB->show();
 
     //Only available in Win or if building the gtk systray
diff --git a/cui/uiconfig/ui/optgeneralpage.ui b/cui/uiconfig/ui/optgeneralpage.ui
index 7238b8932f42..9a87396b2679 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -96,6 +96,7 @@
     </child>
     <child>
       <object class="GtkFrame" id="filedlgframe">
+        <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>