hrc cleanup: Remove include guards

Also add some missing include guards.

Change-Id: I320a3c017ca65d34f2cd516849bcde3dec9b33f1

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

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; }

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

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

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

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

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

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

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

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 )

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
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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 )

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

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

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

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)

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 )

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

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

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

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

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"

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)

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

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

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)
 

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)

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 -----------------------------------------------------------------
 

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

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

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 \

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; }
 // ----------------------------------------------------------------

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)