From 3307afa99c28fd282094e9558795b0a20ba5c6a0 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Mon, 7 Mar 2022 21:44:07 +0100 Subject: tdf#114150: Remove duplication of strings found in file dialogs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I86f720a23dd9d400d39d9606e073b483850a9df2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131153 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- fpicker/inc/fpsofficeResMgr.hxx | 15 -------- fpicker/source/aqua/resourceprovider.mm | 2 +- fpicker/source/office/RemoteFilesDialog.cxx | 2 +- fpicker/source/office/iodlg.cxx | 2 +- fpicker/source/win32/VistaFilePickerImpl.cxx | 2 +- fpicker/source/win32/resourceprovider.cxx | 2 +- include/fpicker/fpsofficeResMgr.hxx | 15 ++++++++ include/fpicker/strings.hrc | 2 ++ vcl/inc/strings.hrc | 19 ---------- vcl/qt5/QtFilePicker.cxx | 37 ++++++++++---------- vcl/unx/gtk3/fpicker/resourceprovider.cxx | 48 +++++++++++++------------- vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx | 31 ++++++++--------- vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx | 4 +-- vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx | 4 +-- 14 files changed, 84 insertions(+), 101 deletions(-) delete mode 100644 fpicker/inc/fpsofficeResMgr.hxx create mode 100644 include/fpicker/fpsofficeResMgr.hxx diff --git a/fpicker/inc/fpsofficeResMgr.hxx b/fpicker/inc/fpsofficeResMgr.hxx deleted file mode 100644 index a86a91509c38..000000000000 --- a/fpicker/inc/fpsofficeResMgr.hxx +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ -#pragma once - -#include - -inline OUString FpsResId(TranslateId aId) { return Translate::get(aId, Translate::Create("fps")); }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 34b0359a231d..951833ae2714 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -29,7 +29,7 @@ #include #include "NSString_OOoAdditions.hxx" -#include +#include #include "resourceprovider.hxx" using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index c36d55deb81b..d417488e4a55 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -12,7 +12,7 @@ #include "fpsmartcontent.hxx" #include "QueryFolderName.hxx" #include "RemoteFilesDialog.hxx" -#include +#include #include #include #include diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c358636ca071..72b3b7733062 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -25,7 +25,7 @@ #include #include "OfficeControlAccess.hxx" #include "PlacesListBox.hxx" -#include +#include #include #include #include diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx index a38e237e2511..dbd0f87983a9 100644 --- a/fpicker/source/win32/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/VistaFilePickerImpl.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/fpicker/source/win32/resourceprovider.cxx b/fpicker/source/win32/resourceprovider.cxx index ff841b385b26..3515e9432146 100644 --- a/fpicker/source/win32/resourceprovider.cxx +++ b/fpicker/source/win32/resourceprovider.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; diff --git a/include/fpicker/fpsofficeResMgr.hxx b/include/fpicker/fpsofficeResMgr.hxx new file mode 100644 index 000000000000..a86a91509c38 --- /dev/null +++ b/include/fpicker/fpsofficeResMgr.hxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +#pragma once + +#include + +inline OUString FpsResId(TranslateId aId) { return Translate::get(aId, Translate::Create("fps")); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/fpicker/strings.hrc b/include/fpicker/strings.hrc index 4dd7fb5fa50c..efce3a69f9da 100644 --- a/include/fpicker/strings.hrc +++ b/include/fpicker/strings.hrc @@ -29,6 +29,8 @@ #define STR_SVT_FOLDERPICKER_DEFAULT_TITLE NC_("STR_SVT_FOLDERPICKER_DEFAULT_TITLE", "Select Path") #define STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION NC_("STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION", "Please select a folder.") #define STR_SVT_ALREADYEXISTOVERWRITE NC_("STR_SVT_ALREADYEXISTOVERWRITE", "A file named \"$filename$\" already exists.\n\nDo you want to replace it?") +#define STR_SVT_ALREADYEXISTOVERWRITE_SECONDARY NC_("STR_SVT_ALREADYEXISTOVERWRITE_SECONDARY", "The file already exists in \"$dirname$\". Replacing it will overwrite its contents.") +#define STR_SVT_ALLFORMATS NC_("STR_SVT_ALLFORMATS", "All Formats") #define STR_SVT_DELETESERVICE NC_("STR_SVT_DELETESERVICE", "Are you sure you want to delete the service?\n\"$servicename$\"") #define STR_SVT_ROOTLABEL NC_("STR_SVT_ROOTLABEL", "Root") #define STR_FILTERNAME_ALL NC_("STR_FILTERNAME_ALL", "All files") diff --git a/vcl/inc/strings.hrc b/vcl/inc/strings.hrc index 33462929e300..0439162f07c3 100644 --- a/vcl/inc/strings.hrc +++ b/vcl/inc/strings.hrc @@ -67,28 +67,9 @@ #define SV_STDTEXT_PREFERENCES NC_("SV_STDTEXT_PREFERENCES", "Preferences...") #define SV_STDTEXT_ALLFILETYPES NC_("SV_STDTEXT_ALLFILETYPES", "Any type") -#define STR_FPICKER_AUTO_EXTENSION NC_("STR_FPICKER_AUTO_EXTENSION", "~Automatic file name extension") -#define STR_FPICKER_PASSWORD NC_("STR_FPICKER_PASSWORD", "Save with pass~word") // dear loplugins, please don't remove this constant, it will be used in follow-up commits -#define STR_FPICKER_GPGENCRYPT NC_("STR_FPICKER_GPGENCRYPT", "Encrypt with ~GPG key") -#define STR_FPICKER_FILTER_OPTIONS NC_("STR_FPICKER_FILTER_OPTIONS", "~Edit filter settings") -#define STR_FPICKER_READONLY NC_("STR_FPICKER_READONLY", "~Read-only") -#define STR_FPICKER_INSERT_AS_LINK NC_("STR_FPICKER_INSERT_AS_LINK", "Insert as ~Link") -#define STR_FPICKER_SHOW_PREVIEW NC_("STR_FPICKER_SHOW_PREVIEW", "Pr~eview") -#define STR_FPICKER_PLAY NC_("STR_FPICKER_PLAY", "~Play") -#define STR_FPICKER_VERSION NC_("STR_FPICKER_VERSION", "~Version:") -#define STR_FPICKER_TEMPLATES NC_("STR_FPICKER_TEMPLATES", "S~tyles:") -#define STR_FPICKER_IMAGE_TEMPLATE NC_("STR_FPICKER_IMAGE_TEMPLATE", "Frame Style: ") -#define STR_FPICKER_IMAGE_ANCHOR NC_("STR_FPICKER_IMAGE_ANCHOR", "A~nchor: ") -#define STR_FPICKER_SELECTION NC_("STR_FPICKER_SELECTION", "~Selection") -#define STR_FPICKER_FOLDER_DEFAULT_TITLE NC_("STR_FPICKER_FOLDER_DEFAULT_TITLE", "Select Path") -#define STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION NC_("STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION", "Please select a folder.") -#define STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY NC_("STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY", "A file named \"$filename$\" already exists. Do you want to replace it?") #define STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY NC_("STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY", "The file already exists in \"$dirname$\". Replacing it will overwrite its contents.") #define STR_FPICKER_ALLFORMATS NC_("STR_FPICKER_ALLFORMATS", "All Formats") -#define STR_FPICKER_OPEN NC_("STR_FPICKER_OPEN", "Open") -#define STR_FPICKER_SAVE NC_("STR_FPICKER_SAVE", "Save") -#define STR_FPICKER_TYPE NC_("STR_FPICKER_TYPE", "File ~type") #define SV_ACCESSERROR_NO_FONTS NC_("SV_ACCESSERROR_NO_FONTS", "No fonts could be found on the system.") diff --git a/vcl/qt5/QtFilePicker.cxx b/vcl/qt5/QtFilePicker.cxx index 42caf06149f0..392e4f800925 100644 --- a/vcl/qt5/QtFilePicker.cxx +++ b/vcl/qt5/QtFilePicker.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include @@ -63,7 +64,7 @@ #include #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; @@ -100,7 +101,7 @@ QtFilePicker::QtFilePicker(css::uno::Reference cons if (m_bIsFolderPicker) { m_pFileDialog->setOption(QFileDialog::ShowDirsOnly, true); - m_pFileDialog->setWindowTitle(toQString(VclResId(STR_FPICKER_FOLDER_DEFAULT_TITLE))); + m_pFileDialog->setWindowTitle(toQString(FpsResId(STR_SVT_FOLDERPICKER_DEFAULT_TITLE))); } m_pLayout = dynamic_cast(m_pFileDialog->layout()); @@ -619,7 +620,7 @@ QString QtFilePicker::getResString(TranslateId pResId) if (!pResId) return aResString; - aResString = toQString(VclResId(pResId)); + aResString = toQString(FpsResId(pResId)); return aResString.replace('~', '&'); } @@ -634,43 +635,43 @@ void QtFilePicker::addCustomControl(sal_Int16 controlId) switch (controlId) { case CHECKBOX_AUTOEXTENSION: - resId = STR_FPICKER_AUTO_EXTENSION; + resId = STR_SVT_FILEPICKER_AUTO_EXTENSION; break; case CHECKBOX_PASSWORD: - resId = STR_FPICKER_PASSWORD; + resId = STR_SVT_FILEPICKER_PASSWORD; break; case CHECKBOX_FILTEROPTIONS: - resId = STR_FPICKER_FILTER_OPTIONS; + resId = STR_SVT_FILEPICKER_FILTER_OPTIONS; break; case CHECKBOX_READONLY: - resId = STR_FPICKER_READONLY; + resId = STR_SVT_FILEPICKER_READONLY; break; case CHECKBOX_LINK: - resId = STR_FPICKER_INSERT_AS_LINK; + resId = STR_SVT_FILEPICKER_INSERT_AS_LINK; break; case CHECKBOX_PREVIEW: - resId = STR_FPICKER_SHOW_PREVIEW; + resId = STR_SVT_FILEPICKER_SHOW_PREVIEW; break; case CHECKBOX_SELECTION: - resId = STR_FPICKER_SELECTION; + resId = STR_SVT_FILEPICKER_SELECTION; break; case CHECKBOX_GPGENCRYPTION: - resId = STR_FPICKER_GPGENCRYPT; + resId = STR_SVT_FILEPICKER_GPGENCRYPT; break; case PUSHBUTTON_PLAY: - resId = STR_FPICKER_PLAY; + resId = STR_SVT_FILEPICKER_PLAY; break; case LISTBOX_VERSION: - resId = STR_FPICKER_VERSION; + resId = STR_SVT_FILEPICKER_VERSION; break; case LISTBOX_TEMPLATE: - resId = STR_FPICKER_TEMPLATES; + resId = STR_SVT_FILEPICKER_TEMPLATES; break; case LISTBOX_IMAGE_TEMPLATE: - resId = STR_FPICKER_IMAGE_TEMPLATE; + resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE; break; case LISTBOX_IMAGE_ANCHOR: - resId = STR_FPICKER_IMAGE_ANCHOR; + resId = STR_SVT_FILEPICKER_IMAGE_ANCHOR; break; case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: @@ -845,10 +846,10 @@ void SAL_CALL QtFilePicker::initialize(const uno::Sequence& args) switch (acceptMode) { case QFileDialog::AcceptOpen: - resId = STR_FPICKER_OPEN; + resId = STR_FILEDLG_OPEN; break; case QFileDialog::AcceptSave: - resId = STR_FPICKER_SAVE; + resId = STR_FILEDLG_SAVE; m_pFileDialog->setFileMode(QFileDialog::AnyFile); break; } diff --git a/vcl/unx/gtk3/fpicker/resourceprovider.cxx b/vcl/unx/gtk3/fpicker/resourceprovider.cxx index f656a93093a8..fa90b8126627 100644 --- a/vcl/unx/gtk3/fpicker/resourceprovider.cxx +++ b/vcl/unx/gtk3/fpicker/resourceprovider.cxx @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include "SalGtkPicker.hxx" using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; @@ -34,27 +34,27 @@ const struct sal_Int32 ctrlId; TranslateId resId; } CtrlIdToResIdTable[] = { - { CHECKBOX_AUTOEXTENSION, STR_FPICKER_AUTO_EXTENSION }, - { CHECKBOX_PASSWORD, STR_FPICKER_PASSWORD }, - { CHECKBOX_GPGENCRYPTION, STR_FPICKER_GPGENCRYPT }, - { CHECKBOX_FILTEROPTIONS, STR_FPICKER_FILTER_OPTIONS }, - { CHECKBOX_READONLY, STR_FPICKER_READONLY }, - { CHECKBOX_LINK, STR_FPICKER_INSERT_AS_LINK }, - { CHECKBOX_PREVIEW, STR_FPICKER_SHOW_PREVIEW }, - { PUSHBUTTON_PLAY, STR_FPICKER_PLAY }, - { LISTBOX_VERSION_LABEL, STR_FPICKER_VERSION }, - { LISTBOX_TEMPLATE_LABEL, STR_FPICKER_TEMPLATES }, - { LISTBOX_IMAGE_TEMPLATE_LABEL, STR_FPICKER_IMAGE_TEMPLATE }, - { LISTBOX_IMAGE_ANCHOR_LABEL, STR_FPICKER_IMAGE_ANCHOR }, - { CHECKBOX_SELECTION, STR_FPICKER_SELECTION }, - { FOLDERPICKER_TITLE, STR_FPICKER_FOLDER_DEFAULT_TITLE }, - { FOLDER_PICKER_DEF_DESCRIPTION, STR_FPICKER_FOLDER_DEFAULT_DESCRIPTION }, - { FILE_PICKER_OVERWRITE_PRIMARY, STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY }, - { FILE_PICKER_OVERWRITE_SECONDARY, STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY }, - { FILE_PICKER_ALLFORMATS, STR_FPICKER_ALLFORMATS }, - { FILE_PICKER_TITLE_OPEN, STR_FPICKER_OPEN }, - { FILE_PICKER_TITLE_SAVE, STR_FPICKER_SAVE }, - { FILE_PICKER_FILE_TYPE, STR_FPICKER_TYPE } + { CHECKBOX_AUTOEXTENSION, STR_SVT_FILEPICKER_AUTO_EXTENSION }, + { CHECKBOX_PASSWORD, STR_SVT_FILEPICKER_PASSWORD }, + { CHECKBOX_GPGENCRYPTION, STR_SVT_FILEPICKER_GPGENCRYPT }, + { CHECKBOX_FILTEROPTIONS, STR_SVT_FILEPICKER_FILTER_OPTIONS }, + { CHECKBOX_READONLY, STR_SVT_FILEPICKER_READONLY }, + { CHECKBOX_LINK, STR_SVT_FILEPICKER_INSERT_AS_LINK }, + { CHECKBOX_PREVIEW, STR_SVT_FILEPICKER_SHOW_PREVIEW }, + { PUSHBUTTON_PLAY, STR_SVT_FILEPICKER_PLAY }, + { LISTBOX_VERSION_LABEL, STR_SVT_FILEPICKER_VERSION }, + { LISTBOX_TEMPLATE_LABEL, STR_SVT_FILEPICKER_TEMPLATES }, + { LISTBOX_IMAGE_TEMPLATE_LABEL, STR_SVT_FILEPICKER_IMAGE_TEMPLATE }, + { LISTBOX_IMAGE_ANCHOR_LABEL, STR_SVT_FILEPICKER_IMAGE_ANCHOR }, + { CHECKBOX_SELECTION, STR_SVT_FILEPICKER_SELECTION }, + { FOLDERPICKER_TITLE, STR_SVT_FOLDERPICKER_DEFAULT_TITLE }, + { FOLDER_PICKER_DEF_DESCRIPTION, STR_SVT_FOLDERPICKER_DEFAULT_DESCRIPTION }, + { FILE_PICKER_OVERWRITE_PRIMARY, STR_SVT_ALREADYEXISTOVERWRITE }, + { FILE_PICKER_OVERWRITE_SECONDARY, STR_SVT_ALREADYEXISTOVERWRITE_SECONDARY }, + { FILE_PICKER_ALLFORMATS, STR_SVT_ALLFORMATS }, + { FILE_PICKER_TITLE_OPEN, STR_FILEDLG_OPEN }, + { FILE_PICKER_TITLE_SAVE, STR_FILEDLG_SAVE }, + { FILE_PICKER_FILE_TYPE, STR_FILEDLG_TYPE } }; static TranslateId CtrlIdToResId( sal_Int32 aControlId ) @@ -73,7 +73,7 @@ OUString SalGtkPicker::getResString( sal_Int32 aId ) // translate the control id to a resource id TranslateId pResId = CtrlIdToResId( aId ); if (pResId) - aResString = VclResId(pResId); + aResString = FpsResId(pResId); return aResString.replace('~', '_'); } diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx index 37335b74e8d6..d3a053a08008 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker.cxx @@ -30,12 +30,11 @@ #include #include - #include "FPServiceInfo.hxx" #undef Region -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; @@ -221,43 +220,43 @@ void Gtk3KDE5FilePicker::addCustomControl(sal_Int16 controlId) switch (controlId) { case CHECKBOX_AUTOEXTENSION: - resId = STR_FPICKER_AUTO_EXTENSION; + resId = STR_SVT_FILEPICKER_AUTO_EXTENSION; break; case CHECKBOX_PASSWORD: - resId = STR_FPICKER_PASSWORD; + resId = STR_SVT_FILEPICKER_PASSWORD; break; case CHECKBOX_FILTEROPTIONS: - resId = STR_FPICKER_FILTER_OPTIONS; + resId = STR_SVT_FILEPICKER_FILTER_OPTIONS; break; case CHECKBOX_READONLY: - resId = STR_FPICKER_READONLY; + resId = STR_SVT_FILEPICKER_READONLY; break; case CHECKBOX_LINK: - resId = STR_FPICKER_INSERT_AS_LINK; + resId = STR_SVT_FILEPICKER_INSERT_AS_LINK; break; case CHECKBOX_PREVIEW: - resId = STR_FPICKER_SHOW_PREVIEW; + resId = STR_SVT_FILEPICKER_SHOW_PREVIEW; break; case CHECKBOX_SELECTION: - resId = STR_FPICKER_SELECTION; + resId = STR_SVT_FILEPICKER_SELECTION; break; case CHECKBOX_GPGENCRYPTION: - resId = STR_FPICKER_GPGENCRYPT; + resId = STR_SVT_FILEPICKER_GPGENCRYPT; break; case PUSHBUTTON_PLAY: - resId = STR_FPICKER_PLAY; + resId = STR_SVT_FILEPICKER_PLAY; break; case LISTBOX_VERSION: - resId = STR_FPICKER_VERSION; + resId = STR_SVT_FILEPICKER_VERSION; break; case LISTBOX_TEMPLATE: - resId = STR_FPICKER_TEMPLATES; + resId = STR_SVT_FILEPICKER_TEMPLATES; break; case LISTBOX_IMAGE_TEMPLATE: - resId = STR_FPICKER_IMAGE_TEMPLATE; + resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE; break; case LISTBOX_IMAGE_ANCHOR: - resId = STR_FPICKER_IMAGE_ANCHOR; + resId = STR_SVT_FILEPICKER_IMAGE_ANCHOR; break; case LISTBOX_VERSION_LABEL: case LISTBOX_TEMPLATE_LABEL: @@ -404,7 +403,7 @@ void SAL_CALL Gtk3KDE5FilePicker::initialize(const uno::Sequence& args return; } - setTitle(getResString(saveDialog ? STR_FPICKER_SAVE : STR_FPICKER_OPEN)); + setTitle(getResString(saveDialog ? STR_FILEDLG_SAVE : STR_FILEDLG_OPEN)); m_ipc.sendCommand(Commands::Initialize, saveDialog); } diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx index f9fd85e94b80..f9b0da12ce9c 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx @@ -40,7 +40,7 @@ #include -#include +#include using namespace ::com::sun::star::ui::dialogs; @@ -103,7 +103,7 @@ OUString getResString(TranslateId pResId) if (!pResId) return {}; - return VclResId(pResId); + return FpsResId(pResId); } // handles the IPC commands for dialog execution and ends the dummy Gtk dialog once the IPC response is there diff --git a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx index fa0b562cc81c..c1569e6be209 100644 --- a/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx +++ b/vcl/unx/gtk3_kde5/gtk3_kde5_folderpicker.cxx @@ -21,7 +21,7 @@ #include -#include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; @@ -34,7 +34,7 @@ Gtk3KDE5FolderPicker::Gtk3KDE5FolderPicker( const uno::Reference& /*xContext*/) { m_ipc.sendCommand(Commands::EnablePickFolderMode); - setTitle(getResString(STR_FPICKER_FOLDER_DEFAULT_TITLE)); + setTitle(getResString(STR_SVT_FOLDERPICKER_DEFAULT_TITLE)); } Gtk3KDE5FolderPicker::~Gtk3KDE5FolderPicker() = default; -- cgit