diff options
Diffstat (limited to 'dbaccess/source/inc')
| -rw-r--r-- | dbaccess/source/inc/OAuthenticationContinuation.hxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/inc/apitools.hxx | 18 | ||||
| -rw-r--r-- | dbaccess/source/inc/dsntypes.hxx | 17 | ||||
| -rw-r--r-- | dbaccess/source/inc/stringconstants.hxx | 5 |
4 files changed, 14 insertions, 33 deletions
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 0812c46f8baa..a87203e7a64c 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX -#define INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX +#pragma once #include <dbadllapi.hxx> @@ -32,7 +31,7 @@ namespace dbaccess { -class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : +class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBA) OAuthenticationContinuation : public comphelper::OInteraction< css::ucb::XInteractionSupplyAuthentication > { bool m_bRememberPassword : 1; // remember the password for this session ? @@ -65,6 +64,4 @@ public: } // namespace dbaccess -#endif // INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 4242019eb404..0f4f2c9bec1c 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -17,22 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX -#define INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX +#pragma once #include <sal/config.h> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <cppuhelper/component.hxx> +#include <cppuhelper/compbase.hxx> #include <osl/mutex.hxx> -#include <osl/diagnose.h> -#include <comphelper/sequence.hxx> -#include <strings.hxx> // OSubComponent - a component which holds a hard ref to its parent // and is been hold itself (by the parent) with a weak ref -class OSubComponent : public ::cppu::OComponentHelper +class OSubComponent : public ::cppu::WeakComponentImplHelper<> { protected: // the parent must support the tunnel implementation @@ -43,11 +37,7 @@ public: OSubComponent(::osl::Mutex& _rMutex, const css::uno::Reference< css::uno::XInterface >& _xParent); -// css::lang::XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; - // css::uno::XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL release() noexcept override; operator css::uno::Reference< css::uno::XInterface > () const @@ -55,6 +45,4 @@ public: }; -#endif // INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 871db0a1fe27..c6529ab6c34a 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX -#define INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX +#pragma once #include <sal/config.h> @@ -56,7 +55,6 @@ enum DATASOURCE_TYPE DST_EVOLUTION_LDAP = 19, DST_KAB = 20, DST_MACAB = 21, - DST_MSACCESS_2007 = 22, DST_EMBEDDED_HSQLDB = 23, DST_MYSQL_NATIVE = 24, DST_MYSQL_NATIVE_DIRECT = 25, @@ -64,6 +62,8 @@ enum DATASOURCE_TYPE DST_EMBEDDED_FIREBIRD = 27, DST_POSTGRES = 28, DST_WRITER = 29, + DST_EMBEDDED_UNKNOWN = 30, /// for all embedded addons driver + DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, @@ -97,9 +97,10 @@ enum DATASOURCE_TYPE #define PAGE_DBSETUPWIZARD_FINAL 16 #define PAGE_DBSETUPWIZARD_USERDEFINED 17 #define PAGE_DBSETUPWIZARD_MYSQL_NATIVE 18 +#define PAGE_DBSETUPWIZARD_POSTGRES 19 // ODsnTypeCollection -class OOO_DLLPUBLIC_DBA ODsnTypeCollection final +class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBA) ODsnTypeCollection final { std::vector<OUString> m_aDsnTypesDisplayNames; /// user readable names for the datasource types @@ -124,10 +125,10 @@ public: OUString cutPrefix(std::u16string_view _sURL) const; /// on a given string, return the type prefix - OUString getPrefix(const OUString& _sURL) const; + OUString getPrefix(std::u16string_view _sURL) const; /// determines whether there is a driver for the given URL prefix/pattern - bool hasDriver( const char* _pAsciiPattern ) const; + bool hasDriver( std::u16string_view _rAsciiPattern ) const; /// on a given string, return the Java Driver Class OUString getJavaDriverClass(std::u16string_view _sURL) const; @@ -185,7 +186,7 @@ public: }; //- ODsnTypeCollection::TypeIterator -class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator +class UNLESS_MERGELIBS_MORE(OOO_DLLPUBLIC_DBA) ODsnTypeCollection::TypeIterator { friend class ODsnTypeCollection; @@ -216,6 +217,4 @@ inline ODsnTypeCollection::TypeIterator ODsnTypeCollection::end() const { return } // namespace dbaccess -#endif // INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/stringconstants.hxx b/dbaccess/source/inc/stringconstants.hxx index 9b7e732fee8f..1f20962a78a3 100644 --- a/dbaccess/source/inc/stringconstants.hxx +++ b/dbaccess/source/inc/stringconstants.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC -#define INCLUDED_DBACCESS_SOURCE_INC_STRINGCONSTANTS_HRC +#pragma once // property ids @@ -169,6 +168,4 @@ #define PROPERTY_ID_PROPCHANGE_NOTIFY 146 #define PROPERTY_ID_AUTOGROW 147 -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |