diff options
Diffstat (limited to 'connectivity/source/inc/ado')
35 files changed, 45 insertions, 153 deletions
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; \ |