From 182a74d937088f0f08850014a7b918719e106b7d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 16 Jul 2017 15:05:04 +0100
Subject: de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e
---
 fpicker/source/aqua/resourceprovider.mm        | 2 +-
 fpicker/source/office/RemoteFilesDialog.hxx    | 2 +-
 fpicker/source/office/iodlg.cxx                | 4 ++--
 fpicker/source/win32/misc/resourceprovider.cxx | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 6942d0fe9fda..e924179f4f40 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -23,7 +23,7 @@
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <osl/mutex.hxx>
-#include <fpicker/fpicker.hrc>
+#include <fpicker/strings.hrc>
 #include <vcl/svapp.hxx>
 #include <tools/resmgr.hxx>
 #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
diff --git a/fpicker/source/office/RemoteFilesDialog.hxx b/fpicker/source/office/RemoteFilesDialog.hxx
index 1b92732e3239..53b6c36bf41c 100644
--- a/fpicker/source/office/RemoteFilesDialog.hxx
+++ b/fpicker/source/office/RemoteFilesDialog.hxx
@@ -24,7 +24,7 @@
 #include <unotools/viewoptions.hxx>
 
 #include <vcl/button.hxx>
-#include <fpicker/fpicker.hrc>
+#include <fpicker/strings.hrc>
 #include <vcl/menubtn.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/vclptr.hxx>
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 3415f2e2d06c..d77dc47fae30 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -42,8 +42,8 @@
 #include "svtools/treelistentry.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include "fpicker/fpicker.hrc"
-#include "svtools/helpid.hrc"
+#include "fpicker/strings.hrc"
+#include "svtools/helpids.h"
 #include <svtools/strings.hrc>
 #include "strings.hrc"
 #include "bitmaps.hlst"
diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx
index 118d7ab932f5..e2782b1a984e 100644
--- a/fpicker/source/win32/misc/resourceprovider.cxx
+++ b/fpicker/source/win32/misc/resourceprovider.cxx
@@ -25,7 +25,7 @@
 #include <rtl/ustrbuf.hxx>
 #include "resourceprovider.hxx"
 #include <osl/mutex.hxx>
-#include <fpicker/fpicker.hrc>
+#include <fpicker/strings.hrc>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-- 
cgit