16 files changed, 48 insertions, 48 deletions
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index b5211056a30f..9fa3ca523f83 100644
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_CATALOG_HXX_
-#define _CONNECTIVITY_DBASE_CATALOG_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCATALOG_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCATALOG_HXX
 
 #include "file/FCatalog.hxx"
 
@@ -37,6 +37,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_CATALOG_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCATALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DCode.hxx b/connectivity/source/inc/dbase/DCode.hxx
index 5135a956572f..0208f8387d9e 100644
--- a/connectivity/source/inc/dbase/DCode.hxx
+++ b/connectivity/source/inc/dbase/DCode.hxx
@@ -16,8 +16,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 CONNECTIVITY_DBASE_DCODE_HXX
-#define CONNECTIVITY_DBASE_DCODE_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX
 
 #include "file/fanalyzer.hxx"
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -57,6 +57,6 @@ namespace connectivity
     }
 }
 
-#endif // CONNECTIVITY_DBASE_DCODE_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index ed7a4db15938..633be716ab2c 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_COLUMNS_HXX_
-#define _CONNECTIVITY_DBASE_COLUMNS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCOLUMNS_HXX
 
 #include "file/FColumns.hxx"
 
@@ -43,6 +43,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_COLUMNS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index bb74bb0b8241..6dcc0d137e58 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_DCONNECTION_HXX_
-#define _CONNECTIVITY_DBASE_DCONNECTION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCONNECTION_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCONNECTION_HXX
 
 #include "file/FConnection.hxx"
 
@@ -46,6 +46,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_DCONNECTION_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index 7c5a60ef3d8d..e4da42a591ed 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_ODATABASEMETADATA_HXX_
-#define _CONNECTIVITY_DBASE_ODATABASEMETADATA_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDATABASEMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDATABASEMETADATA_HXX
 
 #include "file/FDatabaseMetaData.hxx"
 
@@ -56,6 +56,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_ODATABASEMETADATA_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index 32cb069de974..b6d45000ffc4 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_DDRIVER_HXX_
-#define _CONNECTIVITY_DBASE_DDRIVER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include "connectivity/CommonTools.hxx"
@@ -49,6 +49,6 @@ namespace connectivity
     }
 
 }
-#endif //_CONNECTIVITY_DBASE_DDRIVER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 833378cccf5c..e672390bf6e2 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_INDEX_HXX_
-#define _CONNECTIVITY_DBASE_INDEX_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
 
 #include "connectivity/sdbcx/VIndex.hxx"
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -146,7 +146,7 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_DBASE_INDEX_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 83b60c19a9a1..95c9b2075619 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_INDEXCOLUMNS_HXX_
-#define _CONNECTIVITY_DBASE_INDEXCOLUMNS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include "dbase/DIndex.hxx"
@@ -47,7 +47,7 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_INDEXCOLUMNS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 6c72c75a8c4b..772bfb93de99 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_INDEXITER_HXX_
-#define _CONNECTIVITY_DBASE_INDEXITER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXITER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXITER_HXX
 
 #include "file/fcode.hxx"
 #include "dbase/DIndex.hxx"
@@ -73,6 +73,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_INDEXITER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXITER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index f3b15b219a94..a431185bb1e5 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_INDEXES_HXX_
-#define _CONNECTIVITY_DBASE_INDEXES_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include "dbase/DTable.hxx"
@@ -49,6 +49,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_INDEXES_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 1dfe8a48795e..63970aff69f8 100644
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_DPREPAREDSTATEMENT_HXX_
-#define _CONNECTIVITY_DBASE_DPREPAREDSTATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DPREPAREDSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DPREPAREDSTATEMENT_HXX
 
 #include "file/FPreparedStatement.hxx"
 
@@ -38,6 +38,6 @@ namespace connectivity
     }
 }
 
-#endif //_CONNECTIVITY_DBASE_DPREPAREDSTATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DPREPAREDSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index 3f167dface22..bc2980088bd7 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -16,8 +16,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 _CONNECTIVITY_DBASE_DRESULTSET_HXX_
-#define _CONNECTIVITY_DBASE_DRESULTSET_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DRESULTSET_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DRESULTSET_HXX
 
 #include "file/FResultSet.hxx"
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
@@ -78,6 +78,6 @@ namespace connectivity
         };
     }
 }
-#endif //_CONNECTIVITY_DBASE_DRESULTSET_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DRESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index 6d57651c60b4..0e88330d0fb2 100644
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_DSTATEMENT_HXX_
-#define _CONNECTIVITY_DBASE_DSTATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DSTATEMENT_HXX
 
 #include "file/FStatement.hxx"
 
@@ -38,6 +38,6 @@ namespace connectivity
     }
 }
 
-#endif //_CONNECTIVITY_DBASE_DSTATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index c0ad186ffa38..a8d602376aea 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_TABLE_HXX_
-#define _CONNECTIVITY_DBASE_TABLE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
 
 #include "file/FTable.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
@@ -170,6 +170,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_TABLE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index 95ba5b27b5d0..33319f682a3a 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_DBASE_TABLES_HXX_
-#define _CONNECTIVITY_DBASE_TABLES_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLES_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLES_HXX
 
 #include "file/FTables.hxx"
 
@@ -46,6 +46,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_DBASE_TABLES_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index d79358b4f0af..839fdc8e5b74 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -16,8 +16,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 _CONNECTIVITY_DBASE_INDEXNODE_HXX_
-#define _CONNECTIVITY_DBASE_INDEXNODE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
 
 #include "file/fcode.hxx"
 #include "file/FTable.hxx"
@@ -335,7 +335,7 @@ namespace connectivity
 
 
 
-#endif // _CONNECTIVITY_DBASE_INDEXNODE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */