[Libreoffice-commits] core.git: connectivity/inc connectivity/source include/connectivity solenv/clang-format

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 10 06:12:34 UTC 2020 

 connectivity/inc/ParameterCont.hxx                  |    4 --
 connectivity/inc/SQLStatementHelper.hxx             |    5 ---
 connectivity/inc/TIndex.hxx                         |    6 +---
 connectivity/inc/TIndexColumns.hxx                  |    4 --
 connectivity/inc/TKey.hxx                           |    6 +---
 connectivity/inc/TKeyColumns.hxx                    |    4 --
 connectivity/inc/pch/precompiled_dbase.hxx          |    2 -
 connectivity/inc/pch/precompiled_flat.hxx           |    2 -
 connectivity/inc/sdbcx/VCatalog.hxx                 |    5 ---
 connectivity/inc/sdbcx/VGroup.hxx                   |    5 ---
 connectivity/inc/sdbcx/VIndex.hxx                   |    7 +---
 connectivity/inc/sdbcx/VIndexColumn.hxx             |    4 --
 connectivity/inc/sdbcx/VKey.hxx                     |    7 +---
 connectivity/inc/sdbcx/VKeyColumn.hxx               |    4 --
 connectivity/inc/sdbcx/VTypeDef.hxx                 |    5 ---
 connectivity/inc/sdbcx/VUser.hxx                    |    4 --
 connectivity/source/commontools/TIndex.cxx          |    4 +-
 connectivity/source/commontools/TIndexColumns.cxx   |    6 ++--
 connectivity/source/commontools/TIndexes.cxx        |    2 -
 connectivity/source/commontools/TKey.cxx            |    4 +-
 connectivity/source/commontools/TKeyColumns.cxx     |    6 ++--
 connectivity/source/commontools/TKeys.cxx           |    2 -
 connectivity/source/commontools/TTableHelper.cxx    |    2 -
 connectivity/source/commontools/dbtools.cxx         |    2 -
 connectivity/source/commontools/dbtools2.cxx        |    2 -
 connectivity/source/commontools/parameters.cxx      |    2 -
 connectivity/source/drivers/dbase/DIndexColumns.cxx |    2 -
 connectivity/source/drivers/evoab2/NCatalog.hxx     |    2 -
 connectivity/source/drivers/firebird/Catalog.hxx    |    2 -
 connectivity/source/drivers/firebird/User.hxx       |    2 -
 connectivity/source/drivers/macab/MacabCatalog.hxx  |    2 -
 connectivity/source/drivers/mork/MCatalog.hxx       |    2 -
 connectivity/source/inc/ado/ACatalog.hxx            |    2 -
 connectivity/source/inc/ado/AGroup.hxx              |    2 -
 connectivity/source/inc/ado/AIndex.hxx              |    2 -
 connectivity/source/inc/ado/AKey.hxx                |    2 -
 connectivity/source/inc/ado/AUser.hxx               |    2 -
 connectivity/source/inc/dbase/DIndex.hxx            |    2 -
 connectivity/source/inc/file/FCatalog.hxx           |    2 -
 connectivity/source/inc/hsqldb/HCatalog.hxx         |    2 -
 connectivity/source/inc/hsqldb/HUser.hxx            |    2 -
 connectivity/source/inc/mysql/YCatalog.hxx          |    2 -
 connectivity/source/inc/mysql/YTables.hxx           |    2 -
 connectivity/source/inc/mysql/YUser.hxx             |    2 -
 connectivity/source/sdbcx/VCatalog.cxx              |    2 -
 connectivity/source/sdbcx/VGroup.cxx                |    2 -
 connectivity/source/sdbcx/VIndex.cxx                |    2 -
 connectivity/source/sdbcx/VIndexColumn.cxx          |    2 -
 connectivity/source/sdbcx/VKey.cxx                  |    2 -
 connectivity/source/sdbcx/VKeyColumn.cxx            |    2 -
 connectivity/source/sdbcx/VUser.cxx                 |    2 -
 include/connectivity/internalnode.hxx               |    5 ---
 include/connectivity/sqlbison_exports.hxx           |    5 ---
 include/connectivity/sqlscan.hxx                    |    5 ---
 solenv/clang-format/blacklist                       |   30 ++++++++++----------
 55 files changed, 79 insertions(+), 122 deletions(-)

