include/fpicker/strings.hrc | 13 +++++++++++++ sfx2/source/dialog/filedlghelper.cxx | 35 ++++++++++++++++------------------- 2 files changed, 29 insertions(+), 19 deletions(-)
New commits: commit ea2ecd04dd70e228f0ffdc6830b69c837eab8d67 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jun 6 20:51:18 2024 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Jun 7 10:57:53 2024 +0200 replace fpicker-related Help::GetHelpText with core-side translations Change-Id: I109554a3282c4c919cfbf859918cf0f9d75cc967 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168509 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/include/fpicker/strings.hrc b/include/fpicker/strings.hrc index 5ff2a07a0c0b..004a06a53f5d 100644 --- a/include/fpicker/strings.hrc +++ b/include/fpicker/strings.hrc @@ -38,5 +38,18 @@ #define STR_FILEDLG_TYPE NC_("STR_FILEDLG_TYPE", "File ~type") #define STR_FILEDLG_SAVE NC_("STR_FILEDLG_SAVE", "Save") +#define STR_FILESAVE_AUTOEXTENSION NC_("STR_FILESAVE_AUTOEXTENSION", "Automatically adds the file extension to the end of the file name that corresponds to the selected file type.") +#define STR_FILESAVE_SAVEWITHPASSWORD NC_("STR_FILESAVE_SAVEWITHPASSWORD", "Protects the file with a password that must be entered before a user can open the file.") +#define STR_FILESAVE_CUSTOMIZEFILTER NC_("STR_FILESAVE_CUSTOMIZEFILTER", "Allows you to set the spreadsheet saving options for some types of data files.") +#define STR_FILEOPEN_READONLY NC_("STR_FILEOPEN_READONLY", "Opens the file in read-only mode.") +#define STR_FILEDLG_LINK_CB NC_("STR_FILEDLG_LINK_CB", "Inserts the selected graphic file as a link.") +#define STR_FILEDLG_PREVIEW_CB NC_("STR_FILEDLG_PREVIEW_CB", "Displays a preview of the selected graphic file.") +#define STR_FILESAVE_DOPLAY NC_("STR_FILESAVE_DOPLAY", "Plays the selected sound file. Click again to stop playing the sound file.") +#define STR_FILEOPEN_VERSION NC_("STR_FILEOPEN_VERSION", "If there are multiple versions of the selected file, select the version that you want to open.") +#define STR_FILESAVE_TEMPLATE NC_("STR_FILESAVE_TEMPLATE", "Select the paragraph style or outline level that you want to use to separate the source document into sub-documents.") +#define STR_FILEOPEN_IMAGE_TEMPLATE NC_("STR_FILEOPEN_IMAGE_TEMPLATE", "Select the frame style for the graphic.") +#define STR_FILEOPEN_IMAGE_ANCHOR NC_("STR_FILEOPEN_IMAGE_ANCHOR", "Select the frame style for the graphic.") +#define STR_FILESAVE_SELECTION NC_("STR_FILESAVE_SELECTION", "Exports only the selected graphic objects in %PRODUCTNAME Draw and Impress to another format. If this box is not checked, the entire document is exported.") + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 8afdd2f17727..b692a84b2bbf 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -87,6 +87,8 @@ #include <sfx2/sfxsids.hrc> #include "filtergrouping.hxx" #include "filedlgimpl.hxx" +#include <fpicker/fpsofficeResMgr.hxx> +#include <fpicker/strings.hrc> #include <sfx2/strings.hrc> #include <sal/log.hxx> #include <comphelper/sequence.hxx> @@ -209,73 +211,68 @@ void FileDialogHelper_Impl::handleDirectoryChanged() OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEvent ) { - //!!! todo: cache the help strings (here or TRA) + TranslateId aHelpId; - OUString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION : - sHelpId = HID_FILESAVE_AUTOEXTENSION; + aHelpId = STR_FILESAVE_AUTOEXTENSION; break; case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD : - sHelpId = HID_FILESAVE_SAVEWITHPASSWORD; + aHelpId = STR_FILESAVE_SAVEWITHPASSWORD; break; case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS : - sHelpId = HID_FILESAVE_CUSTOMIZEFILTER; + aHelpId = STR_FILESAVE_CUSTOMIZEFILTER; break; case ExtendedFilePickerElementIds::CHECKBOX_READONLY : - sHelpId = HID_FILEOPEN_READONLY; + aHelpId = STR_FILEOPEN_READONLY; break; case ExtendedFilePickerElementIds::CHECKBOX_LINK : - sHelpId = HID_FILEDLG_LINK_CB; + aHelpId = STR_FILEDLG_LINK_CB; break; case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : - sHelpId = HID_FILEDLG_PREVIEW_CB; + aHelpId = STR_FILEDLG_PREVIEW_CB; break; case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY : - sHelpId = HID_FILESAVE_DOPLAY; + aHelpId = STR_FILESAVE_DOPLAY; break; case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL : case ExtendedFilePickerElementIds::LISTBOX_VERSION : - sHelpId = HID_FILEOPEN_VERSION; + aHelpId = STR_FILEOPEN_VERSION; break; case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE : - sHelpId = HID_FILESAVE_TEMPLATE; + aHelpId = STR_FILESAVE_TEMPLATE; break; case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE : - sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE; + aHelpId = STR_FILEOPEN_IMAGE_TEMPLATE; break; case ExtendedFilePickerElementIds::LISTBOX_IMAGE_ANCHOR_LABEL : case ExtendedFilePickerElementIds::LISTBOX_IMAGE_ANCHOR : - sHelpId = HID_FILEOPEN_IMAGE_ANCHOR; + aHelpId = STR_FILEOPEN_IMAGE_ANCHOR; break; case ExtendedFilePickerElementIds::CHECKBOX_SELECTION : - sHelpId = HID_FILESAVE_SELECTION; + aHelpId = STR_FILESAVE_SELECTION; break; default: SAL_WARN( "sfx.dialog", "invalid element id" ); } - OUString aHelpText; - Help* pHelp = Application::GetHelp(); - if ( pHelp ) - aHelpText = pHelp->GetHelpText(sHelpId); - return aHelpText; + return aHelpId ? FpsResId(aHelpId) : OUString(); } void FileDialogHelper_Impl::handleControlStateChanged( const FilePickerEvent& aEvent )
