tdf#42949 Remove unnecessary localization headers from dbaccess

Found by searching for the header names and the localization function:
git grep -l -e \<core_resource.hxx\> -e \<strings.hrc\> dbaccess | xargs grep -c -e "loadString" -e "DBA_RES" | grep :0$ | grep -v /pch

Since certain files use the strings with other functions as well
the above command still gives some false positives.

Change-Id: Ib41c5d8d18f3a00729fcf2c4cd8203a2047ef0df
Reviewed-on: https://gerrit.libreoffice.org/52480
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>

67 files changed, 7 insertions, 69 deletions

diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index fd800d291aaf..8a973b48cbf9 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -22,6 +22,7 @@
 #include <connectivity/sdbcx/VCollection.hxx>
 #include "RowSetCache.hxx"
 #include <stringconstants.hxx>
+#include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 2df45da2ab40..103419cc035d 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -41,7 +41,6 @@
 #include "RowSetRow.hxx"
 #include <comphelper/broadcasthelper.hxx>
 #include "RowSetCacheIterator.hxx"
-#include <core_resource.hxx>
 
 #include <functional>
 
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index f0e6eb62301f..552fd75a0beb 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -27,6 +27,7 @@
 #include "RowSetCache.hxx"
 #include "StaticSet.hxx"
 #include "WrappedResultSet.hxx"
+#include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <core_resource.hxx>
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 15f935d0c048..af325eea88c3 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -18,8 +18,6 @@
  */
 
 #include "WrappedResultSet.hxx"
-#include <core_resource.hxx>
-#include <strings.hrc>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <connectivity/dbexception.hxx>
 
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index d14de81b1a19..f3004cb1c1c5 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -19,8 +19,6 @@
 
 #include <viewcontainer.hxx>
 #include <stringconstants.hxx>
-#include <core_resource.hxx>
-#include <strings.hrc>
 #include <View.hxx>
 
 #include <comphelper/enumhelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index d7e47ad61b05..af71c72510c4 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -19,8 +19,6 @@
 
 #include "commandcontainer.hxx"
 #include "connection.hxx"
-#include <strings.hrc>
-#include <core_resource.hxx>
 #include <databasecontext.hxx>
 #include "databasedocument.hxx"
 #include "datasource.hxx"
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index efd31622c215..006f19138dd0 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -20,8 +20,6 @@
 #include <bookmarkcontainer.hxx>
 #include <stringconstants.hxx>
 #include <apitools.hxx>
-#include <core_resource.hxx>
-#include <strings.hrc>
 
 #include <osl/diagnose.h>
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx
index 93c25b1c77b3..20e62457456a 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -23,7 +23,6 @@
 #include <apitools.hxx>
 #include "bookmarkcontainer.hxx"
 #include "ContentHelper.hxx"
-#include <core_resource.hxx>
 #include "documentevents.hxx"
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index 361208c161d5..34f3c5ace0e1 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -23,8 +23,6 @@
 #include <tools/wldcrd.hxx>
 #include <osl/file.hxx>
 #include <stringconstants.hxx>
-#include <core_resource.hxx>
-#include <strings.hrc>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/string.hxx>
 
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index e0caf2c19e1d..09fd1f69b495 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <strings.hrc>
 #include "macromigrationpages.hxx"
 #include "macromigrationdialog.hxx"
 
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index a445b2bff175..2a2be921e7ff 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -18,6 +18,8 @@
  */
 
 #include "macromigrationwizard.hxx"
