diff options
Diffstat (limited to 'connectivity/source/inc/file/FStatement.hxx')
| -rw-r--r-- | connectivity/source/inc/file/FStatement.hxx | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 93063d460794..57ce0a2fc0de 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX +#pragma once #include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> @@ -96,7 +95,7 @@ namespace connectivity::file // initialize the column index map (mapping select columns to table columns) void createColumnMapping(); // searches the statement for sort criteria - void anylizeSQL(); + void analyzeSQL(); void setOrderbyColumn( connectivity::OSQLParseNode const * pColumnRef, connectivity::OSQLParseNode const * pAscendingDescending); @@ -117,7 +116,7 @@ namespace connectivity::file virtual void parseParamterElem(const OUString& _sColumnName,OSQLParseNode* pRow_Value_Constructor_Elem); // factory method for resultset's - virtual OResultSet* createResultSet() = 0; + virtual rtl::Reference<OResultSet> createResultSet() = 0; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; // OPropertySetHelper @@ -140,7 +139,7 @@ namespace connectivity::file virtual void SAL_CALL disposing() override; // XInterface // virtual void SAL_CALL release() throw(css::uno::RuntimeException) = 0; - virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL acquire() noexcept override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider @@ -165,7 +164,7 @@ namespace connectivity::file // OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL release() noexcept override; }; typedef ::cppu::ImplHelper2< css::sdbc::XStatement,css::lang::XServiceInfo > OStatement_XStatement; @@ -175,15 +174,15 @@ namespace connectivity::file { protected: // factory method for resultset's - virtual OResultSet* createResultSet() override; + virtual rtl::Reference<OResultSet> createResultSet() override; public: // a Constructor, that is needed for when Returning the Object is needed: OStatement( OConnection* _pConnection) : OStatement_BASE2( _pConnection){} DECLARE_SERVICE_INFO(); virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() throw() override; - virtual void SAL_CALL release() throw() override; + virtual void SAL_CALL acquire() noexcept override; + virtual void SAL_CALL release() noexcept override; // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ; @@ -193,6 +192,5 @@ namespace connectivity::file }; } -#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTATEMENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |