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

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5FilePicker.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit e9280e673da66cc37a8908dd82698ff91f2fe4ec
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Feb 6 17:45:56 2019 +0100
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue May 21 21:44:05 2019 +0200

    Qt5FilePicker::addCustomControl: Add missing from kde5
    
    Take over functionality from 'KDE5FilePicker::addCustomControl'
    that has not been implemented in qt5 one yet.
    
    Change-Id: I9690e163b3b739bfec6813d9a4e1e0170b730187
    Reviewed-on: https://gerrit.libreoffice.org/68056
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit c5947393cdd433a4a9d3e19ded1e9ca6ef384d74)
    Reviewed-on: https://gerrit.libreoffice.org/72653

diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index 9a0d6e820783..0d2025cec55b 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -624,9 +624,13 @@ void Qt5FilePicker::addCustomControl(sal_Int16 controlId)
         case LISTBOX_IMAGE_TEMPLATE:
             resId = STR_FPICKER_IMAGE_TEMPLATE;
             break;
+        case LISTBOX_IMAGE_ANCHOR:
+            resId = STR_FPICKER_IMAGE_ANCHOR;
+            break;
         case LISTBOX_VERSION_LABEL:
         case LISTBOX_TEMPLATE_LABEL:
         case LISTBOX_IMAGE_TEMPLATE_LABEL:
+        case LISTBOX_IMAGE_ANCHOR_LABEL:
         case LISTBOX_FILTER_SELECTOR:
             break;
     }
@@ -653,6 +657,7 @@ void Qt5FilePicker::addCustomControl(sal_Int16 controlId)
             break;
         case LISTBOX_VERSION:
         case LISTBOX_TEMPLATE:
+        case LISTBOX_IMAGE_ANCHOR:
         case LISTBOX_IMAGE_TEMPLATE:
         case LISTBOX_FILTER_SELECTOR:
             label = new QLabel(getResString(resId), m_pExtraControls);
@@ -662,6 +667,7 @@ void Qt5FilePicker::addCustomControl(sal_Int16 controlId)
         case LISTBOX_VERSION_LABEL:
         case LISTBOX_TEMPLATE_LABEL:
         case LISTBOX_IMAGE_TEMPLATE_LABEL:
+        case LISTBOX_IMAGE_ANCHOR_LABEL:
             break;
     }