dbaccess: cleanup

* remove an external guard
* fix some include guards

Change-Id: I4e5b5fc5c50acfd81321377e7956e33c838edeba

13 files changed, 20 insertions, 31 deletions

diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index 6250d2ff8f95..fc60a5a1e237 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -105,6 +105,7 @@ namespace dbaccess
         virtual void SAL_CALL updateNumericObject( const ::com::sun::star::uno::Any& x, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // _DBACORE_RESULTCOLUMN_HXX_
+
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_DATACOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index d5fec73809cd..968db008c65e 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACORE_RESULTCOLUMN_HXX_
-#define _DBACORE_RESULTCOLUMN_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTCOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTCOLUMN_HXX
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <column.hxx>
@@ -85,6 +85,6 @@ namespace dbaccess
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
     };
 }
-#endif // _DBACORE_RESULTCOLUMN_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index d09dca9d161f..7e84d4717c56 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -86,6 +86,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // _DBAUI_DETAILPAGES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 8defb64b3118..156bf3377d96 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -102,6 +102,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBWIZ2_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_TEXTCONNECTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index ffc97be64249..d042a3da93e7 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DETAILPAGES_HXX_
-#define _DBAUI_DETAILPAGES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DETAILPAGES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DETAILPAGES_HXX
 
 #include "adminpages.hxx"
 #include "charsets.hxx"
@@ -289,6 +289,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DETAILPAGES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DETAILPAGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx
index fd20d553c807..b0500ede3d2c 100644
--- a/dbaccess/source/ui/inc/dbwizsetup.hxx
+++ b/dbaccess/source/ui/inc/dbwizsetup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBWIZ2_HXX
-#define DBAUI_DBWIZ2_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZSETUP_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZSETUP_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "dsntypes.hxx"
@@ -184,6 +184,6 @@ private:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBWIZ2_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZSETUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx
index dcc67c6d9bc7..0936cd741e18 100644
--- a/dbaccess/source/ui/inc/unoadmin.hxx
+++ b/dbaccess/source/ui/inc/unoadmin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_UNOADMIN_
-#define _DBAUI_UNOADMIN_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UNOADMIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UNOADMIN_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -59,6 +59,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_UNOADMIN_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UNOADMIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
index f9bf52ed23b0..5e829066b32c 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx
@@ -17,12 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBTYPEWIZDLG_HXX
-#define DBAUI_DBTYPEWIZDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
@@ -62,6 +60,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBTYPEWIZDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 39a3fa68bc10..8de36e74dfeb 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
@@ -66,6 +64,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBTYPEWIZDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index 0e78b271d924..3b5c2bf496af 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index edd0c4b048f5..b62bca4c7b44 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index 32ddcdc07a2c..09beb95f3720 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx
index 53f4f17f6bae..b4ae0a336f44 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -20,9 +20,7 @@
 #include "dbustrings.hrc"
 #include <toolkit/awt/vclxwindow.hxx>
 #include "dbu_reghelper.hxx"
-#ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
-#endif
 #include "dbadmin.hxx"
 #include <comphelper/extract.hxx>
 #include <comphelper/processfactory.hxx>