include/connectivity/CommonTools.hxx | 5 +---- include/connectivity/ConnectionWrapper.hxx | 4 +--- include/connectivity/conncleanup.hxx | 6 +----- include/connectivity/dbcharset.hxx | 6 +----- include/connectivity/dbconversion.hxx | 5 +---- include/connectivity/dbexception.hxx | 7 +------ include/connectivity/dbmetadata.hxx | 6 +----- include/connectivity/dbtools.hxx | 5 +---- include/connectivity/dbtoolsdllapi.hxx | 5 +---- 9 files changed, 9 insertions(+), 40 deletions(-)
New commits: commit be49c60b2aaaf5d4780429fb998793c6d25fdb49 Author: praweshm <[email protected]> AuthorDate: Thu Nov 13 20:01:10 2025 +0530 Commit: Ilmari Lauhakangas <[email protected]> CommitDate: Sun Nov 16 11:10:50 2025 +0100 tdf#143148 Use pragma once instead of include guards in connectivity Change-Id: I337b16463f15c42469133bb0eb4620ca1133fd42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193968 Tested-by: Ilmari Lauhakangas <[email protected]> Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index a5279024e351..08b220e40b47 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.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_COMMONTOOLS_HXX -#define INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX +#pragma once #include <sal/config.h> #include <config_java.h> @@ -162,6 +161,4 @@ namespace connectivity return cppu::supportsService(this, rServiceName); \ } \ -#endif // INCLUDED_CONNECTIVITY_COMMONTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx index 7e6ab35163f9..2b1ddf6aca28 100644 --- a/include/connectivity/ConnectionWrapper.hxx +++ b/include/connectivity/ConnectionWrapper.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX -#define INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX +#pragma once #include <sal/config.h> @@ -89,6 +88,5 @@ namespace connectivity ,const OUString& _rPassword = OUString()); }; } -#endif // INCLUDED_CONNECTIVITY_CONNECTIONWRAPPER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index d243e384291b..ba4334365fc9 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX -#define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX +#pragma once #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertyChangeListener.hpp> @@ -84,7 +83,4 @@ namespace dbtools } // namespace dbtools - -#endif // INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index e8e10f9f1d24..4ec8ba11e7f4 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBCHARSET_HXX -#define INCLUDED_CONNECTIVITY_DBCHARSET_HXX +#pragma once #include <config_options.h> #include <sal/config.h> @@ -144,7 +143,4 @@ namespace dbtools } // namespace dbtools - -#endif // INCLUDED_CONNECTIVITY_DBCHARSET_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 742897cb1025..79f12eeb7dbc 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBCONVERSION_HXX -#define INCLUDED_CONNECTIVITY_DBCONVERSION_HXX +#pragma once #include <connectivity/dbtoolsdllapi.hxx> #include <rtl/ustring.hxx> @@ -182,6 +181,4 @@ namespace dbtools::DBTypeConversion } // namespace dbtools::DBTypeConversion -#endif // INCLUDED_CONNECTIVITY_DBCONVERSION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 5929af524705..c2137ee9eefa 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX -#define INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX +#pragma once #include <config_options.h> #include <connectivity/dbtoolsdllapi.hxx> @@ -327,8 +326,4 @@ OOO_DLLPUBLIC_DBTOOLS OUString getStandardSQLState( StandardSQLState _eState ); } // namespace dbtools - -#endif // INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index fa2a6e9e95a4..356748222f5d 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBMETADATA_HXX -#define INCLUDED_CONNECTIVITY_DBMETADATA_HXX +#pragma once #include <memory> #include <connectivity/dbtoolsdllapi.hxx> @@ -188,7 +187,4 @@ namespace dbtools } // namespace dbtools - -#endif // INCLUDED_CONNECTIVITY_DBMETADATA_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index 84dad13eb859..c259288e1316 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBTOOLS_HXX -#define INCLUDED_CONNECTIVITY_DBTOOLS_HXX +#pragma once #include <sal/config.h> @@ -873,6 +872,4 @@ namespace dbase } // namespace connectivity::dbase } // namespace connectivity -#endif // INCLUDED_CONNECTIVITY_DBTOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbtoolsdllapi.hxx b/include/connectivity/dbtoolsdllapi.hxx index 466d5ab23915..3bc91f614037 100644 --- a/include/connectivity/dbtoolsdllapi.hxx +++ b/include/connectivity/dbtoolsdllapi.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX -#define INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX +#pragma once #include <sal/config.h> @@ -30,6 +29,4 @@ #define OOO_DLLPUBLIC_DBTOOLS SAL_DLLPUBLIC_IMPORT #endif -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
