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

[Michael Weghorn (via logerrit)]

 vcl/unx/kde5/KDE5FilePicker.hxx  |    3 ---
 vcl/unx/kde5/KDE5FilePicker2.cxx |    6 ------
 2 files changed, 9 deletions(-)

New commits:
commit 2b122709b0c8258a7b825a3c4d71d1168741db21
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 6 14:58:32 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:39:41 2019 +0200

    Drop KDE5FilePicker::cancel
    
    Base class's 'Qt5FilePicker::cancel' already does nothing
    just the same way.
    
    Change-Id: Ie125d117f27849b29f082c72e320c1021e81163e
    Reviewed-on: https://gerrit.libreoffice.org/68053
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 424ffe2917cb3b0626af4f996aba149aa82a8e76)
    Reviewed-on: https://gerrit.libreoffice.org/72650

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 37bb748eed83..65b67b37c7b1 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -92,9 +92,6 @@ public:
     // XInitialization
     virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rArguments) override;
 
-    // XCancellable
-    virtual void SAL_CALL cancel() override;
-
     // 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 ac43149437d8..6d39aeb23bdf 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -554,12 +554,6 @@ void SAL_CALL KDE5FilePicker::initialize(const uno::Sequence<uno::Any>& args)
     setTitle(VclResId(saveDialog ? STR_FPICKER_SAVE : STR_FPICKER_OPEN));
 }
 
-// XCancellable
-void SAL_CALL KDE5FilePicker::cancel()
-{
-    // TODO
-}
-
 // XServiceInfo
 OUString SAL_CALL KDE5FilePicker::getImplementationName()
 {