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

45 files changed, 44 insertions, 46 deletions

diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/helpids.h
index 569f846822fc..e8d54a4d1193 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/helpids.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
-#define INCLUDED_DBACCESS_INC_DBACCESS_HELPID_HRC
+#ifndef INCLUDED_DBACCESS_INC_HELPIDS_H
+#define INCLUDED_DBACCESS_INC_HELPIDS_H
 
 
 #define HID_DATABROWSE_HEADER                             "DBACCESS_HID_DATABROWSE_HEADER"
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index e2e134d5ac52..8f5ac40c5b3d 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "macromigrationpages.hxx"
 #include "macromigrationdialog.hxx"
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 402998f35920..f283d0b5646f 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -119,7 +119,7 @@
 #include "sqlmessage.hxx"
 #include "UITools.hxx"
 #include "dsntypes.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "dlgsave.hxx"
 #include "dbaccess_slotid.hrc"
 
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4f06cfc6a519..d717c43eafaa 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -51,7 +51,7 @@
 #include <comphelper/string.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include "AppView.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "strings.hxx"
 #include "callbacks.hxx"
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 24a44f4411aa..adc63bd03803 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -19,7 +19,7 @@
 
 #include "AppDetailView.hxx"
 #include <osl/diagnose.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "AppView.hxx"
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 3fe62cb57912..f8b20668ff9d 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "AppIconControl.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "core_resource.hxx"
 #include "strings.hrc"
 #include "bitmaps.hlst"
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 96d546084358..388d05076747 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "AppSwapWindow.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "AppView.hxx"
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 6920cc05614f..aa6518820570 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -21,7 +21,7 @@
 #include "strings.hrc"
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <vcl/toolbox.hxx>
 #include <unotools/configmgr.hxx>
 #include <vcl/waitobj.hxx>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index b3e7ba256657..e7e9a1f0a6e4 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -80,7 +80,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <osl/mutex.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/sfx.hrc>
 #include <svx/fmsearch.hxx>
 #include <svx/svxdlg.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index e9db894c50e4..3fea8ee737c6 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/app.hxx>
 #include <dbaccess/IController.hxx>
 #include "UITools.hxx"