New commits:
commit a2a8ad842fccbf214e2e25414fc715246408aa27
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Fri Feb 7 16:10:07 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Mon Feb 10 07:11:58 2020 +0100

    move some headers inside connectivity
    
    Change-Id: I9a72a9d59db4f198c2261d41143e3b8344845285
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88202
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/connectivity/ParameterCont.hxx b/connectivity/inc/ParameterCont.hxx
similarity index 92%
rename from include/connectivity/ParameterCont.hxx
rename to connectivity/inc/ParameterCont.hxx
index 841a96222aa2..848cec78e4e0 100644
--- a/include/connectivity/ParameterCont.hxx
+++ b/connectivity/inc/ParameterCont.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
-#define INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
+#pragma once
 
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <comphelper/interaction.hxx>
@@ -46,6 +45,5 @@ namespace dbtools
         void operator =(const OParameterContinuation&) = delete;
     };
 } // dbtools
-#endif // INCLUDED_CONNECTIVITY_PARAMETERCONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/SQLStatementHelper.hxx b/connectivity/inc/SQLStatementHelper.hxx
similarity index 89%
rename from include/connectivity/SQLStatementHelper.hxx
rename to connectivity/inc/SQLStatementHelper.hxx
index 027105ff7cc7..0b5ddecf09db 100644
--- a/include/connectivity/SQLStatementHelper.hxx
+++ b/connectivity/inc/SQLStatementHelper.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
-#define INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -41,6 +40,4 @@ namespace dbtools
 }   // namespace dbtools
 
 
-#endif // INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TIndex.hxx b/connectivity/inc/TIndex.hxx
similarity index 90%
rename from include/connectivity/TIndex.hxx
rename to connectivity/inc/TIndex.hxx
index de03af913e6b..1ac2f5c4f9f2 100644
--- a/include/connectivity/TIndex.hxx
+++ b/connectivity/inc/TIndex.hxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_TINDEX_HXX
-#define INCLUDED_CONNECTIVITY_TINDEX_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <connectivity/sdbcx/VIndex.hxx>
+#include "sdbcx/VIndex.hxx"
 
 namespace connectivity
 {
@@ -43,6 +42,5 @@ namespace connectivity
         OTableHelper* getTable() const { return m_pTable; }
     };
 }
-#endif // INCLUDED_CONNECTIVITY_TINDEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TIndexColumns.hxx b/connectivity/inc/TIndexColumns.hxx
similarity index 91%
rename from include/connectivity/TIndexColumns.hxx
rename to connectivity/inc/TIndexColumns.hxx
index 37eecea0497c..aa5687afc212 100644
--- a/include/connectivity/TIndexColumns.hxx
+++ b/connectivity/inc/TIndexColumns.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
-#define INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
+#pragma once
 
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -38,6 +37,5 @@ namespace connectivity
                         const ::std::vector< OUString> &_rVector);
     };
 }
-#endif // INCLUDED_CONNECTIVITY_TINDEXCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TKey.hxx b/connectivity/inc/TKey.hxx
similarity index 90%
rename from include/connectivity/TKey.hxx
rename to connectivity/inc/TKey.hxx
index 131d1c7fcbee..a4d1d92ff2cc 100644
--- a/include/connectivity/TKey.hxx
+++ b/connectivity/inc/TKey.hxx
@@ -17,11 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_TKEY_HXX
-#define INCLUDED_CONNECTIVITY_TKEY_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <connectivity/sdbcx/VKey.hxx>
+#include "sdbcx/VKey.hxx"
 
 namespace connectivity
 {
@@ -40,7 +39,6 @@ namespace connectivity
         OTableHelper* getTable() const { return m_pTable; }
     };
 }
-#endif // INCLUDED_CONNECTIVITY_TKEY_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/TKeyColumns.hxx b/connectivity/inc/TKeyColumns.hxx
similarity index 92%
rename from include/connectivity/TKeyColumns.hxx
rename to connectivity/inc/TKeyColumns.hxx
index 7d8b16489125..c40cd1cd7a61 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/connectivity/inc/TKeyColumns.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
-#define INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
+#pragma once
 
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -38,6 +37,5 @@ namespace connectivity
                         const ::std::vector< OUString> &_rVector);
     };
 }
