[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - 2 commits - vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/unx/kde5/KDE5FilePicker.hxx  |    7 -------
 vcl/unx/kde5/KDE5FilePicker2.cxx |   12 ------------
 2 files changed, 19 deletions(-)

New commits:
commit 92400e8df9f704ac4856dbb85d8551a0488fd334
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 6 09:16:53 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:35:25 2019 +0200

    Drop KDE5FilePicker::disposing
    
    Base class's 'Qt5FilePicker::disposing' is the same.
    
    Change-Id: I91069385541a519f006d10b0580104f14beb551e
    Reviewed-on: https://gerrit.libreoffice.org/68048
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 1542aad2d238ea0b9119befe35fc67e6b2c0a3e7)
    Reviewed-on: https://gerrit.libreoffice.org/72645

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 5a3f797a8e4f..4825a820ed9a 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -119,10 +119,6 @@ public:
     // XCancellable
     virtual void SAL_CALL cancel() override;
 
-    // XEventListener
-    virtual void disposing(const css::lang::EventObject& rEvent);
-    using cppu::WeakComponentImplHelperBase::disposing;
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(const OUString& rServiceName) override;
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index d512cc94fe12..0a96aa0bda7f 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -19,7 +19,6 @@
 
 #include "KDE5FilePicker.hxx"
 
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <cppuhelper/interfacecontainer.h>
@@ -678,17 +677,6 @@ void SAL_CALL KDE5FilePicker::cancel()
     // TODO
 }
 
-// XEventListener
-void KDE5FilePicker::disposing(const lang::EventObject& rEvent)
-{
-    uno::Reference<XFilePickerListener> xFilePickerListener(rEvent.Source, uno::UNO_QUERY);
-
-    if (xFilePickerListener.is())
-    {
-        removeFilePickerListener(xFilePickerListener);
-    }
-}
-
 // XServiceInfo
 OUString SAL_CALL KDE5FilePicker::getImplementationName()
 {
commit 382874d2f945c4653cc64659011195ec8c2b252d
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 6 09:02:23 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:34:52 2019 +0200

    KDE5FilePicker: Drop (now) unused member '_helperMutex'
    
    Change-Id: I4680cc4a8507d0d2409301b62ab81165fcfcdba1
    Reviewed-on: https://gerrit.libreoffice.org/68047
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 6d00c53fac49a29c89bcc4a5e8346195bd2a3b96)
    Reviewed-on: https://gerrit.libreoffice.org/72644

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 8fac527b086e..5a3f797a8e4f 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <functional>
@@ -51,8 +50,6 @@ class KDE5FilePicker : public Qt5FilePicker
 {
     Q_OBJECT
 protected:
-    osl::Mutex _helperMutex;
-
     //running filter string to add to dialog
     QStringList _filters;
     // map of filter titles to full filter for selection