diff options
Diffstat (limited to 'connectivity/source/drivers/evoab2')
11 files changed, 24 insertions, 46 deletions
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: */ |