-#endif // INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/pch/precompiled_dbase.hxx b/connectivity/inc/pch/precompiled_dbase.hxx
index 8882fc958888..7d84b5570cc2 100644
--- a/connectivity/inc/pch/precompiled_dbase.hxx
+++ b/connectivity/inc/pch/precompiled_dbase.hxx
@@ -219,7 +219,7 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/sqliterator.hxx>
 #include <propertyids.hxx>
diff --git a/connectivity/inc/pch/precompiled_flat.hxx b/connectivity/inc/pch/precompiled_flat.hxx
index bcf25cae8f5c..4712783cb181 100644
--- a/connectivity/inc/pch/precompiled_flat.hxx
+++ b/connectivity/inc/pch/precompiled_flat.hxx
@@ -201,7 +201,7 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #endif // PCH_LEVEL >= 4
 
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/sdbcx/VCatalog.hxx
similarity index 97%
rename from include/connectivity/sdbcx/VCatalog.hxx
rename to connectivity/inc/sdbcx/VCatalog.hxx
index 1cf20e1ce257..a9b1d18bb0a3 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/sdbcx/VCatalog.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
+#pragma once
 
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
@@ -116,6 +115,4 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/sdbcx/VGroup.hxx
similarity index 96%
rename from include/connectivity/sdbcx/VGroup.hxx
rename to connectivity/inc/sdbcx/VGroup.hxx
index f393c421e33b..dcf50d1a98b0 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/connectivity/inc/sdbcx/VGroup.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
+#pragma once
 
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
@@ -94,7 +93,5 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/sdbcx/VIndex.hxx
similarity index 95%
rename from include/connectivity/sdbcx/VIndex.hxx
rename to connectivity/inc/sdbcx/VIndex.hxx
index ecfced63e18a..8bf0a4db2be4 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/connectivity/inc/sdbcx/VIndex.hxx
@@ -17,14 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
+#pragma once
 
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <connectivity/sdbcx/VTypeDef.hxx>
+#include <sdbcx/VTypeDef.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -98,6 +97,4 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/sdbcx/VIndexColumn.hxx
similarity index 93%
rename from include/connectivity/sdbcx/VIndexColumn.hxx
rename to connectivity/inc/sdbcx/VIndexColumn.hxx
index 89f7007065a3..6677b291ea5c 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/sdbcx/VIndexColumn.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
@@ -57,6 +56,5 @@ namespace connectivity
         };
     }
 }
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VINDEXCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VKey.hxx b/connectivity/inc/sdbcx/VKey.hxx
similarity index 96%
rename from include/connectivity/sdbcx/VKey.hxx
rename to connectivity/inc/sdbcx/VKey.hxx
index f6a04edcf773..01e1d839f8b4 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/connectivity/inc/sdbcx/VKey.hxx
@@ -17,13 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
+#pragma once
 
 
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <connectivity/sdbcx/VTypeDef.hxx>
+#include <sdbcx/VTypeDef.hxx>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -108,7 +107,5 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VKEY_HXX
-
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/sdbcx/VKeyColumn.hxx
similarity index 94%
rename from include/connectivity/sdbcx/VKeyColumn.hxx
rename to connectivity/inc/sdbcx/VKeyColumn.hxx
index b64c536fd61c..cb6548f31964 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/sdbcx/VKeyColumn.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
@@ -59,6 +58,5 @@ namespace connectivity
         };
     }
 }
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VKEYCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/sdbcx/VTypeDef.hxx
similarity index 90%
rename from include/connectivity/sdbcx/VTypeDef.hxx
rename to connectivity/inc/sdbcx/VTypeDef.hxx
index 8328c3573195..2054003930e4 100644
--- a/include/connectivity/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/sdbcx/VTypeDef.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
+#pragma once
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <cppuhelper/compbase.hxx>
@@ -35,6 +34,4 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VTYPEDEF_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sdbcx/VUser.hxx b/connectivity/inc/sdbcx/VUser.hxx
similarity index 96%
rename from include/connectivity/sdbcx/VUser.hxx
rename to connectivity/inc/sdbcx/VUser.hxx
index a407a063f0d7..c16679466bdd 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/connectivity/inc/sdbcx/VUser.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
-#define INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
+#pragma once
 
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
@@ -95,6 +94,5 @@ namespace connectivity
     }
 }
 
