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

Pranav Kant pranavk at collabora.co.uk
Thu Jan 25 10:24:58 UTC 2018


 fpicker/source/office/iodlg.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 9711a8a35796d0d4ab4b69204bd4484686bf0707
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Thu Jan 25 15:52:52 2018 +0530

    lokdialog: Disable filepicker for LOK
    
    We don't want people to browser their jails in the filepicker dialog.
    
    Change-Id: I2fdd3d948cc1f193098492d1a310424ac2d49317

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 333c384734f1..d40f93214411 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -69,6 +69,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <comphelper/interaction.hxx>
+#include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 
@@ -1797,6 +1798,9 @@ void SvtFileDialog::EnableControl( Control* _pControl, bool _bEnable )
 
 short SvtFileDialog::PrepareExecute()
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return 0;
+
     OUString aEnvValue;
     if ( getEnvironmentValue( "WorkDirMustContainRemovableMedia", aEnvValue ) && aEnvValue == "1" )
     {


More information about the Libreoffice-commits mailing list