+#include <core_resource.hxx>
+#include <strings.hrc>
 
 namespace dbmm
 {
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
index 85adc818e048..c2ed8b02f66f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx
@@ -25,9 +25,6 @@
 
 #include <svtools/genericunodialog.hxx>
 
-#include <core_resource.hxx>
-#include <strings.hrc>
-
 namespace dbmm
 {
 
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 7b21b805e68a..e0a96d68da20 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -26,7 +26,6 @@
 #include <dsntypes.hxx>
 #include <dbaccess/genericcontroller.hxx>
 #include <linkeddocuments.hxx>
-#include <core_resource.hxx>
 #include <TableCopyHelper.hxx>
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 082d23a652e6..3c02548df87f 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "AppDetailPageHelper.hxx"
-#include <core_resource.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/dbtools.hxx>
@@ -52,7 +51,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include "AppView.hxx"
 #include <helpids.h>
-#include <strings.hrc>
 #include <strings.hxx>
 #include <callbacks.hxx>
 #include <dbaccess/IController.hxx>
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 8e3149711e57..0150dc69bc12 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -19,7 +19,6 @@
 
 #include "AppSwapWindow.hxx"
 #include <helpids.h>
-#include <strings.hrc>
 #include "AppView.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 297c952ede08..1f44d6b703cb 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -25,7 +25,6 @@
 #include <vcl/split.hxx>
 #include "dbtreeview.hxx"
 #include <stringconstants.hxx>
-#include <strings.hrc>
 #include <strings.hxx>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 74e07e2a7910..e5944d1969a0 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -28,7 +28,6 @@
 #include <osl/diagnose.h>
 #include "dbtreeview.hxx"
 #include <dbtreelistbox.hxx>
-#include <strings.hrc>
 #include "dbtreemodel.hxx"
 #include <svtools/treelistentry.hxx>
 
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 67cc08b3e712..dc34baf2443e 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -21,7 +21,6 @@
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
-#include <strings.hrc>
 #include <stringconstants.hxx>
 #include <QEnumTypes.hxx>
 #include <UITools.hxx>
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 52c2b944659b..e2c796e7b65d 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -23,7 +23,6 @@
 #include <comphelper/enumhelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <strings.hrc>
 #include <strings.hxx>
 #include <stringconstants.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index e83532d7eb46..da01c624dbef 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -31,7 +31,6 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <RelControliFace.hxx>
-#include <strings.hrc>
 #include <helpids.h>
 #include <osl/diagnose.h>
 
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index b2b62b4b4130..cf8e16f4e3de 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <marktree.hxx>
-#include <strings.hrc>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index e7f71c6a8d27..de55cbfbbe09 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -20,7 +20,6 @@
 #include "admincontrols.hxx"
 #include <dbu_dlg.hxx>
 #include <dsitems.hxx>
-#include <core_resource.hxx>
 
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index e8a7a4c299d6..853bc86568e0 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -23,7 +23,6 @@
 
 #include "advancedsettings.hxx"
 #include <advancedsettingsdlg.hxx>
-#include <core_resource.hxx>
 #include <dsitems.hxx>
 #include "DbAdminImpl.hxx"
 #include "DriverSettings.hxx"
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 0c644aab2f2d..3895235069e7 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -22,7 +22,6 @@
 #include <osl/file.hxx>
 #include <tools/config.hxx>
 #include <sfx2/app.hxx>
-#include <core_resource.hxx>
 #include <dbu_dlg.hxx>
 #include <osl/diagnose.h>
 #include <unotools/localfilehelper.hxx>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index e370b53b32ec..f64c42e3e8ba 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -30,7 +30,6 @@
 #include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
-#include <core_resource.hxx>
 using namespace dbaui;
 
 
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index e7480552f3e3..d2932323be1e 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -19,7 +19,6 @@
 
 #include <dlgsize.hxx>
 #include <dbu_dlg.hxx>
-#include <core_resource.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index e8212deaf39c..72d1bdf51ac0 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <queryfilter.hxx>
-#include <core_resource.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index d95db68beefd..6e87f811da5a 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -20,7 +20,6 @@
 #include <textconnectionsettings.hxx>
 #include "TextConnectionHelper.hxx"
 #include <dbu_pageids.hxx>
-#include <core_resource.hxx>
 #include <dsitems.hxx>
 #include <stringconstants.hxx>
 
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index fa6802bb6fb6..1ed9413e5365 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -23,7 +23,6 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/svapp.hxx>
 #include "SqlNameEdit.hxx"
-#include <core_resource.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 81e226ade2e2..538cf192f7a6 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.hxx
@@ -21,7 +21,6 @@
 
 #include "singledoccontroller.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <core_resource.hxx>
 #include "JoinTableView.hxx"
 #include "JoinDesignView.hxx"
 #include "TableConnectionData.hxx"
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 0793800636eb..0cd9598aa037 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.hxx
@@ -25,7 +25,6 @@
 #include <vcl/fixed.hxx>
 #include "JoinTableView.hxx"
 #include "RelControliFace.hxx"
-#include <core_resource.hxx>
 #include "RelationControl.hxx"
 
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 46703a419063..1e542c10c19e 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX
 
 #include "singledoccontroller.hxx"
-#include <core_resource.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index 1a4fcdd50708..3c09a4e68bb9 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <core_resource.hxx>
 
 class Edit;
 namespace dbaui
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 1173824ecf8d..8b98120d0cef 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX
 
 #include "DExport.hxx"
-#include <core_resource.hxx>
 #include "commontypes.hxx"
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 27bab384caf6..1a373cabd5d1 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -24,7 +24,6 @@
 #include <dsntypes.hxx>
 #include "IItemSetHelper.hxx"
 #include <comphelper/uno3.hxx>
-#include <core_resource.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star {
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index c40b5c104867..459e46d19260 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX
 
 #include "IItemSetHelper.hxx"
-#include <core_resource.hxx>
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index e9a7c523c7a7..0e99afa760bf 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX
 
 #include <dbaccess/genericcontroller.hxx>
-#include <core_resource.hxx>
 #include "brwview.hxx"
 #include "sbagrid.hxx"
 
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 9cf5e97a721f..3a969d469d39 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
 
 #include "ScrollHelper.hxx"
-#include <core_resource.hxx>
 
 #include <com/sun/star/frame/XPopupMenuController.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 6cc13bfe94d3..907a3d9a6701 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -25,7 +25,6 @@
 #include "IItemSetHelper.hxx"
 #include <comphelper/uno3.hxx>
 #include <svtools/wizardmachine.hxx>
-#include <core_resource.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star {
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index 43dcad1d3ea1..ce0d0c7d0a90 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -28,7 +28,6 @@
 #include <memory>
 #include <svtools/roadmapwizard.hxx>
 #include <connectivity/dbtools.hxx>
-#include <core_resource.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace beans {
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index a4063ff65a9e..5b2e08edc982 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -32,7 +32,6 @@
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <unotools/eventlisteneradapter.hxx>
-#include <core_resource.hxx>
 #include <osl/mutex.hxx>
 
 #include <svtools/editbrowsebox.hxx>
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 7781efb83f28..3394aa2fe2a1 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -58,7 +58,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/implbase10.hxx>
-#include <core_resource.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 33b5ebc41c87..58b246dc65bf 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 
-#include <core_resource.hxx>
 #include <svtools/editbrowsebox.hxx>
 #include "indexcollection.hxx"
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index c66ef9814a40..9cd0163046db 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -23,7 +23,6 @@
 #include <svtools/genericunodialog.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <dsntypes.hxx>
-#include <core_resource.hxx>
 
 class SfxItemSet;
 class SfxItemPool;
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index ae3b2a8f116b..7015be4581db 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -22,7 +22,6 @@
 
 #include <svtools/genericunodialog.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <core_resource.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx
index 681913977e97..031d1cd41579 100644
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@ -19,7 +19,6 @@
 
 #include <imageprovider.hxx>
 #include <dbu_pageids.hxx>
-#include <core_resource.hxx>
 #include <stringconstants.hxx>
 #include <bitmaps.hlst>
 
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 8e056acb2186..dc2ad13b4aa7 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/sfxsids.hrc>
-#include <strings.hrc>
 #include <browserids.hxx>
 #include <comphelper/types.hxx>
 #include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 437d4c22d1ad..c744c24b8d30 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -24,7 +24,6 @@
 #include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <browserids.hxx>
-#include <strings.hrc>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index bc17f6b6b589..9c7ad0b3062e 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -21,7 +21,6 @@
 #include <osl/diagnose.h>
 #include <querycontroller.hxx>
 #include <JoinDesignView.hxx>
-#include <strings.hrc>
 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 155618254a81..8daae7f44de9 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -27,7 +27,6 @@
 #include <querycontroller.hxx>
 #include <vcl/image.hxx>
 #include <TableWindowListBox.hxx>
-#include <strings.hrc>
 #include <strings.hxx>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 87fefc9970a7..53c36fb0dac5 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -46,6 +46,7 @@
 #include "querydlg.hxx"
 #include <JoinExchange.hxx>
 #include <comphelper/extract.hxx>
+#include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <svtools/treelistentry.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 6c221380b2f6..a2da22fc1304 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -24,7 +24,6 @@
 #include <undosqledit.hxx>
 #include <browserids.hxx>
 #include <querycontroller.hxx>
-#include <strings.hrc>
 #include <stringconstants.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 227720fc5c12..8d26b499de0f 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -21,7 +21,6 @@
 #include <QueryDesignView.hxx>
 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
-#include <strings.hrc>
 #include <browserids.hxx>
 #include <adtabdlg.hxx>
 #include <querycontroller.hxx>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index b61c9750b1a2..780e3dc02ee8 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -30,6 +30,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include "TableFieldInfo.hxx"
+#include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <helpids.h>
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index a8963e5a4001..6d29cb77bc30 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <querycontroller.hxx>
-#include <strings.hrc>
 #include <stringconstants.hxx>
 #include <bitmaps.hlst>
 #include <comphelper/extract.hxx>
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 42c68d06d13b..718449f4a982 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <comphelper/sequence.hxx>
-#include <strings.hrc>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 6a917ec8c034..f12e5366844a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -27,7 +27,6 @@
 #include <stringconstants.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
-#include <strings.hrc>
 #include <QueryDesignView.hxx>
 #include <JoinController.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 7b572a7722f4..41707d40f2fc 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -21,7 +21,6 @@
 
 #include <LimitBox.hxx>
 #include <dbu_reghelper.hxx>
-#include <core_resource.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 3d13985a545a..e1779a816cf1 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -23,7 +23,6 @@
 #include <svl/undo.hxx>
 #include <vcl/svapp.hxx>
 #include <browserids.hxx>
-#include <strings.hrc>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
index e616815e7e02..dda37a3192c3 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx
@@ -20,7 +20,6 @@
 #include <FieldDescriptions.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <strings.hrc>
 #include <strings.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index bb025af9693f..f47a308e3db4 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/util/XNumberFormatTypes.hpp>
+#include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index bcd2ff733812..2816a400716c 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <TableDesignControl.hxx>
-#include <strings.hrc>
 #include <TableDesignView.hxx>
 #include <TableController.hxx>
 #include <browserids.hxx>
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index f850b021a797..ddc09cb37d32 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/sdbc/XRowSet.hpp>
 
 #include <svtools/genericunodialog.hxx>
-#include <core_resource.hxx>
 #include <apitools.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index 4810d37cfcf7..930dd4bb1386 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -32,7 +32,6 @@
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <com/sun/star/sdb/XInteractionDocumentSave.hpp>
 #include <sfx2/QuerySaveDocument.hxx>
-#include <strings.hrc>
 #include <paramdialog.hxx>
 #include <vcl/svapp.hxx>
 #include <CollectionView.hxx>
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 19fa98b88369..9bc5f365799a 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -22,7 +22,6 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include <core_resource.hxx>
 #include <apitools.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index 62ca64e0cb7b..965fd6291a98 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -20,7 +20,6 @@
 #include <textconnectionsettings.hxx>
 #include <uiservices.hxx>
 #include <dbu_reghelper.hxx>
-#include <core_resource.hxx>
 #include <apitools.hxx>
 #include <unoadmin.hxx>
 #include <stringconstants.hxx>
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index d616888e92ff..c100adee7dd5 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/sdb/XSQLQueryComposer.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
-#include <core_resource.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 namespace dbaui