-#endif // INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index cba83f780137..f7f891308e40 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/TIndex.hxx>
-#include <connectivity/TIndexColumns.hxx>
+#include <TIndex.hxx>
+#include <TIndexColumns.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/TTableHelper.hxx>
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index d69358e35489..bbb5ca706f20 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/TIndexColumns.hxx>
-#include <connectivity/sdbcx/VIndexColumn.hxx>
+#include <TIndexColumns.hxx>
+#include <sdbcx/VIndexColumn.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include <connectivity/TIndex.hxx>
+#include <TIndex.hxx>
 #include <connectivity/TTableHelper.hxx>
 #include <TConnection.hxx>
 
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index a40d2c7fa5de..aeb9253b0885 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <connectivity/TIndexes.hxx>
-#include <connectivity/TIndex.hxx>
+#include <TIndex.hxx>
 #include <connectivity/TTableHelper.hxx>
 #include <com/sun/star/sdb/tools/XIndexAlteration.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 16910f558ef4..1341291abcf3 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/TKey.hxx>
-#include <connectivity/TKeyColumns.hxx>
+#include <TKey.hxx>
+#include <TKeyColumns.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <TConnection.hxx>
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 8c4d36a8cbc9..acbfc54bf000 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/TKeyColumns.hxx>
-#include <connectivity/TKey.hxx>
-#include <connectivity/sdbcx/VKeyColumn.hxx>
+#include <TKeyColumns.hxx>
+#include <TKey.hxx>
+#include <sdbcx/VKeyColumn.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index d9e217c37a72..57b49b6e8416 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <connectivity/TKeys.hxx>
-#include <connectivity/TKey.hxx>
+#include <TKey.hxx>
 #include <connectivity/TTableHelper.hxx>
 #include <com/sun/star/sdb/tools/XKeyAlteration.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index d677887db1d4..246becfa6ae0 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdb/tools/XTableAlteration.hpp>
 #include <com/sun/star/sdb/tools/XKeyAlteration.hpp>
 #include <com/sun/star/sdb/tools/XIndexAlteration.hpp>
-#include <connectivity/sdbcx/VKey.hxx>
+#include <sdbcx/VKey.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 9d4dcd18106d..9398a50a7bc0 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -19,7 +19,7 @@
 
 #include <connectivity/CommonTools.hxx>
 #include <TConnection.hxx>
-#include <connectivity/ParameterCont.hxx>
+#include <ParameterCont.hxx>
 
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index a5e438f3cb77..26b60b23933a 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -20,7 +20,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <connectivity/dbcharset.hxx>
-#include <connectivity/SQLStatementHelper.hxx>
+#include <SQLStatementHelper.hxx>
 #include <unotools/confignode.hxx>
 #include <resource/sharedresources.hxx>
 #include <strings.hrc>
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 6397ea6f783d..1461374173b5 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -35,7 +35,7 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <connectivity/ParameterCont.hxx>
+#include <ParameterCont.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 2ad8c3aa8987..12f0fc2e0e49 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -19,7 +19,7 @@
 
 #include <dbase/DIndexColumns.hxx>
 #include <dbase/DTable.hxx>
-#include <connectivity/sdbcx/VIndexColumn.hxx>
+#include <sdbcx/VIndexColumn.hxx>
 #include <comphelper/types.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx
index 1ed64f510440..d883d53c28a2 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/firebird/Catalog.hxx b/connectivity/source/drivers/firebird/Catalog.hxx
index a8ee9c69b466..b3c9ae4fe820 100644
--- a/connectivity/source/drivers/firebird/Catalog.hxx
+++ b/connectivity/source/drivers/firebird/Catalog.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/firebird/User.hxx b/connectivity/source/drivers/firebird/User.hxx
index d2cc091000b9..cb1690cd997c 100644
--- a/connectivity/source/drivers/firebird/User.hxx
+++ b/connectivity/source/drivers/firebird/User.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX
 
-#include <connectivity/sdbcx/VUser.hxx>
+#include <sdbcx/VUser.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx
index ef6088a991a8..9c45ab1f10ad 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx
index 1c6f7904f4ef..170809f7cd49 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx
index fd34c32d9936..d1d8e22bf49c 100644
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 #include <ado/Awrapadox.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx
index b08487195291..2b3f36fff30f 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX
 
