From 3307afa99c28fd282094e9558795b0a20ba5c6a0 Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
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 <caolanm@redhat.com>
---
 vcl/qt5/QtFilePicker.cxx | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'vcl/qt5')

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 <fpicker/fpsofficeResMgr.hxx>
 #include <QtFilePicker.hxx>
 #include <QtFilePicker.moc>
 
@@ -63,7 +64,7 @@
 #include <QtWidgets/QWidget>
 
 #include <unx/geninst.h>
-#include <strings.hrc>
+#include <fpicker/strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::ui::dialogs;
@@ -100,7 +101,7 @@ QtFilePicker::QtFilePicker(css::uno::Reference<css::uno::XComponentContext> 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<QGridLayout*>(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<uno::Any>& 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;
     }
-- 
cgit