hrc cleanup: Remove include guards

Also add some missing include guards.

Change-Id: I320a3c017ca65d34f2cd516849bcde3dec9b33f1

19 files changed, 0 insertions, 54 deletions

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