diff options
Diffstat (limited to 'dbaccess/source/inc/dsntypes.hxx')
| -rw-r--r-- | dbaccess/source/inc/dsntypes.hxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 871db0a1fe27..ebd287099fa1 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,7 +125,7 @@ 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; @@ -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: */ |