From 5a7e8389f0720f1872f36af401c6b3af7968b7ea Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 14 Jul 2012 02:03:56 +0200 Subject: hrc cleanup: Remove include guards from src files Change-Id: I7d52837f4058bab1bb5a0137788521d12834d519 --- dbaccess/source/sdbtools/resource/sdbt_strings.src | 2 -- dbaccess/source/ui/app/app.src | 12 ------------ dbaccess/source/ui/browser/sbabrw.src | 8 -------- dbaccess/source/ui/browser/sbagrid.src | 11 ----------- dbaccess/source/ui/control/TableGrantCtrl.src | 2 -- dbaccess/source/ui/control/tabletree.src | 4 ---- dbaccess/source/ui/control/undosqledit.src | 2 -- dbaccess/source/ui/dlg/AutoControls.src | 2 -- dbaccess/source/ui/dlg/CollectionView.src | 2 -- dbaccess/source/ui/dlg/ConnectionPage.src | 9 --------- dbaccess/source/ui/dlg/RelationDlg.src | 4 ---- dbaccess/source/ui/dlg/UserAdmin.src | 6 ------ dbaccess/source/ui/dlg/UserAdminDlg.src | 6 ------ dbaccess/source/ui/dlg/adtabdlg.src | 5 ----- dbaccess/source/ui/dlg/dbadmin.src | 10 ---------- dbaccess/source/ui/dlg/dbadmin2.src | 13 ------------- dbaccess/source/ui/dlg/dbadminsetup.src | 6 ------ dbaccess/source/ui/dlg/dbfindex.src | 4 ---- dbaccess/source/ui/dlg/directsql.src | 4 ---- dbaccess/source/ui/dlg/dlgattr.src | 8 -------- dbaccess/source/ui/dlg/dlgsave.src | 6 ------ dbaccess/source/ui/dlg/dlgsize.src | 6 ------ dbaccess/source/ui/dlg/dsselect.src | 5 ----- dbaccess/source/ui/dlg/indexdialog.src | 8 -------- dbaccess/source/ui/dlg/paramdialog.src | 4 ---- dbaccess/source/ui/dlg/queryfilter.src | 2 -- dbaccess/source/ui/dlg/queryorder.src | 2 -- dbaccess/source/ui/dlg/sqlmessage.src | 6 ------ dbaccess/source/ui/imagelists/dbimagelists.src | 4 ---- dbaccess/source/ui/misc/WizardPages.src | 7 ------- dbaccess/source/ui/misc/dbumiscres.src | 2 -- dbaccess/source/ui/querydesign/query.src | 14 -------------- dbaccess/source/ui/querydesign/querydlg.src | 4 ---- dbaccess/source/ui/relationdesign/relation.src | 10 ---------- dbaccess/source/ui/tabledesign/table.src | 12 ------------ dbaccess/source/ui/uno/dbinteraction.src | 2 -- 36 files changed, 214 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src index d5a8dc3779de..2ad724412474 100644 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ b/dbaccess/source/sdbtools/resource/sdbt_strings.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBACCESS_SDBT_RESOURCE_HRC #include "sdbt_resource.hrc" -#endif String STR_QUERY_AND_TABLE_DISTINCT_NAMES { diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index d310ec221284..344fa3e9d949 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -15,24 +15,12 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_APP_HRC_ #include "dbu_app.hrc" -#endif -#ifndef _GLOBLMN_HRC #include -#endif -#ifndef _CNTIDS_HRC #include -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef DBAUI_TOOLBOX_HXX #include "toolbox.hrc" -#endif #define MN_PROPS 25 diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index ded9caa7ad62..b908b54fb9ab 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -15,18 +15,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_BRW_HRC_ #include "dbu_brw.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _GLOBLMN_HRC #include -#endif #include "toolbox.hrc" QueryBox QUERY_BRW_SAVEMODIFIED diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index f7d2e4a69744..9cac876b4c38 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -15,22 +15,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_BRW_HRC_ #include "dbu_brw.hrc" -#endif - -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef DBAUI_TOOLBOX_HXX #include "toolbox.hrc" -#endif -#ifndef _GLOBLMN_HRC #include -#endif Menu RID_SBA_GRID_COLCTXMENU { diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src index 7d7cc7b03bd8..81d6432a6202 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ b/dbaccess/source/ui/control/TableGrantCtrl.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_CONTROL_HRC_ #include "dbu_control.hrc" -#endif String STR_TABLE_PRIV_NAME { diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index e40a84b8ba95..e8727a7c9c2c 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_CONTROL_HRC_ #include "dbu_control.hrc" -#endif -#ifndef _DBAUI_TABLETREE_HRC_ #include "tabletree.hrc" -#endif #include "browserids.hxx" Menu MENU_TABLETREE_POPUP diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src index 3be474973f1f..4899e5cc9361 100644 --- a/dbaccess/source/ui/control/undosqledit.src +++ b/dbaccess/source/ui/control/undosqledit.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_CONTROL_HRC_ #include "dbu_control.hrc" -#endif String STR_QUERY_UNDO_MODIFYSQLEDIT { diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index ecac9d642a63..8b11c126a3a7 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif String STR_DBASE_PATH_OR_FILE { diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index a8a71bb6a1b1..f3d643a083d8 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #include "dbaccess_helpid.hrc" #include "CollectionView.hrc" diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 42ec01016606..76951e539125 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -16,19 +16,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef DBAUI_CONNECTIONPAGE_HRC #include "ConnectionPage.hrc" -#endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif - //......................................................................... TabPage PAGE_CONNECTION diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index d68701aca6b3..2cd9c93c507a 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_RELATIONDIALOG_HRC #include "RelationDlg.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #include "dbaccess_helpid.hrc" ModalDialog DLG_REL_PROPERTIES diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 7f762e7743b0..8ecd463d496d 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_USERADMIN_HRC #include "UserAdmin.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif #define WINDOW_SIZE_X 260 #define WINDOW_SIZE_Y 185 diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src index 1ab363bd7f95..1641d4fbe36d 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.src +++ b/dbaccess/source/ui/dlg/UserAdminDlg.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef DBAUI_USERADMINDLG_HRC #include "UserAdminDlg.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif TabDialog DLG_DATABASE_USERADMIN { diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index 558be985e103..eb720517dae6 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -17,14 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - -#ifndef DBAUI_ADTABDLG_HRC #include "adtabdlg.hrc" -#endif #include "dbaccess_helpid.hrc" -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif ModelessDialog DLG_JOIN_TABADD { diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index aaa1d9a15ee2..f723c68eb11b 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -16,21 +16,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBAUI_DBADMIN_HRC_ #include "dbadmin.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif #include "admincontrols.hrc" //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index fa6e1890e7e3..1a20fd2af29e 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -16,25 +16,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif - -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBAUI_DBADMIN_HRC_ #include "dbadmin.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef DBAUI_TOOLBOX_HXX #include "toolbox.hrc" -#endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index e15148b55ea2..02cd31eb1447 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -16,14 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBAUI_DBADMINSETUP_HRC_ #include "dbadminsetup.hrc" -#endif - -#ifndef _DBAUI_AUTOCONTROLS_HRC_ #include "AutoControls.hrc" -#endif - #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index cf248bcb2f60..38ebda9e9219 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBAUI_DBF_INDEXES_HRC_ #include "dbfindex.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #define WIN_X 264 #define WIN_Y 149 diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index cb7d50f3c211..5ed6be088f07 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBACCESS_UI_DIRECTSQL_HRC_ #include "directsql.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #define BUTTON_SIZE_X 50 #define BUTTON_SIZE_Y 14 diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src index 54c4afb99f81..280c9c903fc0 100644 --- a/dbaccess/source/ui/dlg/dlgattr.src +++ b/dbaccess/source/ui/dlg/dlgattr.src @@ -15,18 +15,10 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVX_DIALOGS_HRC #include -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef DBAUI_SBATTRDLG_HRC #include "dlgattr.hrc" -#endif //================================================ // Der Attributdialog: diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d93ea02ce1b8..96dc6cfb1dc3 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_DLGSAVE_HRC #include "dlgsave.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif ModalDialog DLG_SAVE_AS { diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index bbde191d11f2..ba301bdf3f7c 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_DLGSIZE_HRC #include "dlgsize.hrc" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif ModalDialog DLG_ROWHEIGHT { diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 30c6fd5b10ac..99cb53f63b71 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -16,13 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBAUI_DSSELECT_HRC_ #include "dsselect.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif - ModalDialog DLG_DATASOURCE_SELECTION { diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index c16354323054..d7bdf73d98ec 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -16,18 +16,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBAUI_INDEXDIALOG_HRC_ #include "indexdialog.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif #define DIALOG_SIZE_X 220 #define DIALOG_SIZE_Y 140 diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 354305f773b7..914bbbec6c62 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBAUI_PARAMDIALOG_HRC_ #include "paramdialog.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #define LIST_WIDTH 100 #define LIST_HEIGHT 50 diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index bfe20f8048c0..caa57fe2888a 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_QUERYFILTER_HRC #include "queryfilter.hrc" -#endif #include "dbaccess_helpid.hrc" ModalDialog DLG_FILTERCRIT diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 1cee19c814ab..13d9f82a1629 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_QUERYORDER_HRC #include "queryorder.hrc" -#endif #include "dbaccess_helpid.hrc" ModalDialog DLG_ORDERCRIT diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index 1ad7c54ac5ca..9dcc56051167 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _DBAUI_SQLMESSAGE_HRC_ #include "sqlmessage.hrc" -#endif //------------------------------------------------------------------------- Image BMP_EXCEPTION_ERROR diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 0d3c4d7ab993..c18b1619c774 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 8c1c9abb51dc..abaed727b76f 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -16,16 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef DBAUI_WIZARD_PAGES_HRC #include "WizardPages.hrc" -#endif -#ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif - #include "dbaccess_slotid.hrc" #define WINDOW_SIZE_X 276 diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index e641ebeb66c3..c7bfe0bdca02 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" -#endif Resource RSC_CHARSETS diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 82140d88670a..575ee1e905b7 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -15,27 +15,13 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef DBAUI_QUERY_HRC #include "Query.hrc" -#endif -#ifndef _GLOBLMN_HRC #include -#endif -#ifndef _CNTIDS_HRC #include -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef DBAUI_TOOLBOX_HXX #include "toolbox.hrc" -#endif #define MN_EDIT 20 #define MN_VIEW 21 diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index bfd930a2065d..d01c2bcf644e 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -15,12 +15,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef DBAUI_QUERYDLG_HRC #include "querydlg.hrc" -#endif #include "dbaccess_helpid.hrc" ModalDialog DLG_QRY_JOIN diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index 37ff1da4fd5d..cec72ee77488 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -15,21 +15,11 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_REL_HRC_ #include "dbu_rel.hrc" -#endif -#ifndef _GLOBLMN_HRC #include -#endif -#ifndef _CNTIDS_HRC #include -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif String STR_QUERY_REL_EDIT_RELATION { diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index 26ec02654dde..980fd073781a 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -17,24 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_TBL_HRC_ #include "dbu_tbl.hrc" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBACCESS_SLOTID_HRC_ #include "dbaccess_slotid.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _GLOBLMN_HRC #include -#endif -#ifndef DBAUI_TOOLBOX_HXX #include "toolbox.hrc" -#endif #define MN_EDIT 20 #define MN_VIEW 21 diff --git a/dbaccess/source/ui/uno/dbinteraction.src b/dbaccess/source/ui/uno/dbinteraction.src index 4f6ea432ae78..deb8c331df61 100644 --- a/dbaccess/source/ui/uno/dbinteraction.src +++ b/dbaccess/source/ui/uno/dbinteraction.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _DBU_UNO_HRC_ #include "dbu_uno.hrc" -#endif String STR_REMEMBERPASSWORD_SESSION { -- cgit