diff options
Diffstat (limited to 'connectivity/source/inc/odbc/OResultSet.hxx')
| -rw-r--r-- | connectivity/source/inc/odbc/OResultSet.hxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 960db182497a..719c6be14da8 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSET_HXX -#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSET_HXX +#pragma once #include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> @@ -42,9 +41,7 @@ #include <TSkipDeletedSet.hxx> #include <memory> -namespace connectivity -{ - namespace odbc +namespace connectivity::odbc { /* @@ -105,12 +102,12 @@ namespace connectivity typedef std::map< css::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; - class OOO_DLLPUBLIC_ODBCBASE OResultSet : - public cppu::BaseMutex, - public ::connectivity::IResultSetHelper, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : + public cppu::BaseMutex, + public ::connectivity::IResultSetHelper, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: TBookmarkPosMap m_aPosToBookmarks; @@ -250,8 +247,8 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface 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; //XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet @@ -350,9 +347,8 @@ namespace connectivity protected: using OPropertySetHelper::getFastPropertyValue; }; - } + } -#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ORESULTSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |