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

4 files changed, 6 insertions, 27 deletions

diff --git a/formula/inc/core_resource.hrc b/formula/inc/core_resource.hrc
index 57aa4644e30b..cd9db81c9994 100644
--- a/formula/inc/core_resource.hrc
+++ b/formula/inc/core_resource.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC
 #define INCLUDED_FORMULA_INC_CORE_RESOURCE_HRC
 
-#include "formula/compiler.hrc"
+#include "formula/compiler.hxx"
 #include <utility>
 
 #define NC_(Context, String) (Context "\004" u8##String)
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index bb634fcdfa46..ca99b8e99311 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -31,7 +31,7 @@
 #include "formula/token.hxx"
 #include "formula/tokenarray.hxx"
 #include "formula/FormulaCompiler.hxx"
-#include <formula/compiler.hrc>
+#include <formula/compiler.hxx>
 #include <svl/sharedstringpool.hxx>
 #include <memory>
 
diff --git a/formula/source/ui/dlg/formdlgs.hrc b/formula/source/ui/dlg/formdlgs.hrc
deleted file mode 100644
index 1f213864b89e..000000000000
--- a/formula/source/ui/dlg/formdlgs.hrc
+++ /dev/null
@@ -1,24 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// For tab page
-#define TP_FUNCTION         1
-#define TP_STRUCT           2
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 8a1f3a774818..2c21e5a584e7 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -40,7 +40,6 @@
 #include <unotools/charclass.hxx>
 #include <tools/diagnose_ex.h>
 
-#include "formdlgs.hrc"
 #include "funcpage.hxx"
 #include "formula/formula.hxx"
 #include "formula/IFunctionDescription.hxx"
@@ -64,6 +63,10 @@
 #include <comphelper/string.hxx>
 #include <map>
 
+// For tab page
+#define TP_FUNCTION         1
+#define TP_STRUCT           2
+
 #define TOKEN_OPEN  0
 #define TOKEN_CLOSE 1
 #define TOKEN_SEP   2