diff options
48 files changed, 13 insertions, 136 deletions
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc index 8cbbec6a4bc7..0e47056fc187 100644 --- a/basctl/inc/basidesh.hrc +++ b/basctl/inc/basidesh.hrc @@ -19,9 +19,7 @@ #ifndef _BASIDESH_HRC #define _BASIDESH_HRC -#ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> -#endif // Width of Object Catalog pane in pixels #define OBJCAT_PANE_WIDTH 240 diff --git a/chart2/source/controller/dialogs/Bitmaps.hrc b/chart2/source/controller/dialogs/Bitmaps.hrc index 6cde7b4c2aa1..22767e45c16e 100644 --- a/chart2/source/controller/dialogs/Bitmaps.hrc +++ b/chart2/source/controller/dialogs/Bitmaps.hrc @@ -18,9 +18,7 @@ #ifndef CHART_BITMAPS_HRC #define CHART_BITMAPS_HRC -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #ifndef STD_MASKCOLOR #define STD_MASKCOLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } diff --git a/chart2/source/controller/inc/MenuResIds.hrc b/chart2/source/controller/inc/MenuResIds.hrc index 287d8f0e39ca..a24000f8994e 100644 --- a/chart2/source/controller/inc/MenuResIds.hrc +++ b/chart2/source/controller/inc/MenuResIds.hrc @@ -18,9 +18,7 @@ #ifndef CHART_MENURESIDS_HRC #define CHART_MENURESIDS_HRC -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif //----------------------------------------------------------------------------- // context menus diff --git a/connectivity/source/inc/resource/common_res.hrc b/connectivity/source/inc/resource/common_res.hrc index e3ecad388a37..eabb13278cca 100644 --- a/connectivity/source/inc/resource/common_res.hrc +++ b/connectivity/source/inc/resource/common_res.hrc @@ -19,9 +19,7 @@ #ifndef CONNECTIVITY_RESOURCE_COMMON_HRC #define CONNECTIVITY_RESOURCE_COMMON_HRC -#ifndef CONNECTIVITY_SHARED_RES_HRC #include "resource/conn_shared_res.hrc" -#endif // ============================================================================ // = common strings diff --git a/connectivity/source/inc/resource/mozab_res.hrc b/connectivity/source/inc/resource/mozab_res.hrc index 92970a774e31..bb789e3f7cc8 100644 --- a/connectivity/source/inc/resource/mozab_res.hrc +++ b/connectivity/source/inc/resource/mozab_res.hrc @@ -19,9 +19,7 @@ #ifndef CONNECTIVITY_RESOURCE_MOZAB_HRC #define CONNECTIVITY_RESOURCE_MOZAB_HRC -#ifndef CONNECTIVITY_SHARED_RES_HRC #include "resource/conn_shared_res.hrc" -#endif // ============================================================================ // = the mozab driver's resource strings diff --git a/cui/source/customize/macropg.hrc b/cui/source/customize/macropg.hrc index c67408a18d26..fcc01e2b0b7a 100644 --- a/cui/source/customize/macropg.hrc +++ b/cui/source/customize/macropg.hrc @@ -19,9 +19,7 @@ #ifndef _MACROPG_HRC #define _MACROPG_HRC -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define LB_EVENT 1 #define PB_ASSIGN 2 diff --git a/cui/source/dialogs/hangulhanjadlg.hrc b/cui/source/dialogs/hangulhanjadlg.hrc index b1c0da732302..bfd2510a6642 100644 --- a/cui/source/dialogs/hangulhanjadlg.hrc +++ b/cui/source/dialogs/hangulhanjadlg.hrc @@ -18,9 +18,7 @@ #ifndef SVX_HANGUL_HANJA_DLG_HRC #define SVX_HANGUL_HANJA_DLG_HRC -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif // PushButton #define PB_FIND 1 diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc index 449c746772b9..11c1df4b68f3 100644 --- a/cui/source/options/optinet2.hrc +++ b/cui/source/options/optinet2.hrc @@ -19,10 +19,7 @@ #define _SVX_OPTINET_HRC #include <sfx2/tabpage.hrc> - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif // Proxy ------------------------------------------------------------------ #define GB_SETTINGS 1 diff --git a/cui/source/tabpages/macroass.hrc b/cui/source/tabpages/macroass.hrc index 5be13a418047..c610f94e3bf8 100644 --- a/cui/source/tabpages/macroass.hrc +++ b/cui/source/tabpages/macroass.hrc @@ -19,9 +19,7 @@ #ifndef _MACROASS_HRC #define _MACROASS_HRC -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define LB_EVENT 2 #define PB_ASSIGN 3 diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index 93dfef2f312f..c3db103a03dc 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -19,9 +19,7 @@ #ifndef _DBACCESS_SLOTID_HRC_ #define _DBACCESS_SLOTID_HRC_ -#ifndef _SFXSIDS_HRC #include <sfx2/sfxsids.hrc> -#endif #define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) #define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 4a29d58391a5..303735f885fe 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -19,9 +19,7 @@ #ifndef _DBA_CORE_RESOURCE_HRC_ #define _DBA_CORE_RESOURCE_HRC_ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define RID_CORE_STRINGS_START RID_DBACCESS_START diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 2d6c7b6507ce..8a577a3ef629 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc @@ -19,9 +19,7 @@ #ifndef DBACCESS_SDBT_RESOURCE_HRC #define DBACCESS_SDBT_RESOURCE_HRC -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif //------------------------------------------------------------------------------ #define RID_SDBT_STRINGS_START RID_DBACCESS_START diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index 1fcf3c638560..3a0bd971f7bb 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -18,10 +18,7 @@ #ifndef _DBU_APP_HRC_ #define _DBU_APP_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif - #define RID_STR_NEW_FORM RID_STR_APP_START #define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index e6f720f588a1..2114287f5f62 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -19,18 +19,9 @@ #ifndef _DBAUI_AUTOCONTROLS_HRC_ #define _DBAUI_AUTOCONTROLS_HRC_ - -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif - -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif - -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif #define CHECKBOX_HEIGHT 8 diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc index b72dcdb6f998..c9448a1d7588 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.hrc +++ b/dbaccess/source/ui/dlg/RelationDlg.hrc @@ -18,9 +18,7 @@ #ifndef DBAUI_RELATIONDIALOG_HRC #define DBAUI_RELATIONDIALOG_HRC -#ifndef DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC #include "RelationControl.hrc" -#endif #define FL_CASC_DEL 3 #define FL_CASC_UPD 4 diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc index 1f0b01c89286..bbaaae946fde 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.hrc +++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc @@ -19,16 +19,9 @@ #ifndef _DBAUI_DBADMINSETUP_HRC_ #define _DBAUI_DBADMINSETUP_HRC_ - -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif #define STR_DBASE_HELPTEXT 28 diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc index c504c5a41911..8c4a17e3b75d 100644 --- a/dbaccess/source/ui/dlg/queryfilter.hrc +++ b/dbaccess/source/ui/dlg/queryfilter.hrc @@ -18,9 +18,7 @@ #ifndef DBAUI_QUERYFILTER_HRC #define DBAUI_QUERYFILTER_HRC -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif #define FT_WHEREFIELD 1 #define FT_WHERECOMP 2 diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc index 107ce35db88e..924f406c56d1 100644 --- a/dbaccess/source/ui/dlg/queryorder.hrc +++ b/dbaccess/source/ui/dlg/queryorder.hrc @@ -18,10 +18,7 @@ #ifndef DBAUI_QUERYORDER_HRC #define DBAUI_QUERYORDER_HRC -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif - #define FT_ORDERFIELD 1 #define FT_ORDERDIR 3 diff --git a/dbaccess/source/ui/inc/dbu_brw.hrc b/dbaccess/source/ui/inc/dbu_brw.hrc index 9d6a09ae1dbc..7e249446954d 100644 --- a/dbaccess/source/ui/inc/dbu_brw.hrc +++ b/dbaccess/source/ui/inc/dbu_brw.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_BRW_HRC_ #define _DBU_BRW_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif // FREE RID_STR_BRW_START + 0 #define RID_STR_DATABROWSER_FILTERED RID_STR_BRW_START + 1 diff --git a/dbaccess/source/ui/inc/dbu_control.hrc b/dbaccess/source/ui/inc/dbu_control.hrc index f14e940da067..d6171abcf7ef 100644 --- a/dbaccess/source/ui/inc/dbu_control.hrc +++ b/dbaccess/source/ui/inc/dbu_control.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_CONTROL_HRC_ #define _DBU_CONTROL_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif #define STR_TABLE_PRIV_NAME RID_STR_CONTROL_START #define STR_TABLE_PRIV_INSERT RID_STR_CONTROL_START + 1 diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc index a45dea828f0d..f5ac9a49a291 100644 --- a/dbaccess/source/ui/inc/dbu_dlg.hrc +++ b/dbaccess/source/ui/inc/dbu_dlg.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_DLG_HRC_ #define _DBU_DLG_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif #define PAGE_X 281 #define PAGE_Y 185 diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc index 2138553d4b58..8fe79b61c53f 100644 --- a/dbaccess/source/ui/inc/dbu_misc.hrc +++ b/dbaccess/source/ui/inc/dbu_misc.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_MISC_HRC_ #define _DBU_MISC_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif // free // free diff --git a/dbaccess/source/ui/inc/dbu_qry.hrc b/dbaccess/source/ui/inc/dbu_qry.hrc index 9686f8ab8a02..659254f41d98 100644 --- a/dbaccess/source/ui/inc/dbu_qry.hrc +++ b/dbaccess/source/ui/inc/dbu_qry.hrc @@ -18,10 +18,7 @@ #ifndef _DBU_QRY_HRC_ #define _DBU_QRY_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif - #define STR_QUERY_UNDO_MOVETABWIN RID_STR_QRY_START + 2 #define STR_QUERY_UNDO_SIZETABWIN RID_STR_QRY_START + 3 diff --git a/dbaccess/source/ui/inc/dbu_rel.hrc b/dbaccess/source/ui/inc/dbu_rel.hrc index ad1316741b6e..57eacdff2c7d 100644 --- a/dbaccess/source/ui/inc/dbu_rel.hrc +++ b/dbaccess/source/ui/inc/dbu_rel.hrc @@ -18,10 +18,7 @@ #ifndef _DBU_REL_HRC_ #define _DBU_REL_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif - #define STR_QUERY_REL_EDIT_RELATION RID_STR_REL_START #define STR_RELATIONDESIGN RID_STR_REL_START + 1 diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index b648806d7f5b..e81d36d8fb5a 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -19,9 +19,7 @@ #ifndef _DBU_RESOURCE_HRC_ #define _DBU_RESOURCE_HRC_ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define RID_DIALOG_START RID_DBACCESS_START #define RID_PAGE_START RID_DBACCESS_START diff --git a/dbaccess/source/ui/inc/dbu_tbl.hrc b/dbaccess/source/ui/inc/dbu_tbl.hrc index aff0dc82b744..1dc39f792974 100644 --- a/dbaccess/source/ui/inc/dbu_tbl.hrc +++ b/dbaccess/source/ui/inc/dbu_tbl.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_TBL_HRC_ #define _DBU_TBL_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif #define STR_HELP_AUTOINCREMENT_VALUE RID_STR_TBL_START #define STR_TABLEDESIGN_UNDO_PRIMKEY RID_STR_TBL_START + 1 diff --git a/dbaccess/source/ui/inc/dbu_uno.hrc b/dbaccess/source/ui/inc/dbu_uno.hrc index b9831f291414..c4546b1caad0 100644 --- a/dbaccess/source/ui/inc/dbu_uno.hrc +++ b/dbaccess/source/ui/inc/dbu_uno.hrc @@ -18,9 +18,7 @@ #ifndef _DBU_UNO_HRC_ #define _DBU_UNO_HRC_ -#ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" -#endif #define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) #define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) diff --git a/dbaccess/source/ui/querydesign/querydlg.hrc b/dbaccess/source/ui/querydesign/querydlg.hrc index f3232e05927a..749732f362a8 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hrc +++ b/dbaccess/source/ui/querydesign/querydlg.hrc @@ -19,9 +19,7 @@ #ifndef DBAUI_QUERYDLG_HRC #define DBAUI_QUERYDLG_HRC -#ifndef DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HRC #include "RelationControl.hrc" -#endif #define FL_JOIN 1 #define FT_LISTBOXTITLE 2 diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc index 36bc3cd73f9e..28f1a94e6a2f 100644 --- a/desktop/source/app/desktop.hrc +++ b/desktop/source/app/desktop.hrc @@ -19,9 +19,7 @@ #ifndef _DESKTOP_HRC_ #define _DESKTOP_HRC_ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define RID_DESKTOP_DIALOG_START 2000 // RID_FIRSTSTSTART_START 3000 diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index c021b34e18e8..874409d2dcac 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -19,9 +19,7 @@ #ifndef _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ #define _EXTENSIONS_FORMCTRLR_PROPRESID_HRC_ -#ifndef EXTENSIONS_PROPRESID_HRC #include "propresid.hrc" -#endif // ----------------------------------------------------------------------- // - Strings diff --git a/filter/source/xsltdialog/xmlfiltercommon.hrc b/filter/source/xsltdialog/xmlfiltercommon.hrc index 4f290d299c74..991f6d9e77ea 100644 --- a/filter/source/xsltdialog/xmlfiltercommon.hrc +++ b/filter/source/xsltdialog/xmlfiltercommon.hrc @@ -18,9 +18,7 @@ #ifndef _XMLFILTERCOMMON_HRC_ #define _XMLFILTERCOMMON_HRC_ -#ifndef _FILTER_HRC #include "filter.hrc" -#endif #define DLG_XML_SOURCE_FILE_DIALOG (RID_XSLT_DIALOG_START+0) #define DLG_XML_FILTER_SETTINGS_DIALOG (RID_XSLT_DIALOG_START+1) diff --git a/forms/source/inc/frm_resource.hrc b/forms/source/inc/frm_resource.hrc index 8e7e59254f10..2e67fe6665f2 100644 --- a/forms/source/inc/frm_resource.hrc +++ b/forms/source/inc/frm_resource.hrc @@ -19,15 +19,11 @@ #ifndef _FRM_RESOURCE_HRC_ #define _FRM_RESOURCE_HRC_ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif //------------------------------------------------------------------------------ #define RID_FRM_STRINGS_START RID_FORMLAYER_START - - //------------------------------------------------------------------------------ //- String-IDs #define RID_BASELISTBOX_ERROR_FILLLIST ( RID_FRM_STRINGS_START + 0 ) diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc index 39b2f9694c26..f61adf4d8afb 100644 --- a/forms/source/inc/property.hrc +++ b/forms/source/inc/property.hrc @@ -27,13 +27,8 @@ #ifndef _FRM_PROPERTY_HRC_ #define _FRM_PROPERTY_HRC_ -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif - -#ifndef FRM_STRINGS_HXX #include "frm_strings.hxx" -#endif //......................................................................... namespace frm diff --git a/formula/source/ui/inc/ForResId.hrc b/formula/source/ui/inc/ForResId.hrc index 059b8d0108e5..0a9f7ae9f898 100644 --- a/formula/source/ui/inc/ForResId.hrc +++ b/formula/source/ui/inc/ForResId.hrc @@ -19,11 +19,7 @@ #ifndef FORMULA_FORRESID_HRC #define FORMULA_FORRESID_HRC -// include ----------------------------------------------------------- - -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define RID_DIALOG_START RID_FORMULA_START #define RID_PAGE_START RID_FORMULA_START diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index 628485f34270..4d482b724c78 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -19,11 +19,7 @@ #ifndef _RPTUI_DLGRESID_HRC #define _RPTUI_DLGRESID_HRC -// include ----------------------------------------------------------- - -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif #define RID_DIALOG_START RID_RPT_START #define RID_PAGE_START RID_RPT_START diff --git a/reportdesign/source/core/inc/core_resource.hrc b/reportdesign/source/core/inc/core_resource.hrc index c006546eeb40..9b9f8ed8f8a9 100644 --- a/reportdesign/source/core/inc/core_resource.hrc +++ b/reportdesign/source/core/inc/core_resource.hrc @@ -19,9 +19,7 @@ #ifndef REPORTDESIGN_CORE_RESOURCE_HRC_ #define REPORTDESIGN_CORE_RESOURCE_HRC_ -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif //------------------------------------------------------------------------------ #define RID_CORE_STRINGS_START RID_RPT_START diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 3988fe36d9ad..b3f194ae0dad 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -28,13 +28,8 @@ #ifndef SC_SC_HRC #define SC_SC_HRC -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> // ->#include <solar.hrc> -#endif - -#ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> // ->Svx-IDs -#endif #include "sfx2/sfxcommands.h" #include "svx/svxcommands.h" diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 990a4fa1acd5..a279b290d5c1 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -19,9 +19,7 @@ #ifndef _SD_APP_HRC_ #define _SD_APP_HRC_ -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif // HelpIDs fuer Vorlagen #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc index f6a5f66eb13c..132ce92f2472 100644 --- a/sd/inc/glob.hrc +++ b/sd/inc/glob.hrc @@ -15,9 +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 _SFX_HRC + +#ifndef _SDGLOB_HRC +#define _SDGLOB_HRC + #include <sfx2/sfx.hrc> -#endif #define RID_GLOB_START RID_APP_START+750 @@ -139,3 +141,5 @@ #define STR_SLIDE_TRANSITION_PANE RID_GLOB_START+228 #define RID_SLIDESORTER_ICONS RID_GLOB_START+227 + +#endif // _SDGLOB_HRC diff --git a/sd/inc/sdattr.hrc b/sd/inc/sdattr.hrc index edc76cac7c49..7874e0c94ab5 100644 --- a/sd/inc/sdattr.hrc +++ b/sd/inc/sdattr.hrc @@ -19,9 +19,7 @@ #ifndef _SDATTR_HRC #define _SDATTR_HRC -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif // Anfang Page-Attribute #define ATTR_PAGE_START SID_SD_START + 1234 diff --git a/sd/source/ui/accessibility/accessibility.hrc b/sd/source/ui/accessibility/accessibility.hrc index 0adc44a8f0b0..678328edd4f1 100644 --- a/sd/source/ui/accessibility/accessibility.hrc +++ b/sd/source/ui/accessibility/accessibility.hrc @@ -19,9 +19,7 @@ #ifndef _SD_ACCESSIBILITY_HRC #define _SD_ACCESSIBILITY_HRC -#ifndef _SFX_HRC #include <sfx2/sfx.hrc> -#endif #define SID_SD_A11Y_START (SID_SD_START+600) diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 7ac678471698..319a681ee73c 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -16,9 +16,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "sfx2/sfx.hrc" -#ifndef _SD_CFGID_HXX #include "cfgids.hxx" -#endif + #define STR_NULL (RID_APP_START+3) #define STR_INSERTPAGE (RID_APP_START+35) #define STR_INSERTLAYER (RID_APP_START+37) diff --git a/sfx2/inc/sfx2/cntids.hrc b/sfx2/inc/sfx2/cntids.hrc index b5207bcb431e..429bf65cc15b 100644 --- a/sfx2/inc/sfx2/cntids.hrc +++ b/sfx2/inc/sfx2/cntids.hrc @@ -19,13 +19,8 @@ #ifndef _CNTIDS_HRC #define _CNTIDS_HRC -#ifndef _CNTWIDS_HRC #include <svl/cntwids.hrc> -#endif - -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif // Slot-ID's ----------------------------------------------------------------- diff --git a/sfx2/inc/sfx2/sfx.hrc b/sfx2/inc/sfx2/sfx.hrc index f73bd5c85649..cb87dc5362c3 100644 --- a/sfx2/inc/sfx2/sfx.hrc +++ b/sfx2/inc/sfx2/sfx.hrc @@ -19,13 +19,8 @@ #ifndef _SFX_HRC #define _SFX_HRC -#ifndef _SOLAR_HRC #include <svl/solar.hrc> -#endif - -#ifndef _MEMBERID_HRC #include <svl/memberid.hrc> -#endif #define RID_GROUPS_OFFSET 32000 #define RID_GROUPS_SFXOFFSET 32700 @@ -277,9 +272,7 @@ // Slot-Ids ------------------------------------------------------------- -#ifndef _SFXSIDS_HRC #include <sfx2/sfxsids.hrc> -#endif #define HID_INTERFACE_SFXMAILVIEW 13 #define HID_INTERFACE_SFXEXPLVIEWSH 17 diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 6530d95648bf..d4d85ddb32ee 100644 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc @@ -15,9 +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 _SVX_DIALOGS_HRC + +#ifndef _SVX_GALLERY_HRC +#define _SVX_GALLERY_HRC + #include <svx/dialogs.hrc> -#endif #include "galtheme.hrc" // ----------- @@ -147,3 +149,5 @@ #define GALLERY_BROWSER1 1 #define GALLERY_BROWSER2 2 #define GALLERY_SPLITTER 1 + +#endif // _SVX_GALLERY_HRC diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc index 359e59c50629..43b983533ddd 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc @@ -20,10 +20,7 @@ #define _TEXTCONVERSIONDLGS_CHINESE_DIRECTION_HRC #include "chinese_direction_ids.hrc" - -#ifndef _SVT_CONTROLDIMS_HRC_ #include <svtools/controldims.hrc> -#endif #define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ RadioButton RB_TO_SIMPLIFIED \ diff --git a/sw/inc/rcid.hrc b/sw/inc/rcid.hrc index 8f9bd1c6055c..6081a5e4d807 100644 --- a/sw/inc/rcid.hrc +++ b/sw/inc/rcid.hrc @@ -18,9 +18,7 @@ #ifndef _RDIC_HRC #define _RDIC_HRC -#ifndef _SFXSIDS_HRC //autogen #include <sfx2/sfxsids.hrc> -#endif #define IMAGE_MASK_COLOR Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } // ---------------------------------------------------------------- diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 8b961210078f..9ede06491030 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -19,12 +19,8 @@ #ifndef UUI_IDS_HRC #define UUI_IDS_HRC -#ifndef _SOLAR_HRC #include "svl/solar.hrc" -#endif -#ifndef _ERRCODE_HXX #include "tools/errcode.hxx" -#endif #define RID_KEEP_PASSWORD (RID_UUI_START + 0) #define RID_SAVE_PASSWORD (RID_UUI_START + 1) |