-#include <sfx2/sfx.hrc>
 #include <svtools/acceleratorexecute.hxx>
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 116b2051be6c..cfc5329f42b9 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -21,7 +21,7 @@
 #include <svtools/treelistbox.hxx>
 #include "dbtreelistbox.hxx"
 #include "dbtreemodel.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 3aa1b9237f56..eba7019d0b72 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -19,7 +19,7 @@
 
 #include "sbagrid.hrc"
 #include "core_resource.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "uiservices.hxx"
 
 #include <sot/exchange.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 68cecb3f0cd5..b51a926b3d60 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -19,7 +19,7 @@
 
 #include "browserids.hxx"
 #include "core_resource.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "dbexchange.hxx"
 #include "dbtreelistbox.hxx"
 #include "dbtreemodel.hxx"
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 2a984fa65bae..3b9ed80a3159 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include "QEnumTypes.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <comphelper/numbers.hxx>
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 15c1ce6a6ab2..7f8abfb129f8 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "RelControliFace.hxx"
 #include "strings.hrc"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <osl/diagnose.h>
 
 #include <list>
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index c19b7ae9d5f8..c24cd608d692 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -27,7 +27,7 @@
 #include "sqledit.hxx"
 #include "QueryTextView.hxx"
 #include "querycontainerwindow.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "browserids.hxx"
 #include "querycontroller.hxx"
 #include "undosqledit.hxx"
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 5e83545acfda..98bb2a59b82a 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -30,7 +30,7 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "core_resource.hxx"
 #include <osl/process.h>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index a2abf4eb718a..d29be884d7c4 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -33,7 +33,7 @@
 #include <svl/intitem.hxx>
 #include <unotools/moduleoptions.hxx>
 #include "dsitems.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
 #include "dbadmin.hxx"
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 4305a4c3c5af..d998d7b4e69c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -27,7 +27,7 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
 #include "dbadmin.hxx"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index b642e5d568f1..a65b7db481eb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -31,7 +31,7 @@
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
 #include "dsnItem.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 398a3926566b..13994a7108c5 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -23,7 +23,7 @@
 
 #include <vcl/svapp.hxx>
 #include "dbu_dlg.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <com/sun/star/sdbc/KeyRule.hpp>
 
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 80b7833ea4c3..81a6ad7a200d 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -33,7 +33,7 @@
 #include <svl/intitem.hxx>
 #include "dsitems.hxx"
 #include "dbfindex.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 76b7d7e117cc..3bfdb51278bd 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -22,7 +22,7 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "core_resource.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "dbu_pageids.hxx"
 #include "dbu_dlg.hxx"
 #include "strings.hrc"
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 20d103cce4ab..f887f8be4094 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -37,7 +37,7 @@
 #include "ConnectionPage.hxx"
 #include "DriverSettings.hxx"
 #include "DbAdminImpl.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 20b4c4575ada..233d98effaa6 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -41,7 +41,7 @@
 #include "propertysetitem.hxx"
 #include <unotools/confignode.hxx>
 #include "DbAdminImpl.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "ConnectionPageSetup.hxx"
 #include "UITools.hxx"
 #include <dbaccess/AsynchronousLink.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 47620a341e5d..6375ec5fbe59 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -29,7 +29,7 @@
 #include "dsnItem.hxx"
 #include "core_resource.hxx"
 
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "dbu_dlg.hxx"
 #include "strings.hrc"
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index ec7ab3babded..65167dc6617d 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -27,7 +27,7 @@
 #include "sqlmessage.hxx"
 #include <connectivity/dbtools.hxx>
 #include "UITools.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "SqlNameEdit.hxx"
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index dbf55cd4501d..2f3a95e82ae8 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -26,7 +26,7 @@
 #include "dbu_dlg.hxx"
 #include "strings.hrc"
 #include "bitmaps.hlst"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "indexfieldscontrol.hxx"
 #include "indexcollection.hxx"
 #include <vcl/layout.hxx>
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 990621d212d8..6eafc8a30366 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -22,7 +22,7 @@
 #include "dbu_dlg.hxx"
 #include "strings.hrc"
 #include <osl/diagnose.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 0a8fa07cfd46..a0090fa47d0b 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -34,7 +34,7 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/configmgr.hxx>
 #include <sfx2/sfxuno.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "UITools.hxx"
 #include "core_resource.hxx"
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 88bd74ebb347..62e1992d2060 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include "sqlmessage.hxx"
 #include <vcl/msgbox.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "UITools.hxx"
 #include <osl/diagnose.h>
 #include <svtools/imgdef.hxx>
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx
index 671be050b77c..10b7f2a07b36 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -74,7 +74,7 @@
 #include <svx/svxids.hrc>
 
 #include <svl/itempool.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <svl/itemset.hxx>
 #include "sbagrid.hrc"
 #include <svl/rngitem.hxx>
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index e76ba60e5c64..20ad58771803 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -23,7 +23,7 @@
 #include "WExtendPages.hxx"
 
 #include "defaultobjectnamecheck.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include "core_resource.hxx"
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index f06388a5e9a9..1090938aafff 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 #include "FieldDescriptions.hxx"
 #include "WCopyTable.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "core_resource.hxx"
 #include "strings.hrc"
 #include "bitmaps.hlst"
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index f10fcd592d62..d8b3cc499afe 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -24,7 +24,7 @@
 #include <osl/diagnose.h>
 #include "FieldDescriptions.hxx"
 #include "WCopyTable.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "strings.hrc"
 #include <tools/stream.hxx>
 #include <svtools/svparser.hxx>
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 30f98e857eab..dd667a7cabdc 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -21,7 +21,7 @@
 #include "QueryTableView.hxx"
 #include "stringconstants.hxx"
 #include <osl/diagnose.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "QueryDesignView.hxx"
 #include "browserids.hxx"
 #include "querycontroller.hxx"
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 330acaa7a626..e6fb6dfb2fcb 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -22,7 +22,7 @@
 #include "TableFieldDescription.hxx"
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "QTableWindow.hxx"
 #include "QTableConnection.hxx"
 #include "QTableConnectionData.hxx"
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 4c66586c9a8e..c64f95cbab10 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -32,7 +32,7 @@
 #include "TableFieldInfo.hxx"
 #include "strings.hrc"
 #include "strings.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "stringconstants.hxx"
 #include "QTableWindow.hxx"
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index 988347f399cf..e43e9ceec013 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -33,7 +33,7 @@
 #include "stringconstants.hxx"
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "RelationDesignView.hxx"
 #include "JoinController.hxx"
 #include "TableWindow.hxx"
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
index eddff2dce7e4..1fec0f0c9133 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx
@@ -19,7 +19,7 @@
 
 #include "FieldDescGenWin.hxx"
 #include <osl/diagnose.h>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "TableDesignHelpBar.hxx"
 #include "TableFieldControl.hxx"
 #include "TableDesignView.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index d9f35d6a4a2a..144a980a72a3 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -30,7 +30,7 @@
 #include "strings.hxx"
 #include "stringconstants.hxx"
 #include "browserids.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <comphelper/types.hxx>
 #include "FieldDescControl.hxx"
 #include "FieldDescriptions.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 317ebe73a6e2..c67d080940be 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/builder.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 
 using namespace ::dbaui;
 using namespace ::svt;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 7a049d80d27b..705729d69d25 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -20,7 +20,7 @@
 #include "TableDesignHelpBar.hxx"
 #include <svtools/svmedit.hxx>
 #include <vcl/settings.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include <memory>
 using namespace dbaui;
 #define STANDARD_MARGIN                 6
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index f6a7953214b2..62a1497f4f57 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -19,7 +19,7 @@
 
 #include "TableDesignView.hxx"
 #include "TableController.hxx"
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "FieldDescriptions.hxx"
 #include "TEditControl.hxx"
 #include "TableFieldDescWin.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index dced4032fc46..081d601388eb 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -24,7 +24,7 @@
 #include "TableDesignHelpBar.hxx"
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
-#include "dbaccess_helpid.hrc"
+#include "helpids.h"
 #include "core_resource.hxx"
 #include "core_resource.hxx"