diff options
Diffstat (limited to 'connectivity/source/inc/calc')
| -rw-r--r-- | connectivity/source/inc/calc/CCatalog.hxx | 16 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CConnection.hxx | 186 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CDatabaseMetaData.hxx | 22 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CDriver.hxx | 40 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CTable.hxx | 56 | ||||
| -rw-r--r-- | connectivity/source/inc/calc/CTables.hxx | 22 |
6 files changed, 171 insertions, 171 deletions
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx index 466e96ece829..facca4166617 100644 --- a/connectivity/source/inc/calc/CCatalog.hxx +++ b/connectivity/source/inc/calc/CCatalog.hxx @@ -23,15 +23,15 @@ namespace connectivity::calc { - class OCalcConnection; - class OCalcCatalog : public file::OFileCatalog - { - public: - virtual void refreshTables() override; + class OCalcConnection; + class OCalcCatalog : public file::OFileCatalog + { +public: + virtual void refreshTables() override; - public: - OCalcCatalog(OCalcConnection* _pCon); - }; + public: + OCalcCatalog(OCalcConnection* _pCon); + }; } diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index 6eabeccef5ff..f9f1b8b07afb 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -34,115 +34,115 @@ namespace utl { class CloseVeto; } namespace connectivity::calc +{ + class ODriver; + class OCalcConnection : public file::OConnection { - class ODriver; - class OCalcConnection : public file::OConnection + // the spreadsheet document: + css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDoc; + OUString m_sPassword; + OUString m_aFileName; + oslInterlockedCount m_nDocCount; + + class CloseVetoButTerminateListener : public cppu::WeakComponentImplHelper<css::frame::XTerminateListener> { - // the spreadsheet document: - css::uno::Reference< css::sheet::XSpreadsheetDocument > m_xDoc; - OUString m_sPassword; - OUString m_aFileName; - oslInterlockedCount m_nDocCount; + private: + /// close listener that vetoes so nobody else disposes m_xDoc + std::unique_ptr<utl::CloseVeto> m_pCloseListener; + /// but also listen to XDesktop and if app is terminating anyway, dispose m_xDoc while + /// its still possible to do so properly + css::uno::Reference<css::frame::XDesktop2> m_xDesktop; + osl::Mutex m_aMutex; + public: + CloseVetoButTerminateListener() + : cppu::WeakComponentImplHelper<css::frame::XTerminateListener>(m_aMutex) + { + } - class CloseVetoButTerminateListener : public cppu::WeakComponentImplHelper<css::frame::XTerminateListener> + void start(const css::uno::Reference<css::uno::XInterface>& rCloseable, + const css::uno::Reference<css::frame::XDesktop2>& rDesktop) { - private: - /// close listener that vetoes so nobody else disposes m_xDoc - std::unique_ptr<utl::CloseVeto> m_pCloseListener; - /// but also listen to XDesktop and if app is terminating anyway, dispose m_xDoc while - /// its still possible to do so properly - css::uno::Reference<css::frame::XDesktop2> m_xDesktop; - osl::Mutex m_aMutex; - public: - CloseVetoButTerminateListener() - : cppu::WeakComponentImplHelper<css::frame::XTerminateListener>(m_aMutex) - { - } - - void start(const css::uno::Reference<css::uno::XInterface>& rCloseable, - const css::uno::Reference<css::frame::XDesktop2>& rDesktop) - { - m_xDesktop = rDesktop; - m_xDesktop->addTerminateListener(this); - m_pCloseListener.reset(new utl::CloseVeto(rCloseable, true)); - } - - void stop() - { - m_pCloseListener.reset(); - if (!m_xDesktop.is()) - return; - m_xDesktop->removeTerminateListener(this); - m_xDesktop.clear(); - } - - // XTerminateListener - virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override - { - } - - virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override - { - stop(); - } + m_xDesktop = rDesktop; + m_xDesktop->addTerminateListener(this); + m_pCloseListener.reset(new utl::CloseVeto(rCloseable, true)); + } - virtual void SAL_CALL disposing() override - { - stop(); - cppu::WeakComponentImplHelperBase::disposing(); - } + void stop() + { + m_pCloseListener.reset(); + if (!m_xDesktop.is()) + return; + m_xDesktop->removeTerminateListener(this); + m_xDesktop.clear(); + } + + // XTerminateListener + virtual void SAL_CALL queryTermination(const css::lang::EventObject& /*rEvent*/) override + { + } + + virtual void SAL_CALL notifyTermination(const css::lang::EventObject& /*rEvent*/) override + { + stop(); + } - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override - { - const bool bShutDown = (rEvent.Source == m_xDesktop); - if (bShutDown) - stop(); - } - }; + virtual void SAL_CALL disposing() override + { + stop(); + cppu::WeakComponentImplHelperBase::disposing(); + } - rtl::Reference<CloseVetoButTerminateListener> m_xCloseVetoButTerminateListener; + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override + { + const bool bShutDown = (rEvent.Source == m_xDesktop); + if (bShutDown) + stop(); + } + }; - public: - OCalcConnection(ODriver* _pDriver); - virtual ~OCalcConnection() override; + rtl::Reference<CloseVetoButTerminateListener> m_xCloseVetoButTerminateListener; - virtual void construct(const OUString& _rUrl, - const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override; + public: + OCalcConnection(ODriver* _pDriver); + virtual ~OCalcConnection() override; - // XServiceInfo - DECLARE_SERVICE_INFO(); + virtual void construct(const OUString& _rUrl, + const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) override; - // OComponentHelper - virtual void SAL_CALL disposing() override; + // XServiceInfo + DECLARE_SERVICE_INFO(); - // XConnection - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; - virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog() override; - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + // OComponentHelper + virtual void SAL_CALL disposing() override; - // no interface methods - css::uno::Reference< css::sheet::XSpreadsheetDocument> const & acquireDoc(); - void releaseDoc(); + // XConnection + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog() override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; - class ODocHolder + // no interface methods + css::uno::Reference< css::sheet::XSpreadsheetDocument> const & acquireDoc(); + void releaseDoc(); + + class ODocHolder + { + OCalcConnection* m_pConnection; + css::uno::Reference< css::sheet::XSpreadsheetDocument> m_xDoc; + public: + ODocHolder(OCalcConnection* _pConnection) : m_pConnection(_pConnection) + { + m_xDoc = m_pConnection->acquireDoc(); + } + ~ODocHolder() { - OCalcConnection* m_pConnection; - css::uno::Reference< css::sheet::XSpreadsheetDocument> m_xDoc; - public: - ODocHolder(OCalcConnection* _pConnection) : m_pConnection(_pConnection) - { - m_xDoc = m_pConnection->acquireDoc(); - } - ~ODocHolder() - { - m_xDoc.clear(); - m_pConnection->releaseDoc(); - } - const css::uno::Reference< css::sheet::XSpreadsheetDocument>& getDoc() const { return m_xDoc; } - }; + m_xDoc.clear(); + m_pConnection->releaseDoc(); + } + const css::uno::Reference< css::sheet::XSpreadsheetDocument>& getDoc() const { return m_xDoc; } }; + }; } diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx index 61f9f6aa7ea2..b58f5c1d84e7 100644 --- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx +++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx @@ -22,20 +22,20 @@ #include <component/CDatabaseMetaData.hxx> namespace connectivity::calc - { +{ - //************ Class: java.sql.DatabaseMetaDataDate + //************ Class: java.sql.DatabaseMetaDataDate - class OCalcDatabaseMetaData : public component::OComponentDatabaseMetaData - { - virtual OUString SAL_CALL getURL( ) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; - protected: - virtual ~OCalcDatabaseMetaData() override; - public: - OCalcDatabaseMetaData(file::OConnection* _pCon); - }; + class OCalcDatabaseMetaData : public component::OComponentDatabaseMetaData + { + virtual OUString SAL_CALL getURL( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + protected: + virtual ~OCalcDatabaseMetaData() override; + public: + OCalcDatabaseMetaData(file::OConnection* _pCon); + }; } diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx index 99200d23ee54..6ca822229436 100644 --- a/connectivity/source/inc/calc/CDriver.hxx +++ b/connectivity/source/inc/calc/CDriver.hxx @@ -24,27 +24,27 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace connectivity::calc +{ + /// @throws css::uno::Exception + css::uno::Reference< css::uno::XInterface > + ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); + + class ODriver : public file::OFileDriver { - /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > - ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); - - class ODriver : public file::OFileDriver - { - public: - ODriver(const css::uno::Reference< - css::uno::XComponentContext >& _rxContext) : - file::OFileDriver(_rxContext) {} - - OUString SAL_CALL getImplementationName( ) override; - - // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL - connect( const OUString& url, const css::uno::Sequence< - css::beans::PropertyValue >& info ) override; - 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; - }; + public: + ODriver(const css::uno::Reference< + css::uno::XComponentContext >& _rxContext) : + file::OFileDriver(_rxContext) {} + + OUString SAL_CALL getImplementationName( ) override; + + // XDriver + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL + connect( const OUString& url, const css::uno::Sequence< + css::beans::PropertyValue >& info ) override; + 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; + }; } diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx index b4751fd876d7..17dcab61b2f7 100644 --- a/connectivity/source/inc/calc/CTable.hxx +++ b/connectivity/source/inc/calc/CTable.hxx @@ -32,40 +32,40 @@ namespace com::sun::star::util { namespace connectivity::calc - { - typedef component::OComponentTable OCalcTable_BASE; - class OCalcConnection; +{ + typedef component::OComponentTable OCalcTable_BASE; + class OCalcConnection; - class OCalcTable : public OCalcTable_BASE - { - private: - std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset - css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet; - OCalcConnection* m_pCalcConnection; - sal_Int32 m_nStartCol; - sal_Int32 m_nStartRow; - sal_Int32 m_nDataCols; - bool m_bHasHeaders; - css::uno::Reference< css::util::XNumberFormats > m_xFormats; - ::Date m_aNullDate; + class OCalcTable : public OCalcTable_BASE + { + private: + std::vector<sal_Int32> m_aTypes; // holds all type for columns just to avoid to ask the propertyset + css::uno::Reference< css::sheet::XSpreadsheet > m_xSheet; + OCalcConnection* m_pCalcConnection; + sal_Int32 m_nStartCol; + sal_Int32 m_nStartRow; + sal_Int32 m_nDataCols; + bool m_bHasHeaders; + css::uno::Reference< css::util::XNumberFormats > m_xFormats; + ::Date m_aNullDate; - void fillColumns(); + void fillColumns(); - public: - OCalcTable( sdbcx::OCollection* _pTables,OCalcConnection* _pConnection, - const OUString& Name, - const OUString& Type, - const OUString& Description = OUString(), - const OUString& SchemaName = OUString(), - const OUString& CatalogName = OUString() - ); + public: + OCalcTable( sdbcx::OCollection* _pTables,OCalcConnection* _pConnection, + const OUString& Name, + const OUString& Type, + const OUString& Description = OUString(), + const OUString& SchemaName = OUString(), + const OUString& CatalogName = OUString() + ); - virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override; + virtual bool fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool bRetrieveData) override; - virtual void SAL_CALL disposing() override; + virtual void SAL_CALL disposing() override; - void construct() override; - }; + void construct() override; + }; } diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx index 0fb9ac54c08a..39c427fdd696 100644 --- a/connectivity/source/inc/calc/CTables.hxx +++ b/connectivity/source/inc/calc/CTables.hxx @@ -22,18 +22,18 @@ #include <file/FTables.hxx> namespace connectivity::calc - { - typedef file::OTables OCalcTables_BASE; +{ + typedef file::OTables OCalcTables_BASE; - class OCalcTables : public OCalcTables_BASE - { - protected: - virtual css::uno::Reference< css::beans::XPropertySet > createObject(const OUString& _rName) override; - public: - OCalcTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< OUString> &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) - {} - }; + class OCalcTables : public OCalcTables_BASE + { + protected: + virtual css::uno::Reference< css::beans::XPropertySet > createObject(const OUString& _rName) override; + public: + OCalcTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, + const ::std::vector< OUString> &_rVector) : OCalcTables_BASE(_rMetaData,_rParent,_rMutex,_rVector) + {} + }; } |