diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-08-03 11:52:23 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2021-08-03 14:39:03 +0200 |
| commit | e6671ea1ceb9e6925ef396156c922a62ded19461 (patch) | |
| tree | 44778554641ab360523d9ff460acbcfd741428d4 | |
| parent | 742b5f0e75cb00f9e14b11343a9c29f241179ca9 (diff) | |
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@yahoo.fr>
| -rw-r--r-- | vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.hxx | 3 |
3 files changed, 5 insertions, 4 deletions
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 { |