diff options
104 files changed, 1 insertions, 421 deletions
diff --git a/accessibility/source/helper/accessiblestrings.src b/accessibility/source/helper/accessiblestrings.src index bb611fa9c8bf..4174855e92e5 100644 --- a/accessibility/source/helper/accessiblestrings.src +++ b/accessibility/source/helper/accessiblestrings.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ #include <accessibility/helper/accessiblestrings.hrc> -#endif String RID_STR_ACC_ACTION_CLICK diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index 44eee67f67d1..22f1d8c8cb36 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -18,9 +18,7 @@ #include <baside2.hrc> #include <helpid.hrc> -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif #include "dlgresid.hrc" #include <sfx2/sfxcommands.h> #include <svx/svxcommands.h> diff --git a/basic/source/classes/sb.src b/basic/source/classes/sb.src index 3deecde69d6d..19fa675aabd3 100644 --- a/basic/source/classes/sb.src +++ b/basic/source/classes/sb.src @@ -25,9 +25,7 @@ * ************************************************************************/ #define __RSC -#ifndef _ERRCODE_HXX //autogen #include <tools/errcode.hxx> -#endif #include "sb.hrc" #include <basic/sberrors.hxx> diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 04d0b1ae9a30..3cf589109390 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src @@ -19,10 +19,7 @@ #include "dlg_InsertLegend.hrc" #include "CommonResources.hrc" #include "res_LegendPosition.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif ModalDialog DLG_LEGEND { diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index da9f9be7071a..3ad6ce4e2ba7 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -19,10 +19,7 @@ #include "tp_3D_SceneGeometry.hrc" #include "dlg_View3D.hrc" #include "HelpIds.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define WIDTH_FL 108 #define WIDTH_MF 57 diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index cd3791d8256e..387ff3b6f138 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -28,10 +28,7 @@ #include "tp_ChartType.hrc" #include "dlg_CreationWizard.hrc" #include "CommonResources.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; } diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index 86dc9a411281..243cb9b60d22 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.src @@ -18,10 +18,7 @@ #include "HelpIds.hrc" #include "tp_RangeChooser.hrc" #include "dlg_CreationWizard.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; } diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index c323497c4e3a..9f6111c0acd7 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -21,10 +21,7 @@ #include "res_SecondaryAxisCheckBoxes.hrc" #include "dlg_CreationWizard.hrc" #include "res_LegendPosition.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; } #define WIZ_TITLES_WIDTH 130 diff --git a/connectivity/source/drivers/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src index 0f23d6078030..fa4496e0ee24 100644 --- a/connectivity/source/drivers/hsqldb/hsqlui.src +++ b/connectivity/source/drivers/hsqldb/hsqlui.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef CONNECTIVITY_HSQLUI_HRC #include "hsqlui.hrc" -#endif /* Note: The resource file built here (hsqldb.res, finally) is *not* included diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 3b86d6bb09df..06a0690d38ce 100644 --- a/cui/source/dialogs/hangulhanjadlg.src +++ b/cui/source/dialogs/hangulhanjadlg.src @@ -18,9 +18,7 @@ #include <cuires.hrc> #include "helpid.hrc" -#ifndef SVX_HANGUL_HANJA_DLG_HRC #include "hangulhanjadlg.hrc" -#endif ModalDialog RID_SVX_MDLG_HANGULHANJA { diff --git a/cui/source/options/doclinkdialog.src b/cui/source/options/doclinkdialog.src index 45fcc3bf500f..7fc25c2e0ad1 100644 --- a/cui/source/options/doclinkdialog.src +++ b/cui/source/options/doclinkdialog.src @@ -17,9 +17,7 @@ */ #include <cuires.hrc> -#ifndef _SVX_DOCLINKDIALOG_HRC_ #include "doclinkdialog.hrc" -#endif #define DIALOG_SIZE_X 200 #define DIALOG_SIZE_Y 94 diff --git a/cui/source/options/optpath.src b/cui/source/options/optpath.src index f0c7f5e6d9a3..f2f717585138 100644 --- a/cui/source/options/optpath.src +++ b/cui/source/options/optpath.src @@ -24,12 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - // include -------------------------------------------------------------- #include "optpath.hrc" #include <cuires.hrc> -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif #include "helpid.hrc" // RID_SFXPAGE_PATH ----------------------------------------------------- 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 <svx/globlmn.hrc> -#endif -#ifndef _CNTIDS_HRC #include <sfx2/cntids.hrc> -#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 <svx/globlmn.hrc> -#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 <svx/globlmn.hrc> -#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 <svx/dialogs.hrc> -#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 <svx/globlmn.hrc> -#endif -#ifndef _CNTIDS_HRC #include <sfx2/cntids.hrc> -#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 <svx/globlmn.hrc> -#endif -#ifndef _CNTIDS_HRC #include <sfx2/cntids.hrc> -#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 <svx/globlmn.hrc> -#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 { diff --git a/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index c246af9a8b00..e0e8c3950361 100644 --- a/extensions/source/abpilot/abspilot.src +++ b/extensions/source/abpilot/abspilot.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef EXTENSIONS_ABPRESID_HRC #include "abpresid.hrc" -#endif //........................................................................ ModalDialog RID_DLG_ADDRESSBOOKSOURCEPILOT diff --git a/extensions/source/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index f900325ec0f1..16bf88a330fb 100644 --- a/extensions/source/dbpilots/commonpagesdbp.src +++ b/extensions/source/dbpilots/commonpagesdbp.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif TabPage RID_PAGE_TABLESELECTION { diff --git a/extensions/source/dbpilots/dbpilots.src b/extensions/source/dbpilots/dbpilots.src index 5106da727e90..faad04dc8135 100644 --- a/extensions/source/dbpilots/dbpilots.src +++ b/extensions/source/dbpilots/dbpilots.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif ModalDialog RID_DLG_GROUPBOXWIZARD { diff --git a/extensions/source/dbpilots/gridpages.src b/extensions/source/dbpilots/gridpages.src index 5170aa76e7a5..ad617cb392e2 100644 --- a/extensions/source/dbpilots/gridpages.src +++ b/extensions/source/dbpilots/gridpages.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif TabPage RID_PAGE_GW_FIELDSELECTION { diff --git a/extensions/source/dbpilots/groupboxpages.src b/extensions/source/dbpilots/groupboxpages.src index 867d4d8b1149..515efb4fe7cf 100644 --- a/extensions/source/dbpilots/groupboxpages.src +++ b/extensions/source/dbpilots/groupboxpages.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif TabPage RID_PAGE_GROUPRADIOSELECTION { diff --git a/extensions/source/dbpilots/listcombopages.src b/extensions/source/dbpilots/listcombopages.src index 0d9023e1f753..3a2304441c73 100644 --- a/extensions/source/dbpilots/listcombopages.src +++ b/extensions/source/dbpilots/listcombopages.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_DBP_DBPRESID_HRC_ #include "dbpresid.hrc" -#endif TabPage RID_PAGE_LCW_CONTENTSELECTION_TABLE { diff --git a/extensions/source/propctrlr/fontdialog.src b/extensions/source/propctrlr/fontdialog.src index c74e7b0620bf..d7647683e4a3 100644 --- a/extensions/source/propctrlr/fontdialog.src +++ b/extensions/source/propctrlr/fontdialog.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif TabDialog RID_TABDLG_FONTDIALOG { diff --git a/extensions/source/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src index ca61be85c5fc..67ee53e89346 100644 --- a/extensions/source/propctrlr/formlinkdialog.src +++ b/extensions/source/propctrlr/formlinkdialog.src @@ -16,13 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propctrlr.hrc" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HRC #include "formlinkdialog.hrc" -#endif ModalDialog RID_DLG_FORMLINKS { diff --git a/extensions/source/propctrlr/formres.src b/extensions/source/propctrlr/formres.src index 83763b152d66..f12e66e0240e 100644 --- a/extensions/source/propctrlr/formres.src +++ b/extensions/source/propctrlr/formres.src @@ -25,12 +25,8 @@ * ************************************************************************/ -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif String RID_STR_EDITMASK { diff --git a/extensions/source/propctrlr/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src index 6ab0616ddd13..6489ff49ec40 100644 --- a/extensions/source/propctrlr/listselectiondlg.src +++ b/extensions/source/propctrlr/listselectiondlg.src @@ -16,13 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif #include "propctrlr.hrc" -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HRC #include "listselectiondlg.hrc" -#endif ModalDialog RID_DLG_SELECTION { diff --git a/extensions/source/propctrlr/newdatatype.src b/extensions/source/propctrlr/newdatatype.src index eaa1beb81d5f..a662576c277b 100644 --- a/extensions/source/propctrlr/newdatatype.src +++ b/extensions/source/propctrlr/newdatatype.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HRC #include "newdatatype.hrc" -#endif #define DIALOG_WIDTH 150 #define DIALOG_HEIGHT 55 diff --git a/extensions/source/propctrlr/pcrmiscres.src b/extensions/source/propctrlr/pcrmiscres.src index eb15e0a033ca..f1a0392a4c2a 100644 --- a/extensions/source/propctrlr/pcrmiscres.src +++ b/extensions/source/propctrlr/pcrmiscres.src @@ -25,12 +25,8 @@ * ************************************************************************/ -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif -#ifndef _EXTENSIONS_PROPCTRLR_FORMLOCALID_HRC_ #include "formlocalid.hrc" -#endif String RID_STR_CONFIRM_DELETE_DATA_TYPE { diff --git a/extensions/source/propctrlr/propres.src b/extensions/source/propctrlr/propres.src index c8e4bffa0c96..8ddaf9d00b5b 100644 --- a/extensions/source/propctrlr/propres.src +++ b/extensions/source/propctrlr/propres.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif #include "formresid.hrc" String RID_STR_STANDARD diff --git a/extensions/source/propctrlr/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src index 96f59d7ee1a1..b607e62bd92d 100644 --- a/extensions/source/propctrlr/selectlabeldialog.src +++ b/extensions/source/propctrlr/selectlabeldialog.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef EXTENSIONS_PROPRESID_HRC #include "formresid.hrc" -#endif ModalDialog RID_DLG_SELECTLABELCONTROL { diff --git a/extensions/source/propctrlr/taborder.src b/extensions/source/propctrlr/taborder.src index dc63cc508d3d..84968bdcc906 100644 --- a/extensions/source/propctrlr/taborder.src +++ b/extensions/source/propctrlr/taborder.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #include "formresid.hrc" -#endif -#ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HRC #include "taborder.hrc" -#endif #include "propctrlr.hrc" ModalDialog RID_DLG_TABORDER diff --git a/forms/source/resource/strings.src b/forms/source/resource/strings.src index 31bbc21068fb..02ff79801d05 100644 --- a/forms/source/resource/strings.src +++ b/forms/source/resource/strings.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FRM_RESOURCE_HRC_ #include "frm_resource.hrc" -#endif String RID_BASELISTBOX_ERROR_FILLLIST { diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src index cbcca25c755d..8498b6209a13 100644 --- a/forms/source/resource/xforms.src +++ b/forms/source/resource/xforms.src @@ -16,9 +16,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _FRM_RESOURCE_HRC_ #include "frm_resource.hrc" -#endif String RID_STR_XFORMS_NO_BINDING_EXPRESSION diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 332bdc75ea02..7184d4977fbe 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -26,10 +26,7 @@ ************************************************************************/ #include "helpid.hrc" - -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif String STR_MENU_ADDONS { diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index e062e14779d1..5ba0a87445e4 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -27,9 +27,7 @@ #include "CondFormat.hrc" #include "RptResId.hrc" #include "helpids.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif #include "rptui_slotid.hrc" Control WIN_CONDITION diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 586dafb71956..83f333e2fdef 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -18,12 +18,8 @@ #include "DateTime.hrc" #include "RptResId.hrc" #include "helpids.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif ModalDialog RID_DATETIME_DLG diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index d8f80f45aaf1..b80f39a15420 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -27,12 +27,8 @@ #include "GroupsSorting.hrc" #include "RptResId.hrc" #include "helpids.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif FloatingWindow RID_GROUPS_SORTING diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index e35c76364f58..7d81a13030bd 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -27,12 +27,8 @@ #include "RptResId.hrc" #include "helpids.hrc" #include "rptui_slotid.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif #include <svl/solar.hrc> #define RID_SVXIMG_COLLAPSEDNODE (RID_FORMS_START + 2) diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 83e979d72d29..8fc0fd1b3483 100644 --- a/reportdesign/source/ui/dlg/PageNumber.src +++ b/reportdesign/source/ui/dlg/PageNumber.src @@ -27,12 +27,8 @@ #include "PageNumber.hrc" #include "RptResId.hrc" #include "helpids.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif ModalDialog RID_PAGENUMBERS diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src index e24d4f219281..45bf522d2464 100644 --- a/reportdesign/source/ui/inspection/inspection.src +++ b/reportdesign/source/ui/inspection/inspection.src @@ -26,12 +26,8 @@ ************************************************************************/ #include "RptResId.hrc" #include "rptui_slotid.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif String RID_STR_PROPPAGE_DEFAULT { diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index c9ae0623ce09..b76f1a1f5fc2 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -26,12 +26,8 @@ ************************************************************************/ #include "RptResId.hrc" #include "rptui_slotid.hrc" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif -#ifndef _SBASLTID_HRC #include <svx/svxids.hrc> -#endif #include "helpids.hrc" // Dialog Controls --------------------------------------------------------------- diff --git a/sd/source/ui/animations/SlideTransitionPane.src b/sd/source/ui/animations/SlideTransitionPane.src index ca479865e6fa..a065b74a5f86 100644 --- a/sd/source/ui/animations/SlideTransitionPane.src +++ b/sd/source/ui/animations/SlideTransitionPane.src @@ -19,10 +19,7 @@ #include "CustomAnimation.hrc" #include "SlideTransitionPane.hrc" #include "helpids.h" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif // Note: Sizes of 1 usually mean they are auto-calculated diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src index 80456e451753..a111733dba0f 100644 --- a/sd/source/ui/app/menuids3_tmpl.src +++ b/sd/source/ui/app/menuids3_tmpl.src @@ -25,9 +25,8 @@ * ************************************************************************/ -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif + #define MN_CHANGEBEZIER \ MenuItem\ {\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 563a83ffb89d..68e66efc1487 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -32,9 +32,7 @@ #undef SD_POPUP #define SD_POPUP RID_GRAPHIC_TEXTOBJ_POPUP #include "popup2.src" -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif #include "helpids.h" #define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src index aeeaff6df5ad..090d63cb22fd 100644 --- a/sfx2/source/dialog/srchdlg.src +++ b/sfx2/source/dialog/srchdlg.src @@ -16,15 +16,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SFX_SRCHDLG_HRC_ #include "srchdlg.hrc" -#endif -#ifndef _SFX_DIALOG_HRC #include "dialog.hrc" -#endif -#ifndef _SFX_HELPID_HRC #include "helpid.hrc" -#endif ModelessDialog RID_DLG_SEARCH { diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index e7a07dce5e51..c7d9a07e27a8 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -21,9 +21,7 @@ // //============================================================================ -#ifndef _SVTOOLS_HRC #include <svl/svl.hrc> -#endif String STR_SVT_MIMETYPE_APP_OCTSTREAM { diff --git a/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src index beb2236ab2c8..325c77ccd140 100644 --- a/svtools/source/brwbox/editbrowsebox.src +++ b/svtools/source/brwbox/editbrowsebox.src @@ -25,13 +25,8 @@ * ************************************************************************/ -#ifndef _SVTOOLS_EDITBROWSEBOX_HRC_ #include "editbrowsebox.hrc" -#endif - -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif ImageList RID_SVTOOLS_IMAGELIST_EDITBROWSEBOX { diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src index d3566a404a01..8f6da0edeecb 100644 --- a/svtools/source/misc/helpagent.src +++ b/svtools/source/misc/helpagent.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> -#endif Bitmap BMP_HELP_AGENT_IMAGE { diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src index 3b4adfa194b3..2586ae6d82ac 100644 --- a/svx/source/dialog/frmsel.src +++ b/svx/source/dialog/frmsel.src @@ -16,12 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif -#ifndef SVX_FRMSEL_HRC #include "frmsel.hrc" -#endif Resource RID_SVXSTR_BORDER_CONTROL { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 122ecb0014a9..1656278a5641 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -19,9 +19,7 @@ #include "chinese_dictionarydialog.hrc" #include "chinese_direction.hrc" -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif //----------------------------------------------------------------------------- //defines for positions and sizes: diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 46ccc6e27eaf..2dc1c61aa9c4 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -19,9 +19,7 @@ #include "chinese_translationdialog.hrc" #include "chinese_direction.hrc" -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif //----------------------------------------------------------------------------- //defines for positions and sizes: diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src index cd588fe37fe7..f3071021d955 100644 --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -25,12 +25,8 @@ * ************************************************************************/ /* StarView ressource file */ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "globals.hrc" #include "config.hrc" #include "optdlg.hrc" diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 2f9b792f67bc..c4832819adbe 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.src @@ -26,12 +26,8 @@ ************************************************************************/ /* StarView ressource file */ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "globals.hrc" #include "config.hrc" #include "redlopt.hrc" diff --git a/sw/source/ui/fmtui/tmpdlg.src b/sw/source/ui/fmtui/tmpdlg.src index b9cde9c9494c..06d80ccd317e 100644 --- a/sw/source/ui/fmtui/tmpdlg.src +++ b/sw/source/ui/fmtui/tmpdlg.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif #include "fmtui.hrc" #include "globals.hrc" #include "svx/dialogs.hrc" diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index 0c924918c8a3..0afee9b8867a 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.src @@ -26,12 +26,8 @@ ************************************************************************/ /* StarView ressource file */ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> -#endif #include "globals.hrc" #include "misc.hrc" #include "linenum.hrc" diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 615f35fcafc6..241edf81c866 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -25,12 +25,8 @@ * ************************************************************************/ -#ifndef _SVXIDS_HRC #include <svx/svxids.hrc> -#endif -#ifndef _GLOBLMN_HRC #include <svx/globlmn.hrc> -#endif #include "workctrl.hrc" #include "helpid.h" #include "cmdid.h" diff --git a/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src index 90b8fdf1201c..94ff3ef5c55a 100644 --- a/toolkit/source/awt/xthrobber.src +++ b/toolkit/source/awt/xthrobber.src @@ -25,9 +25,7 @@ * ************************************************************************/ -#ifndef _TOOLKIT_AWT_XTHROBBER_HRC_ #include <xthrobber.hrc> -#endif #define STD_MASK_COLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; diff --git a/uui/source/alreadyopen.src b/uui/source/alreadyopen.src index ae3c45baf817..60cb2df4169c 100644 --- a/uui/source/alreadyopen.src +++ b/uui/source/alreadyopen.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_ALREADYOPEN_TITLE { diff --git a/uui/source/filechanged.src b/uui/source/filechanged.src index 84ab58d97515..c8c367277ab7 100644 --- a/uui/source/filechanged.src +++ b/uui/source/filechanged.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_FILECHANGED_TITLE { diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src index 29ef9c2ac155..cc7640609665 100644 --- a/uui/source/fltdlg.src +++ b/uui/source/fltdlg.src @@ -18,13 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif - -#ifndef UUI_FLTDLG_HRC #include "fltdlg.hrc" -#endif ModalDialog DLG_FILTER_SELECT { diff --git a/uui/source/ids.src b/uui/source/ids.src index d19264eec56a..244626477668 100644 --- a/uui/source/ids.src +++ b/uui/source/ids.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif String RID_KEEP_PASSWORD { diff --git a/uui/source/lockfailed.src b/uui/source/lockfailed.src index f0974bfe7ba5..761ececab943 100644 --- a/uui/source/lockfailed.src +++ b/uui/source/lockfailed.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_LOCKFAILED_TITLE { diff --git a/uui/source/logindlg.src b/uui/source/logindlg.src index 11521c0d5c51..ea3de7043c04 100644 --- a/uui/source/logindlg.src +++ b/uui/source/logindlg.src @@ -18,13 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif - -#ifndef UUI_LOGINDLG_HRC #include "logindlg.hrc" -#endif ModalDialog DLG_UUI_LOGIN { diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src index 1f4053d03e4a..e3b1990caade 100644 --- a/uui/source/masterpasscrtdlg.src +++ b/uui/source/masterpasscrtdlg.src @@ -18,12 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSCRTDLG_HRC #include <masterpasscrtdlg.hrc> -#endif ModalDialog DLG_UUI_MASTERPASSWORD_CRT { diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src index 8e0c8600d4da..53690b4e198c 100644 --- a/uui/source/masterpassworddlg.src +++ b/uui/source/masterpassworddlg.src @@ -18,12 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_MASTERPASSWORDDLG_HRC #include <masterpassworddlg.hrc> -#endif ModalDialog DLG_UUI_MASTERPASSWORD { diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src index f9fb4e932536..abec1a72efc5 100644 --- a/uui/source/nameclashdlg.src +++ b/uui/source/nameclashdlg.src @@ -18,13 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include "ids.hrc" -#endif - -#ifndef UUI_NAMECLASHDLG_HRC #include "nameclashdlg.hrc" -#endif #define DLG_WIDTH 250 #define DLG_HEIGTH 75 diff --git a/uui/source/openlocked.src b/uui/source/openlocked.src index 79d4623aef95..b6dcafe8528e 100644 --- a/uui/source/openlocked.src +++ b/uui/source/openlocked.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_OPENLOCKED_TITLE { diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src index a062c86df537..29f4557a69c0 100644 --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -18,12 +18,8 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_PASSWORDDLG_HRC #include <passworddlg.hrc> -#endif ModalDialog DLG_UUI_PASSWORD { diff --git a/uui/source/passworderrs.src b/uui/source/passworderrs.src index e11dd6f85b48..a557b8343022 100644 --- a/uui/source/passworderrs.src +++ b/uui/source/passworderrs.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_ERROR_PASSWORD_TO_OPEN_WRONG { diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src index 3c916eb6c9fc..8ae04a750f8e 100644 --- a/uui/source/sslwarndlg.src +++ b/uui/source/sslwarndlg.src @@ -17,13 +17,8 @@ */ #define __RSC - -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_SSLWARN_HRC #include <sslwarndlg.hrc> -#endif ModalDialog DLG_UUI_SSLWARN { diff --git a/uui/source/trylater.src b/uui/source/trylater.src index 13da2b8b764d..cf0b2649d401 100644 --- a/uui/source/trylater.src +++ b/uui/source/trylater.src @@ -18,9 +18,7 @@ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif String STR_TRYLATER_TITLE { diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src index a607eb08fbae..9a562cd424e5 100644 --- a/uui/source/unknownauthdlg.src +++ b/uui/source/unknownauthdlg.src @@ -17,12 +17,8 @@ */ #define __RSC -#ifndef UUI_IDS_HRC #include <ids.hrc> -#endif -#ifndef UUI_UNKNOWNAUTH_HRC #include <unknownauthdlg.hrc> -#endif ModalDialog DLG_UUI_UNKNOWNAUTH { |