fixincludeguards.sh: connectivity

16 files changed, 47 insertions, 47 deletions

diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index e230a7a80bb6..6c6e717ae0ab 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_CATALOG_HXX_
-#define _CONNECTIVITY_FILE_CATALOG_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX
 
 #include "connectivity/sdbcx/VCatalog.hxx"
 
@@ -59,6 +59,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_CATALOG_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 110f1d11caf4..ad2e5575b382 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_COLUMNS_HXX_
-#define _CONNECTIVITY_FILE_COLUMNS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOLUMNS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -47,6 +47,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_COLUMNS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index a53c8423b586..cbd73b38dc5b 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.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_FILE_OCONNECTION_HXX_
-#define _CONNECTIVITY_FILE_OCONNECTION_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCONNECTION_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCONNECTION_HXX
 
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
@@ -149,6 +149,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_OCONNECTION_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index 27cdd86bc739..b36741f89206 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_ODATABASEMETADATA_HXX_
-#define _CONNECTIVITY_FILE_ODATABASEMETADATA_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATABASEMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATABASEMETADATA_HXX
 
 #include "TDatabaseMetaDataBase.hxx"
 #include "file/FConnection.hxx"
@@ -185,6 +185,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_ODATABASEMETADATA_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATABASEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 79f6df54d3ef..bb22b9588195 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_ODRIVER_HXX_
-#define _CONNECTIVITY_FILE_ODRIVER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDRIVER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -74,7 +74,7 @@ namespace connectivity
     }
 
 }
-#endif //_CONNECTIVITY_FILE_ODRIVER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDRIVER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index b73d941263b6..6421f41a3b4e 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_FNUMERICFUNCTIONS_HXX_
-#define _CONNECTIVITY_FILE_FNUMERICFUNCTIONS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
 
 #include "file/fcode.hxx"
 #include "file/filedllapi.hxx"
@@ -363,6 +363,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_FILE_FNUMERICFUNCTIONS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index 08be47e2ac3d..e380c84d2ddd 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_OPREPAREDSTATEMENT_HXX_
-#define _CONNECTIVITY_FILE_OPREPAREDSTATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FPREPAREDSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FPREPAREDSTATEMENT_HXX
 
 #include "file/filedllapi.hxx"
 #include "file/FStatement.hxx"
@@ -121,7 +121,7 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_OPREPAREDSTATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FPREPAREDSTATEMENT_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index ed79248f47b0..064531b3c1d5 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_FRESULTSET_HXX_
-#define _CONNECTIVITY_FILE_FRESULTSET_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSET_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSET_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index a52ab750adca..6f18b285ac3a 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_ORESULTSETMETADATA_HXX_
-#define _CONNECTIVITY_FILE_ORESULTSETMETADATA_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSETMETADATA_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSETMETADATA_HXX
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -78,7 +78,7 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_ORESULTSETMETADATA_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FRESULTSETMETADATA_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index a8d1e07b30e6..6cc8bf1482bb 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_OSTATEMENT_HXX_
-#define _CONNECTIVITY_FILE_OSTATEMENT_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX
 
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
@@ -203,6 +203,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_OSTATEMENT_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index d341703f0023..00e6f8d1b389 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_TABLE_HXX_
-#define _CONNECTIVITY_FILE_TABLE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX
 
 #include "connectivity/sdbcx/VTable.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -106,6 +106,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_TABLE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index 2728c85582c1..828e93bb7663 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_TABLES_HXX_
-#define _CONNECTIVITY_FILE_TABLES_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX
 
 #include "file/filedllapi.hxx"
 #include "connectivity/sdbcx/VCollection.hxx"
@@ -49,6 +49,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_TABLES_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index 796c2d6b0ba3..d34ff5fc9258 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_FANALYZER_HXX_
-#define _CONNECTIVITY_FILE_FANALYZER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
 
 #include "file/fcomp.hxx"
 #include "file/filedllapi.hxx"
@@ -82,6 +82,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_FANALYZER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 842f4cf0eaa2..6ff472f12e5d 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_FILE_FCODE_HXX_
-#define _CONNECTIVITY_FILE_FCODE_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCODE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCODE_HXX
 
 #include "connectivity/sqliterator.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -376,6 +376,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_FILE_FCODE_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 1ad755422ad8..9ba2f276f2a5 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.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_FILE_FCOMP_HXX_
-#define _CONNECTIVITY_FILE_FCOMP_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
 
 #include "file/fcode.hxx"
 #include "file/filedllapi.hxx"
@@ -106,6 +106,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_FILE_FCOMP_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index 9f27eb39fa1f..05246ea7676c 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_QUOTED_STRING_HXX
-#define CONNECTIVITY_QUOTED_STRING_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_QUOTEDSTRING_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_QUOTEDSTRING_HXX
 
 #include <rtl/ustring.hxx>
 #include "file/filedllapi.hxx"
@@ -45,6 +45,6 @@ namespace connectivity
     };
 }
 
-#endif // CONNECTIVITY_QUOTED_STRING_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_QUOTEDSTRING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */