[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 |    2 --
 2 files changed, 5 deletions(-)

New commits:
commit e22b58f690e8a5aba77ab7f2d6152eea0e0b2de9
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 6 13:28:54 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:37:35 2019 +0200

    Drop KDE5FilePicker::setDescription
    
    Base class's 'Qt5FilePicker::setDescription'
    does the same, namely nothing.
    
    Change-Id: Ie89a1e1edaf20c49a1b16f43000a4a054b21f3b2
    Reviewed-on: https://gerrit.libreoffice.org/68051
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 3035db41839f12642a02040099468695bf5ab335)
    Reviewed-on: https://gerrit.libreoffice.org/72648

diff --git a/vcl/unx/kde5/KDE5FilePicker.hxx b/vcl/unx/kde5/KDE5FilePicker.hxx
index 58a0c5d95c96..05a8f138350d 100644
--- a/vcl/unx/kde5/KDE5FilePicker.hxx
+++ b/vcl/unx/kde5/KDE5FilePicker.hxx
@@ -95,9 +95,6 @@ public:
     virtual void SAL_CALL setLabel(sal_Int16 nControlId, const OUString& rLabel) override;
     virtual OUString SAL_CALL getLabel(sal_Int16 nControlId) override;
 
-    // XFolderPicker stuff
-    virtual void SAL_CALL setDescription(const OUString& rDescription) override;
-
     /* TODO XFilePreview
 
     virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats(  );
diff --git a/vcl/unx/kde5/KDE5FilePicker2.cxx b/vcl/unx/kde5/KDE5FilePicker2.cxx
index 072966c52e44..f146870a4713 100644
--- a/vcl/unx/kde5/KDE5FilePicker2.cxx
+++ b/vcl/unx/kde5/KDE5FilePicker2.cxx
@@ -335,8 +335,6 @@ OUString SAL_CALL KDE5FilePicker::getLabel(sal_Int16 controlId)
     return label;
 }
 
-void SAL_CALL KDE5FilePicker::setDescription(const OUString&) {}
-
 void KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 {
     const char* resId = nullptr;