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

[Katarina Behrens]

 fpicker/source/office/iodlg.cxx           |    3 ---
 fpicker/uiconfig/ui/explorerfiledialog.ui |    1 -
 2 files changed, 4 deletions(-)

New commits:
commit af318eeb4e23694e17b09b902afb98ddf9da9b7b
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Tue Oct 31 21:33:26 2017 +0100

    tdf#113304,filepicker: encrypt w/ GPG only when it makes sense
    
    remotely gpg4libre-related
    
    Change-Id: Iec6f1ca04e55c8d66e65bb8d349b613b66ad1c69
    Reviewed-on: https://gerrit.libreoffice.org/44137
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 72f4e494cb36..ff486ddb3d0a 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -638,9 +638,6 @@ void SvtFileDialog::Init_Impl
         pImpl->_pCbPassword->SetText( FpsResId( STR_SVT_FILEPICKER_PASSWORD ) );
         pImpl->_pCbPassword->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
         pImpl->_pCbPassword->Show();
-    }
-    if ( nStyle & PickerFlags::Password )
-    {
         pImpl->_pCbGPGEncrypt->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) );
         pImpl->_pCbGPGEncrypt->Show();
     }
diff --git a/fpicker/uiconfig/ui/explorerfiledialog.ui b/fpicker/uiconfig/ui/explorerfiledialog.ui
index 4d43b4112efe..b533c06b4295 100644
--- a/fpicker/uiconfig/ui/explorerfiledialog.ui
+++ b/fpicker/uiconfig/ui/explorerfiledialog.ui
@@ -454,7 +454,6 @@
                                 <child>
                                   <object class="GtkCheckButton" id="gpgencrypt">
                                     <property name="label" translatable="yes" context="explorerfiledialog|gpgencrypt">Encrypt with GPG key</property>
-                                    <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
                                     <property name="draw_indicator">True</property>