[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source

[Andras Timar]

 cui/source/options/optgdlg.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 310396aaa9c8b0e25053decbb673af339eebdec3
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Nov 13 10:23:59 2013 +0100

    fdo#59256 hide this option when experimental features are disabled
    
    GTK print dialog is experimental, the checkbox has no effect, if
    experimental features are disabled.
    On Mac OS X LibreOffice cannot use native print dialog at all.
    
    Change-Id: I7497f1da0ec74b9067675e34eb4314b7a4616f06
    Reviewed-on: https://gerrit.libreoffice.org/6664
    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 1ae32e1..fbb1cf7 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -187,8 +187,13 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet)
     get(m_pExtHelpCB, "exthelp");
     if (!lcl_HasSystemFilePicker())
         get<VclContainer>("filedlgframe")->Hide();
-#if !defined(MACOSX) && ! ENABLE_GTK
+#if ! ENABLE_GTK
     get<VclContainer>("printdlgframe")->Hide();
+#else
+    if (!SvtMiscOptions().IsExperimentalMode())
+    {
+        get<VclContainer>("printdlgframe")->Hide();
+    }
 #endif
     get(m_pFileDlgCB, "filedlg");
     get(m_pPrintDlgCB, "printdlg");