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>
---
 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 +-
 6 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 fpicker/inc/fpsofficeResMgr.hxx

(limited to 'fpicker')

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 <unotools/resmgr.hxx>
-
-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 <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 
 #include "NSString_OOoAdditions.hxx"
-#include <fpsofficeResMgr.hxx>
+#include <fpicker/fpsofficeResMgr.hxx>
 #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 <fpsofficeResMgr.hxx>
+#include <fpicker/fpsofficeResMgr.hxx>
 #include <fpicker/strings.hrc>
 #include <strings.hrc>
 #include <comphelper/docpasswordrequest.hxx>
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 <svtools/PlaceEditDialog.hxx>
 #include "OfficeControlAccess.hxx"
 #include "PlacesListBox.hxx"
-#include <fpsofficeResMgr.hxx>
+#include <fpicker/fpsofficeResMgr.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/stream.hxx>
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 <com/sun/star/lang/SystemDependent.hpp>
 #include <comphelper/sequence.hxx>
 #include <fpicker/strings.hrc>
-#include <fpsofficeResMgr.hxx>
+#include <fpicker/fpsofficeResMgr.hxx>
 #include <osl/file.hxx>
 #include <rtl/process.h>
 #include <o3tl/char16_t2wchar_t.hxx>
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 <unotools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <fpsofficeResMgr.hxx>
+#include <fpicker/fpsofficeResMgr.hxx>
 
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;
-- 
cgit