configmgr/source/xmldata.hxx | 6 -
connectivity/inc/sdbcx/VCatalog.hxx | 6 -
connectivity/inc/sdbcx/VGroup.hxx | 6 -
connectivity/inc/sdbcx/VIndex.hxx | 6 -
connectivity/inc/sdbcx/VIndexColumn.hxx | 6 -
connectivity/inc/sdbcx/VKey.hxx | 7 -
connectivity/inc/sdbcx/VKeyColumn.hxx | 6 -
connectivity/inc/sdbcx/VTypeDef.hxx | 5
connectivity/inc/sdbcx/VUser.hxx | 6 -
connectivity/source/drivers/evoab2/NCatalog.hxx | 6 -
connectivity/source/drivers/evoab2/NColumns.hxx | 5
connectivity/source/drivers/evoab2/NConnection.hxx | 7 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 6 -
connectivity/source/drivers/evoab2/NDriver.hxx | 8 -
connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 6 -
connectivity/source/drivers/evoab2/NResultSet.hxx | 6 -
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 7 -
connectivity/source/drivers/evoab2/NStatement.hxx | 6 -
connectivity/source/drivers/evoab2/NTable.hxx | 6 -
connectivity/source/drivers/evoab2/NTables.hxx | 7 -
connectivity/source/drivers/firebird/Blob.hxx | 5
connectivity/source/drivers/firebird/Catalog.hxx | 8 -
connectivity/source/drivers/firebird/Clob.hxx | 5
connectivity/source/drivers/firebird/Column.hxx | 6 -
connectivity/source/drivers/firebird/Columns.hxx | 7 -
connectivity/source/drivers/firebird/Connection.hxx | 6 -
connectivity/source/drivers/firebird/DatabaseMetaData.hxx | 6 -
connectivity/source/drivers/firebird/Driver.hxx | 5
connectivity/source/drivers/firebird/Indexes.hxx | 7 -
connectivity/source/drivers/firebird/Keys.hxx | 7 -
connectivity/source/drivers/firebird/PreparedStatement.hxx | 6 -
connectivity/source/drivers/firebird/ResultSet.hxx | 6 -
connectivity/source/drivers/firebird/ResultSetMetaData.hxx | 6 -
connectivity/source/drivers/firebird/Statement.hxx | 7 -
connectivity/source/drivers/firebird/StatementCommonBase.hxx | 6 -
connectivity/source/drivers/firebird/SubComponent.hxx | 24 ----
connectivity/source/drivers/firebird/Table.hxx | 7 -
connectivity/source/drivers/firebird/Tables.hxx | 7 -
connectivity/source/drivers/firebird/User.hxx | 7 -
connectivity/source/drivers/firebird/Users.hxx | 7 -
connectivity/source/drivers/firebird/Util.hxx | 6 -
connectivity/source/drivers/hsqldb/HTerminateListener.hxx | 9 -
connectivity/source/drivers/macab/MacabAddressBook.hxx | 5
connectivity/source/drivers/macab/MacabCatalog.hxx | 7 -
connectivity/source/drivers/macab/MacabColumns.hxx | 5
connectivity/source/drivers/macab/MacabConnection.hxx | 5
connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx | 5
connectivity/source/drivers/macab/MacabDriver.hxx | 5
connectivity/source/drivers/macab/MacabGroup.hxx | 5
connectivity/source/drivers/macab/MacabHeader.hxx | 5
connectivity/source/drivers/macab/MacabPreparedStatement.hxx | 5
connectivity/source/drivers/macab/MacabRecord.hxx | 5
connectivity/source/drivers/macab/MacabRecords.hxx | 5
connectivity/source/drivers/macab/MacabResultSet.hxx | 5
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 5
connectivity/source/drivers/macab/MacabStatement.cxx | 5
connectivity/source/drivers/macab/MacabStatement.hxx | 5
connectivity/source/drivers/macab/MacabTable.hxx | 5
connectivity/source/drivers/macab/MacabTables.hxx | 5
connectivity/source/drivers/macab/macabcondition.hxx | 5
connectivity/source/drivers/macab/macaborder.hxx | 5
connectivity/source/drivers/macab/macabutilities.hxx | 5
connectivity/source/drivers/mork/MCatalog.hxx | 6 -
connectivity/source/drivers/mork/MColumnAlias.hxx | 6 -
connectivity/source/drivers/mork/MColumns.hxx | 6 -
connectivity/source/drivers/mork/MConnection.hxx | 6 -
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 6 -
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx | 6 -
connectivity/source/drivers/mork/MErrorResource.hxx | 6 -
connectivity/source/drivers/mork/MPreparedStatement.hxx | 6 -
connectivity/source/drivers/mork/MQueryHelper.hxx | 6 -
connectivity/source/drivers/mork/MResultSet.hxx | 5
connectivity/source/drivers/mork/MResultSetMetaData.hxx | 6 -
connectivity/source/drivers/mork/MStatement.hxx | 6 -
connectivity/source/drivers/mork/MTable.hxx | 6 -
connectivity/source/drivers/mork/MTables.hxx | 6 -
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 5
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 14 --
connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx | 5
connectivity/source/drivers/mysqlc/mysqlc_driver.hxx | 8 -
connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 8 -
connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx | 8 -
connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx | 8 -
connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx | 8 -
connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx | 5
connectivity/source/drivers/mysqlc/mysqlc_statement.hxx | 5
connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx | 17 --
connectivity/source/inc/ado/ACallableStatement.hxx | 5
connectivity/source/inc/ado/ACatalog.hxx | 5
connectivity/source/inc/ado/AColumn.hxx | 5
connectivity/source/inc/ado/AColumns.hxx | 5
connectivity/source/inc/ado/AConnection.hxx | 5
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 6 -
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 5
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 5
connectivity/source/inc/ado/ADriver.hxx | 5
connectivity/source/inc/ado/AGroup.hxx | 5
connectivity/source/inc/ado/AGroups.hxx | 5
connectivity/source/inc/ado/AIndex.hxx | 5
connectivity/source/inc/ado/AIndexes.hxx | 5
connectivity/source/inc/ado/AKey.hxx | 5
connectivity/source/inc/ado/AKeys.hxx | 5
connectivity/source/inc/ado/AResultSet.hxx | 5
connectivity/source/inc/ado/AResultSetMetaData.hxx | 5
connectivity/source/inc/ado/AStatement.hxx | 5
connectivity/source/inc/ado/ATable.hxx | 5
connectivity/source/inc/ado/ATables.hxx | 5
connectivity/source/inc/ado/AUser.hxx | 5
connectivity/source/inc/ado/AUsers.hxx | 5
connectivity/source/inc/ado/AView.hxx | 5
connectivity/source/inc/ado/AViews.hxx | 5
connectivity/source/inc/ado/Aolevariant.hxx | 23 +--
connectivity/source/inc/ado/Aolewrap.hxx | 6 -
connectivity/source/inc/ado/Awrapado.hxx | 6 -
connectivity/source/inc/ado/Awrapadox.hxx | 5
connectivity/source/inc/ado/WrapCatalog.hxx | 5
connectivity/source/inc/ado/WrapColumn.hxx | 5
connectivity/source/inc/ado/WrapIndex.hxx | 5
connectivity/source/inc/ado/WrapKey.hxx | 5
connectivity/source/inc/ado/WrapTable.hxx | 5
connectivity/source/inc/ado/WrapTypeDefs.hxx | 5
connectivity/source/inc/ado/adoimp.hxx | 7 -
connectivity/source/inc/calc/CCatalog.hxx | 6 -
connectivity/source/inc/calc/CConnection.hxx | 6 -
connectivity/source/inc/calc/CDatabaseMetaData.hxx | 6 -
connectivity/source/inc/calc/CDriver.hxx | 6 -
connectivity/source/inc/calc/CTable.hxx | 6 -
connectivity/source/inc/calc/CTables.hxx | 6 -
connectivity/source/inc/component/CColumns.hxx | 6 -
connectivity/source/inc/component/CDatabaseMetaData.hxx | 6 -
connectivity/source/inc/component/CPreparedStatement.hxx | 6 -
connectivity/source/inc/component/CResultSet.hxx | 6 -
connectivity/source/inc/component/CStatement.hxx | 6 -
connectivity/source/inc/component/CTable.hxx | 6 -
connectivity/source/inc/dbase/DCatalog.hxx | 6 -
connectivity/source/inc/dbase/DColumns.hxx | 6 -
connectivity/source/inc/dbase/DConnection.hxx | 6 -
connectivity/source/inc/dbase/DDatabaseMetaData.hxx | 6 -
connectivity/source/inc/dbase/DDriver.hxx | 5
connectivity/source/inc/dbase/DIndex.hxx | 5
connectivity/source/inc/dbase/DIndexColumns.hxx | 6 -
connectivity/source/inc/dbase/DIndexIter.hxx | 6 -
connectivity/source/inc/dbase/DIndexes.hxx | 6 -
connectivity/source/inc/dbase/DPreparedStatement.hxx | 6 -
connectivity/source/inc/dbase/DResultSet.hxx | 6 -
connectivity/source/inc/dbase/DStatement.hxx | 6 -
connectivity/source/inc/dbase/DTable.hxx | 6 -
connectivity/source/inc/dbase/DTables.hxx | 6 -
connectivity/source/inc/dbase/dindexnode.hxx | 6 -
connectivity/source/inc/file/FCatalog.hxx | 6 -
connectivity/source/inc/file/FColumns.hxx | 6 -
connectivity/source/inc/file/FConnection.hxx | 6 -
connectivity/source/inc/file/FDatabaseMetaData.hxx | 6 -
connectivity/source/inc/file/FDateFunctions.hxx | 6 -
connectivity/source/inc/file/FDriver.hxx | 5
connectivity/source/inc/file/FNumericFunctions.hxx | 6 -
connectivity/source/inc/file/FPreparedStatement.hxx | 6 -
connectivity/source/inc/file/FResultSet.hxx | 6 -
connectivity/source/inc/file/FResultSetMetaData.hxx | 6 -
connectivity/source/inc/file/FStatement.hxx | 6 -
connectivity/source/inc/file/FStringFunctions.hxx | 6 -
connectivity/source/inc/file/FTable.hxx | 6 -
connectivity/source/inc/file/FTables.hxx | 6 -
connectivity/source/inc/file/fanalyzer.hxx | 6 -
connectivity/source/inc/flat/ECatalog.hxx | 6 -
connectivity/source/inc/flat/EColumns.hxx | 6 -
connectivity/source/inc/flat/EConnection.hxx | 6 -
connectivity/source/inc/flat/EDatabaseMetaData.hxx | 6 -
connectivity/source/inc/flat/EDriver.hxx | 5
connectivity/source/inc/flat/EPreparedStatement.hxx | 6 -
connectivity/source/inc/flat/EResultSet.hxx | 6 -
connectivity/source/inc/flat/EStatement.hxx | 6 -
connectivity/source/inc/flat/ETable.hxx | 6 -
connectivity/source/inc/flat/ETables.hxx | 6 -
connectivity/source/inc/hsqldb/HCatalog.hxx | 6 -
connectivity/source/inc/hsqldb/HColumns.hxx | 6 -
connectivity/source/inc/hsqldb/HConnection.hxx | 6 -
connectivity/source/inc/hsqldb/HDriver.hxx | 9 -
connectivity/source/inc/hsqldb/HStorageMap.hxx | 10 -
connectivity/source/inc/hsqldb/HTable.hxx | 6 -
connectivity/source/inc/hsqldb/HTables.hxx | 6 -
connectivity/source/inc/hsqldb/HUser.hxx | 6 -
connectivity/source/inc/hsqldb/HViews.hxx | 6 -
connectivity/source/inc/mysql/YCatalog.hxx | 6 -
connectivity/source/inc/mysql/YColumns.hxx | 6 -
connectivity/source/inc/mysql/YTable.hxx | 6 -
connectivity/source/inc/mysql/YTables.hxx | 6 -
connectivity/source/inc/mysql/YUser.hxx | 6 -
connectivity/source/inc/mysql/YViews.hxx | 6 -
connectivity/source/inc/odbc/OBoundParam.hxx | 6 -
connectivity/source/inc/odbc/OConnection.hxx | 6 -
connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 6 -
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 5
connectivity/source/inc/odbc/ODriver.hxx | 5
connectivity/source/inc/odbc/OPreparedStatement.hxx | 6 -
connectivity/source/inc/odbc/OResultSet.hxx | 6 -
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 6 -
connectivity/source/inc/odbc/OStatement.hxx | 6 -
connectivity/source/inc/odbc/OTools.hxx | 5
connectivity/source/inc/writer/WCatalog.hxx | 7 -
connectivity/source/inc/writer/WConnection.hxx | 17 --
connectivity/source/inc/writer/WDatabaseMetaData.hxx | 7 -
connectivity/source/inc/writer/WDriver.hxx | 16 --
connectivity/source/inc/writer/WTable.hxx | 30 -----
connectivity/source/inc/writer/WTables.hxx | 5
connectivity/workben/skeleton/SResultSet.hxx | 4
include/connectivity/PColumn.hxx | 6 -
include/connectivity/dbconversion.hxx | 59
++++------
include/connectivity/dbexception.hxx | 24 +---
include/connectivity/paramwrapper.hxx | 6 -
include/connectivity/sdbcx/IRefreshable.hxx | 6 -
include/connectivity/sdbcx/VCollection.hxx | 6 -
include/connectivity/sdbcx/VColumn.hxx | 6 -
include/connectivity/sdbcx/VDescriptor.hxx | 6 -
include/connectivity/sdbcx/VTable.hxx | 6 -
include/connectivity/sdbcx/VView.hxx | 6 -
include/connectivity/sqlnode.hxx | 28 +---
include/connectivity/sqlparse.hxx | 20 +--
218 files changed, 428 insertions(+), 1057 deletions(-)
New commits:
commit bf36f5ba679fe256edf83b7482bb671f41400959
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 16 14:14:12 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jul 18 19:08:12 2020 +0200
compact namespace: connectivity
Change-Id: I4f7999672ba15d9f453ded9accb3991b8150c32d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98905
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/configmgr/source/xmldata.hxx b/configmgr/source/xmldata.hxx
index 8f287df48afe..ae9e01cca731 100644
--- a/configmgr/source/xmldata.hxx
+++ b/configmgr/source/xmldata.hxx
@@ -31,9 +31,7 @@ namespace xmlreader {
struct Span;
}
-namespace configmgr {
-
-namespace xmldata {
+namespace configmgr::xmldata {
Type parseType(
xmlreader::XmlReader const & reader, xmlreader::Span const & text);
@@ -46,8 +44,6 @@ OUString parseTemplateReference(
}
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VCatalog.hxx
b/connectivity/inc/sdbcx/VCatalog.hxx
index a9b1d18bb0a3..3c87a08700b6 100644
--- a/connectivity/inc/sdbcx/VCatalog.hxx
+++ b/connectivity/inc/sdbcx/VCatalog.hxx
@@ -35,9 +35,7 @@ namespace com::sun::star::sdbc { class XDatabaseMetaData; }
namespace com::sun::star::sdbc { class XResultSet; }
namespace com::sun::star::sdbc { class XRow; }
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
class OCollection;
@@ -112,7 +110,7 @@ namespace connectivity
virtual css::uno::Reference< css::container::XNameAccess >
SAL_CALL getGroups( ) override;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VGroup.hxx
b/connectivity/inc/sdbcx/VGroup.hxx
index dcf50d1a98b0..6ab971680f34 100644
--- a/connectivity/inc/sdbcx/VGroup.hxx
+++ b/connectivity/inc/sdbcx/VGroup.hxx
@@ -31,9 +31,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
typedef OCollection OUsers;
@@ -90,7 +88,7 @@ namespace connectivity
virtual OUString SAL_CALL getName( ) override;
virtual void SAL_CALL setName( const OUString& aName ) override;
};
- }
+
}
diff --git a/connectivity/inc/sdbcx/VIndex.hxx
b/connectivity/inc/sdbcx/VIndex.hxx
index 8bf0a4db2be4..9b486d85d04d 100644
--- a/connectivity/inc/sdbcx/VIndex.hxx
+++ b/connectivity/inc/sdbcx/VIndex.hxx
@@ -29,9 +29,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <cppuhelper/implbase1.hxx>
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
class OCollection;
class OIndex;
@@ -94,7 +92,7 @@ namespace connectivity
// XDataDescriptorFactory
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) override;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VIndexColumn.hxx
b/connectivity/inc/sdbcx/VIndexColumn.hxx
index 6677b291ea5c..056b8239411b 100644
--- a/connectivity/inc/sdbcx/VIndexColumn.hxx
+++ b/connectivity/inc/sdbcx/VIndexColumn.hxx
@@ -22,9 +22,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <connectivity/sdbcx/VColumn.hxx>
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
class OIndexColumn;
typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndexColumn>
OIndexColumn_PROP;
@@ -54,7 +52,7 @@ namespace connectivity
virtual void construct() override;
DECLARE_SERVICE_INFO();
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VKey.hxx b/connectivity/inc/sdbcx/VKey.hxx
index 01e1d839f8b4..8594923bad24 100644
--- a/connectivity/inc/sdbcx/VKey.hxx
+++ b/connectivity/inc/sdbcx/VKey.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <memory>
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
struct OOO_DLLPUBLIC_DBTOOLS KeyProperties
@@ -104,8 +102,7 @@ namespace connectivity
// XDataDescriptorFactory
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
createDataDescriptor( ) override;
};
- }
-}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VKeyColumn.hxx
b/connectivity/inc/sdbcx/VKeyColumn.hxx
index cb6548f31964..2a1b50403982 100644
--- a/connectivity/inc/sdbcx/VKeyColumn.hxx
+++ b/connectivity/inc/sdbcx/VKeyColumn.hxx
@@ -22,9 +22,7 @@
#include <connectivity/dbtoolsdllapi.hxx>
#include <connectivity/sdbcx/VColumn.hxx>
-namespace connectivity
-{
- namespace sdbcx
+namespace connectivity::sdbcx
{
class OKeyColumn;
typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn>
OKeyColumn_PROP;
@@ -56,7 +54,7 @@ namespace connectivity
virtual void construct() override;
DECLARE_SERVICE_INFO();
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VTypeDef.hxx
b/connectivity/inc/sdbcx/VTypeDef.hxx
index 2054003930e4..92a1f3c9c104 100644
--- a/connectivity/inc/sdbcx/VTypeDef.hxx
+++ b/connectivity/inc/sdbcx/VTypeDef.hxx
@@ -24,14 +24,11 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XNamed.hpp>
-namespace connectivity
+namespace connectivity::sdbcx
{
- namespace sdbcx
- {
typedef cppu::WeakComponentImplHelper< css::sdbcx::XColumnsSupplier,
css::container::XNamed,
css::lang::XServiceInfo>
ODescriptor_BASE;
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/inc/sdbcx/VUser.hxx b/connectivity/inc/sdbcx/VUser.hxx
index c16679466bdd..31a4be400657 100644
--- a/connectivity/inc/sdbcx/VUser.hxx
+++ b/connectivity/inc/sdbcx/VUser.hxx
@@ -31,10 +31,8 @@
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <connectivity/dbtoolsdllapi.hxx>
-namespace connectivity
+namespace connectivity::sdbcx
{
- namespace sdbcx
- {
typedef OCollection OGroups;
typedef ::cppu::WeakComponentImplHelper< css::sdbcx::XUser,
@@ -91,7 +89,7 @@ namespace connectivity
virtual OUString SAL_CALL getName( ) override;
virtual void SAL_CALL setName( const OUString& aName ) override;
};
- }
+
}
diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx
b/connectivity/source/drivers/evoab2/NCatalog.hxx
index d883d53c28a2..d54ad68a2a9a 100644
--- a/connectivity/source/drivers/evoab2/NCatalog.hxx
+++ b/connectivity/source/drivers/evoab2/NCatalog.hxx
@@ -22,10 +22,8 @@
#include <sdbcx/VCatalog.hxx>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
class OEvoabConnection;
class OEvoabCatalog : public connectivity::sdbcx::OCatalog
{
@@ -41,8 +39,8 @@ namespace connectivity
virtual css::uno::Reference< css::container::XNameAccess >
SAL_CALL getTables(
) override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx
b/connectivity/source/drivers/evoab2/NColumns.hxx
index d3038aaa62af..be5996c6ebec 100644
--- a/connectivity/source/drivers/evoab2/NColumns.hxx
+++ b/connectivity/source/drivers/evoab2/NColumns.hxx
@@ -23,10 +23,8 @@
#include "NTable.hxx"
#include <connectivity/sdbcx/VCollection.hxx>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
class OEvoabColumns final : public sdbcx::OCollection
{
OEvoabTable* m_pTable;
@@ -42,7 +40,6 @@ namespace connectivity
m_pTable(_pTable)
{ }
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCOLUMNS_HXX
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx
b/connectivity/source/drivers/evoab2/NConnection.hxx
index 2ba2a8db7ea8..ccd9fa7bc04c 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -31,10 +31,7 @@
#include <osl/module.h>
#include "EApi.h"
-namespace connectivity
-{
- namespace evoab
- {
+namespace connectivity::evoab {
namespace SDBCAddress {
typedef enum {
@@ -105,8 +102,8 @@ namespace connectivity
virtual css::uno::Any SAL_CALL getWarnings( ) override;
virtual void SAL_CALL clearWarnings( ) override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCONNECTION_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 61a9449e65b0..11270aca5259 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -25,10 +25,8 @@
#include <FDatabaseMetaDataResultSet.hxx>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
//************ Class: OEvoabDatabaseMetaData
@@ -213,9 +211,9 @@ namespace connectivity
virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const
OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types )
override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NDATABASEMETADATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx
b/connectivity/source/drivers/evoab2/NDriver.hxx
index d492e9bb5288..258c9c0091c0 100644
--- a/connectivity/source/drivers/evoab2/NDriver.hxx
+++ b/connectivity/source/drivers/evoab2/NDriver.hxx
@@ -27,9 +27,7 @@
#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver"
-namespace connectivity
-{
- namespace evoab
+namespace connectivity::evoab
{
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver,
css::lang::XServiceInfo >
ODriver_BASE;
@@ -67,9 +65,9 @@ namespace connectivity
// static methods
static bool acceptsURL_Stat( const OUString& url );
};
- }
-
}
+
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NDRIVER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
index 20d5790ca4a0..62e79cb335f4 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx
@@ -31,10 +31,8 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/implbase5.hxx>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement,
css::sdbc::XParameters,
@@ -106,9 +104,9 @@ namespace connectivity
virtual sal_Int32 SAL_CALL getUpdateCount( ) override;
virtual sal_Bool SAL_CALL getMoreResults( ) override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NPREPAREDSTATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx
b/connectivity/source/drivers/evoab2/NResultSet.hxx
index 40b0027cfe48..034dcc439de0 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.hxx
@@ -42,10 +42,8 @@
#include "NStatement.hxx"
#include "NResultSetMetaData.hxx"
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
struct ComparisonData;
class OEvoabVersionHelper
@@ -179,9 +177,9 @@ namespace connectivity
// XColumnLocate
virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName
) override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NRESULTSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
index 9c309aaddb67..9d8dc6db3e23 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx
@@ -25,10 +25,9 @@
#include "NConnection.hxx"
#include <rtl/ref.hxx>
#include <com/sun/star/connection/XConnection.hpp>
-namespace connectivity
+
+namespace connectivity::evoab
{
- namespace evoab
- {
//************ Class: ResultSetMetaData
@@ -73,9 +72,9 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column )
override;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column )
override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NRESULTSETMETADATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx
b/connectivity/source/drivers/evoab2/NStatement.hxx
index 14c12700ca62..835b177ae03f 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -43,10 +43,8 @@
#include <list>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XWarningsSupplier
, css::sdbc::XCloseable
> OCommonStatement_IBase;
@@ -270,9 +268,9 @@ namespace connectivity
virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnection( ) override ;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NSTATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NTable.hxx
b/connectivity/source/drivers/evoab2/NTable.hxx
index eb1159847d20..2b38171b398f 100644
--- a/connectivity/source/drivers/evoab2/NTable.hxx
+++ b/connectivity/source/drivers/evoab2/NTable.hxx
@@ -23,10 +23,8 @@
#include "NConnection.hxx"
#include <connectivity/sdbcx/VTable.hxx>
-namespace connectivity
+namespace connectivity::evoab
{
- namespace evoab
- {
typedef connectivity::sdbcx::OTable OEvoabTable_TYPEDEF;
class OEvoabTable : public OEvoabTable_TYPEDEF
@@ -50,9 +48,9 @@ namespace connectivity
OUString const & getTableName() const { return m_Name; }
OUString const & getSchema() const { return m_SchemaName; }
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NTABLE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/evoab2/NTables.hxx
b/connectivity/source/drivers/evoab2/NTables.hxx
index 99542ba53e5e..593367c73a86 100644
--- a/connectivity/source/drivers/evoab2/NTables.hxx
+++ b/connectivity/source/drivers/evoab2/NTables.hxx
@@ -21,10 +21,9 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
+
+namespace connectivity::evoab
{
- namespace evoab
- {
class OEvoabTables : public sdbcx::OCollection
{
css::uno::Reference< css::sdbc::XDatabaseMetaData >
m_xMetaData;
@@ -40,8 +39,8 @@ namespace connectivity
{}
virtual void disposing() override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NTABLES_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Blob.hxx
b/connectivity/source/drivers/firebird/Blob.hxx
index 0a3627de417c..9cad65a3c05f 100644
--- a/connectivity/source/drivers/firebird/Blob.hxx
+++ b/connectivity/source/drivers/firebird/Blob.hxx
@@ -17,9 +17,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/sdbc/XBlob.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XBlob,
css::io::XInputStream >
@@ -95,7 +93,6 @@ namespace connectivity
// ---- OComponentHelper ------------------------------------------
virtual void SAL_CALL disposing() override;
};
- }
}
diff --git a/connectivity/source/drivers/firebird/Catalog.hxx
b/connectivity/source/drivers/firebird/Catalog.hxx
index b3c9ae4fe820..1ac364bc845c 100644
--- a/connectivity/source/drivers/firebird/Catalog.hxx
+++ b/connectivity/source/drivers/firebird/Catalog.hxx
@@ -12,9 +12,7 @@
#include <sdbcx/VCatalog.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
class Catalog: public ::connectivity::sdbcx::OCatalog
{
@@ -34,8 +32,8 @@ namespace connectivity
// IRefreshableUsers
virtual void refreshUsers() override;
};
- } // namespace firebird
-} // namespace connectivity
+
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CATALOG_HXX
diff --git a/connectivity/source/drivers/firebird/Clob.hxx
b/connectivity/source/drivers/firebird/Clob.hxx
index 626b284d3785..8ebc639f0bbb 100644
--- a/connectivity/source/drivers/firebird/Clob.hxx
+++ b/connectivity/source/drivers/firebird/Clob.hxx
@@ -18,9 +18,7 @@
#include <com/sun/star/sdbc/XClob.hpp>
#include <rtl/ref.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XClob >
Clob_BASE;
@@ -61,7 +59,6 @@ namespace connectivity
// ---- OComponentHelper ------------------------------------------
virtual void SAL_CALL disposing() override;
};
- }
}
diff --git a/connectivity/source/drivers/firebird/Column.hxx
b/connectivity/source/drivers/firebird/Column.hxx
index b72203da8a4e..ce0bfa217051 100644
--- a/connectivity/source/drivers/firebird/Column.hxx
+++ b/connectivity/source/drivers/firebird/Column.hxx
@@ -11,9 +11,7 @@
#include <connectivity/sdbcx/VColumn.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
class Column;
typedef ::comphelper::OIdPropertyArrayUsageHelper<Column> Column_PROP;
@@ -29,7 +27,7 @@ namespace connectivity
virtual void construct() override;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames( ) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX
diff --git a/connectivity/source/drivers/firebird/Columns.hxx
b/connectivity/source/drivers/firebird/Columns.hxx
index 844d99ee0830..c7a22a2c245f 100644
--- a/connectivity/source/drivers/firebird/Columns.hxx
+++ b/connectivity/source/drivers/firebird/Columns.hxx
@@ -14,10 +14,8 @@
#include <connectivity/TColumnsHelper.hxx>
-namespace connectivity
+namespace connectivity::firebird
{
- namespace firebird
- {
class Columns: public ::connectivity::OColumnsHelper
{
protected:
@@ -28,8 +26,7 @@ namespace connectivity
const ::std::vector< OUString> &_rVector);
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_COLUMNS_HXX
diff --git a/connectivity/source/drivers/firebird/Connection.hxx
b/connectivity/source/drivers/firebird/Connection.hxx
index 7365aa06aee2..9e2c9c24865d 100644
--- a/connectivity/source/drivers/firebird/Connection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -41,9 +41,7 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::WeakComponentImplHelper<
css::document::XDocumentEventListener,
@@ -239,7 +237,7 @@ namespace connectivity
virtual void SAL_CALL disposing( const css::lang::EventObject&
Source ) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CONNECTION_HXX
diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index 64025809ae23..ccad90f3925f 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -26,9 +26,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
//************ Class: ODatabaseMetaData
@@ -198,7 +196,7 @@ namespace connectivity
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const
OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types )
override;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnection( ) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_DATABASEMETADATA_HXX
diff --git a/connectivity/source/drivers/firebird/Driver.hxx
b/connectivity/source/drivers/firebird/Driver.hxx
index acace9d13298..59cb1c49db69 100644
--- a/connectivity/source/drivers/firebird/Driver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -29,9 +29,7 @@
#include <cppuhelper/compbase.hxx>
#include <unotools/tempfile.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
// The SQL dialect in use
// Has to be used in various isc_* calls.
@@ -85,7 +83,6 @@ namespace connectivity
const OUString& rsURL,
const css::uno::Sequence< css::beans::PropertyValue >&
rInfo) override;
};
- }
}
diff --git a/connectivity/source/drivers/firebird/Indexes.hxx
b/connectivity/source/drivers/firebird/Indexes.hxx
index 364b36b04278..5f748fbd5eec 100644
--- a/connectivity/source/drivers/firebird/Indexes.hxx
+++ b/connectivity/source/drivers/firebird/Indexes.hxx
@@ -14,9 +14,7 @@
#include <connectivity/TIndexes.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/**
@@ -37,8 +35,7 @@ namespace connectivity
const std::vector< OUString>& rVector);
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebord
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_INDEXES_HXX
diff --git a/connectivity/source/drivers/firebird/Keys.hxx
b/connectivity/source/drivers/firebird/Keys.hxx
index 143dbbf5486b..466ee9c81d0e 100644
--- a/connectivity/source/drivers/firebird/Keys.hxx
+++ b/connectivity/source/drivers/firebird/Keys.hxx
@@ -12,10 +12,7 @@
#include <connectivity/TKeys.hxx>
-namespace connectivity
-{
-
- namespace firebird
+namespace connectivity::firebird
{
class Table;
@@ -34,7 +31,7 @@ namespace connectivity
void dropObject(sal_Int32 nPosition, const OUString& sName) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_KEYS_HXX
diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx
b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index e77201791cd1..db64c0b763e7 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -32,9 +32,7 @@
#include <ibase.h>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
class OBoundParam;
@@ -149,7 +147,7 @@ namespace connectivity
virtual css::uno::Reference< css::sdbc::XResultSetMetaData >
SAL_CALL getMetaData( ) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_PREPAREDSTATEMENT_HXX
diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx
b/connectivity/source/drivers/firebird/ResultSet.hxx
index dc1a611febe2..7306e0c42405 100644
--- a/connectivity/source/drivers/firebird/ResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -36,9 +36,7 @@
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/*
** OResultSet
@@ -213,7 +211,7 @@ namespace connectivity
OResultSet::retrieveValue(
const sal_Int32 nColumnIndex,
const ISC_SHORT nType);
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_RESULTSET_HXX
diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
index 09474b8a7e9b..95c36ab958d4 100644
--- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
@@ -29,9 +29,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::WeakImplHelper< css::sdbc::XResultSetMetaData>
OResultSetMetaData_BASE;
@@ -77,7 +75,7 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column)
override;
virtual OUString SAL_CALL getColumnServiceName(sal_Int32 column)
override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_RESULTSETMETADATA_HXX
diff --git a/connectivity/source/drivers/firebird/Statement.hxx
b/connectivity/source/drivers/firebird/Statement.hxx
index 4c9168fd4304..903f12407ee8 100644
--- a/connectivity/source/drivers/firebird/Statement.hxx
+++ b/connectivity/source/drivers/firebird/Statement.hxx
@@ -25,9 +25,7 @@
#include <cppuhelper/implbase1.hxx>
#include <com/sun/star/sdbc/XBatchExecution.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::ImplHelper1< css::sdbc::XStatement >
@@ -80,9 +78,8 @@ namespace connectivity
// OComponentHelper
virtual void SAL_CALL disposing() override;
-
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_STATEMENT_HXX
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
index 5a53706ee938..b321a27db4f4 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
@@ -33,9 +33,7 @@
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/util/XCancellable.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
typedef ::cppu::WeakComponentImplHelper<
css::sdbc::XWarningsSupplier,
@@ -129,7 +127,7 @@ namespace connectivity
virtual void SAL_CALL close( ) override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_STATEMENTCOMMONBASE_HXX
diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx
b/connectivity/source/drivers/firebird/SubComponent.hxx
index d37100670995..4d9c107213f5 100644
--- a/connectivity/source/drivers/firebird/SubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -24,27 +24,10 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-namespace cppu {
- class IPropertyArrayHelper;
-}
-
-namespace com
-{
- namespace sun
- {
- namespace star
- {
- namespace lang
- {
- class XComponent;
- }
- }
- }
-}
-namespace connectivity
-{
+namespace cppu { class IPropertyArrayHelper; }
+namespace com::sun::star::lang { class XComponent; }
- namespace firebird
+namespace connectivity::firebird
{
/// @throws css::lang::DisposedException
void checkDisposed(bool _bThrow);
@@ -124,7 +107,6 @@ namespace connectivity
return s_pProps;
}
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX
diff --git a/connectivity/source/drivers/firebird/Table.hxx
b/connectivity/source/drivers/firebird/Table.hxx
index 586152ecce10..8cf0ff53f90d 100644
--- a/connectivity/source/drivers/firebird/Table.hxx
+++ b/connectivity/source/drivers/firebird/Table.hxx
@@ -14,9 +14,7 @@
#include <connectivity/TTableHelper.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/**
@@ -79,8 +77,7 @@ namespace connectivity
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_TABLE_HXX
diff --git a/connectivity/source/drivers/firebird/Tables.hxx
b/connectivity/source/drivers/firebird/Tables.hxx
index 635774727095..3f36b9865c3b 100644
--- a/connectivity/source/drivers/firebird/Tables.hxx
+++ b/connectivity/source/drivers/firebird/Tables.hxx
@@ -15,9 +15,7 @@
#include <connectivity/sdbcx/VCollection.hxx>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/**
@@ -56,8 +54,7 @@ namespace connectivity
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_TABLES_HXX
diff --git a/connectivity/source/drivers/firebird/User.hxx
b/connectivity/source/drivers/firebird/User.hxx
index 5668c3223c13..16fa138976b9 100644
--- a/connectivity/source/drivers/firebird/User.hxx
+++ b/connectivity/source/drivers/firebird/User.hxx
@@ -13,9 +13,7 @@
#include <sdbcx/VUser.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/**
@@ -44,8 +42,7 @@ namespace connectivity
virtual void refreshGroups() override;
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USER_HXX
diff --git a/connectivity/source/drivers/firebird/Users.hxx
b/connectivity/source/drivers/firebird/Users.hxx
index 39e019e4dada..6a6be1ead6a6 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -13,9 +13,7 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
/**
@@ -51,8 +49,7 @@ namespace connectivity
};
- } // namespace firebird
-} // namespace connectivity
+} // namespace connectivity::firebird
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USERS_HXX
diff --git a/connectivity/source/drivers/firebird/Util.hxx
b/connectivity/source/drivers/firebird/Util.hxx
index 107840876e55..efb222f3ff22 100644
--- a/connectivity/source/drivers/firebird/Util.hxx
+++ b/connectivity/source/drivers/firebird/Util.hxx
@@ -16,9 +16,7 @@
#include <com/sun/star/uno/XInterface.hpp>
-namespace connectivity
-{
- namespace firebird
+namespace connectivity::firebird
{
// Type Blob has 2 subtypes values
// 0 for BLOB, 1 for CLOB
@@ -123,7 +121,7 @@ public:
OUString escapeWith( const OUString& sText, const char aKey, const
char aEscapeChar);
sal_Int64 pow10Integer( int nDecimalCount );
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_UTIL_HXX
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
index 62e8ec79d660..63d69b29e64b 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx
@@ -23,11 +23,7 @@
#include <com/sun/star/frame/XTerminateListener.hpp>
-namespace connectivity
-{
-
-
- namespace hsqldb
+namespace connectivity::hsqldb
{
class ODriverDelegator;
class OConnectionController : public ::cppu::WeakImplHelper<
css::frame::XTerminateListener >
@@ -45,9 +41,8 @@ namespace connectivity
virtual void SAL_CALL queryTermination( const
css::lang::EventObject& aEvent ) override;
virtual void SAL_CALL notifyTermination( const
css::lang::EventObject& aEvent ) override;
};
- }
-} // namespace connectivity
+} // namespace connectivity::hsqldb
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_HSQLDB_HTERMINATELISTENER_HXX
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx
b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index a74621ef2a39..33c267313796 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -30,10 +30,8 @@
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabAddressBook
{
protected:
@@ -57,7 +55,6 @@ namespace connectivity
MacabRecords *getMacabRecordsMatch(const OUString& _tableName);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABADDRESSBOOK_HXX
diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx
b/connectivity/source/drivers/macab/MacabCatalog.hxx
index 9c45ab1f10ad..88aad76bede3 100644
--- a/connectivity/source/drivers/macab/MacabCatalog.hxx
+++ b/connectivity/source/drivers/macab/MacabCatalog.hxx
@@ -22,11 +22,9 @@
#include <sdbcx/VCatalog.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
- class MacabConnection;
+ class MacabConnection;
class MacabCatalog : public connectivity::sdbcx::OCatalog
{
@@ -49,7 +47,6 @@ namespace connectivity
virtual css::uno::Reference< css::container::XNameAccess >
SAL_CALL getTables(
) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCATALOG_HXX
diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx
b/connectivity/source/drivers/macab/MacabColumns.hxx
index 36da039a9ffc..1a85da155d62 100644
--- a/connectivity/source/drivers/macab/MacabColumns.hxx
+++ b/connectivity/source/drivers/macab/MacabColumns.hxx
@@ -23,10 +23,8 @@
#include "MacabTable.hxx"
#include <connectivity/sdbcx/VCollection.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabColumns : public sdbcx::OCollection
{
protected:
@@ -40,7 +38,6 @@ namespace connectivity
::osl::Mutex& _rMutex,
const ::std::vector< OUString> &_rVector);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCOLUMNS_HXX
diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx
b/connectivity/source/drivers/macab/MacabConnection.hxx
index 6173b26dc5f4..73ee0a731a76 100644
--- a/connectivity/source/drivers/macab/MacabConnection.hxx
+++ b/connectivity/source/drivers/macab/MacabConnection.hxx
@@ -30,10 +30,8 @@
#include <cppuhelper/compbase.hxx>
#include <TConnection.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
typedef ::cppu::WeakComponentImplHelper<css::sdbc::XConnection,
css::sdbc::XWarningsSupplier,
@@ -110,7 +108,6 @@ namespace connectivity
MacabDriver* getDriver() const { return m_pDriver;}
MacabAddressBook* getAddressBook() const;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCONNECTION_HXX
diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
index c1c9feb5cc06..46cb6769bf0e 100644
--- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx
@@ -24,10 +24,8 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <cppuhelper/implbase.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabDatabaseMetaData : public ::cppu::WeakImplHelper<
css::sdbc::XDatabaseMetaData>
{
@@ -193,7 +191,6 @@ namespace connectivity
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const
OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types )
override;
virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL
getConnection( ) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABDATABASEMETADATA_HXX
diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx
b/connectivity/source/drivers/macab/MacabDriver.hxx
index 4c9412c9642a..ca7707228164 100644
--- a/connectivity/source/drivers/macab/MacabDriver.hxx
+++ b/connectivity/source/drivers/macab/MacabDriver.hxx
@@ -33,10 +33,8 @@
#define MACAB_DRIVER_VERSION_MAJOR 0
#define MACAB_DRIVER_VERSION_MINOR 1
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabConnection;
class MacabDriver;
@@ -159,7 +157,6 @@ namespace connectivity
*/
void impl_shutdownImplementationModule();
};
- }
}
diff --git a/connectivity/source/drivers/macab/MacabGroup.hxx
b/connectivity/source/drivers/macab/MacabGroup.hxx
index 4d9313282a25..65240661b138 100644
--- a/connectivity/source/drivers/macab/MacabGroup.hxx
+++ b/connectivity/source/drivers/macab/MacabGroup.hxx
@@ -28,15 +28,12 @@
#include <postmac.h>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabGroup: public MacabRecords {
public:
MacabGroup(const ABAddressBookRef _addressBook, const
MacabRecords *_allRecords, const ABGroupRef _xGroup);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABGROUP_HXX
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx
b/connectivity/source/drivers/macab/MacabHeader.hxx
index c77ae2da0c0a..8902af091d5a 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -22,10 +22,8 @@
#include "MacabRecord.hxx"
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabHeader: public MacabRecord{
protected:
macabfield **sortRecord(sal_Int32 _start, sal_Int32 _length);
@@ -56,7 +54,6 @@ namespace connectivity
macabfield *operator* () const;
};
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABHEADER_HXX
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
index a37c1b29a8a4..42c401efb1dd 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx
@@ -27,10 +27,8 @@
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <cppuhelper/implbase.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
typedef ::cppu::ImplInheritanceHelper< MacabCommonStatement,
css::sdbc::XPreparedStatement,
css::sdbc::XParameters,
@@ -109,7 +107,6 @@ namespace connectivity
// XResultSetMetaDataSupplier
virtual css::uno::Reference< css::sdbc::XResultSetMetaData >
SAL_CALL getMetaData( ) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABPREPAREDSTATEMENT_HXX
diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx
b/connectivity/source/drivers/macab/MacabRecord.hxx
index e677611bdec8..3183ec9109e1 100644
--- a/connectivity/source/drivers/macab/MacabRecord.hxx
+++ b/connectivity/source/drivers/macab/MacabRecord.hxx
@@ -33,10 +33,8 @@
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
/* a MacabRecord is at root a list of macabfields (which is just
* something to hold both a CFTypeRef (a CoreFoundation object) and
* its Address Book type.
@@ -69,7 +67,6 @@ namespace connectivity
static OUString fieldToString(const macabfield *_aField);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORD_HXX
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx
b/connectivity/source/drivers/macab/MacabRecords.hxx
index 1e7d9975de15..933b741e82c9 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -33,10 +33,8 @@
#include <postmac.h>
#include <com/sun/star/util/DateTime.hpp>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
/* This struct is for converting CF types to AB types (Core Foundation
* types to Address Book types).
*/
@@ -123,7 +121,6 @@ namespace connectivity
};
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRECORDS_HXX
diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx
b/connectivity/source/drivers/macab/MacabResultSet.hxx
index 418a66c1f5b6..d8cb200e84e6 100644
--- a/connectivity/source/drivers/macab/MacabResultSet.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSet.hxx
@@ -32,10 +32,8 @@
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
/*
** MacabResultSet
*/
@@ -211,7 +209,6 @@ namespace connectivity
// XDeleteRows
virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const
css::uno::Sequence< css::uno::Any >& rows ) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRESULTSET_HXX
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
index ec7c2c651dd5..2d813d61ef5e 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx
@@ -27,10 +27,8 @@
#include <connectivity/dbexception.hxx>
#include <rtl/ref.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
/*
** MacabResultSetMetaData
*/
@@ -79,7 +77,6 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column )
override;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column )
override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABRESULTSETMETADATA_HXX
diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx
b/connectivity/source/drivers/macab/MacabStatement.cxx
index db6e3876b993..407c90527eef 100644
--- a/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -44,17 +44,14 @@ using namespace com::sun::star::container;
using namespace com::sun::star::io;
using namespace com::sun::star::util;
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
void impl_throwError(const char* pErrorId)
{
::connectivity::SharedResources aResources;
const OUString sError( aResources.getResourceString(pErrorId) );
::dbtools::throwGenericSQLException(sError,nullptr);
}
- }
}
IMPLEMENT_SERVICE_INFO(MacabStatement,
"com.sun.star.sdbc.drivers.MacabStatement", "com.sun.star.sdbc.Statement");
diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx
b/connectivity/source/drivers/macab/MacabStatement.hxx
index 3c8187016499..65b9b6afa531 100644
--- a/connectivity/source/drivers/macab/MacabStatement.hxx
+++ b/connectivity/source/drivers/macab/MacabStatement.hxx
@@ -31,10 +31,8 @@
#include <cppuhelper/basemutex.hxx>
#include <comphelper/proparrhlp.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement,
css::sdbc::XWarningsSupplier,
css::util::XCancellable,
@@ -166,7 +164,6 @@ namespace connectivity
explicit MacabStatement(MacabConnection* _pConnection);
DECLARE_SERVICE_INFO();
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABSTATEMENT_HXX
diff --git a/connectivity/source/drivers/macab/MacabTable.hxx
b/connectivity/source/drivers/macab/MacabTable.hxx
index 58e43175dfe2..3db8ab0aae50 100644
--- a/connectivity/source/drivers/macab/MacabTable.hxx
+++ b/connectivity/source/drivers/macab/MacabTable.hxx
@@ -23,10 +23,8 @@
#include "MacabConnection.hxx"
#include <connectivity/sdbcx/VTable.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
typedef connectivity::sdbcx::OTable MacabTable_TYPEDEF;
class MacabTable : public MacabTable_TYPEDEF
@@ -52,7 +50,6 @@ namespace connectivity
OUString const & getTableName() const { return m_Name; }
OUString const & getSchema() const { return m_SchemaName; }
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABTABLE_HXX
diff --git a/connectivity/source/drivers/macab/MacabTables.hxx
b/connectivity/source/drivers/macab/MacabTables.hxx
index 7e87a473a37d..43922585e46b 100644
--- a/connectivity/source/drivers/macab/MacabTables.hxx
+++ b/connectivity/source/drivers/macab/MacabTables.hxx
@@ -23,10 +23,8 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabTables : public sdbcx::OCollection
{
css::uno::Reference< css::sdbc::XDatabaseMetaData >
m_xMetaData;
@@ -47,7 +45,6 @@ namespace connectivity
virtual void disposing() override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABTABLES_HXX
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx
b/connectivity/source/drivers/macab/macabcondition.hxx
index 15eb853b19dd..8d930ed34ff3 100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -25,10 +25,8 @@
#include <connectivity/dbexception.hxx>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabCondition
{
@@ -159,7 +157,6 @@ class MacabConditionAnd : public MacabConditionBoolean
virtual bool eval(const MacabRecord *aRecord) const override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCONDITION_HXX
diff --git a/connectivity/source/drivers/macab/macaborder.hxx
b/connectivity/source/drivers/macab/macaborder.hxx
index de7a2ed7c189..a5bef2f4adba 100644
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
@@ -27,10 +27,8 @@
#include <memory>
#include <vector>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
class MacabOrder
{
public:
@@ -61,7 +59,6 @@ namespace connectivity
void addOrder(MacabOrder *pOrder);
virtual sal_Int32 compare(const MacabRecord *record1, const
MacabRecord *record2) const override;
};
- }
}
#endif
diff --git a/connectivity/source/drivers/macab/macabutilities.hxx
b/connectivity/source/drivers/macab/macabutilities.hxx
index c384604e3514..d0027c8da6ed 100644
--- a/connectivity/source/drivers/macab/macabutilities.hxx
+++ b/connectivity/source/drivers/macab/macabutilities.hxx
@@ -29,10 +29,8 @@
#include <AddressBook/ABAddressBookC.h>
#include <postmac.h>
-namespace connectivity
+namespace connectivity::macab
{
- namespace macab
- {
inline OUString CFStringToOUString(const CFStringRef sOrig)
{
@@ -135,7 +133,6 @@ namespace connectivity
}
void impl_throwError(const char* pErrorId);
- }
}
#endif // _ CONNECTIVITY_MACAB_UTILITIES_HXX_
diff --git a/connectivity/source/drivers/mork/MCatalog.hxx
b/connectivity/source/drivers/mork/MCatalog.hxx
index 170809f7cd49..32d6d2b7e216 100644
--- a/connectivity/source/drivers/mork/MCatalog.hxx
+++ b/connectivity/source/drivers/mork/MCatalog.hxx
@@ -21,9 +21,7 @@
#include <sdbcx/VCatalog.hxx>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
// please don't name the class the same name as in another namespaces
// some compilers have problems with this task as I noticed on windows
@@ -45,7 +43,7 @@ namespace connectivity
OConnection* getConnection() const { return
m_pConnection; }
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCATALOG_HXX
diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx
b/connectivity/source/drivers/mork/MColumnAlias.hxx
index 3900b324b394..1482802768ff 100644
--- a/connectivity/source/drivers/mork/MColumnAlias.hxx
+++ b/connectivity/source/drivers/mork/MColumnAlias.hxx
@@ -25,9 +25,7 @@
#include <unordered_map>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class OColumnAlias
{
@@ -65,7 +63,7 @@ namespace connectivity
private:
void initialize( const css::uno::Reference<
css::lang::XMultiServiceFactory >& _rxORB );
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCOLUMNALIAS_HXX
diff --git a/connectivity/source/drivers/mork/MColumns.hxx
b/connectivity/source/drivers/mork/MColumns.hxx
index b0774af27c88..fa7a6f03bd8a 100644
--- a/connectivity/source/drivers/mork/MColumns.hxx
+++ b/connectivity/source/drivers/mork/MColumns.hxx
@@ -23,9 +23,7 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include "MTable.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class OColumns final : public sdbcx::OCollection
{
@@ -41,7 +39,7 @@ namespace connectivity
,m_pTable(_pTable)
{}
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCOLUMNS_HXX
diff --git a/connectivity/source/drivers/mork/MConnection.hxx
b/connectivity/source/drivers/mork/MConnection.hxx
index b4e8e9f58c88..99807fd838dc 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -20,9 +20,7 @@
// do we want here namespace too?
class MorkParser;
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class MorkDriver;
class ErrorDescriptor;
@@ -93,7 +91,7 @@ namespace connectivity
void throwSQLException( const ErrorDescriptor& _rError, const
css::uno::Reference< css::uno::XInterface >& _rxContext );
void throwSQLException( const char* pErrorResourceId, const
css::uno::Reference< css::uno::XInterface >& _rxContext );
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index 8677fc7aa903..22f4aad769e6 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -14,9 +14,7 @@
#include <TDatabaseMetaDataBase.hxx>
#include "MConnection.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class MDatabaseMetaDataHelper;
@@ -183,7 +181,7 @@ namespace connectivity
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const
OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types )
override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
index 0ae96dac96a6..6c709b256a3b 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
@@ -13,9 +13,7 @@
#include <FDatabaseMetaDataResultSet.hxx>
#include "MConnection.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class MDatabaseMetaDataHelper
{
@@ -31,7 +29,7 @@ namespace connectivity
const OUString& tableNamePattern,
ODatabaseMetaDataResultSet::ORows& _rRows);
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX
diff --git a/connectivity/source/drivers/mork/MErrorResource.hxx
b/connectivity/source/drivers/mork/MErrorResource.hxx
index 0691b18134f4..a0efc09cbd9b 100644
--- a/connectivity/source/drivers/mork/MErrorResource.hxx
+++ b/connectivity/source/drivers/mork/MErrorResource.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class ErrorDescriptor
{
@@ -48,7 +46,7 @@ namespace connectivity
bool is() const { return m_pErrorResourceId != nullptr; }
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MERRORRESOURCE_HXX
diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx
b/connectivity/source/drivers/mork/MPreparedStatement.hxx
index c40ffc90950e..d7caad8e76f1 100644
--- a/connectivity/source/drivers/mork/MPreparedStatement.hxx
+++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx
@@ -25,9 +25,7 @@
#include <com/sun/star/sdbc/XMultipleResults.hpp>
#include <cppuhelper/implbase5.hxx>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
typedef ::cppu::ImplHelper5< css::sdbc::XPreparedStatement,
@@ -126,7 +124,7 @@ namespace connectivity
private:
using OPropertySetHelper::getFastPropertyValue;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MPREPAREDSTATEMENT_HXX
diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx
b/connectivity/source/drivers/mork/MQueryHelper.hxx
index 67d2b081d3c2..7b6a9fc59763 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.hxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.hxx
@@ -24,9 +24,7 @@
#include "MErrorResource.hxx"
#include "MColumnAlias.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class OConnection;
class MQueryHelper;
@@ -176,7 +174,7 @@ namespace connectivity
void setAddressbook( OUString const &);
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MQUERYHELPER_HXX
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx
b/connectivity/source/drivers/mork/MResultSet.hxx
index 0531781d7cc1..a63b71b901dd 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -42,9 +42,7 @@
#include <connectivity/sqliterator.hxx>
#include <TSortIndex.hxx>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
/*
@@ -342,7 +340,6 @@ public:
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSET_HXX
diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx
b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
index 5362a4ac080c..953ed6b214ef 100644
--- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx
+++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx
@@ -25,9 +25,7 @@
#include <rtl/ref.hxx>
#include "MTable.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
//************ Class: ResultSetMetaData
@@ -80,7 +78,7 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column )
override;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column )
override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MRESULTSETMETADATA_HXX
diff --git a/connectivity/source/drivers/mork/MStatement.hxx
b/connectivity/source/drivers/mork/MStatement.hxx
index 3cd7113a8e47..9aade8c5c96f 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -29,9 +29,7 @@
#include <memory>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class OResultSet;
@@ -176,7 +174,7 @@ namespace connectivity
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MSTATEMENT_HXX
diff --git a/connectivity/source/drivers/mork/MTable.hxx
b/connectivity/source/drivers/mork/MTable.hxx
index 7cbe216be9ae..cf2b80d58287 100644
--- a/connectivity/source/drivers/mork/MTable.hxx
+++ b/connectivity/source/drivers/mork/MTable.hxx
@@ -23,9 +23,7 @@
#include <connectivity/TTableHelper.hxx>
#include "MConnection.hxx"
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
typedef ::connectivity::OTableHelper OTable_Base;
@@ -54,7 +52,7 @@ namespace connectivity
private:
using OTable_Base::getConnection;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLE_HXX
diff --git a/connectivity/source/drivers/mork/MTables.hxx
b/connectivity/source/drivers/mork/MTables.hxx
index ac3730f9aa16..d0a1d420a0d5 100644
--- a/connectivity/source/drivers/mork/MTables.hxx
+++ b/connectivity/source/drivers/mork/MTables.hxx
@@ -21,9 +21,7 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-namespace connectivity
-{
- namespace mork
+namespace connectivity::mork
{
class OTables : public sdbcx::OCollection
{
@@ -40,7 +38,7 @@ namespace connectivity
// only the name is identical to ::cppu::OComponentHelper
virtual void disposing() override;
};
- }
+
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLES_HXX
diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
index 24407e038ccb..e3d3fa7e4aac 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx
@@ -28,10 +28,8 @@
#include <cppuhelper/compbase.hxx>
-namespace connectivity
+namespace connectivity::mozab
{
- namespace mozab
- {
typedef ::cppu::WeakComponentImplHelper<
css::mozilla::XMozillaBootstrap,
css::lang::XServiceInfo >
OMozillaBootstrap_BASE;
class ProfileAccess;
@@ -75,7 +73,6 @@ namespace connectivity
// XProxyRunner
virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference<
css::mozilla::XCodeProxy >& aCode ) override;
};
- }
}
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
index 8921a9c4bcfc..0558d2996ead 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
@@ -29,17 +29,10 @@
#include <map>
using namespace com::sun::star::mozilla;
-namespace connectivity
-{
- namespace mozab
- {
- class ProfileStruct;
- }
-}
+namespace connectivity::mozab { class ProfileStruct; }
+
typedef std::map<OUString, ::connectivity::mozab::ProfileStruct> ProfileList;
-namespace connectivity
-{
- namespace mozab
+namespace connectivity::mozab
{
class ProfileStruct
{
@@ -82,7 +75,6 @@ namespace connectivity
void LoadXPToolkitProfiles(MozillaProductType product);
};
- }
}
#endif //
INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILEDISCOVER_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
index 6814a574c87d..18109d359ca0 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.hxx
@@ -25,9 +25,7 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::uno::Any;
@@ -232,7 +230,6 @@ public:
css::uno::Reference<css::sdbc::XConnection> SAL_CALL getConnection()
override;
};
}
-}
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_DATABASEMETADATA_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
index b55d9cfeeeaf..e5d199fcad6f 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.hxx
@@ -28,9 +28,7 @@
#include <cppuhelper/compbase2.hxx>
#include <osl/module.h>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using css::sdbc::SQLException;
using css::uno::Exception;
@@ -86,8 +84,8 @@ public:
static rtl_TextEncoding getDefaultEncoding() { return
RTL_TEXTENCODING_UTF8; }
};
-} /* mysqlc */
-} /* connectivity */
+
+} /* connectivity::mysqlc */
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_DRIVER_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
index 4ff64d5b4320..511a053b8e1a 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx
@@ -40,9 +40,7 @@
#include <cppuhelper/compbase12.hxx>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::Any;
@@ -250,8 +248,8 @@ public:
private:
using ::cppu::OPropertySetHelper::getFastPropertyValue;
};
-} /* mysqlc */
-} /* connectivity */
+
+} /* connectivity::mysqlc */
#endif // CONNECTIVITY_SRESULTSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
index 0177b15dbd03..78471b1e3208 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_preparedstatement.hxx
@@ -29,9 +29,7 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <cppuhelper/compbase4.hxx>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::sdbc::XResultSetMetaData;
@@ -154,8 +152,8 @@ public:
// XResultSetMetaDataSupplier
Reference<css::sdbc::XResultSetMetaData> SAL_CALL getMetaData() override;
};
-} /* mysqlc */
-} /* connectivity */
+
+} /* connectivity::mysqlc */
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PREPAREDSTATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx
index b2c1a1be071e..8d8b541cfa24 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx
@@ -23,9 +23,7 @@
// this define has to be set to split the names into different dll's or so's
// every dll has his own set of property names
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
enum
{
@@ -41,8 +39,8 @@ enum
PROPERTY_ID_USEBOOKMARKS,
PROPERTY_ID_ISBOOKMARKABLE
};
-} /* mysqlc */
-} /* connectivity */
+
+} /* connectivity::mysqlc */
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_PROPERTYIDS_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
index dca2bb4a9d88..3854ad92944b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx
@@ -39,9 +39,7 @@
#include <cppuhelper/compbase12.hxx>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::Any;
@@ -272,8 +270,8 @@ public:
private:
using ::cppu::OPropertySetHelper::getFastPropertyValue;
};
-} /* mysqlc */
-} /* connectivity */
+
+} /* connectivity::mysqlc */
#endif // CONNECTIVITY_SRESULTSET_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
index 52ca9595b9ba..d08d21c47d92 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.hxx
@@ -29,9 +29,7 @@
#include <cppuhelper/implbase1.hxx>
#include <mysql.h>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::uno::RuntimeException;
@@ -102,7 +100,6 @@ public:
OUString SAL_CALL getColumnServiceName(sal_Int32 column) override;
};
}
-}
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_RESULTSETMETADATA_HXX
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
index 4416ccceb150..c85e054dd732 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx
@@ -35,9 +35,7 @@
#include <cppuhelper/compbase3.hxx>
#include <rtl/ref.hxx>
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
using ::com::sun::star::sdbc::SQLException;
using ::com::sun::star::sdbc::SQLWarning;
@@ -174,7 +172,6 @@ public:
// css::uno::Sequence<sal_Int32> SAL_CALL executeBatch() override;
};
}
-}
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_STATEMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
index a1b02da51fa5..6d1c07801024 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx
@@ -28,24 +28,12 @@ namespace cppu
{
class IPropertyArrayHelper;
}
-
-namespace com
-{
-namespace sun
-{
-namespace star
-{
-namespace lang
+namespace com::sun::star::lang
{
class XComponent;
}
-}
-}
-}
-namespace connectivity
-{
-namespace mysqlc
+namespace connectivity::mysqlc
{
/// @throws css::lang::DisposedException
void checkDisposed(bool _bThrow);
@@ -153,7 +141,6 @@ css::uno::Sequence<T> concatSequences(const
css::uno::Sequence<T>& _rLeft,
return aReturn;
}
}
-}
#endif // INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX
diff --git a/connectivity/source/inc/ado/ACallableStatement.hxx
b/connectivity/source/inc/ado/ACallableStatement.hxx
index 6d6979e40f35..3114242558ac 100644
--- a/connectivity/source/inc/ado/ACallableStatement.hxx
+++ b/connectivity/source/inc/ado/ACallableStatement.hxx
@@ -25,10 +25,8 @@
#include <com/sun/star/sdbc/XOutParameters.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
//************ Class: java.sql.CallableStatement
@@ -73,7 +71,6 @@ namespace connectivity
virtual void SAL_CALL registerOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override;
virtual void SAL_CALL registerNumericOutParameter( sal_Int32
parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) override;
};
- }
}
#endif // _CONNECTIVITY_OCallableStatement_HXX_
diff --git a/connectivity/source/inc/ado/ACatalog.hxx
b/connectivity/source/inc/ado/ACatalog.hxx
index d1d8e22bf49c..9afe9e41cfb9 100644
--- a/connectivity/source/inc/ado/ACatalog.hxx
+++ b/connectivity/source/inc/ado/ACatalog.hxx
@@ -22,10 +22,8 @@
#include <sdbcx/VCatalog.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
class OCatalog : public connectivity::sdbcx::OCatalog
@@ -47,7 +45,6 @@ namespace connectivity
sdbcx::OCollection* getPrivateTables() const { return
m_pTables.get(); }
WpADOCatalog getCatalog() const { return m_aCatalog;
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX
diff --git a/connectivity/source/inc/ado/AColumn.hxx
b/connectivity/source/inc/ado/AColumn.hxx
index cc49f3b364c4..84344ece755e 100644
--- a/connectivity/source/inc/ado/AColumn.hxx
+++ b/connectivity/source/inc/ado/AColumn.hxx
@@ -23,10 +23,8 @@
#include <connectivity/sdbcx/VColumn.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
typedef sdbcx::OColumn OColumn_ADO;
class OAdoColumn : public OColumn_ADO
@@ -53,7 +51,6 @@ namespace connectivity
WpADOColumn getColumnImpl() const;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMN_HXX
diff --git a/connectivity/source/inc/ado/AColumns.hxx
b/connectivity/source/inc/ado/AColumns.hxx
index 6b605df7cab2..f9773ba48460 100644
--- a/connectivity/source/inc/ado/AColumns.hxx
+++ b/connectivity/source/inc/ado/AColumns.hxx
@@ -25,10 +25,8 @@
#include <connectivity/sdbcx/IRefreshable.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
class OColumns : public sdbcx::OCollection
{
@@ -54,7 +52,6 @@ namespace connectivity
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMNS_HXX
diff --git a/connectivity/source/inc/ado/AConnection.hxx
b/connectivity/source/inc/ado/AConnection.hxx
index 21bc9129c2c8..29f552946a89 100644
--- a/connectivity/source/inc/ado/AConnection.hxx
+++ b/connectivity/source/inc/ado/AConnection.hxx
@@ -28,10 +28,8 @@
#include <TConnection.hxx>
#include <ado/Awrapado.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
struct OExtendedTypeInfo
{
::connectivity::OTypeInfo aSimpleType; // the general
type info
@@ -131,7 +129,6 @@ namespace connectivity
sal_Int32 _nScale,
bool& _brForceToType);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACONNECTION_HXX
diff --git a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
index 83a84f3bda03..af59ab2429e1 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaData.hxx
@@ -23,10 +23,8 @@
#include <TDatabaseMetaDataBase.hxx>
#include <map>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOConnection;
class OConnection;
@@ -218,8 +216,8 @@ namespace connectivity
virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override;
virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL
getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const
OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types )
override;
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATA_HXX
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
index 4d99bdce387d..a13ae359a5cc 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx
@@ -34,10 +34,8 @@
#include <comphelper/proparrhlp.hxx>
#include <ado/AStatement.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
/*
** java_sql_ResultSet
*/
@@ -222,7 +220,6 @@ namespace connectivity
return map;
}
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADATABASEMETADATARESULTSET_HXX
diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
index 714aa91367bd..59750edfd400 100644
--- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx
@@ -27,10 +27,8 @@
#include <ado/ADatabaseMetaDataResultSet.hxx>
#include <OColumn.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
//************ Class: ResultSetMetaData
@@ -100,7 +98,6 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column )
override;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column )
override;
};
- }
}
#endif // _CONNECTIVITY_ADO_ADATABASEMETARESULTSETMETADATA_HXX_
diff --git a/connectivity/source/inc/ado/ADriver.hxx
b/connectivity/source/inc/ado/ADriver.hxx
index df017f2b6fa2..c7bc558fb4d3 100644
--- a/connectivity/source/inc/ado/ADriver.hxx
+++ b/connectivity/source/inc/ado/ADriver.hxx
@@ -28,10 +28,8 @@
namespace com::sun::star::lang { class XMultiServiceFactory; }
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
ODriver_CreateInstance(const css::uno::Reference<
css::lang::XMultiServiceFactory >& _rxFactory);
@@ -83,7 +81,6 @@ namespace connectivity
virtual css::uno::Reference< css::sdbcx::XTablesSupplier >
SAL_CALL getDataDefinitionByConnection( const css::uno::Reference<
css::sdbc::XConnection >& connection ) override;
virtual css::uno::Reference< css::sdbcx::XTablesSupplier >
SAL_CALL getDataDefinitionByURL( const OUString& url, const css::uno::Sequence<
css::beans::PropertyValue >& info ) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ADRIVER_HXX
diff --git a/connectivity/source/inc/ado/AGroup.hxx
b/connectivity/source/inc/ado/AGroup.hxx
index 2b3f36fff30f..73b526006647 100644
--- a/connectivity/source/inc/ado/AGroup.hxx
+++ b/connectivity/source/inc/ado/AGroup.hxx
@@ -23,10 +23,8 @@
#include <sdbcx/VGroup.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
typedef sdbcx::OGroup OGroup_ADO;
class OCatalog;
@@ -60,7 +58,6 @@ namespace connectivity
WpADOGroup getImpl() const { return m_aGroup; }
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX
diff --git a/connectivity/source/inc/ado/AGroups.hxx
b/connectivity/source/inc/ado/AGroups.hxx
index 1676b9a6c089..91c38dc64b1b 100644
--- a/connectivity/source/inc/ado/AGroups.hxx
+++ b/connectivity/source/inc/ado/AGroups.hxx
@@ -24,10 +24,8 @@
#include <ado/Awrapadox.hxx>
#include <ado/ACatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OGroups : public sdbcx::OCollection
{
WpADOGroups m_aCollection;
@@ -49,7 +47,6 @@ namespace connectivity
{
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUPS_HXX
diff --git a/connectivity/source/inc/ado/AIndex.hxx
b/connectivity/source/inc/ado/AIndex.hxx
index b31bef3f808c..41a839619b78 100644
--- a/connectivity/source/inc/ado/AIndex.hxx
+++ b/connectivity/source/inc/ado/AIndex.hxx
@@ -24,10 +24,8 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
class OAdoIndex : public sdbcx::OIndex
{
@@ -47,7 +45,6 @@ namespace connectivity
WpADOIndex getImpl() const { return m_aIndex;}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEX_HXX
diff --git a/connectivity/source/inc/ado/AIndexes.hxx
b/connectivity/source/inc/ado/AIndexes.hxx
index 4c253cac5e2e..065c8a0b1843 100644
--- a/connectivity/source/inc/ado/AIndexes.hxx
+++ b/connectivity/source/inc/ado/AIndexes.hxx
@@ -23,10 +23,8 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
class OIndexes : public sdbcx::OCollection
{
@@ -51,7 +49,6 @@ namespace connectivity
{
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEXES_HXX
diff --git a/connectivity/source/inc/ado/AKey.hxx
b/connectivity/source/inc/ado/AKey.hxx
index bd0b5a6404e9..ffb1eebe4216 100644
--- a/connectivity/source/inc/ado/AKey.hxx
+++ b/connectivity/source/inc/ado/AKey.hxx
@@ -24,10 +24,8 @@
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
typedef sdbcx::OKey OKey_ADO;
class OConnection;
@@ -57,7 +55,6 @@ namespace connectivity
static sal_Int32 MapKeyRule(const KeyTypeEnum& _eNum);
static KeyTypeEnum Map2KeyRule(sal_Int32 _eNum);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEY_HXX
diff --git a/connectivity/source/inc/ado/AKeys.hxx
b/connectivity/source/inc/ado/AKeys.hxx
index 35ef33e37455..6de3d5a2055a 100644
--- a/connectivity/source/inc/ado/AKeys.hxx
+++ b/connectivity/source/inc/ado/AKeys.hxx
@@ -23,10 +23,8 @@
#include <connectivity/sdbcx/VCollection.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OConnection;
class OKeys : public sdbcx::OCollection
{
@@ -51,7 +49,6 @@ namespace connectivity
{
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEYS_HXX
diff --git a/connectivity/source/inc/ado/AResultSet.hxx
b/connectivity/source/inc/ado/AResultSet.hxx
index f901553332e0..101835f26019 100644
--- a/connectivity/source/inc/ado/AResultSet.hxx
+++ b/connectivity/source/inc/ado/AResultSet.hxx
@@ -37,10 +37,8 @@
#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
/*
** java_sql_ResultSet
*/
@@ -230,7 +228,6 @@ namespace connectivity
virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const
css::uno::Sequence< css::uno::Any >& rows ) override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ARESULTSET_HXX
diff --git a/connectivity/source/inc/ado/AResultSetMetaData.hxx
b/connectivity/source/inc/ado/AResultSetMetaData.hxx
index ebb52be02e2b..6389efc04a70 100644
--- a/connectivity/source/inc/ado/AResultSetMetaData.hxx
+++ b/connectivity/source/inc/ado/AResultSetMetaData.hxx
@@ -27,10 +27,8 @@
#include <ado/AResultSet.hxx>
#include <OColumn.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
//************ Class: ResultSetMetaData
@@ -77,7 +75,6 @@ namespace connectivity
virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column )
override;
virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column )
override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ARESULTSETMETADATA_HXX
diff --git a/connectivity/source/inc/ado/AStatement.hxx
b/connectivity/source/inc/ado/AStatement.hxx
index 278a3595095b..2ec7e2f51d74 100644
--- a/connectivity/source/inc/ado/AStatement.hxx
+++ b/connectivity/source/inc/ado/AStatement.hxx
@@ -35,10 +35,8 @@
#include <ado/Awrapado.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
typedef ::cppu::WeakComponentImplHelper< css::sdbc::XStatement,
css::sdbc::XWarningsSupplier,
css::util::XCancellable,
@@ -214,7 +212,6 @@ namespace connectivity
virtual void SAL_CALL clearBatch( ) override;
virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( )
override;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ASTATEMENT_HXX
diff --git a/connectivity/source/inc/ado/ATable.hxx
b/connectivity/source/inc/ado/ATable.hxx
index 51a9fd14588b..dd0949dd2c3d 100644
--- a/connectivity/source/inc/ado/ATable.hxx
+++ b/connectivity/source/inc/ado/ATable.hxx
@@ -24,10 +24,8 @@
#include <ado/Awrapadox.hxx>
#include <ado/ACatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
typedef connectivity::sdbcx::OTable OTable_TYPEDEF;
typedef connectivity::sdbcx::OTableDescriptor_BASE
OTableDescriptor_BASE_TYPEDEF;
@@ -70,7 +68,6 @@ namespace connectivity
WpADOTable getImpl() const { return m_aTable;}
OCatalog* getCatalog() const { return m_pCatalog; }
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLE_HXX
diff --git a/connectivity/source/inc/ado/ATables.hxx
b/connectivity/source/inc/ado/ATables.hxx
index a65741862702..2ca881051ff6 100644
--- a/connectivity/source/inc/ado/ATables.hxx
+++ b/connectivity/source/inc/ado/ATables.hxx
@@ -23,10 +23,8 @@
#include <ado/Awrapadox.hxx>
#include <ado/ACatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OCatalog;
class OTables : public sdbcx::OCollection
{
@@ -50,7 +48,6 @@ namespace connectivity
}
void appendNew(const OUString& _rsNewTable);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLES_HXX
diff --git a/connectivity/source/inc/ado/AUser.hxx
b/connectivity/source/inc/ado/AUser.hxx
index 3b7227d36455..1368ed46d922 100644
--- a/connectivity/source/inc/ado/AUser.hxx
+++ b/connectivity/source/inc/ado/AUser.hxx
@@ -23,10 +23,8 @@
#include <sdbcx/VUser.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OCatalog;
typedef connectivity::sdbcx::OUser OUser_TYPEDEF;
typedef connectivity::sdbcx::OUser_BASE OUser_BASE_TYPEDEF;
@@ -84,7 +82,6 @@ namespace connectivity
virtual void construct() override;
OUString getPassword() const { return m_Password;}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX
diff --git a/connectivity/source/inc/ado/AUsers.hxx
b/connectivity/source/inc/ado/AUsers.hxx
index 181639196576..17979351ef0a 100644
--- a/connectivity/source/inc/ado/AUsers.hxx
+++ b/connectivity/source/inc/ado/AUsers.hxx
@@ -24,10 +24,8 @@
#include <ado/Awrapadox.hxx>
#include <ado/ACatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OUsers : public sdbcx::OCollection
{
@@ -51,7 +49,6 @@ namespace connectivity
{
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSERS_HXX
diff --git a/connectivity/source/inc/ado/AView.hxx
b/connectivity/source/inc/ado/AView.hxx
index 1bc3dd00bf2d..8aabc1053ba8 100644
--- a/connectivity/source/inc/ado/AView.hxx
+++ b/connectivity/source/inc/ado/AView.hxx
@@ -23,10 +23,8 @@
#include <connectivity/sdbcx/VView.hxx>
#include <ado/Awrapadox.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
typedef sdbcx::OView OView_ADO;
@@ -49,7 +47,6 @@ namespace connectivity
WpADOView getImpl() const { return m_aView;}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEW_HXX
diff --git a/connectivity/source/inc/ado/AViews.hxx
b/connectivity/source/inc/ado/AViews.hxx
index 1ef1a6be31c3..be90d1463f08 100644
--- a/connectivity/source/inc/ado/AViews.hxx
+++ b/connectivity/source/inc/ado/AViews.hxx
@@ -25,10 +25,8 @@
#include <ado/ACatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OViews : public sdbcx::OCollection
{
@@ -49,7 +47,6 @@ namespace connectivity
{
}
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEWS_HXX
diff --git a/connectivity/source/inc/ado/Aolevariant.hxx
b/connectivity/source/inc/ado/Aolevariant.hxx
index 732880a7c088..0c6ebd649cf1 100644
--- a/connectivity/source/inc/ado/Aolevariant.hxx
+++ b/connectivity/source/inc/ado/Aolevariant.hxx
@@ -25,25 +25,15 @@
#include <oaidl.h>
-namespace com
+namespace com::sun::star::util
{
- namespace sun
- {
- namespace star
- {
- namespace util
- {
- struct Date;
- struct Time;
- struct DateTime;
- }
- }
- }
+ struct Date;
+ struct Time;
+ struct DateTime;
}
-namespace connectivity
+
+namespace connectivity::ado
{
- namespace ado
- {
class OLEString
{
BSTR m_sStr;
@@ -146,7 +136,6 @@ namespace connectivity
void set(double n);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AOLEVARIANT_HXX
diff --git a/connectivity/source/inc/ado/Aolewrap.hxx
b/connectivity/source/inc/ado/Aolewrap.hxx
index ef5c1a85995f..fc5b4070de0f 100644
--- a/connectivity/source/inc/ado/Aolewrap.hxx
+++ b/connectivity/source/inc/ado/Aolewrap.hxx
@@ -28,10 +28,8 @@ namespace rtl
{
class OUString;
}
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class OLEVariant;
class WpBase
{
@@ -218,8 +216,8 @@ namespace connectivity
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AOLEWRAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/ado/Awrapado.hxx
b/connectivity/source/inc/ado/Awrapado.hxx
index c7817a75b326..8536bdee6a9f 100644
--- a/connectivity/source/inc/ado/Awrapado.hxx
+++ b/connectivity/source/inc/ado/Awrapado.hxx
@@ -29,10 +29,8 @@
#include <ado/Aolewrap.hxx>
#include <ado/Aolevariant.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOConnection;
class WpADOCommand;
class WpADORecordset;
@@ -369,8 +367,8 @@ namespace connectivity
*/
static OLEVariant getValue(const WpADOProperties&
_rProps,const OLEVariant &_aPosition);
};
- }
}
+
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AWRAPADO_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/ado/Awrapadox.hxx
b/connectivity/source/inc/ado/Awrapadox.hxx
index 7a4f3e5a1ef7..469afd41727e 100644
--- a/connectivity/source/inc/ado/Awrapadox.hxx
+++ b/connectivity/source/inc/ado/Awrapadox.hxx
@@ -66,10 +66,8 @@ typedef struct _ADOTable Table;
#include <ado/WrapTable.hxx>
#include <ado/WrapCatalog.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOView : public WpOLEBase<ADOView>
{
public:
@@ -132,7 +130,6 @@ namespace connectivity
/* [in] */ ActionEnum Action,
/* [in] */ RightsEnum Rights);
};
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/ado/WrapCatalog.hxx
b/connectivity/source/inc/ado/WrapCatalog.hxx
index 3587d5bcd34a..d91f598eb7e3 100644
--- a/connectivity/source/inc/ado/WrapCatalog.hxx
+++ b/connectivity/source/inc/ado/WrapCatalog.hxx
@@ -21,10 +21,8 @@
#include <ado/WrapTypeDefs.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOCatalog : public WpOLEBase<_ADOCatalog>
{
public:
@@ -44,7 +42,6 @@ namespace connectivity
ADOProcedures* get_Procedures();
void Create();
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCATALOG_HXX
diff --git a/connectivity/source/inc/ado/WrapColumn.hxx
b/connectivity/source/inc/ado/WrapColumn.hxx
index 7f3dd3d86903..1c34956a2622 100644
--- a/connectivity/source/inc/ado/WrapColumn.hxx
+++ b/connectivity/source/inc/ado/WrapColumn.hxx
@@ -23,10 +23,8 @@
#include <adoint.h>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOColumn : public WpOLEBase<_ADOColumn>
{
public:
@@ -56,7 +54,6 @@ namespace connectivity
WpADOProperties get_Properties() const;
void put_ParentCatalog(/* [in] */ _ADOCatalog __RPC_FAR
*ppvObject);
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPCOLUMN_HXX
diff --git a/connectivity/source/inc/ado/WrapIndex.hxx
b/connectivity/source/inc/ado/WrapIndex.hxx
index e60a1249afc2..8fb836c949ff 100644
--- a/connectivity/source/inc/ado/WrapIndex.hxx
+++ b/connectivity/source/inc/ado/WrapIndex.hxx
@@ -21,10 +21,8 @@
#include <ado/WrapTypeDefs.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOIndex : public WpOLEBase<_ADOIndex>
{
public:
@@ -46,7 +44,6 @@ namespace connectivity
void put_PrimaryKey(bool _b);
WpADOColumns get_Columns() const;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPINDEX_HXX
diff --git a/connectivity/source/inc/ado/WrapKey.hxx
b/connectivity/source/inc/ado/WrapKey.hxx
index e5e10a56c835..52a3963f305c 100644
--- a/connectivity/source/inc/ado/WrapKey.hxx
+++ b/connectivity/source/inc/ado/WrapKey.hxx
@@ -21,10 +21,8 @@
#include <ado/WrapTypeDefs.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOKey : public WpOLEBase<ADOKey>
{
public:
@@ -48,7 +46,6 @@ namespace connectivity
void put_UpdateRule(const RuleEnum& _eNum) ;
WpADOColumns get_Columns() const;
};
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPKEY_HXX
diff --git a/connectivity/source/inc/ado/WrapTable.hxx
b/connectivity/source/inc/ado/WrapTable.hxx
index b7a1be72eb30..a0ae8e5b87f7 100644
--- a/connectivity/source/inc/ado/WrapTable.hxx
+++ b/connectivity/source/inc/ado/WrapTable.hxx
@@ -21,10 +21,8 @@
#include <ado/WrapTypeDefs.hxx>
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOCatalog;
class WpADOTable : public WpOLEBase<_ADOTable>
@@ -51,7 +49,6 @@ namespace connectivity
typedef WpOLEAppendCollection<ADOTables, _ADOTable, WpADOTable>
WpADOTables;
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPTABLE_HXX
diff --git a/connectivity/source/inc/ado/WrapTypeDefs.hxx
b/connectivity/source/inc/ado/WrapTypeDefs.hxx
index 1a76dc5f898c..991d0018e5d8 100644
--- a/connectivity/source/inc/ado/WrapTypeDefs.hxx
+++ b/connectivity/source/inc/ado/WrapTypeDefs.hxx
@@ -20,10 +20,8 @@
#define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPTYPEDEFS_HXX
-namespace connectivity
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOTable;
class WpADOKey;
class WpADOIndex;
@@ -39,7 +37,6 @@ namespace connectivity
typedef WpOLEAppendCollection<ADOGroups, ADOGroup, WpADOGroup>
WpADOGroups;
typedef WpOLEAppendCollection<ADOViews, ADOView, WpADOView>
WpADOViews;
typedef WpOLEAppendCollection<ADOUsers, _ADOUser, WpADOUser>
WpADOUsers;
- }
}
#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_WRAPTYPEDEFS_HXX
diff --git a/connectivity/source/inc/ado/adoimp.hxx
b/connectivity/source/inc/ado/adoimp.hxx
index 8393ca731aa3..5394aac3e4a0 100644
--- a/connectivity/source/inc/ado/adoimp.hxx
+++ b/connectivity/source/inc/ado/adoimp.hxx
@@ -24,10 +24,9 @@
#include <adoctint.h>
struct ADOConnection;
-namespace connectivity
+
+namespace connectivity::ado
{
- namespace ado
- {
class WpADOField;
class OLEString;
@@ -88,9 +87,9 @@ namespace connectivity
};
- }
}
+
#define ADO_PROP(ItemName) \
WpADOProperty aProp(aProps.GetItem(ItemName)); \
OLEVariant aVar; \
diff --git a/connectivity/source/inc/calc/CCatalog.hxx
b/connectivity/source/inc/calc/CCatalog.hxx
index 724b5fb129a0..466e96ece829 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -21,10 +21,8 @@
#include <file/FCatalog.hxx>
-namespace connectivity
+namespace connectivity::calc
{
- namespace calc
- {
class OCalcConnection;
class OCalcCatalog : public file::OFileCatalog
{
@@ -34,7 +32,7 @@ namespace connectivity
public:
OCalcCatalog(OCalcConnection* _pCon);
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CConnection.hxx
b/connectivity/source/inc/calc/CConnection.hxx
index b0eeb2d4acea..6eabeccef5ff 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -33,9 +33,7 @@ namespace com::sun::star {
namespace utl { class CloseVeto; }
-namespace connectivity
-{
- namespace calc
+namespace connectivity::calc
{
class ODriver;
class OCalcConnection : public file::OConnection
@@ -145,7 +143,7 @@ namespace connectivity
const css::uno::Reference< css::sheet::XSpreadsheetDocument>&
getDoc() const { return m_xDoc; }
};
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index a46d09c14b1c..61f9f6aa7ea2 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -21,9 +21,7 @@
#include <component/CDatabaseMetaData.hxx>
-namespace connectivity
-{
- namespace calc
+namespace connectivity::calc
{
//************ Class: java.sql.DatabaseMetaDataDate
@@ -38,7 +36,7 @@ namespace connectivity
public:
OCalcDatabaseMetaData(file::OConnection* _pCon);
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CDriver.hxx
b/connectivity/source/inc/calc/CDriver.hxx
index 02d9dea55033..99200d23ee54 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -23,9 +23,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-namespace connectivity
-{
- namespace calc
+namespace connectivity::calc
{
/// @throws css::uno::Exception
css::uno::Reference< css::uno::XInterface >
@@ -47,7 +45,7 @@ namespace connectivity
virtual sal_Bool SAL_CALL acceptsURL( const OUString& url )
override;
virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo >
SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence<
css::beans::PropertyValue >& info ) override;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CTable.hxx
b/connectivity/source/inc/calc/CTable.hxx
index b9835c222fc4..a8f49b661bc4 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -31,9 +31,7 @@ namespace com::sun::star::util {
}
-namespace connectivity
-{
- namespace calc
+namespace connectivity::calc
{
typedef component::OComponentTable OCalcTable_BASE;
class OCalcConnection;
@@ -72,7 +70,7 @@ namespace connectivity
void construct() override;
};
- }
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/calc/CTables.hxx
b/connectivity/source/inc/calc/CTables.hxx
index 65c7135f0981..0b88592a2e6a 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -21,9 +21,7 @@
#include <file/FTables.hxx>
-namespace connectivity
-{
- namespace calc
+namespace connectivity::calc
{
typedef file::OTables OCalcTables_BASE;
@@ -36,7 +34,7 @@ namespace connectivity
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