-#include <connectivity/sdbcx/VGroup.hxx>
+#include <sdbcx/VGroup.hxx>
 #include <ado/Awrapadox.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx
index 783c904cf27c..b31bef3f808c 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEX_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEX_HXX
 
-#include <connectivity/sdbcx/VIndex.hxx>
+#include <sdbcx/VIndex.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <ado/Awrapadox.hxx>
 
diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx
index e14cb210c3f0..bd0b5a6404e9 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEY_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEY_HXX
 
-#include <connectivity/sdbcx/VKey.hxx>
+#include <sdbcx/VKey.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <ado/Awrapadox.hxx>
 
diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx
index 046c2055cd04..3b7227d36455 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX
 
-#include <connectivity/sdbcx/VUser.hxx>
+#include <sdbcx/VUser.hxx>
 #include <ado/Awrapadox.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index cfa77bdd2583..018c4b915ae8 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
 
-#include <connectivity/sdbcx/VIndex.hxx>
+#include <sdbcx/VIndex.hxx>
 #include <dbase/DTable.hxx>
 #include <dbase/dindexnode.hxx>
 
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index ad21bfcb711c..7bdbb7edb649 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 #include <file/filedllapi.hxx>
 
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index b2aa95c11a2b..0202da3502d1 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index 6b93707ee06b..1e16a765246f 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX
 
-#include <connectivity/sdbcx/VUser.hxx>
+#include <sdbcx/VUser.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx
index 8af6b82c2aa0..35dd2a3cdad4 100644
--- a/connectivity/source/inc/mysql/YCatalog.hxx
+++ b/connectivity/source/inc/mysql/YCatalog.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX
 
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx
index ba8af5d20cc2..5c960f5f0a62 100644
--- a/connectivity/source/inc/mysql/YTables.hxx
+++ b/connectivity/source/inc/mysql/YTables.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLES_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <connectivity/SQLStatementHelper.hxx>
+#include <SQLStatementHelper.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 namespace connectivity
 {
diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx
index d05fb8ea6053..3377d13fca86 100644
--- a/connectivity/source/inc/mysql/YUser.hxx
+++ b/connectivity/source/inc/mysql/YUser.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSER_HXX
 
-#include <connectivity/sdbcx/VUser.hxx>
+#include <sdbcx/VUser.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index dc5decfbf573..b30519fcaab1 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <comphelper/types.hxx>
-#include <connectivity/sdbcx/VCatalog.hxx>
+#include <sdbcx/VCatalog.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <connectivity/sdbcx/VDescriptor.hxx>
diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx
index 9bb92592d5f4..ed11a617526f 100644
--- a/connectivity/source/sdbcx/VGroup.cxx
+++ b/connectivity/source/sdbcx/VGroup.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <connectivity/sdbcx/VGroup.hxx>
+#include <sdbcx/VGroup.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbexception.hxx>
 
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index a274aaa6c102..1649ff83ad97 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/sdbcx/VIndex.hxx>
+#include <sdbcx/VIndex.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 41436ee02733..edd1ea93e9a2 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/sdbcx/VIndexColumn.hxx>
+#include <sdbcx/VIndexColumn.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <TConnection.hxx>
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index a310f984a7c3..33e9340b51c7 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/sdbcx/VKey.hxx>
+#include <sdbcx/VKey.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <comphelper/sequence.hxx>
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index 49a779a01350..b6f69e65c9de 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <connectivity/sdbcx/VKeyColumn.hxx>
+#include <sdbcx/VKeyColumn.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <TConnection.hxx>
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index 26ef01f4b614..9cecd7dfdd46 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <connectivity/sdbcx/VUser.hxx>
+#include <sdbcx/VUser.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index 7acb3fcff5ff..1b878f8b5542 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
-#define INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
+#pragma once
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sqlnode.hxx>
@@ -46,6 +45,4 @@ namespace connectivity
     };
 }
 
