[Libreoffice-commits] core.git: 2 commits - basctl/source include/vcl vcl/source

[Caolán McNamara]

 basctl/source/basicide/moduldl2.cxx |    6 ++++--
 include/vcl/dialog.hxx              |    1 -
 vcl/source/window/dialog.cxx        |   17 -----------------
 3 files changed, 4 insertions(+), 20 deletions(-)

New commits:
commit 4cf89526e6eb76097ccfa0f710507b87da2a0aa0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 1 11:06:49 2017 +0100

    move to FileDialogHelper
    
    Change-Id: I90579f0994f573743327999da2382351a5eb0d3e
    Reviewed-on: https://gerrit.libreoffice.org/41793
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 55391863174d..2f25c8c0b7d9 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -30,6 +30,7 @@
 #include <rtl/uri.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/filedlghelper.hxx>
 #include <sfx2/request.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
@@ -1174,12 +1175,13 @@ Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler()
 void LibPage::ExportAsPackage( const OUString& aLibName )
 {
     // file open dialog
+    sfx2::FileDialogHelper aDlg(ui::dialogs::TemplateDescription::FILESAVE_SIMPLE);
+    Reference <XFilePicker3> xFP = aDlg.GetFilePicker();
+
     Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
     Reference< task::XInteractionHandler2 > xHandler( task::InteractionHandler::createWithParent(xContext, nullptr) );
     Reference< XSimpleFileAccess3 > xSFA = SimpleFileAccess::create(xContext);
 
-    Reference < XFilePicker3 > xFP = FilePicker::createWithMode(xContext, TemplateDescription::FILESAVE_SIMPLE);
-
     xFP->setTitle(IDEResId(RID_STR_EXPORTPACKAGE));
 
     // filter
commit 52ec6ab3e31c16329f5c177ac47943dd93ab3a04
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 1 15:56:52 2017 +0100

    weird SetModalInputMode variant only called by itself
    
    Change-Id: I5846eaee38109238f49736583fb4e326ab21f698
    Reviewed-on: https://gerrit.libreoffice.org/41794
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 2730467e4cab..1ddbf016b88c 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -149,7 +149,6 @@ public:
                                          sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const;
 
     void            SetModalInputMode( bool bModal );
-    void            SetModalInputMode( bool bModal, bool bSubModalDialogs );
     bool            IsModalInputMode() const { return mbModalMode; }
 
     void            GrabFocusToFirstControl();
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 1ad300fdbf9b..7ee245c024a2 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1088,23 +1088,6 @@ void Dialog::SetModalInputMode( bool bModal )
     ImplGetFrame()->SetModal(bModal);
 }
 
-void Dialog::SetModalInputMode( bool bModal, bool bSubModalDialogs )
-{
-    if ( bSubModalDialogs )
-    {
-        vcl::Window* pOverlap = ImplGetFirstOverlapWindow();
-        pOverlap = pOverlap->mpWindowImpl->mpFirstOverlap;
-        while ( pOverlap )
-        {
-            if ( pOverlap->IsDialog() )
-                static_cast<Dialog*>(pOverlap)->SetModalInputMode( bModal, true );
-            pOverlap = pOverlap->mpWindowImpl->mpNext;
-        }
-    }
-
-    SetModalInputMode( bModal );
-}
-
 void Dialog::GrabFocusToFirstControl()
 {
     vcl::Window* pFocusControl;