[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - 2 commits - include/svtools sfx2/source svtools/source

[Katarina Behrens (via logerrit)]

 include/svtools/prnsetup.hxx        |    1 -
 sfx2/source/doc/guisaveas.cxx       |   11 +----------
 svtools/source/dialogs/prnsetup.cxx |    7 +------
 3 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit dedd3c0b67d67c34bfe9418ba0356a3ba096974f
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed Apr 17 12:02:13 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Apr 17 18:17:53 2019 +0200

    Revert "Redirect filter options dialog to the main thread"
    
    This reverts commit c2b4dcc46680db854fa1e5f3c490b88bd53b7f5e.
    
    Change-Id: Ifa22f188dfd7e8d7aa2d09a0180b4220c69a3578
    Reviewed-on: https://gerrit.libreoffice.org/70871
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 9c1c9192b96a..a6219aa3947d 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -94,7 +94,6 @@
 #include <officecfg/Office/Common.hxx>
 
 #include <vcl/FilterConfigItem.hxx>
-#include <vcl/threadex.hxx>
 #include <com/sun/star/system/SystemShellExecute.hpp>
 #include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 
@@ -267,8 +266,6 @@ class ModelData_Impl
 
     bool m_bRecommendReadOnly;
 
-    bool solar_execute(uno::Reference< ui::dialogs::XExecutableDialog > xFilterDialog);
-
 public:
     ModelData_Impl( SfxStoringHelper& aOwner,
                     const uno::Reference< frame::XModel >& xModel,
@@ -561,10 +558,6 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl(
     return aFilterProps;
 }
 
-bool ModelData_Impl::solar_execute( uno::Reference<ui::dialogs::XExecutableDialog> xFilterDialog)
-{
-    return xFilterDialog->execute();
-}
 
 bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
 {
@@ -601,9 +594,7 @@ bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName )
                             GetMediaDescr() >> aPropsForDialog;
                             xFilterProperties->setPropertyValues( aPropsForDialog );
 
-                            bool bRet = vcl::solarthread::syncExecute(std::bind(&ModelData_Impl::solar_execute, this, xFilterDialog));
-
-                            if( bRet )
+                            if( xFilterDialog->execute() )
                             {
                                 uno::Sequence< beans::PropertyValue > aPropsFromDialog =
                                                                             xFilterProperties->getPropertyValues();
commit fae1a1e8be1122104bcfba5f5b19d7ab6a39a743
Author:     Katarina Behrens <Katarina.Behrens at cib.de>
AuthorDate: Wed Apr 17 11:48:53 2019 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Apr 17 18:17:44 2019 +0200

    Revert "Redirect printer setup into the main thread"
    
    This reverts commit eaaf6f4f925bf04833a464176d376efe92cdcd69.
    
    Change-Id: Iece7a447207f19e454e6d7c74702d829754a8074
    Reviewed-on: https://gerrit.libreoffice.org/70870
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 267274d8d61a..007294e52656 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -47,7 +47,6 @@ private:
     AutoTimer              maStatusTimer;
     VclPtr<Printer>        mpPrinter;
     VclPtr<Printer>        mpTempPrinter;
-    short solar_execute();
 
     SVT_DLLPRIVATE void         ImplSetInfo();
 
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index e7362e7bc44c..cf8a3f5c5eb9 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -21,7 +21,6 @@
 #include <svtools/svtools.hrc>
 #include <svtools/svtresid.hxx>
 #include <vcl/print.hxx>
-#include <vcl/threadex.hxx>
 
 
 void ImplFillPrnDlgListBox( const Printer* pPrinter,
@@ -332,10 +331,6 @@ void PrinterSetupDialog::DataChanged( const DataChangedEvent& rDCEvt )
     ModalDialog::DataChanged( rDCEvt );
 }
 
-short PrinterSetupDialog::solar_execute()
-{
-    return ModalDialog::Execute();
-}
 
 short PrinterSetupDialog::Execute()
 {
@@ -352,7 +347,7 @@ short PrinterSetupDialog::Execute()
     maStatusTimer.Start();
 
     // start dialog
-    short nRet = vcl::solarthread::syncExecute(std::bind(&PrinterSetupDialog::solar_execute, this));
+    short nRet = ModalDialog::Execute();
 
     // update data if the dialog was terminated with OK
     if ( nRet == RET_OK )