-#endif // INCLUDED_CONNECTIVITY_INTERNALNODE_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
index 4cd68a5974c0..ba0dbd9c57cc 100644
--- a/include/connectivity/sqlbison_exports.hxx
+++ b/include/connectivity/sqlbison_exports.hxx
@@ -7,8 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
-#define INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
+#pragma once
 
 #include <rtl/ustring.hxx>
 
@@ -19,6 +18,4 @@ OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const
 int SQLyyparse();
 void setParser( ::connectivity::OSQLParser* );
 
-#endif // INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index e09ede20ea8d..0c976682b8a3 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_CONNECTIVITY_SQLSCAN_HXX
-#define INCLUDED_CONNECTIVITY_SQLSCAN_HXX
+#pragma once
 
 #include <connectivity/IParseContext.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -66,6 +65,4 @@ namespace connectivity
     };
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 5dcdab99ddd1..85aa95514dc4 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -1877,6 +1877,20 @@ configmgr/source/xcuparser.hxx
 configmgr/source/xmldata.cxx
 configmgr/source/xmldata.hxx
 connectivity/inc/strings.hxx
+connectivity/inc/ParameterCont.hxx
+connectivity/inc/SQLStatementHelper.hxx
+connectivity/inc/TIndexColumns.hxx
+connectivity/inc/TIndex.hxx
+connectivity/inc/TKey.hxx
+connectivity/inc/TKeyColumns.hxx
+connectivity/inc/sdbcx/VCatalog.hxx
+connectivity/inc/sdbcx/VGroup.hxx
+connectivity/inc/sdbcx/VIndex.hxx
+connectivity/inc/sdbcx/VIndexColumn.hxx
+connectivity/inc/sdbcx/VKey.hxx
+connectivity/inc/sdbcx/VKeyColumn.hxx
+connectivity/inc/sdbcx/VTypeDef.hxx
+connectivity/inc/sdbcx/VUser.hxx
 connectivity/qa/connectivity/ado/DriverTest.cxx
 connectivity/qa/connectivity/commontools/FValue_test.cxx
 connectivity/qa/connectivity/mork/DriverTest.cxx
@@ -5751,14 +5765,8 @@ include/connectivity/DriversConfig.hxx
 include/connectivity/FValue.hxx
 include/connectivity/IParseContext.hxx
 include/connectivity/PColumn.hxx
-include/connectivity/ParameterCont.hxx
-include/connectivity/SQLStatementHelper.hxx
 include/connectivity/TColumnsHelper.hxx
-include/connectivity/TIndex.hxx
-include/connectivity/TIndexColumns.hxx
 include/connectivity/TIndexes.hxx
-include/connectivity/TKey.hxx
-include/connectivity/TKeyColumns.hxx
 include/connectivity/TKeys.hxx
 include/connectivity/TTableHelper.hxx
 include/connectivity/conncleanup.hxx
@@ -5767,26 +5775,18 @@ include/connectivity/dbconversion.hxx
 include/connectivity/dbexception.hxx
 include/connectivity/dbmetadata.hxx
 include/connectivity/dbtools.hxx
+include/connectivity/internalnode.hxx
 include/connectivity/filtermanager.hxx
 include/connectivity/formattedcolumnvalue.hxx
-include/connectivity/internalnode.hxx
 include/connectivity/odbc.hxx
 include/connectivity/parameters.hxx
 include/connectivity/paramwrapper.hxx
 include/connectivity/predicateinput.hxx
 include/connectivity/sdbcx/IRefreshable.hxx
-include/connectivity/sdbcx/VCatalog.hxx
 include/connectivity/sdbcx/VCollection.hxx
 include/connectivity/sdbcx/VColumn.hxx
 include/connectivity/sdbcx/VDescriptor.hxx
-include/connectivity/sdbcx/VGroup.hxx
-include/connectivity/sdbcx/VIndex.hxx
-include/connectivity/sdbcx/VIndexColumn.hxx
-include/connectivity/sdbcx/VKey.hxx
-include/connectivity/sdbcx/VKeyColumn.hxx
 include/connectivity/sdbcx/VTable.hxx
-include/connectivity/sdbcx/VTypeDef.hxx
-include/connectivity/sdbcx/VUser.hxx
 include/connectivity/sdbcx/VView.hxx
 include/connectivity/sqlbison_exports.hxx
 include/connectivity/sqlerror.hxx

More information about the Libreoffice-commits mailing list