diff options
Diffstat (limited to 'connectivity/source/drivers/macab')
20 files changed, 21 insertions, 81 deletions
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_ |