[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx     |    2 +-
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx |    4 ++--
 vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e6671ea1ceb9e6925ef396156c922a62ded19461
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Aug 3 11:52:23 2021 +0100
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Tue Aug 3 14:39:03 2021 +0200

    fix enable-gtk3-kde5 build
    
    Change-Id: I020e6e74f800e58bee71674d2219a89c40a70eda
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119930
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
index eec532d4091a..37335b74e8d6 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx
@@ -216,7 +216,7 @@ OUString SAL_CALL Gtk3KDE5FilePicker::getLabel(sal_Int16 controlId)
 
 void Gtk3KDE5FilePicker::addCustomControl(sal_Int16 controlId)
 {
-    const char* resId = nullptr;
+    TranslateId resId;
 
     switch (controlId)
     {
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
index 4bccf1e24d72..6ffd51272dfd 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx
@@ -97,9 +97,9 @@ void sendIpcArg(std::ostream& stream, const OUString& string)
     sendIpcStringArg(stream, utf8.getLength(), utf8.getStr());
 }
 
-OUString getResString(const char* pResId)
+OUString getResString(TranslateId pResId)
 {
-    if (pResId == nullptr)
+    if (!pResId)
         return {};
 
     return VclResId(pResId);
diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
index e24fb92de023..58ca3eb4527a 100644
--- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
+++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <osl/process.h>
+#include <unotools/resmgr.hxx>
 
 #include "filepicker_ipc_commands.hxx"
 
@@ -28,7 +29,7 @@
 #include <thread>
 #include <sstream>
 
-OUString getResString(const char* pResId);
+OUString getResString(TranslateId pResId);
 
 class Gtk3KDE5FilePickerIpc
 {