From b66cfdbc1aa43fb42cf881bcc702798e95a50a9c Mon Sep 17 00:00:00 2001 From: Andrea Gelmini Date: Sat, 22 Jul 2017 15:36:44 +0200 Subject: Removed duplicated includes Mainly about "core_resource.hxx" and "strings.hrc". It passed "make check" on Linux. Change-Id: I994420d5e33d02b64929f8a51c548a7322d88a79 Reviewed-on: https://gerrit.libreoffice.org/40311 Tested-by: Jenkins Reviewed-by: Julien Nabet --- dbaccess/source/ui/app/AppDetailView.cxx | 1 - dbaccess/source/ui/dlg/CollectionView.cxx | 1 - dbaccess/source/ui/dlg/ConnectionHelper.cxx | 1 - dbaccess/source/ui/dlg/ConnectionPage.cxx | 1 - dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1 - dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 5 +++-- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 1 - dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 1 - dbaccess/source/ui/dlg/UserAdmin.cxx | 1 - dbaccess/source/ui/dlg/adminpages.cxx | 1 - dbaccess/source/ui/dlg/dbadmin.cxx | 1 - dbaccess/source/ui/dlg/detailpages.cxx | 1 - dbaccess/source/ui/dlg/dlgsave.cxx | 1 - dbaccess/source/ui/dlg/generalpage.cxx | 1 - dbaccess/source/ui/dlg/paramdialog.cxx | 1 - dbaccess/source/ui/dlg/queryorder.cxx | 1 - dbaccess/source/ui/dlg/sqlmessage.cxx | 1 - dbaccess/source/ui/misc/DExport.cxx | 1 - dbaccess/source/ui/misc/HtmlReader.cxx | 1 - dbaccess/source/ui/misc/RtfReader.cxx | 1 - dbaccess/source/ui/misc/WCPage.cxx | 1 - dbaccess/source/ui/misc/WColumnSelect.cxx | 1 - dbaccess/source/ui/misc/WCopyTable.cxx | 1 - dbaccess/source/ui/misc/charsets.cxx | 1 - dbaccess/source/ui/misc/datasourceconnector.cxx | 1 - dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 1 - dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 -- dbaccess/source/ui/misc/linkeddocuments.cxx | 1 - dbaccess/source/ui/misc/singledoccontroller.cxx | 1 - dbaccess/source/ui/querydesign/LimitBox.cxx | 1 - dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 1 - dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 1 - dbaccess/source/ui/uno/copytablewizard.cxx | 1 - 33 files changed, 3 insertions(+), 35 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index adc63bd03803..90a6e77ac507 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -39,7 +39,6 @@ #include #include "callbacks.hxx" #include -#include "core_resource.hxx" #include "svtools/treelistentry.hxx" #include "svtools/viewdataentry.hxx" #include diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index 0d92a221646a..e7267ca68ca7 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -26,7 +26,6 @@ #include #include #include -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 98bb2a59b82a..90df7695b5c2 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -31,7 +31,6 @@ #include #include "dsitems.hxx" #include "helpids.h" -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index d29be884d7c4..65f2d0663ae7 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -40,7 +40,6 @@ #include #include #include "sqlmessage.hxx" -#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index d998d7b4e69c..6d26d4b4296f 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -34,7 +34,6 @@ #include #include #include "sqlmessage.hxx" -#include "core_resource.hxx" #include "odbcconfig.hxx" #include "dsselect.hxx" #include diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index a65b7db481eb..fb31b1b0dc27 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -35,9 +35,11 @@ #include #include #include + #if HAVE_FEATURE_JAVA -#include + #include #endif + #include #include "DriverSettings.hxx" #include "dbadmin.hxx" @@ -52,7 +54,6 @@ #include #include #include "finteraction.hxx" -#include "core_resource.hxx" #include #include #include "TextConnectionHelper.hxx" diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 7ef15fe23176..8437c36f7e0b 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -35,7 +35,6 @@ #include "strings.hxx" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 81a6ad7a200d..f87ee4279ccf 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -19,7 +19,6 @@ #include -#include "core_resource.hxx" #include "core_resource.hxx" #include "TextConnectionHelper.hxx" #include "sqlmessage.hxx" diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 62d4c3e31edc..7d9bb184e5dc 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -37,7 +37,6 @@ #include "strings.hxx" #include "core_resource.hxx" #include "dbadmin.hxx" -#include "core_resource.hxx" #include #include diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index f13a88ff9f9b..8862f712ac0a 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -28,7 +28,6 @@ #include "stringconstants.hxx" #include "dsitems.hxx" #include "dsselect.hxx" -#include "core_resource.hxx" #include "odbcconfig.hxx" #include "optionalboolitem.hxx" #include "sqlmessage.hxx" diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index 016f973c10a5..cc761520ac94 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -31,7 +31,6 @@ #include "strings.hrc" #include "dsitems.hxx" #include "dsnItem.hxx" -#include "core_resource.hxx" #include "optionalboolitem.hxx" #include "propertysetitem.hxx" #include "stringlistitem.hxx" diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 6375ec5fbe59..40c1b1f515c9 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -27,7 +27,6 @@ #include "dsitems.hxx" #include "dbfindex.hxx" #include "dsnItem.hxx" -#include "core_resource.hxx" #include "helpids.h" #include "dbu_dlg.hxx" diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index 65167dc6617d..ba74dc26570e 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -35,7 +35,6 @@ #include #include #include -#include "core_resource.hxx" #include "objectnamecheck.hxx" #include diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index a90c3842f7bc..08032871052f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -26,7 +26,6 @@ #include "dsitems.hxx" #include "stringconstants.hxx" #include "dbadmin.hxx" -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index aa230db58365..74fa78bacecb 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -23,7 +23,6 @@ #include "strings.hrc" #include "strings.hxx" #include "commontypes.hxx" -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index cdf545f7fd98..83f2d84fb7dc 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -26,7 +26,6 @@ #include #include #include -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index a0090fa47d0b..bef59f71af24 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -36,7 +36,6 @@ #include #include "helpids.h" #include "UITools.hxx" -#include "core_resource.hxx" #include diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 7851fc23e46f..5b7282424b8f 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -33,7 +33,6 @@ #include #include #include -#include "core_resource.hxx" #include "stringconstants.hxx" #include "strings.hrc" #include "strings.hxx" diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index e7fa222acbe8..6f344fae645b 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -52,7 +52,6 @@ #include "QEnumTypes.hxx" #include "WCPage.hxx" #include -#include "core_resource.hxx" #include "UITools.hxx" #include #include diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 1cf32f7846f5..3fdb0ee3ffa1 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -43,7 +43,6 @@ #include #include #include "WExtendPages.hxx" -#include "core_resource.hxx" #include "QEnumTypes.hxx" #include "UITools.hxx" #include diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 20ad58771803..0f5f7d7d1aa1 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -36,7 +36,6 @@ #include #include #include "UITools.hxx" -#include "core_resource.hxx" #include using namespace ::dbaui; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index f9fcff3e4f1f..ac702ece7af1 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -28,7 +28,6 @@ #include #include #include -#include "core_resource.hxx" #include "stringconstants.hxx" #include diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 40c7b42119ba..780a03013f43 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -21,7 +21,6 @@ #include "strings.hxx" #include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hxx" #include "sqlmessage.hxx" #include "UITools.hxx" #include "WColumnSelect.hxx" diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 78f60be945bd..e8a97524fd9d 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -22,7 +22,6 @@ #include #include "strings.hrc" #include -#include "core_resource.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index e0992eb01a15..c12f7b8e66ff 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -42,7 +42,6 @@ #include #include "strings.hrc" #include "strings.hxx" -#include "core_resource.hxx" namespace dbaui { diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 6ef9d424d536..a6f1baa4f9ad 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -24,7 +24,6 @@ #include "strings.hrc" #include "strings.hxx" #include "stringconstants.hxx" -#include "core_resource.hxx" #include #include diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index d4325e99090a..5da1f40d8e59 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -22,8 +22,6 @@ #include "strings.hrc" -#include "core_resource.hxx" - #include #include #include diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 3c70c3f10c8d..d4e41b2e5385 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -42,7 +42,6 @@ #include #include "browserids.hxx" #include -#include "core_resource.hxx" #include #include #include diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 4575f44872fe..7d0bab0766b1 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -24,7 +24,6 @@ #include "browserids.hxx" #include "strings.hrc" #include "stringconstants.hxx" -#include "core_resource.hxx" #include diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx index 7c2a991db627..9eb4851f039e 100644 --- a/dbaccess/source/ui/querydesign/LimitBox.cxx +++ b/dbaccess/source/ui/querydesign/LimitBox.cxx @@ -11,7 +11,6 @@ #include "LimitBox.hxx" #include "strings.hrc" #include "core_resource.hxx" -#include "core_resource.hxx" #define ALL_STRING DBA_RES(STR_QUERY_LIMIT_ALL) #define ALL_INT -1 diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 18edc5813369..0e711246d550 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -31,7 +31,6 @@ #include "strings.hxx" #include "UITools.hxx" #include "core_resource.hxx" -#include "core_resource.hxx" #include #include diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 081d601388eb..72cd51b6b734 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -26,7 +26,6 @@ #include #include "helpids.h" #include "core_resource.hxx" -#include "core_resource.hxx" #define STANDARD_MARGIN 6 #define DETAILS_HEADER_HEIGHT 25 diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 60462ff3781c..48174ffed413 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -24,7 +24,6 @@ #include "strings.hxx" #include "stringconstants.hxx" #include "core_resource.hxx" -#include "core_resource.hxx" #include "sqlmessage.hxx" #include "uiservices.hxx" #include "WCopyTable.hxx" -- cgit v1.2.3