diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-12-30 13:32:01 +0000 |
| commit | 0416c98d433be40fe2e2d0199ebaa8d029e8e338 (patch) | |
| tree | 8b781a46dcb4bc28ea9405e6c8591d7b1f9b21ea /connectivity | |
| parent | 1de383819e70ec2816447d6b621695d178eeb9ee (diff) | |
CWS-TOOLING: integrate CWS sb102
2008-12-11 16:18:12 +0100 sb r265332 : #i95065# cleanup, to make Windows linking work
2008-12-11 16:16:03 +0100 sb r265331 : #i95065# missing SAL_DLLPUBLIC_EXPORT
2008-12-09 17:40:28 +0100 sb r265122 : #i94469# move CJK specific configuration data to brand layer
2008-12-09 16:09:08 +0100 sb r265112 : #i96959# use PTHREAD_MUTEX_RECURSIVE on all platforms
2008-12-09 15:54:31 +0100 sb r265110 : #i95065# do not derive apphelper::LifeTimeGuard from osl::ResettableMutexGuard to avoid problems with VISIBILITY_HIDDEN=TRUE on MSC
2008-12-09 15:40:51 +0100 sb r265104 : #i95065# add VISIBILITY_HIDDEN=TRUE to connectivity/source/drivers/mozab
2008-12-09 15:36:21 +0100 sb r265102 : #i95501# updated SDK_HOME
2008-12-09 15:31:46 +0100 sb r265099 : typo (temppath vs. tmppath)
2008-12-08 11:48:08 +0100 sb r264979 : #i95065# removed spurious ExplicitCategoriesProvider.obj (ExplicitCategoriesProvider.cxx is not in this directory)
2008-12-07 19:41:07 +0100 sb r264960 : #i96994# erroneously doubled backslash caused visibility feature to be disabled for all GCC versions on Mac OS X
2008-12-06 23:54:49 +0100 sb r264948 : changes from trunk that CWS-TOOLING's rebase to DEV300:m37 (r264891) had missed, as files had been moved around on this CWS
2008-12-05 20:29:23 +0100 sb r264919 : #i85508# versions of flex apparently differ in whether input() resp. yyinput() returns zero or EOF upon end of file
2008-12-05 15:37:23 +0100 sb r264908 : #i95315# removed obsolete jut
2008-12-05 15:34:59 +0100 sb r264907 : #i95531# removed empty obsolete directories
2008-12-05 10:09:23 +0100 sb r264891 : CWS-TOOLING: rebase CWS sb102 to trunk@264807 (milestone: DEV300:m37)
2008-12-04 14:50:20 +0100 sb r264845 : #i95065# introduced VISIBILITY_HIDDEN makefile flag to reduce duplications; made additional libraries use VISIBILITY_HIDDEN=TRUE to avoid warnings with recent GCC 4 versions (had to split certain code directories to make changes that would otherwise erroneously affect multiple libraries built in the same makefile); changed connectivity::ORefVector to no longer derive from std::vector, as that caused problems with the MSC implementation of VISIBILITY_HIDDEN=TRUE; replaced uses of JNIEXPORT with SAL_DLLPUBLIC_EXPORT, as the former does not expand to visibility attributes on some platforms where the latter does
2008-12-03 11:29:38 +0100 sb r264759 : #i94583# remove unnecessary (and wrong) assertion check for rtl_getAppCommandArg return value (which is guaranteed to return osl_Process_E_None or not return at all)
2008-12-02 17:18:31 +0100 sb r264724 : #i96809# silenced GCC 4.3.2 warning
2008-12-02 13:29:34 +0100 sb r264695 : #i96797# make get_tmp_dir fail less often
2008-11-28 17:19:24 +0100 sb r264566 : #i95691# inadvertently missing from -c 264564
2008-11-28 17:07:50 +0100 sb r264564 : #i95691# only structs of exactly 1, 2, 4, or 8 bytes are returned through registers
2008-11-25 13:28:08 +0100 sb r264291 : #i96427# support for SAL_EXCEPTION_DLLPUBLIC_EXPORT (patch by np)
2008-11-21 14:45:22 +0100 sb r264140 : #i95428# added SAL_EXCEPTION_DLLPUBLIC_EXPORT and SAL_EXCEPTION_DLLPRIVATE
2008-11-19 13:19:37 +0100 sb r263984 : #i95525# removed erroneous application/octet-stream svn:mime-type properties
Diffstat (limited to 'connectivity')
184 files changed, 1377 insertions, 1069 deletions
diff --git a/connectivity/dbtools.pmk b/connectivity/dbtools.pmk new file mode 100644 index 000000000000..89a56d132178 --- /dev/null +++ b/connectivity/dbtools.pmk @@ -0,0 +1,33 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: $ +# +# $Revision: $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +VISIBILITY_HIDDEN = TRUE +CDEFS += -DOOO_DLLIMPLEMENTATION_DBTOOLS diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index 5d16469e78d0..a502fea5c076 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -43,6 +43,7 @@ #include <osl/interlck.h> #include <jvmaccess/virtualmachine.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include "connectivity/dbtoolsdllapi.hxx" namespace com { namespace sun { namespace star { namespace util { struct Date; @@ -54,12 +55,12 @@ namespace com { namespace sun { namespace star { namespace util { namespace connectivity { //------------------------------------------------------------------------------ - sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); + OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); //------------------------------------------------------------------------------ - rtl::OUString toString(const ::com::sun::star::uno::Any& rValue); - rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); - rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); - rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); + OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const ::com::sun::star::uno::Any& rValue); + OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); + OOO_DLLPUBLIC_DBTOOLS rtl::OUString toTimeString(const ::com::sun::star::util::Time& rTime); + OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateTimeString(const ::com::sun::star::util::DateTime& rDateTime); // typedefs typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; @@ -70,30 +71,35 @@ namespace connectivity // ------------------------------------------------------------------------- // class ORefVector allows reference counting on a std::vector // ------------------------------------------------------------------------- - template< class VectorVal > class ORefVector : public ::std::vector< VectorVal > + template< class VectorVal > class ORefVector { + std::vector< VectorVal > m_vector; oslInterlockedCount m_refCount; // ORefVector(const ORefVector&); // ORefVector& operator=(const ORefVector&); - typedef ::std::vector< VectorVal > BaseClass; protected: virtual ~ORefVector(){} public: + typedef std::vector< VectorVal > Vector; + ORefVector() : m_refCount(0) {} - ORefVector(size_t _st) : ::std::vector< VectorVal > (_st) , m_refCount(0) {} - ORefVector(const ORefVector& _rRH) : ::std::vector< VectorVal > (_rRH),m_refCount(0) + ORefVector(size_t _st) : m_vector(_st) , m_refCount(0) {} + ORefVector(const ORefVector& _rRH) : m_vector(_rRH.m_vector),m_refCount(0) { } ORefVector& operator=(const ORefVector& _rRH) { if ( &_rRH != this ) { - BaseClass::operator=(_rRH); + m_vector = _rRH.m_vector; } return *this; } + std::vector< VectorVal > & get() { return m_vector; } + std::vector< VectorVal > const & get() const { return m_vector; } + inline static void * SAL_CALL operator new( size_t nSize ) SAL_THROW( () ) { return ::rtl_allocateMemory( nSize ); } inline static void SAL_CALL operator delete( void * pMem ) SAL_THROW( () ) @@ -132,15 +138,17 @@ namespace connectivity // ======================================================================================= // search from __first to __last the column with the name _rVal // when no such column exist __last is returned - OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OOO_DLLPUBLIC_DBTOOLS + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); // ======================================================================================= // search from __first to __last the column with the realname _rVal // when no such column exist __last is returned - OSQLColumns::const_iterator findRealName( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OOO_DLLPUBLIC_DBTOOLS + OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); @@ -149,13 +157,14 @@ namespace connectivity // ======================================================================================= // search from __first to __last the column with the property _rProp equals the value _rVal // when no such column exist __last is returned - OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OOO_DLLPUBLIC_DBTOOLS + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); - void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); + OOO_DLLPUBLIC_DBTOOLS void checkDisposed(sal_Bool _bThrow) throw ( ::com::sun::star::lang::DisposedException ); /** creates a java virtual machine @@ -164,7 +173,7 @@ namespace connectivity @return The JavaVM. */ - ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); /** return <TRUE/> if the java class exists, otherwise <FALSE/>. @param _pJVM @@ -172,7 +181,7 @@ namespace connectivity @param _sClassName The class name to look for. */ - sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); } //================================================================================== diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx index fdaf9ba0c6d5..5e6ca95f7285 100644 --- a/connectivity/inc/connectivity/ConnectionWrapper.hxx +++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/broadcasthelper.hxx> #include "connectivity/CommonTools.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -50,7 +51,7 @@ namespace connectivity ::com::sun::star::lang::XUnoTunnel > OConnection_BASE; - class OConnectionWrapper : public OConnection_BASE + class OOO_DLLPUBLIC_DBTOOLS OConnectionWrapper : public OConnection_BASE { protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyConnection; diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx index 37b5976df9b1..15aa13f25507 100644 --- a/connectivity/inc/connectivity/DateConversion.hxx +++ b/connectivity/inc/connectivity/DateConversion.hxx @@ -34,10 +34,11 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class DateConversion + class OOO_DLLPUBLIC_DBTOOLS DateConversion { public: static sal_Int32 toINT32(const ::com::sun::star::util::Date&) diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index 3edc6139238d..afb9af2c7b20 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -37,6 +37,7 @@ #include <osl/diagnose.h> #include <comphelper/stl_types.hxx> #include <vos/ref.hxx> +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/CommonTools.hxx" #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Date.hpp> @@ -46,7 +47,7 @@ namespace connectivity { - class ORowSetValue + class OOO_DLLPUBLIC_DBTOOLS ORowSetValue { union { @@ -347,7 +348,7 @@ namespace connectivity }; /// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted" - class ORowSetValueDecorator : public ::vos::OReference + class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::vos::OReference { ORowSetValue m_aValue; // my own value public: @@ -371,7 +372,7 @@ namespace connectivity // ------------------------------------------------------------------------- /// TSetBound is a unary_function to set the bound value with e.q. for_each call - struct TSetBound : ::std::unary_function<ORowSetValue,void> + struct OOO_DLLPUBLIC_DBTOOLS TSetBound : ::std::unary_function<ORowSetValue,void> { sal_Bool m_bBound; TSetBound(sal_Bool _bBound) : m_bBound(_bBound){} @@ -381,7 +382,7 @@ namespace connectivity // ------------------------------------------------------------------------- /// TSetBound is a unary_function to set the bound value with e.q. for_each call - struct TSetRefBound : ::std::unary_function<ORowSetValueDecoratorRef,void> + struct OOO_DLLPUBLIC_DBTOOLS TSetRefBound : ::std::unary_function<ORowSetValueDecoratorRef,void> { sal_Bool m_bBound; TSetRefBound(sal_Bool _bBound) : m_bBound(_bBound){} @@ -405,13 +406,13 @@ namespace connectivity typedef ODeleteVector< ORowSetValue > OValueVector; - class OValueRefVector : public ODeleteVector< ORowSetValueDecoratorRef > + class OOO_DLLPUBLIC_DBTOOLS OValueRefVector : public ODeleteVector< ORowSetValueDecoratorRef > { public: OValueRefVector(){} OValueRefVector(size_t _st) : ODeleteVector< ORowSetValueDecoratorRef >(_st) { - for(OValueRefVector::iterator aIter = begin() ; aIter != end() ;++aIter) + for(OValueRefVector::Vector::iterator aIter = get().begin() ; aIter != get().end() ;++aIter) *aIter = new ORowSetValueDecorator; } }; @@ -422,7 +423,7 @@ namespace connectivity ::std::vector<sal_Int32> m_nParameterIndexes; public: OAssignValues() : m_nParameterIndexes(1,SQL_NO_PARAMETER){} - OAssignValues(size_type n) : OValueRefVector(n),m_nParameterIndexes(n+1,SQL_NO_PARAMETER){} + OAssignValues(Vector::size_type n) : OValueRefVector(n),m_nParameterIndexes(n+1,SQL_NO_PARAMETER){} void setParameterIndex(sal_Int32 _nId,sal_Int32 _nParameterIndex) { m_nParameterIndexes[_nId] = _nParameterIndex;} sal_Int32 getParameterIndex(sal_Int32 _nId) const { return m_nParameterIndexes[_nId]; } diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx index ceee9ee41af8..c51484fe1a6f 100644 --- a/connectivity/inc/connectivity/IParseContext.hxx +++ b/connectivity/inc/connectivity/IParseContext.hxx @@ -34,13 +34,14 @@ namespace connectivity { class OSQLParseNode; } #include <rtl/ustring.hxx> #include <com/sun/star/lang/Locale.hpp> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { //========================================================================== //= IParseContext //========================================================================== - class IParseContext + class OOO_DLLPUBLIC_DBTOOLS IParseContext { public: enum ErrorCode diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 8e124da9d517..86da92997ab6 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -30,6 +30,7 @@ #ifndef _CONNECTIVITY_PCOLUMN_HXX_ #define _CONNECTIVITY_PCOLUMN_HXX_ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VColumn.hxx" #include "connectivity/CommonTools.hxx" #include <vos/ref.hxx> @@ -46,8 +47,8 @@ namespace connectivity typedef sdbcx::OColumn OParseColumn_BASE; typedef ::comphelper::OPropertyArrayUsageHelper<OParseColumn> OParseColumn_PROP; - class OParseColumn : public OParseColumn_BASE, - public OParseColumn_PROP + class OOO_DLLPUBLIC_DBTOOLS OParseColumn : + public OParseColumn_BASE, public OParseColumn_PROP { ::rtl::OUString m_aRealName; ::rtl::OUString m_aTableName; @@ -115,8 +116,8 @@ namespace connectivity typedef sdbcx::OColumn OOrderColumn_BASE; typedef ::comphelper::OPropertyArrayUsageHelper<OOrderColumn> OOrderColumn_PROP; - class OOrderColumn : public OOrderColumn_BASE, - public OOrderColumn_PROP + class OOO_DLLPUBLIC_DBTOOLS OOrderColumn : + public OOrderColumn_BASE, public OOrderColumn_PROP { sal_Bool m_bAscending; sal_Bool m_bOrder; diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx index fabbc4db8eb8..4a45e88063c2 100644 --- a/connectivity/inc/connectivity/ParameterCont.hxx +++ b/connectivity/inc/connectivity/ParameterCont.hxx @@ -32,12 +32,14 @@ #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <comphelper/interaction.hxx> +#include "connectivity/dbtoolsdllapi.hxx" + namespace dbtools { //==================================================================== //= OParameterContinuation //==================================================================== - class OParameterContinuation : public comphelper::OInteraction< ::com::sun::star::sdb::XInteractionSupplyParameters > + class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public comphelper::OInteraction< ::com::sun::star::sdb::XInteractionSupplyParameters > { ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aValues; diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx index d4f14d4e1c1d..25576f0653b5 100644 --- a/connectivity/inc/connectivity/TColumnsHelper.hxx +++ b/connectivity/inc/connectivity/TColumnsHelper.hxx @@ -34,7 +34,7 @@ #include "connectivity/sdbcx/VCollection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "connectivity/sdbcx/IRefreshable.hxx" - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -42,7 +42,7 @@ namespace connectivity class OColumnsHelperImpl; /** contains generell column handling to creat default columns and default sql statements. */ - class OColumnsHelper : public sdbcx::OCollection + class OOO_DLLPUBLIC_DBTOOLS OColumnsHelper : public sdbcx::OCollection { OColumnsHelperImpl* m_pImpl; protected: diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx index 77c1b1c8b6b8..360b7a870865 100644 --- a/connectivity/inc/connectivity/TIndex.hxx +++ b/connectivity/inc/connectivity/TIndex.hxx @@ -31,13 +31,14 @@ #ifndef CONNECTIVITY_INDEXHELPER_HXX_ #define CONNECTIVITY_INDEXHELPER_HXX_ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VIndex.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { class OTableHelper; - class OIndexHelper : public connectivity::sdbcx::OIndex + class OOO_DLLPUBLIC_DBTOOLS OIndexHelper : public connectivity::sdbcx::OIndex { OTableHelper* m_pTable; public: diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx index 0489bff918b0..ebdd7bf1981e 100644 --- a/connectivity/inc/connectivity/TIndexColumns.hxx +++ b/connectivity/inc/connectivity/TIndexColumns.hxx @@ -32,12 +32,12 @@ #define CONNECTIVITY_INDEXCOLUMNSHELPER_HXX #include "connectivity/sdbcx/VCollection.hxx" - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { class OIndexHelper; - class OIndexColumns : public sdbcx::OCollection + class OOO_DLLPUBLIC_DBTOOLS OIndexColumns : public sdbcx::OCollection { OIndexHelper* m_pIndex; protected: diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx index 683aab607ed1..e7f6bd065f06 100644 --- a/connectivity/inc/connectivity/TIndexes.hxx +++ b/connectivity/inc/connectivity/TIndexes.hxx @@ -31,13 +31,14 @@ #ifndef CONNECTIVITY_INDEXESHELPER_HXX #define CONNECTIVITY_INDEXESHELPER_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VCollection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { class OTableHelper; - class OIndexesHelper : public sdbcx::OCollection + class OOO_DLLPUBLIC_DBTOOLS OIndexesHelper : public sdbcx::OCollection { OTableHelper* m_pTable; protected: diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx index c32c9cda34d9..f5b7f3ee9fa8 100644 --- a/connectivity/inc/connectivity/TKey.hxx +++ b/connectivity/inc/connectivity/TKey.hxx @@ -31,13 +31,14 @@ #ifndef CONNECTIVITY_TKEY_HXX #define CONNECTIVITY_TKEY_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include <connectivity/sdbcx/VKey.hxx> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { class OTableHelper; - class OTableKeyHelper : public connectivity::sdbcx::OKey + class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper : public connectivity::sdbcx::OKey { OTableHelper* m_pTable; public: diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx index 578211628884..b112e52400b1 100644 --- a/connectivity/inc/connectivity/TKeyColumns.hxx +++ b/connectivity/inc/connectivity/TKeyColumns.hxx @@ -33,11 +33,11 @@ #include "connectivity/sdbcx/VCollection.hxx" #include "connectivity/TKey.hxx" - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class OKeyColumnsHelper : public connectivity::sdbcx::OCollection + class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper : public connectivity::sdbcx::OCollection { OTableKeyHelper* m_pKey; protected: diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx index 4831e896f22d..e57d2c449aec 100644 --- a/connectivity/inc/connectivity/TKeys.hxx +++ b/connectivity/inc/connectivity/TKeys.hxx @@ -34,12 +34,12 @@ #include "connectivity/sdbcx/VCollection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "connectivity/TTableHelper.hxx" - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { typedef sdbcx::OCollection OKeys_BASE; - class OKeysHelper : public OKeys_BASE + class OOO_DLLPUBLIC_DBTOOLS OKeysHelper : public OKeys_BASE { OTableHelper* m_pTable; protected: diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx index 8d308639ee6d..f09a1211d7dd 100644 --- a/connectivity/inc/connectivity/TTableHelper.hxx +++ b/connectivity/inc/connectivity/TTableHelper.hxx @@ -31,6 +31,7 @@ #ifndef CONNECTIVITY_TABLEHELPER_HXX #define CONNECTIVITY_TABLEHELPER_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VTable.hxx" #include "connectivity/sdbcx/VKey.hxx" #include "connectivity/StdTypeDefs.hxx" @@ -40,11 +41,11 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getTypeString(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xColProp); DECLARE_STL_USTRINGACCESS_MAP( sdbcx::TKeyProperties , TKeyMap); - class OTableHelper : public OTable_TYPEDEF + class OOO_DLLPUBLIC_DBTOOLS OTableHelper : public OTable_TYPEDEF { TKeyMap m_aKeys; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx index 1824946a986b..8a98d929459a 100644 --- a/connectivity/inc/connectivity/conncleanup.hxx +++ b/connectivity/inc/connectivity/conncleanup.hxx @@ -35,6 +35,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include "connectivity/dbtoolsdllapi.hxx" //......................................................................... namespace dbtools @@ -48,7 +49,7 @@ namespace dbtools ::com::sun::star::sdbc::XRowSetListener > OAutoConnectionDisposer_Base; - class OAutoConnectionDisposer : public OAutoConnectionDisposer_Base + class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public OAutoConnectionDisposer_Base { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOriginalConnection; diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index a09829d646bc..a91d033bf542 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -35,6 +35,7 @@ #include <rtl/textenc.h> #include <rtl/tencinfo.h> #include <rtl/ustring.hxx> +#include "connectivity/dbtoolsdllapi.hxx" //......................................................................... namespace dbtools @@ -58,7 +59,7 @@ namespace dbtools </ul> </p> */ - class OCharsetMap + class OOO_DLLPUBLIC_DBTOOLS OCharsetMap { protected: DECLARE_STL_STDKEY_SET( rtl_TextEncoding, TextEncBag ); @@ -103,7 +104,7 @@ namespace dbtools //------------------------------------------------------------------------- //- CharsetIteratorDerefHelper //------------------------------------------------------------------------- - class CharsetIteratorDerefHelper + class OOO_DLLPUBLIC_DBTOOLS CharsetIteratorDerefHelper { friend class OCharsetMap::CharsetIterator; @@ -126,11 +127,11 @@ namespace dbtools //------------------------------------------------------------------------- //- OCharsetMap::CharsetIterator //------------------------------------------------------------------------- - class OCharsetMap::CharsetIterator + class OOO_DLLPUBLIC_DBTOOLS OCharsetMap::CharsetIterator { friend class OCharsetMap; - friend bool operator==(const CharsetIterator& lhs, const CharsetIterator& rhs); + friend OOO_DLLPUBLIC_DBTOOLS bool operator==(const CharsetIterator& lhs, const CharsetIterator& rhs); friend bool operator!=(const CharsetIterator& lhs, const CharsetIterator& rhs) { return !(lhs == rhs); } // friend sal_Int32 operator-(const CharsetIterator& lhs, const CharsetIterator& rhs); diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx index 0dbe5ea271b4..e25412bfffe9 100644 --- a/connectivity/inc/connectivity/dbconversion.hxx +++ b/connectivity/inc/connectivity/dbconversion.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/uno/Reference.hxx> - +#include "connectivity/dbtoolsdllapi.hxx" // forward declarations namespace rtl @@ -84,7 +84,7 @@ namespace dbtools { //......................................................................... - class DBTypeConversion + class OOO_DLLPUBLIC_DBTOOLS DBTypeConversion { public: static ::com::sun::star::util::Date getStandardDate(); diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx index d6d8ca119949..5c9f575da7c7 100644 --- a/connectivity/inc/connectivity/dbexception.hxx +++ b/connectivity/inc/connectivity/dbexception.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include "connectivity/standardsqlstate.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace com { @@ -69,7 +70,7 @@ enum OOoBaseErrorCode //= SQLExceptionInfo - encapsulating the type info of an SQLException-derived class //============================================================================== -class SQLExceptionInfo +class OOO_DLLPUBLIC_DBTOOLS SQLExceptionInfo { public: enum TYPE { SQL_EXCEPTION, SQL_WARNING, SQL_CONTEXT, UNDEFINED }; @@ -157,7 +158,7 @@ protected: //= SQLExceptionIteratorHelper - iterating through an SQLException chain //============================================================================== -class SQLExceptionIteratorHelper +class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper { protected: const ::com::sun::star::sdbc::SQLException* m_pCurrent; @@ -242,7 +243,7 @@ public: @raises RuntimeException in case of an internal error */ -::rtl::OUString getStandardSQLState( StandardSQLState _eState ); +OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getStandardSQLState( StandardSQLState _eState ); //---------------------------------------------------------------------------------- /** returns a standard ASCII string for a given SQLState @@ -254,10 +255,10 @@ public: @raises RuntimeException in case of an internal error */ -const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ); +OOO_DLLPUBLIC_DBTOOLS const sal_Char* getStandardSQLStateAscii( StandardSQLState _eState ); //---------------------------------------------------------------------------------- -void throwFunctionNotSupportedException( +OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( const ::rtl::OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any() @@ -267,7 +268,7 @@ void throwFunctionNotSupportedException( //---------------------------------------------------------------------------------- /** throws an exception with SQL state IM001, saying that a certain function is not supported */ -void throwFunctionNotSupportedException( +OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedException( const sal_Char* _pAsciiFunctionName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::com::sun::star::uno::Any* _pNextException = NULL @@ -277,7 +278,7 @@ void throwFunctionNotSupportedException( //---------------------------------------------------------------------------------- /** throws a function sequence (HY010) exception */ -void throwFunctionSequenceException( +OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any() ) @@ -286,7 +287,7 @@ void throwFunctionSequenceException( //---------------------------------------------------------------------------------- /** throw a invalid index sqlexception */ -void throwInvalidIndexException( +OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _Context, const ::com::sun::star::uno::Any& _Next = ::com::sun::star::uno::Any() ) @@ -295,7 +296,7 @@ void throwInvalidIndexException( //---------------------------------------------------------------------------------- /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ -void throwGenericSQLException( +OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( const ::rtl::OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource ) @@ -304,7 +305,7 @@ void throwGenericSQLException( //---------------------------------------------------------------------------------- /** throw a generic SQLException, i.e. one with an SQLState of HY000, an ErrorCode of 0 and no NextException */ -void throwGenericSQLException( +OOO_DLLPUBLIC_DBTOOLS void throwGenericSQLException( const ::rtl::OUString& _rMsg, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxSource, const ::com::sun::star::uno::Any& _rNextException @@ -321,7 +322,7 @@ void throwGenericSQLException( @param _pNextException the next exception to chain into the thrown exception, if any */ -void throwFeatureNotImplementedException( +OOO_DLLPUBLIC_DBTOOLS void throwFeatureNotImplementedException( const sal_Char* _pAsciiFeatureName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::com::sun::star::uno::Any* _pNextException = NULL @@ -331,7 +332,7 @@ void throwFeatureNotImplementedException( //---------------------------------------------------------------------------------- /** throws an SQLException */ -void throwSQLException( +OOO_DLLPUBLIC_DBTOOLS void throwSQLException( const sal_Char* _pAsciiMessage, const sal_Char* _pAsciiState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, @@ -343,7 +344,7 @@ void throwSQLException( //---------------------------------------------------------------------------------- /** throws an SQLException */ -void throwSQLException( +OOO_DLLPUBLIC_DBTOOLS void throwSQLException( const sal_Char* _pAsciiMessage, StandardSQLState _eSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, @@ -355,7 +356,7 @@ void throwSQLException( //---------------------------------------------------------------------------------- /** throws an SQLException */ -void throwSQLException( +OOO_DLLPUBLIC_DBTOOLS void throwSQLException( const ::rtl::OUString& _rMessage, StandardSQLState _eSQLState, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx index 89b7cb82bf8a..91280e97fab1 100644 --- a/connectivity/inc/connectivity/dbmetadata.hxx +++ b/connectivity/inc/connectivity/dbmetadata.hxx @@ -36,6 +36,7 @@ /** === end UNO includes === **/ #include <memory> +#include "connectivity/dbtoolsdllapi.hxx" //........................................................................ namespace dbtools @@ -57,7 +58,7 @@ namespace dbtools Once CWS dba30 is integrated, we could easily add all the meta data which is part of the "Info" property of a data source. */ - class DatabaseMetaData + class OOO_DLLPUBLIC_DBTOOLS DatabaseMetaData { private: ::std::auto_ptr< DatabaseMetaData_Impl > m_pImpl; diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 8943f1f0d476..186e2f81b786 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/stl_types.hxx> #include <unotools/sharedunocomponent.hxx> +#include "connectivity/dbtoolsdllapi.hxx" namespace com { namespace sun { namespace star { @@ -103,6 +104,7 @@ namespace dbtools // date conversion // calculates the default numberformat for a given datatype and a give language + OOO_DLLPUBLIC_DBTOOLS sal_Int32 getDefaultNumberFormat(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes >& _xTypes, const ::com::sun::star::lang::Locale& _rLocale); @@ -110,6 +112,7 @@ namespace dbtools // calculates the default numberformat for a given datatype and a give language // @param _nDataType @see com.sun.star.sdbc.DataType // @param _nScale can be zero + OOO_DLLPUBLIC_DBTOOLS sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, sal_Int32 _nScale, sal_Bool _bIsCurrency, @@ -152,6 +155,7 @@ namespace dbtools very moment, also the temporary observer object dies. This way, it is ensured that there's no resource leak from an un-owned connection object. */ + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> connectRowset( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, @@ -183,7 +187,7 @@ namespace dbtools </li> </ul> */ - SharedConnection ensureRowSetConnection( + OOO_DLLPUBLIC_DBTOOLS SharedConnection ensureRowSetConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, bool _bUseAutoConnectionDisposer @@ -193,14 +197,14 @@ namespace dbtools /** returns the connection the RowSet is currently working with (which is the ActiveConnection property) */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) throw (::com::sun::star::uno::RuntimeException); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection( const ::rtl::OUString& _rsTitleOrPath, const ::rtl::OUString& _rsUser, const ::rtl::OUString& _rsPwd, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, @@ -211,14 +215,14 @@ namespace dbtools /** determines whether the given component is part of a document which is an embedded database document (such as a form) */ - bool isEmbeddedInDatabase( + OOO_DLLPUBLIC_DBTOOLS bool isEmbeddedInDatabase( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxComponent, ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxActualConnection ); /** returns the columns of the named table of the given connection */ - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getTableFields( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, const ::rtl::OUString& _rName ); @@ -262,6 +266,7 @@ namespace dbtools @return the container of the columns (aka fields) of the object */ + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getFieldsByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, @@ -299,7 +304,7 @@ namespace dbtools @return an array of strings containing the names of the columns (aka fields) of the object */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Int32 _nCommandType, @@ -311,8 +316,9 @@ namespace dbtools /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source, and <i>append</i> _rException (i.e. put it into the NextException member of the SQLContext). */ - ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails ); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails ); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdbc::SQLException prependErrorInfo( const ::com::sun::star::sdbc::SQLException& _rChainedException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, @@ -322,7 +328,7 @@ namespace dbtools /** search the parent hierachy for a data source. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> findDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent); + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> findDataSource(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParent); /** determines the value of a booolean data source setting, given by ASCII name @@ -331,7 +337,7 @@ namespace dbtools @param _pAsciiSettingName the ASCII name of the setting */ - bool getBooleanDataSourceSetting( + OOO_DLLPUBLIC_DBTOOLS bool getBooleanDataSourceSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const sal_Char* _pAsciiSettingName ); @@ -341,18 +347,20 @@ namespace dbtools Use getBooleanDataSourceSetting instead, which cares for the default of the property itself, instead of spreading this knowledge through all callers. */ + OOO_DLLPUBLIC_DBTOOLS sal_Bool isDataSourcePropertyEnabled(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xProp ,const ::rtl::OUString& _sProperty, sal_Bool _bDefault = sal_False); - ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getDefaultReportEngineServiceName(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); /** quote the given name with the given quote string. */ - ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName); /** quote the given table name (which may contain a catalog and a schema) according to the rules provided by the meta data */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString quoteTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _rxMeta , const ::rtl::OUString& _rName ,EComposeRule _eComposeRule); @@ -365,7 +373,7 @@ namespace dbtools @param _rName (out parameter) upon return, contains the table name @param _eComposeRule where do you need the name for */ - void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData, + OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule); /** calculate a NumberFormatsSupplier for use with an given connection @@ -376,7 +384,7 @@ namespace dbtools @param _rxFactory required (only of _bAllowDefault is sal_True) for creating the DatabaseEnvironment. @return the formatter all object related to the given connection should work with. */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Bool _bAllowDefault = sal_False, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>() @@ -398,7 +406,7 @@ namespace dbtools If <TRUE/>, the <b>Order</b> property of the row set will also be examined. In case it is not empty, it will also be added to the composed statement. */ - ::rtl::OUString getComposedRowSetStatement( + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString getComposedRowSetStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, sal_Bool _bUseRowSetFilter = sal_True, @@ -413,7 +421,7 @@ namespace dbtools This implies that a connection will be set on the RowSet if needed. (need to changes this sometimes ...) */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > getCurrentSettingsComposer( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > getCurrentSettingsComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxRowSetProps, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory ); @@ -423,7 +431,7 @@ namespace dbtools @param _rxNew the destination property set @param _rLocale the locale for converting number related properties */ - void TransferFormComponentProperties( + OOO_DLLPUBLIC_DBTOOLS void TransferFormComponentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxNew, const ::com::sun::star::lang::Locale& _rLocale @@ -432,20 +440,20 @@ namespace dbtools /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT @param _rxCursorSet the property set */ - sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE @param _rxCursorSet the property set */ - sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE @param _rxCursorSet the property set */ - sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); + OOO_DLLPUBLIC_DBTOOLS sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); //---------------------------------------------------------------------------------- /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules */ - ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName, @@ -458,7 +466,7 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, @@ -470,7 +478,7 @@ namespace dbtools the settings "UseCatalogInSelect" and "UseSchemaInSelect", which might be present in the data source which the connection belongs to. */ - ::rtl::OUString composeTableNameForSelect( + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableNameForSelect( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ); //---------------------------------------------------------------------------------- @@ -480,7 +488,7 @@ namespace dbtools @param _xTable The table. */ - ::rtl::OUString composeTableName( + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, EComposeRule _eComposeRule, @@ -489,10 +497,10 @@ namespace dbtools bool _bQuote); //---------------------------------------------------------------------------------- - sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, + OOO_DLLPUBLIC_DBTOOLS sal_Int32 getSearchColumnFlag( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, sal_Int32 _nDataType); // return the datasource for the given datasource name - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName, + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> getDataSource(const ::rtl::OUString& _rsDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); /** search for a name that is NOT in the NameAcces @@ -505,13 +513,14 @@ namespace dbtools @return A name which doesn't exist in the collection. */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _rxContainer, const ::rtl::OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True); /** creates a unique name which is not already used in the given name array */ - ::rtl::OUString createUniqueName( + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createUniqueName( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rNames, const ::rtl::OUString& _rBaseName, sal_Bool _bStartWithNumber = sal_True @@ -523,7 +532,7 @@ namespace dbtools @see isValidSQLName */ - ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials); + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString convertName2SQLName(const ::rtl::OUString& _rName,const ::rtl::OUString& _rSpecials); /** checks whether the given name is a valid SQL name @@ -532,8 +541,9 @@ namespace dbtools @see convertName2SQLName */ - sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials ); + OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials ); + OOO_DLLPUBLIC_DBTOOLS void showError( const SQLExceptionInfo& _rInfo, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -550,6 +560,7 @@ namespace dbtools @return <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ + OOO_DLLPUBLIC_DBTOOLS sal_Bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ); @@ -560,6 +571,7 @@ namespace dbtools @param _xConnection the connection must be able to create <type scope="com::sun::star::sdb">SingleSelectQueryComposer</type>s @param _xPreparedStmt the prepared statement where the parameters could be set when needed */ + OOO_DLLPUBLIC_DBTOOLS void askForParameters( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xComposer, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, @@ -572,6 +584,7 @@ namespace dbtools @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType @param scale the scale of the sql type can be 0 */ + OOO_DLLPUBLIC_DBTOOLS void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, @@ -591,6 +604,7 @@ namespace dbtools @return <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ + OOO_DLLPUBLIC_DBTOOLS sal_Bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, const sal_Int32 _nColumnIndex, const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) ); @@ -603,6 +617,7 @@ namespace dbtools @param _bAddScale The scale will also be added when the value is 0. */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); @@ -613,6 +628,7 @@ namespace dbtools @param _xConnection The connection. */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); @@ -624,6 +640,7 @@ namespace dbtools @param _bAddScale The scale will also be added when the value is 0. */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); @@ -638,6 +655,7 @@ namespace dbtools @return The CREATE TABLE statement. */ + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); @@ -658,6 +676,7 @@ namespace dbtools @param _nDataType The data type of the column. */ + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, @@ -678,7 +697,7 @@ namespace dbtools @return The datadefintion object. */ - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( + OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> getDataDefinitionByURLAndConnection( const ::rtl::OUString& _rsUrl, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -693,6 +712,7 @@ namespace dbtools @param _sTable contains the table name */ + OOO_DLLPUBLIC_DBTOOLS sal_Int32 getTablePrivileges(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& _xMetaData, const ::rtl::OUString& _sCatalog, const ::rtl::OUString& _sSchema, @@ -712,6 +732,7 @@ namespace dbtools @param _rInfo The information about the column(s). */ + OOO_DLLPUBLIC_DBTOOLS void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sComposedTableName, const ::rtl::OUString& _rName, @@ -730,7 +751,7 @@ namespace dbtools @param _out_rSQLPredicate the buffer to which the comparison predicate will be appended */ - void getBoleanComparisonPredicate( + OOO_DLLPUBLIC_DBTOOLS void getBoleanComparisonPredicate( const ::rtl::OUString& _rExpression, const sal_Bool _bValue, const sal_Int32 _nBooleanComparisonMode, diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx new file mode 100644 index 000000000000..23cadc513ab7 --- /dev/null +++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx @@ -0,0 +1,43 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: $ +* +* $Revision: $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX +#define INCLUDED_CONNECTIVITY_DBTOOLSDLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_DBTOOLS +#define OOO_DLLPUBLIC_DBTOOLS SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_DBTOOLS SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx index f241db0aa812..8e833ec842c4 100644 --- a/connectivity/inc/connectivity/filtermanager.hxx +++ b/connectivity/inc/connectivity/filtermanager.hxx @@ -39,6 +39,7 @@ #include <rtl/ustring.hxx> #include <vector> +#include "connectivity/dbtoolsdllapi.hxx" //........................................................................ namespace dbtools @@ -68,7 +69,7 @@ namespace dbtools controls which act as live filter, which could be implemented with a third component), but at the moment there are only these two. */ - class FilterManager + class OOO_DLLPUBLIC_DBTOOLS FilterManager { public: enum FilterComponent diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index be6e2a2c07da..fbe39a75f20d 100644 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx @@ -41,6 +41,7 @@ #include <boost/noncopyable.hpp> #include <memory> +#include "connectivity/dbtoolsdllapi.hxx" namespace comphelper { class ComponentContext; } @@ -56,7 +57,7 @@ namespace dbtools /** a class which helps retrieving and setting the value of a database column as formatted string. */ - class FormattedColumnValue : public ::boost::noncopyable + class OOO_DLLPUBLIC_DBTOOLS FormattedColumnValue : public ::boost::noncopyable { public: /** constructs an instance diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx index 039ccdb292ab..78da13363c26 100644 --- a/connectivity/inc/connectivity/parameters.hxx +++ b/connectivity/inc/connectivity/parameters.hxx @@ -45,6 +45,7 @@ #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> /** === end UNO includes === **/ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/paramwrapper.hxx" #include <unotools/sharedunocomponent.hxx> #include <comphelper/implementationreference.hxx> @@ -62,7 +63,7 @@ namespace dbtools //= ParameterManager //==================================================================== class FilterManager; - class ParameterManager + class OOO_DLLPUBLIC_DBTOOLS ParameterManager { public: /// classifies the origin of the data to fill a parameter diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx index 0b137a32d22b..7eee5363cc87 100644 --- a/connectivity/inc/connectivity/paramwrapper.hxx +++ b/connectivity/inc/connectivity/paramwrapper.hxx @@ -31,6 +31,7 @@ #ifndef CONNECTIVITY_PARAMWRAPPER_HXX #define CONNECTIVITY_PARAMWRAPPER_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include <connectivity/FValue.hxx> /** === begin UNO includes === **/ @@ -62,7 +63,7 @@ namespace param /** wraps a parameter column as got from an SQLQueryComposer, so that it has an additional property "Value", which is forwarded to an XParameters interface */ - class ParameterWrapper :public ::cppu::OWeakObject + class OOO_DLLPUBLIC_DBTOOLS ParameterWrapper :public ::cppu::OWeakObject ,public ::comphelper::OMutexAndBroadcastHelper ,public ::cppu::OPropertySetHelper { @@ -142,7 +143,8 @@ namespace param > ParameterWrapperContainer_Base; /// class for the parameter event @see approveParameter - class ParameterWrapperContainer : public ParameterWrapperContainer_Base + class OOO_DLLPUBLIC_DBTOOLS ParameterWrapperContainer : + public ParameterWrapperContainer_Base { private: ::osl::Mutex m_aMutex; diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 602485925b85..57c66b137d0e 100644 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/i18n/XLocaleData.hpp> #include <connectivity/sqlparse.hxx> +#include "connectivity/dbtoolsdllapi.hxx" //......................................................................... namespace dbtools @@ -49,7 +50,7 @@ namespace dbtools /** A class which allows input of an SQL predicate for a row set column into a edit field. */ - class OPredicateInputController + class OOO_DLLPUBLIC_DBTOOLS OPredicateInputController { private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx index 1852edfb1615..628999c1e265 100644 --- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx +++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx @@ -31,24 +31,25 @@ #define _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ #include "connectivity/CommonTools.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { namespace sdbcx { - class SAL_NO_VTABLE IRefreshableGroups + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableGroups { public: virtual void refreshGroups() = 0; }; - class SAL_NO_VTABLE IRefreshableUsers + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableUsers { public: virtual void refreshUsers() = 0; }; - class SAL_NO_VTABLE IRefreshableColumns + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableColumns { public: virtual void refreshColumns() = 0; diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx index 3397b0883de7..25c5b0f74a2a 100644 --- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx @@ -44,6 +44,7 @@ #include "OSubComponent.hxx" #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/StdTypeDefs.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -62,7 +63,8 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> OCatalog_BASE; - class SAL_NO_VTABLE OCatalog : public OCatalog_BASE, + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCatalog : + public OCatalog_BASE, public IRefreshableGroups, public IRefreshableUsers, public connectivity::OSubComponent<OCatalog, OCatalog_BASE> diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index d399f6f584ff..8e2ace67d88c 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -49,6 +49,7 @@ #include "connectivity/CommonTools.hxx" #include <com/sun/star/container/XContainer.hpp> #include "connectivity/StdTypeDefs.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <memory> @@ -71,7 +72,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > ObjectType; - class SAL_NO_VTABLE IObjectCollection + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IObjectCollection { public: virtual void reserve(size_t nLength) = 0; @@ -98,7 +99,8 @@ namespace connectivity //************************************************************ // OCollection //************************************************************ - class SAL_NO_VTABLE OCollection : public OCollectionBase + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE OCollection : + public OCollectionBase { protected: ::std::auto_ptr<IObjectCollection> m_pElements; diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index d4fdcd862108..73be9e968c70 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -38,6 +38,7 @@ #include "connectivity/CommonTools.hxx" #include <comphelper/broadcasthelper.hxx> #include "connectivity/sdbcx/VDescriptor.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> namespace connectivity @@ -52,7 +53,8 @@ namespace connectivity typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OColumn_BASE; - class OColumn : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OColumn : + public comphelper::OBaseMutex, public OColumn_BASE, public OColumnDescriptor_BASE, public OColumn_PROP, diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index bdae9deb32bc..f9861c659c51 100644 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx @@ -37,7 +37,7 @@ #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/stl_types.hxx> - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -47,7 +47,7 @@ namespace connectivity // = ODescriptor // ========================================================================= typedef ::comphelper::OPropertyContainer ODescriptor_PBASE; - class ODescriptor + class OOO_DLLPUBLIC_DBTOOLS ODescriptor :public ODescriptor_PBASE ,public ::com::sun::star::lang::XUnoTunnel { diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index 7dbd46e1d438..4784397d2b03 100644 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx @@ -47,6 +47,7 @@ #include <comphelper/propertycontainer.hxx> #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/sdbcx/VDescriptor.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> namespace connectivity @@ -60,7 +61,8 @@ namespace connectivity ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo> OGroup_BASE; - class OGroup : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OGroup : + public comphelper::OBaseMutex, public OGroup_BASE, public IRefreshableUsers, public ::comphelper::OPropertyArrayUsageHelper<OGroup>, diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index f6cc199f966c..fc2093ca7bc0 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -44,6 +44,7 @@ #include "connectivity/sdbcx/VTypeDef.hxx" #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/sdbcx/VDescriptor.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <cppuhelper/implbase1.hxx> @@ -57,7 +58,8 @@ namespace connectivity typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OIndex_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndex> OIndex_PROP; - class OIndex : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OIndex : + public comphelper::OBaseMutex, public ODescriptor_BASE, public IRefreshableColumns, public OIndex_PROP, diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index 16c0653d161d..2145e71f72e7 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx @@ -31,6 +31,7 @@ #ifndef _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_ #define _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VColumn.hxx" namespace connectivity @@ -40,8 +41,8 @@ namespace connectivity class OIndexColumn; typedef ::comphelper::OIdPropertyArrayUsageHelper<OIndexColumn> OIndexColumn_PROP; - class OIndexColumn : public OColumn, - public OIndexColumn_PROP + class OOO_DLLPUBLIC_DBTOOLS OIndexColumn : + public OColumn, public OIndexColumn_PROP { protected: sal_Bool m_IsAscending; diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index 239bad3b73ef..2405d995db15 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -39,6 +39,7 @@ #include <com/sun/star/container/XNamed.hpp> #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/sdbcx/VDescriptor.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <cppuhelper/implbase1.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <boost/shared_ptr.hpp> @@ -48,7 +49,7 @@ namespace connectivity namespace sdbcx { - struct KeyProperties + struct OOO_DLLPUBLIC_DBTOOLS KeyProperties { ::rtl::OUString m_ReferencedTable; sal_Int32 m_Type; @@ -69,7 +70,8 @@ namespace connectivity typedef ::cppu::ImplHelper1< ::com::sun::star::sdbcx::XDataDescriptorFactory > OKey_BASE; class OCollection; - class OKey : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OKey : + public comphelper::OBaseMutex, public ODescriptor_BASE, public IRefreshableColumns, public ::comphelper::OIdPropertyArrayUsageHelper<OKey>, diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index 33089f913a82..c9e60b64b6a3 100644 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx @@ -31,6 +31,7 @@ #ifndef _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_ #define _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VColumn.hxx" namespace connectivity @@ -40,8 +41,8 @@ namespace connectivity class OKeyColumn; typedef ::comphelper::OIdPropertyArrayUsageHelper<OKeyColumn> OKeyColumn_PROP; - class OKeyColumn : public OColumn, - public OKeyColumn_PROP + class OOO_DLLPUBLIC_DBTOOLS OKeyColumn : + public OColumn, public OKeyColumn_PROP { protected: ::rtl::OUString m_ReferencedColumn; diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index 5085990e3a9f..dac0f9744303 100644 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx @@ -45,6 +45,7 @@ #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/sdbcx/VDescriptor.hxx" #include "connectivity/CommonTools.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity @@ -68,7 +69,8 @@ namespace connectivity typedef ::comphelper::OIdPropertyArrayUsageHelper<OTable> OTable_PROP; - class OTable : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OTable : + public comphelper::OBaseMutex, public OTable_BASE, public OTableDescriptor_BASE, public IRefreshableColumns, diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index 1864a7f43efd..a1b912cba155 100644 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx @@ -42,7 +42,7 @@ #include <com/sun/star/container/XNamed.hpp> #include "connectivity/sdbcx/IRefreshable.hxx" #include "connectivity/sdbcx/VDescriptor.hxx" - +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -55,7 +55,8 @@ namespace connectivity ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo> OUser_BASE; - class OUser : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS OUser : + public comphelper::OBaseMutex, public OUser_BASE, public IRefreshableGroups, public ::comphelper::OPropertyArrayUsageHelper<OUser>, diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index 26c36690cf9a..d34d1be5495e 100644 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.hxx @@ -40,6 +40,7 @@ #include <cppuhelper/interfacecontainer.h> #include <com/sun/star/container/XNamed.hpp> #include "connectivity/sdbcx/VDescriptor.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <comphelper/IdPropArrayHelper.hxx> namespace connectivity @@ -50,7 +51,7 @@ namespace connectivity typedef ::cppu::OWeakObject OView_BASE; - class OViewHelper + class OOO_DLLPUBLIC_DBTOOLS OViewHelper { protected: ::osl::Mutex m_aMutex; @@ -60,7 +61,8 @@ namespace connectivity OViewHelper(): rBHelper(m_aMutex){} }; - class OView : public OViewHelper, + class OOO_DLLPUBLIC_DBTOOLS OView : + public OViewHelper, public OView_BASE, public ::com::sun::star::container::XNamed, public ::com::sun::star::lang::XServiceInfo, diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index d8ee54853a36..a6c9987e6d43 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -39,6 +39,7 @@ #include <boost/shared_ptr.hpp> #include <boost/optional.hpp> +#include "connectivity/dbtoolsdllapi.hxx" //........................................................................ namespace connectivity @@ -72,7 +73,7 @@ namespace connectivity @see ::com::sun::star::sdb::ErrorCondition */ - class SQLError + class OOO_DLLPUBLIC_DBTOOLS SQLError { public: // -------------------------------------------------------------------- diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 700a0acdf9cf..ddbf3e24af3c 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -30,6 +30,7 @@ #ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #define _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sqlnode.hxx" #include <connectivity/IParseContext.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -61,7 +62,7 @@ namespace connectivity struct OSQLParseTreeIteratorImpl; - class OSQLParseTreeIterator + class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator { private: ::com::sun::star::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 273ac67d8dff..459ded6158d4 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -30,6 +30,7 @@ #ifndef _CONNECTIVITY_SQLNODE_HXX #define _CONNECTIVITY_SQLNODE_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/dbmetadata.hxx" #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/util/XNumberFormatTypes.hpp> @@ -80,7 +81,7 @@ namespace connectivity //================================================================== //= SQLParseNodeParameter //================================================================== - struct SQLParseNodeParameter + struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter { const ::com::sun::star::lang::Locale& rLocale; ::dbtools::DatabaseMetaData aMetaData; @@ -114,7 +115,7 @@ namespace connectivity //========================================================================== //= OSQLParseNode //========================================================================== - class OSQLParseNode + class OOO_DLLPUBLIC_DBTOOLS OSQLParseNode { friend class OSQLParser; diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index dc0f172bcb97..9f27600f43a3 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -45,6 +45,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/XLocaleData.hpp> #include "connectivity/IParseContext.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <map> @@ -78,7 +79,7 @@ namespace connectivity //========================================================================== //= OParseContext //========================================================================== - class OParseContext : public IParseContext + class OOO_DLLPUBLIC_DBTOOLS OParseContext : public IParseContext { public: OParseContext(); @@ -116,7 +117,7 @@ namespace connectivity struct OSQLParser_Data; /** Parser for SQL92 */ - class OSQLParser + class OOO_DLLPUBLIC_DBTOOLS OSQLParser { friend class OSQLParseNode; friend class OSQLInternalNode; diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx index 1af15c3bc0c8..31b7c3488b2c 100644 --- a/connectivity/inc/connectivity/statementcomposer.hxx +++ b/connectivity/inc/connectivity/statementcomposer.hxx @@ -39,6 +39,7 @@ #include <boost/noncopyable.hpp> #include <memory> +#include "connectivity/dbtoolsdllapi.hxx" //........................................................................ namespace dbtools @@ -51,7 +52,7 @@ namespace dbtools struct StatementComposer_Data; /** a class which is able to compose queries (SELECT statements) from a command and a command type */ - class StatementComposer : public ::boost::noncopyable + class OOO_DLLPUBLIC_DBTOOLS StatementComposer : public ::boost::noncopyable { ::std::auto_ptr< StatementComposer_Data > m_pData; diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index 20a866663cee..b218d868fae3 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -40,6 +40,7 @@ #include <vector> #include <memory> +#include "connectivity/dbtoolsdllapi.hxx" //======================================================================== //= forward declarations @@ -99,7 +100,7 @@ namespace comphelper { a pointer to an object implementing the IDataAccessToolsFactory interface, aquired exactly <em>once</em>. */ -extern "C" void* SAL_CALL createDataAccessToolsFactory(); +extern "C" OOO_DLLPUBLIC_DBTOOLS void* SAL_CALL createDataAccessToolsFactory(); //======================================================================== //= @@ -120,7 +121,7 @@ namespace connectivity //================================================================ //= IDataAccessTools //================================================================ - class IDataAccessTools : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS IDataAccessTools : public ::rtl::IReference { public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection_withFeedback( @@ -234,7 +235,8 @@ namespace connectivity //================================================================ /** simple wrapper for the <type>OCharsetMap</type> */ - class IDataAccessCharSet : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS IDataAccessCharSet : + public ::rtl::IReference { // to be extended if necessary .... public: @@ -249,7 +251,8 @@ namespace connectivity //================================================================ //= IDataAccessTypeConversion //================================================================ - class IDataAccessTypeConversion : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS IDataAccessTypeConversion : + public ::rtl::IReference { public: virtual ::com::sun::star::util::Date getStandardDate() const = 0; @@ -279,7 +282,7 @@ namespace connectivity //================================================================ /** a simple version of the OSQLParseNode, with all methods beeing virtual */ - class ISQLParseNode : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS ISQLParseNode : public ::rtl::IReference { public: virtual void parseNodeToStr(::rtl::OUString& _rString, @@ -302,7 +305,7 @@ namespace connectivity //================================================================ /** a simple version of the OSQLParser, with all methods beeing virtual */ - class ISQLParser : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS ISQLParser : public ::rtl::IReference { public: virtual ::rtl::Reference< ISQLParseNode > predicateTree( @@ -320,7 +323,8 @@ namespace connectivity //================================================================ /** the main factory for runtime-loadable tools in the DBTOOLS library */ - class IDataAccessToolsFactory : public ::rtl::IReference + class OOO_DLLPUBLIC_DBTOOLS IDataAccessToolsFactory : + public ::rtl::IReference { public: /// creates a simple version of the class OSQLParser diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst index 409abb250c02..e7f761db0b6f 100644 --- a/connectivity/prj/build.lst +++ b/connectivity/prj/build.lst @@ -16,10 +16,11 @@ cn connectivity\source\drivers\macab nmake - u cn_macab cn_ cn connectivity\source\drivers\evoab nmake - u cn_evoab cn_dbtools cn_file cn_inc NULL cn connectivity\source\drivers\evoab2 nmake - u cn_evoab2 cn_dbtools cn_file cn_inc NULL cn connectivity\source\drivers\calc nmake - all cn_calc cn_file cn_inc NULL -cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_dbtools cn_inc NULL +cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL +cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL -cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbc cn_inc NULL +cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index c4f34f382190..c8c14200d901 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -887,13 +887,13 @@ extern "C" { //--------------------------------------------------------------------------------------- - void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/) +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** _ppEnvTypeName, uno_Environment** /*_ppEnv*/) { *_ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //--------------------------------------------------------------------------------------- -sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) +SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) { ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); sMainKeyName += ODatabaseMetaDataResultSet::getImplementationName_Static(); @@ -921,7 +921,7 @@ sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star return sal_True; } //--------------------------------------------------------------------------------------- -void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) +SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplName, ::com::sun::star::lang::XMultiServiceFactory* _pServiceManager, void* /*_pRegistryKey*/) { void* pRet = NULL; diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 6b82c919a0c8..17d10e6077cf 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -93,10 +93,10 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v Freeze(); ::vos::ORef<OKeySet> pKeySet = new OKeySet(); - pKeySet->reserve(m_aKeyValues.size()); + pKeySet->get().reserve(m_aKeyValues.size()); ::std::transform(m_aKeyValues.begin() ,m_aKeyValues.end() - ,::std::back_inserter(*pKeySet) + ,::std::back_inserter(pKeySet->get()) ,::std::select1st<TIntValuePairVector::value_type>()); pKeySet->setFrozen(); return pKeySet; diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index cc9a1a5b2104..a1847c98d2ab 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -89,6 +89,7 @@ #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" +#include "OSubComponent.hxx" #include <algorithm> @@ -2007,8 +2008,8 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) } // ------------------------------------------------------------------------- - OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -2016,8 +2017,8 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sName,_rVal,_rCase); } // ------------------------------------------------------------------------- - OSQLColumns::const_iterator findRealName( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) { @@ -2025,8 +2026,8 @@ void checkDisposed(sal_Bool _bThrow) throw ( DisposedException ) return find(__first,__last,sRealName,_rVal,_rCase); } // ------------------------------------------------------------------------- - OSQLColumns::const_iterator find( OSQLColumns::const_iterator __first, - OSQLColumns::const_iterator __last, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase) diff --git a/connectivity/source/commontools/makefile.mk b/connectivity/source/commontools/makefile.mk index 34f21248e2a8..814f75a3a0c7 100644 --- a/connectivity/source/commontools/makefile.mk +++ b/connectivity/source/commontools/makefile.mk @@ -40,6 +40,7 @@ ENVCFLAGS+=/FR$(SLO)$/ .ENDIF .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/dbtools.pmk # Disable optimization for SunCC SPARC and MACOSX (funny loops # when parsing e.g. "x+width/2"), diff --git a/connectivity/source/dbtools/makefile.mk b/connectivity/source/dbtools/makefile.mk index 0727d4ff6cac..908d38c92e03 100644 --- a/connectivity/source/dbtools/makefile.mk +++ b/connectivity/source/dbtools/makefile.mk @@ -40,6 +40,7 @@ USE_DEFFILE=TRUE # --- Settings ---------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/dbtools.pmk .INCLUDE : $(PRJ)$/version.mk LDUMP=ldump2.exe diff --git a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx index 9a6e4a5d312b..bad8b2b3e386 100644 --- a/connectivity/source/drivers/adabas/BResultSetMetaData.cxx +++ b/connectivity/source/drivers/adabas/BResultSetMetaData.cxx @@ -67,8 +67,8 @@ sal_Int32 SAL_CALL OAdabasResultSetMetaData::isNullable( sal_Int32 column ) thro { sal_Int32 nValue = 0; sal_Bool bFound = sal_False; - if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->size() ) - bFound = (*m_aSelectColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nValue; + if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() ) + bFound = (m_aSelectColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nValue; if ( !bFound ) nValue = getNumColAttrib(column,SQL_DESC_NULLABLE); @@ -77,10 +77,10 @@ sal_Int32 SAL_CALL OAdabasResultSetMetaData::isNullable( sal_Int32 column ) thro // ------------------------------------------------------------------------- sal_Bool SAL_CALL OAdabasResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) { - if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->size() ) + if ( m_aSelectColumns.isValid() && column > 0 && column <= (sal_Int32)m_aSelectColumns->get().size() ) { sal_Bool bAutoIncrement = sal_False; - (*m_aSelectColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; + (m_aSelectColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; return bAutoIncrement; } diff --git a/connectivity/source/drivers/adabas/Bservices.cxx b/connectivity/source/drivers/adabas/Bservices.cxx index 3e97b4ec4372..268313285512 100644 --- a/connectivity/source/drivers/adabas/Bservices.cxx +++ b/connectivity/source/drivers/adabas/Bservices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index c8addb8a194a..149aab4ebfd2 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=adabas ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx index 8bd757f70ae3..2c2d6fe76453 100644 --- a/connectivity/source/drivers/calc/CColumns.cxx +++ b/connectivity/source/drivers/calc/CColumns.cxx @@ -48,9 +48,9 @@ sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName) OCalcTable* pTable = (OCalcTable*)m_pTable; ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->end()) + if(aIter != aCols->get().end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index 42f14cfa9c5c..81d3d9b6a4cc 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -99,7 +99,7 @@ Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeExcept checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny((sal_Int32)(*m_aRow)[0]->getValue()); + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 9357a05d1c4f..74c2c6d51305 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -506,12 +506,12 @@ void OCalcTable::fillColumns() // check if the column name already exists ::rtl::OUString aAlias = aColumnName; - OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->end()) + while(aFind != m_aColumns->get().end()) { (aAlias = aColumnName) += ::rtl::OUString::valueOf((sal_Int32)++nExprCnt); - aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(), @@ -519,7 +519,7 @@ void OCalcTable::fillColumns() eType, sal_False, sal_False, bCurrency, getConnection()->getMetaData()->storesMixedCaseQuotedIdentifiers() ); Reference< XPropertySet> xCol = pColumn; - m_aColumns->push_back(xCol); + m_aColumns->get().push_back(xCol); m_aTypes.push_back(eType); m_aPrecisions.push_back(nPrecision); m_aScales.push_back(nDecimals); @@ -635,8 +635,8 @@ void OCalcTable::refreshColumns() TStringVector aVector; - OSQLColumns::const_iterator aEnd = m_aColumns->end(); - for(OSQLColumns::const_iterator aIter = m_aColumns->begin();aIter != aEnd;++aIter) + OSQLColumns::Vector::const_iterator aEnd = m_aColumns->get().end(); + for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != aEnd;++aIter) aVector.push_back(Reference< XNamed>(*aIter,UNO_QUERY)->getName()); if(m_pColumns) @@ -808,19 +808,19 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols, BOOL bIsCurRecordDeleted = sal_False; _rRow->setDeleted(bIsCurRecordDeleted); - *(*_rRow)[0] = m_nFilePos; + *(_rRow->get())[0] = m_nFilePos; if (!bRetrieveData) return TRUE; // fields - OSQLColumns::const_iterator aIter = _rCols.begin(); - OSQLColumns::const_iterator aEnd = _rCols.end(); - for (OValueRefVector::size_type i = 1; aIter != aEnd && i < _rRow->size(); + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); + OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end(); + for (OValueRefVector::Vector::size_type i = 1; aIter != aEnd && i < _rRow->get().size(); ++aIter, i++) { - if ( (*_rRow)[i]->isBound() ) + if ( (_rRow->get())[i]->isBound() ) { sal_Int32 nType = 0; if ( _bUseTableDefs ) @@ -829,7 +829,7 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols, (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; - lcl_SetValue( (*_rRow)[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, + lcl_SetValue( (_rRow->get())[i]->get(), m_xSheet, m_nStartCol, m_nStartRow, m_bHasHeaders, m_aNullDate, m_nFilePos, i, nType ); } } diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx index c494f5516576..77f95e4cbcb3 100644 --- a/connectivity/source/drivers/calc/Cservices.cxx +++ b/connectivity/source/drivers/calc/Cservices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index c05434ec2ff2..a45255cc2b22 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=calc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 11b80e00a4b2..f9b1432a041b 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -53,10 +53,10 @@ sdbcx::ObjectType ODbaseColumns::createObject(const ::rtl::OUString& _rName) // Reference< XFastPropertySet> xCol(pTable->getColumns()[_rName],UNO_QUERY); ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->end()) + if(aIter != aCols->get().end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 08448407de3b..8e4ef568aa62 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -586,7 +586,7 @@ BOOL ODbaseIndex::CreateImpl() sal_Int32 nType = 0; ::vos::ORef<OSQLColumns> aCols = m_pTable->getTableColumns(); - Reference< XPropertySet > xTableCol(*find(aCols->begin(),aCols->end(),aName,::comphelper::UStringMixEqual(isCaseSensitive()))); + Reference< XPropertySet > xTableCol(*find(aCols->get().begin(),aCols->get().end(),aName,::comphelper::UStringMixEqual(isCaseSensitive()))); xTableCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)) >>= nType; diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 3af06d07be50..024833071fc7 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -53,10 +53,10 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const ::rtl::OUString& _rName const ODbaseTable* pTable = m_pIndex->getTable(); ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); Reference< XPropertySet > xCol; - if(aIter != aCols->end()) + if(aIter != aCols->get().end()) xCol = *aIter; if(!xCol.is()) diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index ad89cc5e3271..6c7052ece83e 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -104,7 +104,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeExcep checkDisposed(OResultSet_BASE::rBHelper.bDisposed); OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getBookmark called for deleted row"); - return makeAny((sal_Int32)(*m_aRow)[0]->getValue()); + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) @@ -194,9 +194,9 @@ sal_Bool ODbaseResultSet::fillIndexValues(const Reference< XColumnsSupplier> &_x while (nRec != SQL_COLUMN_NOTFOUND) { if (m_aOrderbyAscending[0]) - m_pFileSet->push_back(nRec); + m_pFileSet->get().push_back(nRec); else - m_pFileSet->insert(m_pFileSet->begin(),nRec); + m_pFileSet->get().insert(m_pFileSet->get().begin(),nRec); nRec = pIter->Next(); } m_pFileSet->setFrozen(); diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 9df542fd77d2..63362c139860 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -183,7 +183,7 @@ void ODbaseTable::fillColumns() if(!m_aColumns.isValid()) m_aColumns = new OSQLColumns(); else - m_aColumns->clear(); + m_aColumns->get().clear(); m_aTypes.clear(); m_aPrecisions.clear(); @@ -193,7 +193,7 @@ void ODbaseTable::fillColumns() const sal_Int32 nFieldCount = (m_aHeader.db_kopf - 1) / 32 - 1; OSL_ENSURE(nFieldCount,"No columns in table!"); - m_aColumns->reserve(nFieldCount); + m_aColumns->get().reserve(nFieldCount); m_aTypes.reserve(nFieldCount); m_aPrecisions.reserve(nFieldCount); m_aScales.reserve(nFieldCount); @@ -282,7 +282,7 @@ void ODbaseTable::fillColumns() sal_False, sal_False, bCase); - m_aColumns->push_back(xCol); + m_aColumns->get().push_back(xCol); } // for (; i < nFieldCount; i++) OSL_ENSURE(i,"No columns in table!"); } @@ -499,9 +499,9 @@ void ODbaseTable::refreshColumns() ::osl::MutexGuard aGuard( m_aMutex ); TStringVector aVector; - aVector.reserve(m_aColumns->size()); + aVector.reserve(m_aColumns->get().size()); - for(OSQLColumns::const_iterator aIter = m_aColumns->begin();aIter != m_aColumns->end();++aIter) + for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != m_aColumns->get().end();++aIter) aVector.push_back(Reference< XNamed>(*aIter,UNO_QUERY)->getName()); if(m_pColumns) @@ -630,16 +630,16 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s // Satz als geloescht markieren // rRow.setState(bIsCurRecordDeleted ? ROW_DELETED : ROW_CLEAN ); _rRow->setDeleted(bIsCurRecordDeleted); - *(*_rRow)[0] = m_nFilePos; + *(_rRow->get())[0] = m_nFilePos; if (!bRetrieveData) return TRUE; sal_Size nByteOffset = 1; // Felder: - OSQLColumns::const_iterator aIter = _rCols.begin(); - OSQLColumns::const_iterator aEnd = _rCols.end(); - const sal_Size nCount = _rRow->size(); + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); + OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end(); + const sal_Size nCount = _rRow->get().size(); for (sal_Size i = 1; aIter != aEnd && nByteOffset <= m_nBufferSize && i < nCount;++aIter, i++) { // Laengen je nach Datentyp: @@ -672,7 +672,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s } // Ist die Variable ueberhaupt gebunden? - if ( !(*_rRow)[i]->isBound() ) + if ( !(_rRow->get())[i]->isBound() ) { // Nein - naechstes Feld. nByteOffset += nLen; @@ -692,9 +692,9 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s aStr.EraseTrailingChars(); if ( aStr.Len() ) - *(*_rRow)[i] = ::rtl::OUString(aStr); + *(*(_rRow).get())[i] = ::rtl::OUString(aStr); else// keine StringLaenge, dann NULL - (*_rRow)[i]->setNull(); + (*(_rRow.get()))[i]->setNull(); pData[nLen] = cLast; } @@ -714,7 +714,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s if (!aStr.Len()) { nByteOffset += nLen; - (*_rRow)[i]->setNull(); // keine Werte -> fertig + (_rRow->get())[i]->setNull(); // keine Werte -> fertig continue; } @@ -724,7 +724,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s { if (aStr.Len() != nLen) { - (*_rRow)[i]->setNull(); + (_rRow->get())[i]->setNull(); break; } const sal_uInt16 nYear = (sal_uInt16)aStr.Copy( 0, 4 ).ToInt32(); @@ -732,11 +732,11 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s const sal_uInt16 nDay = (sal_uInt16)aStr.Copy( 6, 2 ).ToInt32(); const ::com::sun::star::util::Date aDate(nDay,nMonth,nYear); - *(*_rRow)[i] = aDate; + *(_rRow->get())[i] = aDate; } break; case DataType::DECIMAL: - *(*_rRow)[i] = ORowSetValue(aStr); + *(_rRow->get())[i] = ORowSetValue(aStr); // pVal->setDouble(SdbTools::ToDouble(aStr)); break; case DataType::BIT: @@ -749,7 +749,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s case 'J': b = TRUE; break; default: b = FALSE; break; } - *(*_rRow)[i] = b; + *(_rRow->get())[i] = b; // pVal->setDouble(b); } break; @@ -758,16 +758,16 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s const long nBlockNo = aStr.ToInt32(); // Blocknummer lesen if (nBlockNo > 0 && m_pMemoStream) // Daten aus Memo-Datei lesen, nur wenn { - if ( !ReadMemo(nBlockNo, (*_rRow)[i]->get()) ) + if ( !ReadMemo(nBlockNo, (_rRow->get())[i]->get()) ) break; } else - (*_rRow)[i]->setNull(); + (_rRow->get())[i]->setNull(); } break; default: OSL_ASSERT("Falscher Type"); } - (*_rRow)[i]->setTypeKind(nType); + (_rRow->get())[i]->setTypeKind(nType); } // if (aStatus.IsError()) @@ -1247,7 +1247,7 @@ BOOL ODbaseTable::InsertRow(OValueRefVector& rRow, BOOL bFlush,const Reference<X // bei Erfolg # erhoehen m_aHeader.db_anz++; - *rRow[0] = m_nFilePos; // BOOKmark setzen + *rRow.get()[0] = m_nFilePos; // BOOKmark setzen m_nFilePos = nTempPos; } } @@ -1295,7 +1295,7 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols) long nFilePos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng; m_pFileStream->Seek(nFilePos); - OValueRefRow aRow = new OValueRefVector(_rCols.size()); + OValueRefRow aRow = new OValueRefVector(_rCols.get().size()); if (!fetchRow(aRow,_rCols,TRUE,TRUE)) return sal_False; @@ -1319,17 +1319,17 @@ BOOL ODbaseTable::DeleteRow(const OSQLColumns& _rCols) ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) ); OSL_ENSURE(pIndex,"ODbaseTable::DeleteRow: No Index returned!"); - OSQLColumns::const_iterator aIter = _rCols.begin(); + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); sal_Int32 nPos = 1; - for(;aIter != _rCols.end();++aIter,++nPos) + for(;aIter != _rCols.get().end();++aIter,++nPos) { if(aCase(getString((*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME))),aColName)) break; } - if (aIter == _rCols.end()) + if (aIter == _rCols.get().end()) continue; - pIndex->Delete(m_nFilePos,*(*aRow)[nPos]); + pIndex->Delete(m_nFilePos,*(aRow->get())[nPos]); } } } @@ -1420,7 +1420,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const if (xIndex.is()) { // first check if the value is different to the old one and when if it conform to the index - if(pOrgRow.isValid() && (rRow[nPos]->getValue().isNull() || rRow[nPos] == (*pOrgRow)[nPos])) + if(pOrgRow.isValid() && (rRow.get()[nPos]->getValue().isNull() || rRow.get()[nPos] == (pOrgRow->get())[nPos])) continue; else { @@ -1430,7 +1430,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) ); OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!"); - if (pIndex->Find(0,*rRow[nPos])) + if (pIndex->Find(0,*rRow.get()[nPos])) { // es existiert kein eindeutiger Wert if ( !aColName.getLength() ) @@ -1508,7 +1508,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ++nPos; // the row values start at 1 // Ist die Variable ueberhaupt gebunden? - if ( !rRow[nPos]->isBound() ) + if ( !rRow.get()[nPos]->isBound() ) { // Nein - naechstes Feld. nByteOffset += nLen; @@ -1521,14 +1521,14 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) ); OSL_ENSURE(pIndex,"ODbaseTable::UpdateBuffer: No Index returned!"); // Update !! - if (pOrgRow.isValid() && !rRow[nPos]->getValue().isNull() )//&& pVal->isModified()) - pIndex->Update(m_nFilePos,*(*pOrgRow)[nPos],*rRow[nPos]); + if (pOrgRow.isValid() && !rRow.get()[nPos]->getValue().isNull() )//&& pVal->isModified()) + pIndex->Update(m_nFilePos,*(pOrgRow->get())[nPos],*rRow.get()[nPos]); else - pIndex->Insert(m_nFilePos,*rRow[nPos]); + pIndex->Insert(m_nFilePos,*rRow.get()[nPos]); } char* pData = (char *)(m_pBuffer + nByteOffset); - if (rRow[nPos]->getValue().isNull()) + if (rRow.get()[nPos]->getValue().isNull()) { memset(pData,' ',nLen); // Zuruecksetzen auf NULL nByteOffset += nLen; @@ -1544,10 +1544,10 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const case DataType::DATE: { ::com::sun::star::util::Date aDate; - if(rRow[nPos]->getValue().getTypeKind() == DataType::DOUBLE) - aDate = ::dbtools::DBTypeConversion::toDate(rRow[nPos]->getValue().getDouble()); + if(rRow.get()[nPos]->getValue().getTypeKind() == DataType::DOUBLE) + aDate = ::dbtools::DBTypeConversion::toDate(rRow.get()[nPos]->getValue().getDouble()); else - aDate = rRow[nPos]->getValue(); + aDate = rRow.get()[nPos]->getValue(); char s[9]; snprintf(s, sizeof(s), @@ -1563,7 +1563,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const { memset(pData,' ',nLen); // Zuruecksetzen auf NULL - const double n = rRow[nPos]->getValue(); + const double n = rRow.get()[nPos]->getValue(); // ein const_cast, da GetFormatPrecision am SvNumberFormat nicht const ist, obwohl es das eigentlich // sein koennte und muesste @@ -1574,7 +1574,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const { strncpy(pData,aDefaultValue.GetBuffer(),nLen); // write the resulting double back - *rRow[nPos] = toDouble(aDefaultValue); + *rRow.get()[nPos] = toDouble(aDefaultValue); } else { @@ -1595,7 +1595,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const } } break; case DataType::BIT: - *pData = rRow[nPos]->getValue().getBool() ? 'T' : 'F'; + *pData = rRow.get()[nPos]->getValue().getBool() ? 'T' : 'F'; break; case DataType::LONGVARCHAR: { @@ -1606,7 +1606,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const // Naechstes Anfangszeichen wieder restaurieren: pData[nLen] = cNext; - if (!m_pMemoStream || !WriteMemo(rRow[nPos]->get(), nBlockNo)) + if (!m_pMemoStream || !WriteMemo(rRow.get()[nPos]->get(), nBlockNo)) break; ByteString aStr; @@ -1621,7 +1621,7 @@ BOOL ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,const { memset(pData,' ',nLen); // Zuruecksetzen auf NULL - ::rtl::OUString sStringToWrite( rRow[nPos]->getValue().getString() ); + ::rtl::OUString sStringToWrite( rRow.get()[nPos]->getValue().getString() ); // convert the string, using the connection's encoding ::rtl::OString sEncoded; @@ -2161,20 +2161,20 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) if(_nPos) { aInsertRow = new OValueRefVector(_pNewTable->m_pColumns->getCount()); - ::std::for_each(aInsertRow->begin(),aInsertRow->end(),TSetRefBound(sal_True)); + ::std::for_each(aInsertRow->get().begin(),aInsertRow->get().end(),TSetRefBound(sal_True)); } else aInsertRow = aRow; // we only have to bind the values which we need to copy into the new table - ::std::for_each(aRow->begin(),aRow->end(),TSetRefBound(sal_True)); - if(_nPos && (_nPos < (sal_Int32)aRow->size())) - (*aRow)[nPos]->setBound(sal_False); + ::std::for_each(aRow->get().begin(),aRow->get().end(),TSetRefBound(sal_True)); + if(_nPos && (_nPos < (sal_Int32)aRow->get().size())) + (aRow->get())[nPos]->setBound(sal_False); sal_Bool bOk = sal_True; sal_Int32 nCurPos; - OValueRefVector::iterator aIter; + OValueRefVector::Vector::iterator aIter; for(sal_uInt32 nRowPos = 0; nRowPos < m_aHeader.db_anz;++nRowPos) { bOk = seekRow( IResultSetHelper::BOOKMARK, nRowPos+1, nCurPos ); @@ -2186,9 +2186,9 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos) // special handling when pos == 0 then we don't have to distinguish between the two rows if(_nPos) { - aIter = aRow->begin()+1; + aIter = aRow->get().begin()+1; sal_Int32 nCount = 1; - for(OValueRefVector::iterator aInsertIter = aInsertRow->begin()+1; aIter != aRow->end() && aInsertIter != aInsertRow->end();++aIter,++nCount) + for(OValueRefVector::Vector::iterator aInsertIter = aInsertRow->get().begin()+1; aIter != aRow->get().end() && aInsertIter != aInsertRow->get().end();++aIter,++nCount) { if(nPos != nCount) { diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx index cb773ae893d0..c76ff840c8ff 100644 --- a/connectivity/source/drivers/dbase/Dservices.cxx +++ b/connectivity/source/drivers/dbase/Dservices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index ea964ab061ac..4e2535c3bfce 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -34,6 +34,8 @@ PRJINC=..$/.. PRJNAME=connectivity TARGET=dbase +VISIBILITY_HIDDEN=TRUE + # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx index fd495e7a37f9..9608c8efd384 100644 --- a/connectivity/source/drivers/evoab/LColumns.cxx +++ b/connectivity/source/drivers/evoab/LColumns.cxx @@ -49,9 +49,9 @@ sdbcx::ObjectType OEvoabColumns::createObject(const ::rtl::OUString& _rName) OEvoabTable* pTable = (OEvoabTable*)m_pTable; ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->end()) + if(aIter != aCols->get().end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/evoab/LFolderList.cxx b/connectivity/source/drivers/evoab/LFolderList.cxx index 9ea5a2bf2d1c..a3c031c05c05 100644 --- a/connectivity/source/drivers/evoab/LFolderList.cxx +++ b/connectivity/source/drivers/evoab/LFolderList.cxx @@ -99,13 +99,13 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal if(!m_aColumns.isValid()) m_aColumns = new OSQLColumns(); else - m_aColumns->clear(); + m_aColumns->get().clear(); m_aTypes.clear(); m_aPrecisions.clear(); m_aScales.clear(); // reserve some space - m_aColumns->reserve(nFieldCount); + m_aColumns->get().reserve(nFieldCount); m_aTypes.reserve(nFieldCount); m_aPrecisions.reserve(nFieldCount); m_aScales.reserve(nFieldCount); @@ -259,12 +259,12 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal // check if the columname already exists String aAlias(aColumnName); - OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->end()) + while(aFind != m_aColumns->get().end()) { (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt); - aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(), @@ -277,7 +277,7 @@ void OEvoabFolderList::fillColumns(const ::com::sun::star::lang::Locale& _aLocal sal_False, bCase); Reference< XPropertySet> xCol = pColumn; - m_aColumns->push_back(xCol); + m_aColumns->get().push_back(xCol); m_aTypes.push_back(eType); m_aPrecisions.push_back(nPrecision); m_aScales.push_back(nScale); @@ -340,20 +340,20 @@ void OEvoabFolderList::construct() //------------------------------------------------------------------ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) { - (*_rRow)[0] = m_nFilePos; // the "bookmark" + (_rRow->get())[0] = m_nFilePos; // the "bookmark" OEvoabConnection* pConnection = (OEvoabConnection*)m_pConnection; // Felder: xub_StrLen nStartPos = 0; String aStr; - OSQLColumns::const_iterator aIter = _rCols.begin(); - for (sal_Int32 i = 0; aIter != _rCols.end();++aIter, ++i) + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); + for (sal_Int32 i = 0; aIter != _rCols.get().end();++aIter, ++i) { m_aCurrentLine.GetTokenSpecial(aStr,nStartPos,pConnection->getFieldDelimiter(),pConnection->getStringDelimiter()); //OSL_TRACE("OEvoabFolderList::fetchRow()::aStr = %s\n", ((OUtoCStr(::rtl::OUString(aStr))) ? (OUtoCStr(::rtl::OUString(aStr))):("NULL")) ); if (aStr.Len() == 0) - (*_rRow)[i+1].setNull(); + (_rRow->get())[i+1].setNull(); else { // length depending on the data type @@ -375,18 +375,18 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) switch(nType) { case DataType::DATE: - (*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); + (_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); break; case DataType::TIMESTAMP: - (*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); + (_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); break; default: - (*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); + (_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); } } catch(Exception&) { - (*_rRow)[i+1].setNull(); + (_rRow->get())[i+1].setNull(); } } break; case DataType::DOUBLE: @@ -420,15 +420,15 @@ sal_Bool OEvoabFolderList::fetchRow(OValueRow _rRow,const OSQLColumns & _rCols) // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) - (*_rRow)[i+1] = String::CreateFromDouble(nVal); + (_rRow->get())[i+1] = String::CreateFromDouble(nVal); else - (*_rRow)[i+1] = nVal; + (_rRow->get())[i+1] = nVal; } break; default: { // Wert als String in Variable der Row uebernehmen - (*_rRow)[i+1] = aStr; + (_rRow->get())[i+1] = aStr; } break; } @@ -504,13 +504,13 @@ const ORowSetValue& OEvoabFolderList::getValue(sal_Int32 _nColumnIndex ) throw(: { checkIndex( _nColumnIndex ); - m_bIsNull = (*m_aRow)[_nColumnIndex].isNull(); - return (*m_aRow)[_nColumnIndex]; + m_bIsNull = (m_aRow->get())[_nColumnIndex].isNull(); + return (m_aRow->get())[_nColumnIndex]; } // ----------------------------------------------------------------------------- void OEvoabFolderList::checkIndex(sal_Int32 _nColumnIndex ) throw(::com::sun::star::sdbc::SQLException) { - if ( _nColumnIndex <= 0 || _nColumnIndex >= (sal_Int32)m_aRow->size() ) { + if ( _nColumnIndex <= 0 || _nColumnIndex >= (sal_Int32)m_aRow->get().size() ) { // ::dbtools::throwInvalidIndexException(); ; } @@ -531,8 +531,8 @@ void OEvoabFolderList::initializeRow(sal_Int32 _nColumnCount) if(!m_aRow.isValid()) { m_aRow = new OValueVector(_nColumnCount); - (*m_aRow)[0].setBound(sal_True); - ::std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetBound(sal_False)); + (m_aRow->get())[0].setBound(sal_True); + ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(sal_False)); } //OSL_TRACE("OEvoabFolderList::initializeRow()::_nColumnCount = %d\n", _nColumnCount); diff --git a/connectivity/source/drivers/evoab/LResultSet.cxx b/connectivity/source/drivers/evoab/LResultSet.cxx index a09568baecc9..fd4959465710 100644 --- a/connectivity/source/drivers/evoab/LResultSet.cxx +++ b/connectivity/source/drivers/evoab/LResultSet.cxx @@ -120,7 +120,7 @@ Any SAL_CALL OEvoabResultSet::getBookmark( ) throw( SQLException, RuntimeExcep checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny((sal_Int32)(*m_aRow)[0]->getValue()); + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OEvoabResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) diff --git a/connectivity/source/drivers/evoab/LServices.cxx b/connectivity/source/drivers/evoab/LServices.cxx index fd82d329a4e5..bab5ae8cfce9 100644 --- a/connectivity/source/drivers/evoab/LServices.cxx +++ b/connectivity/source/drivers/evoab/LServices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/evoab/LTable.cxx b/connectivity/source/drivers/evoab/LTable.cxx index e6f68e8621c3..cbb4bc53e9f4 100644 --- a/connectivity/source/drivers/evoab/LTable.cxx +++ b/connectivity/source/drivers/evoab/LTable.cxx @@ -110,14 +110,14 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) if(!m_aColumns.isValid()) m_aColumns = new OSQLColumns(); else - m_aColumns->clear(); + m_aColumns->get().clear(); m_aTypes.clear(); m_aPrecisions.clear(); m_aScales.clear(); // reserve some space m_aColumnRawNames.reserve(nFieldCount); - m_aColumns->reserve(nFieldCount); + m_aColumns->get().reserve(nFieldCount); m_aTypes.reserve(nFieldCount); m_aPrecisions.reserve(nFieldCount); m_aScales.reserve(nFieldCount); @@ -283,12 +283,12 @@ void OEvoabTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) // check if the columname already exists String aAlias(aColumnName); - OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->end()) + while(aFind != m_aColumns->get().end()) { (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt); - aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } m_aColumnRawNames.push_back(::rtl::OUString(aAlias)); @@ -430,9 +430,9 @@ void OEvoabTable::refreshColumns() ::osl::MutexGuard aGuard( m_aMutex ); TStringVector aVector; - aVector.reserve(m_aColumns->size()); + aVector.reserve(m_aColumns->get().size()); - for(OSQLColumns::const_iterator aIter = m_aColumns->begin();aIter != m_aColumns->end();++aIter) + for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != m_aColumns->get().end();++aIter) aVector.push_back(Reference< XNamed>(*aIter,UNO_QUERY)->getName()); if(m_pColumns) @@ -514,7 +514,7 @@ sal_Int64 OEvoabTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R //------------------------------------------------------------------ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal_Bool bIsTable,sal_Bool bRetrieveData) { - *(*_rRow)[0] = m_nFilePos; + *(_rRow->get())[0] = m_nFilePos; if (!bRetrieveData) return TRUE; @@ -523,14 +523,14 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa // Felder: xub_StrLen nStartPos = 0; String aStr; - OSQLColumns::const_iterator aIter = _rCols.begin(); - for (sal_Int32 i = 0; aIter != _rCols.end();++aIter, ++i) + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); + for (sal_Int32 i = 0; aIter != _rCols.get().end();++aIter, ++i) { m_aCurrentLine.GetTokenSpecial(aStr,nStartPos,pConnection->getFieldDelimiter(),pConnection->getStringDelimiter()); //OSL_TRACE("OEvoabTable::fetchRow()::aStr = %s\n", ((OUtoCStr(::rtl::OUString(aStr))) ? (OUtoCStr(::rtl::OUString(aStr))):("NULL")) ); if (aStr.Len() == 0) - (*_rRow)[i+1]->setNull(); + (_rRow->get())[i+1]->setNull(); else { // Laengen je nach Datentyp: @@ -564,18 +564,18 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa switch(nType) { case DataType::DATE: - *(*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); + *(_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); break; case DataType::TIMESTAMP: - *(*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); + *(_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); break; default: - *(*_rRow)[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); + *(_rRow->get())[i+1] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); } } catch(Exception&) { - (*_rRow)[i+1]->setNull(); + (_rRow->get())[i+1]->setNull(); } } break; case DataType::DOUBLE: @@ -609,15 +609,15 @@ sal_Bool OEvoabTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sa // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) - *(*_rRow)[i+1] = ORowSetValue(String::CreateFromDouble(nVal)); + *(_rRow->get())[i+1] = ORowSetValue(String::CreateFromDouble(nVal)); else - *(*_rRow)[i+1] = nVal; + *(_rRow->get())[i+1] = nVal; } break; default: { // Wert als String in Variable der Row uebernehmen - *(*_rRow)[i+1] = ORowSetValue(aStr); + *(_rRow->get())[i+1] = ORowSetValue(aStr); } break; } @@ -632,8 +632,8 @@ sal_Bool OEvoabTable::setColumnAliases() size_t nSize = m_aColumnRawNames.size(); if(nSize == 0 || m_aPrecisions.size() != nSize || m_aScales.size() != nSize || m_aTypes.size() != nSize) return sal_False; - m_aColumns->clear(); - m_aColumns->reserve(nSize); + m_aColumns->get().clear(); + m_aColumns->get().reserve(nSize); ::rtl::OUString aColumnReadName; ::rtl::OUString aColumnHeadlineName; ::rtl::OUString aColumnDisplayName; @@ -690,7 +690,7 @@ sal_Bool OEvoabTable::setColumnAliases() sal_False, bCase); Reference< XPropertySet> xCol = pColumn; - m_aColumns->push_back(xCol); + m_aColumns->get().push_back(xCol); } return sal_True; } diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index a25e8cb94c76..897636fc0073 100644 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -34,6 +34,8 @@ PRJINC=..$/.. PRJNAME=connectivity TARGET=evoab +VISIBILITY_HIDDEN=TRUE + # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index d0cd13743dc1..ae46e1e28aa2 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -245,9 +245,9 @@ void OOperandParam::describe(const Reference< XPropertySet>& rColumn, ::vos::ORe { // den alten namen beibehalten - OSL_ENSURE(getRowPos() < rParameterColumns->size(),"Invalid index for orderkey values!"); + OSL_ENSURE(getRowPos() < rParameterColumns->get().size(),"Invalid index for orderkey values!"); - Reference< XPropertySet> xColumn = (*rParameterColumns)[getRowPos()]; + Reference< XPropertySet> xColumn = (rParameterColumns->get())[getRowPos()]; try { diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx index 6594c2dcc714..8d0ff84972b6 100644 --- a/connectivity/source/drivers/file/FNoException.cxx +++ b/connectivity/source/drivers/file/FNoException.cxx @@ -118,15 +118,15 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< // ----------------------------------------------------------------------------- OKeyValue* OResultSet::GetOrderbyKeyValue(OValueRefRow& _rRow) { - UINT32 nBookmarkValue = Abs((sal_Int32)(*_rRow)[0]->getValue()); + UINT32 nBookmarkValue = Abs((sal_Int32)(_rRow->get())[0]->getValue()); OKeyValue* pKeyValue = OKeyValue::createKeyValue((UINT32)nBookmarkValue); ::std::vector<sal_Int32>::iterator aIter = m_aOrderbyColumnNumber.begin(); for (;aIter != m_aOrderbyColumnNumber.end(); ++aIter) { - OSL_ENSURE(*aIter < static_cast<sal_Int32>(_rRow->size()),"Invalid index for orderkey values!"); - pKeyValue->pushKey(new ORowSetValueDecorator((*_rRow)[*aIter]->getValue())); + OSL_ENSURE(*aIter < static_cast<sal_Int32>(_rRow->get().size()),"Invalid index for orderkey values!"); + pKeyValue->pushKey(new ORowSetValueDecorator((_rRow->get())[*aIter]->getValue())); } return pKeyValue; diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 5f4edc082618..0278a1ae8035 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -99,7 +99,7 @@ void OPreparedStatement::disposing() m_xMetaData = NULL; if(m_aParameterRow.isValid()) { - m_aParameterRow->clear(); + m_aParameterRow->get().clear(); m_aParameterRow = NULL; } @@ -111,7 +111,7 @@ void OPreparedStatement::construct(const ::rtl::OUString& sql) throw(SQLExcepti OStatement_Base::construct(sql); m_aParameterRow = new OValueRefVector(); - m_aParameterRow->push_back(new ORowSetValueDecorator(sal_Int32(0)) ); + m_aParameterRow->get().push_back(new ORowSetValueDecorator(sal_Int32(0)) ); Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); @@ -280,9 +280,9 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / checkAndResizeParameters(parameterIndex); if ( m_aAssignValues.isValid() ) - (*m_aAssignValues)[m_aParameterIndexes[parameterIndex]]->setNull(); + (m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]]->setNull(); else - (*m_aParameterRow)[parameterIndex]->setNull(); + (m_aParameterRow->get())[parameterIndex]->setNull(); } // ------------------------------------------------------------------------- @@ -376,8 +376,8 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); - m_aParameterRow->clear(); - m_aParameterRow->push_back(new ORowSetValueDecorator(sal_Int32(0)) ); + m_aParameterRow->get().clear(); + m_aParameterRow->get().push_back(new ORowSetValueDecorator(sal_Int32(0)) ); } // ------------------------------------------------------------------------- OResultSet* OPreparedStatement::createResultSet() @@ -391,8 +391,8 @@ Reference<XResultSet> OPreparedStatement::initResultSet() Reference<XResultSet> xRs(m_pResultSet); // check if we got enough paramters - if ( (m_aParameterRow.isValid() && ( m_aParameterRow->size() -1 ) < m_xParamColumns->size()) || - (m_xParamColumns.isValid() && !m_aParameterRow.isValid() && !m_aParameterRow->empty()) ) + if ( (m_aParameterRow.isValid() && ( m_aParameterRow->get().size() -1 ) < m_xParamColumns->get().size()) || + (m_xParamColumns.isValid() && !m_aParameterRow.isValid() && !m_aParameterRow->get().empty()) ) m_pConnection->throwGenericSQLException(STR_INVALID_PARA_COUNT,*this); m_pResultSet->OpenImpl(); @@ -416,14 +416,14 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) ::connectivity::checkDisposed(OStatement_BASE::rBHelper.bDisposed); if ( m_aAssignValues.isValid() && (parameterIndex < 1 || parameterIndex >= static_cast<sal_Int32>(m_aParameterIndexes.size())) ) throwInvalidIndexException(*this); - else if ( static_cast<sal_Int32>((*m_aParameterRow).size()) <= parameterIndex ) + else if ( static_cast<sal_Int32>((m_aParameterRow->get()).size()) <= parameterIndex ) { - sal_Int32 i = m_aParameterRow->size(); - (*m_aParameterRow).resize(parameterIndex+1); + sal_Int32 i = m_aParameterRow->get().size(); + (m_aParameterRow->get()).resize(parameterIndex+1); for ( ;i <= parameterIndex+1; ++i ) { - if ( !(*m_aParameterRow)[i].isValid() ) - (*m_aParameterRow)[i] = new ORowSetValueDecorator; + if ( !(m_aParameterRow->get())[i].isValid() ) + (m_aParameterRow->get())[i] = new ORowSetValueDecorator; } } } @@ -434,9 +434,9 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetVal checkAndResizeParameters(parameterIndex); if(m_aAssignValues.isValid()) - *(*m_aAssignValues)[m_aParameterIndexes[parameterIndex]] = x; + *(m_aAssignValues->get())[m_aParameterIndexes[parameterIndex]] = x; else - *((*m_aParameterRow)[parameterIndex]) = x; + *((m_aParameterRow->get())[parameterIndex]) = x; } // ----------------------------------------------------------------------------- UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol) @@ -478,8 +478,8 @@ UINT32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere ,sal_False ,sal_False ,m_aSQLIterator.isCaseSensitive()); - m_xParamColumns->push_back(xParaColumn); - return m_xParamColumns->size(); + m_xParamColumns->get().push_back(xParaColumn); + return m_xParamColumns->get().size(); } // ----------------------------------------------------------------------------- void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) @@ -529,13 +529,13 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult) m_pResultSet->setParameterRow(m_aParameterRow); // Parameter substituieren (AssignValues und Kriterien): - if (!m_xParamColumns->empty()) + if (!m_xParamColumns->get().empty()) { // Zunaechst AssignValues USHORT nParaCount=0; // gibt die aktuelle Anzahl der bisher gesetzen Parameter an // Nach zu substituierenden Parametern suchen: - size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->size() : 1; // 1 ist wichtig fuer die Kriterien + size_t nCount = m_aAssignValues.isValid() ? m_aAssignValues->get().size() : 1; // 1 ist wichtig fuer die Kriterien for (size_t j = 1; j < nCount; j++) { UINT32 nParameter = (*m_aAssignValues).getParameterIndex(j); @@ -548,19 +548,19 @@ void OPreparedStatement::initializeResultSet(OResultSet* _pResult) // (*m_aAssignValues)[j] = (*m_aParameterRow)[(UINT16)nParameter]; } - if (m_aParameterRow.isValid() && (m_xParamColumns->size()+1) != m_aParameterRow->size() ) + if (m_aParameterRow.isValid() && (m_xParamColumns->get().size()+1) != m_aParameterRow->get().size() ) { - sal_Int32 i = m_aParameterRow->size(); - sal_Int32 nParamColumns = m_xParamColumns->size()+1; - m_aParameterRow->resize(nParamColumns); + sal_Int32 i = m_aParameterRow->get().size(); + sal_Int32 nParamColumns = m_xParamColumns->get().size()+1; + m_aParameterRow->get().resize(nParamColumns); for ( ;i < nParamColumns; ++i ) { - if ( !(*m_aParameterRow)[i].isValid() ) - (*m_aParameterRow)[i] = new ORowSetValueDecorator; + if ( !(m_aParameterRow->get())[i].isValid() ) + (m_aParameterRow->get())[i] = new ORowSetValueDecorator; } //m_aParameterRow->resize(m_xParamColumns->size()+1); } - if (m_aParameterRow.isValid() && nParaCount < m_aParameterRow->size() ) + if (m_aParameterRow.isValid() && nParaCount < m_aParameterRow->get().size() ) { m_pSQLAnalyzer->bindParameterRow(m_aParameterRow); @@ -575,9 +575,9 @@ void OPreparedStatement::parseParamterElem(const String& _sColumnName,OSQLParseN sal_Int32 nParameter = -1; if(m_xParamColumns.isValid()) { - OSQLColumns::const_iterator aIter = find(m_xParamColumns->begin(),m_xParamColumns->end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive())); - if(aIter != m_xParamColumns->end()) - nParameter = m_xParamColumns->size() - (m_xParamColumns->end() - aIter) + 1;// +1 because the rows start at 1 + OSQLColumns::Vector::const_iterator aIter = find(m_xParamColumns->get().begin(),m_xParamColumns->get().end(),_sColumnName,::comphelper::UStringMixEqual(m_pTable->isCaseSensitive())); + if(aIter != m_xParamColumns->get().end()) + nParameter = m_xParamColumns->get().size() - (m_xParamColumns->get().end() - aIter) + 1;// +1 because the rows start at 1 } if(nParameter == -1) nParameter = AddParameter(pRow_Value_Constructor_Elem,xCol); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index f14c7d6f600f..96f2767d3a77 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -184,7 +184,7 @@ void OResultSet::clear() DELETEZ(m_pSortIndex); if(m_aInsertRow.isValid()) - m_aInsertRow->clear(); + m_aInsertRow->get().clear(); m_aSkipDeletedSet.clear(); } @@ -232,15 +232,15 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex ) throw(::com::su checkIndex(columnIndex ); - m_bWasNull = (*m_aSelectRow)[columnIndex]->getValue().isNull(); - return *(*m_aSelectRow)[columnIndex]; + m_bWasNull = (m_aSelectRow->get())[columnIndex]->getValue().isNull(); + return *(m_aSelectRow->get())[columnIndex]; } // ----------------------------------------------------------------------------- void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) { if ( columnIndex <= 0 // || columnIndex > (sal_Int32)m_xColumns->size() - || columnIndex >= (sal_Int32)m_aSelectRow->size() ) + || columnIndex >= (sal_Int32)m_aSelectRow->get().size() ) ::dbtools::throwInvalidIndexException(*this); } // ------------------------------------------------------------------------- @@ -304,7 +304,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) OSL_ENSURE((m_bShowDeleted || !m_aRow->isDeleted()),"getRow called for deleted row"); - return m_aSkipDeletedSet.getMappedPosition((*m_aRow)[0]->getValue()); + return m_aSkipDeletedSet.getMappedPosition((m_aRow->get())[0]->getValue()); } // ------------------------------------------------------------------------- @@ -382,7 +382,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_nRowPos == sal_Int32(m_pFileSet->size()); + return m_nRowPos == sal_Int32(m_pFileSet->get().size()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) @@ -400,7 +400,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return m_nRowPos == sal_Int32(m_pFileSet->size() - 1); + return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1); } // ------------------------------------------------------------------------- void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) @@ -592,12 +592,12 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) m_bRowInserted = m_pTable->InsertRow(m_aInsertRow.getBody(), TRUE,m_xColsIdx); if(m_bRowInserted && m_pFileSet.isValid()) { - sal_Int32 nPos = (*m_aInsertRow)[0]->getValue(); - m_pFileSet->push_back(nPos); - *(*m_aInsertRow)[0] = sal_Int32(m_pFileSet->size()); + sal_Int32 nPos = (m_aInsertRow->get())[0]->getValue(); + m_pFileSet->get().push_back(nPos); + *(m_aInsertRow->get())[0] = sal_Int32(m_pFileSet->get().size()); clearInsertRow(); - m_aSkipDeletedSet.insertNewPosition((*m_aRow)[0]->getValue()); + m_aSkipDeletedSet.insertNewPosition((m_aRow->get())[0]->getValue()); } } // ------------------------------------------------------------------------- @@ -610,7 +610,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) lcl_throwError(STR_TABLE_READONLY,*this); m_bRowUpdated = m_pTable->UpdateRow(m_aInsertRow.getBody(), m_aRow,m_xColsIdx); - *(*m_aInsertRow)[0] = (sal_Int32)(*m_aRow)[0]->getValue(); + *(m_aInsertRow->get())[0] = (sal_Int32)(m_aRow->get())[0]->getValue(); clearInsertRow(); } @@ -628,7 +628,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException) if(m_aRow->isDeleted()) lcl_throwError(STR_ROW_ALREADY_DELETED,*this); - sal_Int32 nPos = (sal_Int32)(*m_aRow)[0]->getValue(); + sal_Int32 nPos = (sal_Int32)(m_aRow->get())[0]->getValue(); m_bRowDeleted = m_pTable->DeleteRow(m_xColumns.getBody()); if(m_bRowDeleted && m_pFileSet.isValid()) { @@ -651,8 +651,8 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept if(m_aInsertRow.isValid()) { - OValueRefVector::iterator aIter = m_aInsertRow->begin()+1; - for(;aIter != m_aInsertRow->end();++aIter) + OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; + for(;aIter != m_aInsertRow->get().end();++aIter) { (*aIter)->setBound(sal_False); (*aIter)->setNull(); @@ -671,8 +671,8 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti m_bInserted = sal_True; - OValueRefVector::iterator aIter = m_aInsertRow->begin()+1; - for(;aIter != m_aInsertRow->end();++aIter) + OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin()+1; + for(;aIter != m_aInsertRow->get().end();++aIter) { (*aIter)->setBound(sal_False); (*aIter)->setNull(); @@ -692,8 +692,8 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (*m_aInsertRow)[columnIndex]->setBound(sal_True); - *(*m_aInsertRow)[columnIndex] = x; + (m_aInsertRow->get())[columnIndex]->setBound(sal_True); + *(m_aInsertRow->get())[columnIndex] = x; } // ----------------------------------------------------------------------------- @@ -916,8 +916,8 @@ again: else if (m_pFileSet.isValid()) { // OSL_ENSURE(!m_pFileSet->IsFrozen() , "Falsche CursorPosition!"); - sal_uInt32 nBookmarkValue = Abs((sal_Int32)(*m_aEvaluateRow)[0]->getValue()); - m_pFileSet->push_back(nBookmarkValue); + sal_uInt32 nBookmarkValue = Abs((sal_Int32)(m_aEvaluateRow->get())[0]->getValue()); + m_pFileSet->get().push_back(nBookmarkValue); } } else if (m_aSQLIterator.getStatementType() == SQL_STATEMENT_UPDATE) @@ -971,7 +971,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, ExecuteRow(eCursorPosition,nOffset,FALSE,bRetrieveData); // now set the bookmark for outside this is the logical pos and not the file pos - *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); } else { @@ -989,7 +989,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, break; case IResultSetHelper::LAST: // OSL_ENSURE(IsRowCountFinal(), "Fehler im Keyset!"); // muss eingefroren sein, sonst Fehler beim SQLCursor - m_nRowPos = m_pFileSet->size() - 1; + m_nRowPos = m_pFileSet->get().size() - 1; break; case IResultSetHelper::RELATIVE: m_nRowPos += nOffset; @@ -1006,20 +1006,20 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, // Der FileCursor ist ausserhalb des gueltigen Bereichs, wenn // a.) m_nRowPos < 1 // b.) Ein KeySet besteht und m_nRowPos > m_pFileSet->size() - if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->size() )) // && m_pFileSet->IsFrozen() + if (m_nRowPos < 0 || (m_pFileSet->isFrozen() && eCursorPosition != IResultSetHelper::BOOKMARK && m_nRowPos >= (INT32)m_pFileSet->get().size() )) // && m_pFileSet->IsFrozen() { // aStatus.Set(SQL_STAT_NO_DATA_FOUND); goto Error; } else { - if (m_nRowPos < (INT32)m_pFileSet->size()) + if (m_nRowPos < (INT32)m_pFileSet->get().size()) { // Fetch ueber Index - ExecuteRow(IResultSetHelper::BOOKMARK,(*m_pFileSet)[m_nRowPos],FALSE,bRetrieveData); + ExecuteRow(IResultSetHelper::BOOKMARK,(m_pFileSet->get())[m_nRowPos],FALSE,bRetrieveData); // now set the bookmark for outside - *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); if ( (bRetrieveData || m_pSQLAnalyzer->hasRestriction()) && m_pSQLAnalyzer->hasFunctions() ) { m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); @@ -1028,15 +1028,15 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, else // Index muss weiter aufgebaut werden { // Zunaechst auf die letzte bekannte Zeile setzen - if (!m_pFileSet->empty()) + if (!m_pFileSet->get().empty()) { - m_aFileSetIter = m_pFileSet->end()-1; + m_aFileSetIter = m_pFileSet->get().end()-1; // m_pFileSet->SeekPos(m_pFileSet->size()-1); m_pTable->seekRow(IResultSetHelper::BOOKMARK, *m_aFileSetIter, m_nFilePos); } sal_Bool bOK = sal_True; // Ermitteln der Anzahl weiterer Fetches - while (bOK && m_nRowPos >= (INT32)m_pFileSet->size()) + while (bOK && m_nRowPos >= (INT32)m_pFileSet->get().size()) { if (m_pEvaluationKeySet) { @@ -1064,7 +1064,7 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, m_pTable->fetchRow(m_aRow, m_pTable->getTableColumns().getBody(), sal_True,bRetrieveData); // now set the bookmark for outside - *(*m_aRow->begin()) = sal_Int32(m_nRowPos + 1); + *(*m_aRow->get().begin()) = sal_Int32(m_nRowPos + 1); if ( (bRetrieveData || m_pSQLAnalyzer->hasRestriction()) && m_pSQLAnalyzer->hasFunctions() ) { @@ -1115,12 +1115,12 @@ BOOL OResultSet::Move(IResultSetHelper::Movement eCursorPosition, INT32 nOffset, { // COUNT(*) in Ergebnisrow packen // (muss die erste und einzige Variable in der Row sein) - if (m_aRow->size() >= 2) + if (m_aRow->get().size() >= 2) { - *(*m_aRow)[1] = m_nRowCountResult; - *(*m_aRow)[0] = sal_Int32(1); - (*m_aRow)[1]->setBound(sal_True); - (*m_aSelectRow)[1] = (*m_aRow)[1]; + *(m_aRow->get())[1] = m_nRowCountResult; + *(m_aRow->get())[0] = sal_Int32(1); + (m_aRow->get())[1]->setBound(sal_True); + (m_aSelectRow->get())[1] = (m_aRow->get())[1]; } } else @@ -1154,7 +1154,7 @@ Error: case IResultSetHelper::ABSOLUTE: case IResultSetHelper::RELATIVE: if (nOffset > 0) - m_nRowPos = m_pFileSet.isValid() ? (sal_Int32)m_pFileSet->size() : -1; + m_nRowPos = m_pFileSet.isValid() ? (sal_Int32)m_pFileSet->get().size() : -1; else if (nOffset < 0) m_nRowPos = -1; break; @@ -1207,8 +1207,8 @@ void OResultSet::sortRows() ::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); for (::std::vector<sal_Int16>::size_type i=0;aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) { - OSL_ENSURE((sal_Int32)m_aRow->size() > *aOrderByIter,"Invalid Index"); - switch ((*(m_aRow->begin()+*aOrderByIter))->getValue().getTypeKind()) + OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index"); + switch ((*(m_aRow->get().begin()+*aOrderByIter))->getValue().getTypeKind()) { case DataType::CHAR: case DataType::VARCHAR: @@ -1236,7 +1236,7 @@ void OResultSet::sortRows() OSL_ASSERT("OFILECursor::Execute: Datentyp nicht implementiert"); break; } - (*m_aEvaluateRow)[*aOrderByIter]->setBound(sal_True); + (m_aEvaluateRow->get())[*aOrderByIter]->setBound(sal_True); } m_pSortIndex = new OSortIndex(eKeyType,m_aOrderbyAscending); @@ -1324,7 +1324,7 @@ BOOL OResultSet::OpenImpl() { if(isCount()) { - if(m_xColumns->size() > 1) + if(m_xColumns->get().size() > 1) lcl_throwError(STR_QUERY_COMPLEX_COUNT,*this); m_nRowCountResult = 0; @@ -1402,24 +1402,24 @@ BOOL OResultSet::OpenImpl() // abgelegt werden! { if(m_pTable->getCurrentLastPos() > 0) - m_pFileSet->reserve(m_pTable->getCurrentLastPos() ); + m_pFileSet->get().reserve(m_pTable->getCurrentLastPos() ); for (sal_Int32 i = 0; i < m_pTable->getCurrentLastPos(); i++) - m_pFileSet->push_back(i + 1); + m_pFileSet->get().push_back(i + 1); } } OSL_ENSURE(m_pFileSet.isValid(),"Kein KeySet vorhanden! :-("); if(bDistinct && m_pFileSet.isValid()) // sicher ist sicher { - OValueRow aSearchRow = new OValueVector(m_aRow->size()); - OValueRefVector::iterator aRowIter = m_aRow->begin(); - OValueVector::iterator aSearchIter = aSearchRow->begin(); + OValueRow aSearchRow = new OValueVector(m_aRow->get().size()); + OValueRefVector::Vector::iterator aRowIter = m_aRow->get().begin(); + OValueVector::Vector::iterator aSearchIter = aSearchRow->get().begin(); for ( ++aRowIter,++aSearchIter; // the first column is the bookmark column - aRowIter != m_aRow->end(); + aRowIter != m_aRow->get().end(); ++aRowIter,++aSearchIter) - aSearchIter->setBound((*aRowIter)->isBound()); + aSearchIter->setBound((*aRowIter)->isBound()); - size_t nMaxRow = m_pFileSet->size(); + size_t nMaxRow = m_pFileSet->get().size(); if (nMaxRow) { @@ -1431,44 +1431,44 @@ BOOL OResultSet::OpenImpl() for( size_t j = nMaxRow-1; j > 0; --j) { - nPos = (*m_pFileSet)[j]; + nPos = (m_pFileSet->get())[j]; ExecuteRow(IResultSetHelper::BOOKMARK,nPos,FALSE); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); { // copy row values - OValueRefVector::iterator copyFrom = m_aSelectRow->begin(); - OValueVector::iterator copyTo = aSearchRow->begin(); + OValueRefVector::Vector::iterator copyFrom = m_aSelectRow->get().begin(); + OValueVector::Vector::iterator copyTo = aSearchRow->get().begin(); for ( ++copyFrom,++copyTo; // the first column is the bookmark column - copyFrom != m_aSelectRow->end(); + copyFrom != m_aSelectRow->get().end(); ++copyFrom,++copyTo) *copyTo = *(*copyFrom); // *aSearchRow = *m_aRow; } // compare with next row - nKey = (*m_pFileSet)[j-1]; + nKey = (m_pFileSet->get())[j-1]; ExecuteRow(IResultSetHelper::BOOKMARK,nKey,FALSE); m_pSQLAnalyzer->setSelectionEvaluationResult(m_aSelectRow,m_aColMapping); - OValueRefVector::iterator loopInRow = m_aSelectRow->begin(); - OValueVector::iterator existentInSearchRow = aSearchRow->begin(); + OValueRefVector::Vector::iterator loopInRow = m_aSelectRow->get().begin(); + OValueVector::Vector::iterator existentInSearchRow = aSearchRow->get().begin(); for ( ++loopInRow,++existentInSearchRow; // the first column is the bookmark column - loopInRow != m_aSelectRow->end(); + loopInRow != m_aSelectRow->get().end(); ++loopInRow,++existentInSearchRow) { if ( (*loopInRow)->isBound() && !( *(*loopInRow) == *existentInSearchRow) ) break; } - if(loopInRow == m_aSelectRow->end()) - (*m_pFileSet)[j] = 0; // Rows match -- Mark for deletion by setting key to 0 + if(loopInRow == m_aSelectRow->get().end()) + (m_pFileSet->get())[j] = 0; // Rows match -- Mark for deletion by setting key to 0 #if OSL_DEBUG_LEVEL > 1 else nFound++; #endif } - m_pFileSet->erase(::std::remove_if(m_pFileSet->begin(),m_pFileSet->end(), + m_pFileSet->get().erase(::std::remove_if(m_pFileSet->get().begin(),m_pFileSet->get().end(), ::std::bind2nd(::std::equal_to<sal_Int32>(),0)) - ,m_pFileSet->end()); + ,m_pFileSet->get().end()); if (bWasSorted) { @@ -1476,7 +1476,7 @@ BOOL OResultSet::OpenImpl() m_aOrderbyColumnNumber = aOrderbyColumnNumberSave; m_aOrderbyAscending.assign(aOrderbyAscendingSave.begin(), aOrderbyAscendingSave.end()); - TIntVector aEvaluationKeySet(*m_pFileSet); + TIntVector aEvaluationKeySet(m_pFileSet->get()); m_pEvaluationKeySet = &aEvaluationKeySet; sortRows(); } @@ -1484,7 +1484,7 @@ BOOL OResultSet::OpenImpl() { m_aOrderbyColumnNumber.clear(); m_aOrderbyAscending.clear(); - ::std::sort(m_pFileSet->begin(),m_pFileSet->end()); + ::std::sort(m_pFileSet->get().begin(),m_pFileSet->get().end()); } } // SetRowCount(m_pFileSet->count()); @@ -1597,11 +1597,11 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); const ::rtl::OUString sType = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE); - typedef ::std::map<OSQLColumns::iterator,sal_Bool> IterMap; + typedef ::std::map<OSQLColumns::Vector::iterator,sal_Bool> IterMap; IterMap aSelectIters; - OValueRefVector::iterator aRowIter = _rRow->begin()+1; + OValueRefVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column - aRowIter != _rRow->end(); + aRowIter != _rRow->get().end(); ++i, ++aRowIter ) { @@ -1618,8 +1618,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, // look if we have such a select column // TODO: would like to have a O(log n) search here ... - for ( OSQLColumns::iterator aIter = _rxColumns->begin(); - aIter != _rxColumns->end(); + for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); + aIter != _rxColumns->get().end(); ++aIter ) { @@ -1633,12 +1633,12 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, aSelectIters.insert(IterMap::value_type(aIter,sal_True)); if(_bSetColumnMapping) { - sal_Int32 nSelectColumnPos = aIter - _rxColumns->begin() + 1; + sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; // the getXXX methods are 1-based ... sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column ... _rColMapping[nSelectColumnPos] = nTableColumnPos; - (*_rSelectRow)[nSelectColumnPos] = *aRowIter; + (_rSelectRow->get())[nSelectColumnPos] = *aRowIter; } (*aRowIter)->setBound(sal_True); @@ -1662,8 +1662,8 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, Reference<XNameAccess> xNameAccess(_xNames,UNO_QUERY); Sequence< ::rtl::OUString > aSelectColumns = xNameAccess->getElementNames(); - for ( OSQLColumns::iterator aIter = _rxColumns->begin(); - aIter != _rxColumns->end(); + for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); + aIter != _rxColumns->get().end(); ++aIter ) { @@ -1677,7 +1677,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, if ( xNameAccess->hasByName( sSelectColumnRealName ) ) { aSelectIters.insert(IterMap::value_type(aIter,sal_True)); - sal_Int32 nSelectColumnPos = aIter - _rxColumns->begin() + 1; + sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; const ::rtl::OUString* pBegin = aSelectColumns.getConstArray(); const ::rtl::OUString* pEnd = pBegin + aSelectColumns.getLength(); for(sal_Int32 i=0;pBegin != pEnd;++pBegin,++i) @@ -1688,7 +1688,7 @@ void OResultSet::setBoundedColumns(const OValueRefRow& _rRow, sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column ... _rColMapping[nSelectColumnPos] = nTableColumnPos; - (*_rSelectRow)[nSelectColumnPos] = (*_rRow)[nTableColumnPos]; + (_rSelectRow->get())[nSelectColumnPos] = (_rRow->get())[nTableColumnPos]; break; } } @@ -1728,14 +1728,14 @@ void OResultSet::doTableSpecials(const OSQLTable& _xTable) void OResultSet::clearInsertRow() { m_aRow->setDeleted(sal_False); // set to false here because this is the new row - OValueRefVector::iterator aIter = m_aInsertRow->begin(); - const OValueRefVector::iterator aEnd = m_aInsertRow->end(); + OValueRefVector::Vector::iterator aIter = m_aInsertRow->get().begin(); + const OValueRefVector::Vector::iterator aEnd = m_aInsertRow->get().end(); for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos) { ORowSetValueDecoratorRef& rValue = (*aIter); if ( rValue->isBound() ) { - (*m_aRow)[nPos]->setValue( (*aIter)->getValue() ); + (m_aRow->get())[nPos]->setValue( (*aIter)->getValue() ); } rValue->setBound(nPos == 0); rValue->setModified(sal_False); @@ -1748,8 +1748,8 @@ void OResultSet::initializeRow(OValueRefRow& _rRow,sal_Int32 _nColumnCount) if(!_rRow.isValid()) { _rRow = new OValueRefVector(_nColumnCount); - (*_rRow)[0]->setBound(sal_True); - ::std::for_each(_rRow->begin()+1,_rRow->end(),TSetRefBound(sal_False)); + (_rRow->get())[0]->setBound(sal_True); + ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetRefBound(sal_False)); } } // ----------------------------------------------------------------------------- @@ -1765,7 +1765,7 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 // ----------------------------------------------------------------------------- sal_Int32 OResultSet::getDriverPos() const { - return (*m_aRow)[0]->getValue(); + return (m_aRow->get())[0]->getValue(); } // ----------------------------------------------------------------------------- sal_Bool OResultSet::deletedVisible() const diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index e979489e4eb0..8ebc0ed1281c 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -63,7 +63,7 @@ OResultSetMetaData::~OResultSetMetaData() // ----------------------------------------------------------------------------- void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) { - if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->size()) + if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } // ------------------------------------------------------------------------- @@ -76,13 +76,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) { - return (*m_xColumns).size(); + return (m_xColumns->get()).size(); } // ------------------------------------------------------------------------- @@ -102,8 +102,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th { checkColumnIndex(column); - Any aName((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); - return aName.hasValue() ? getString(aName) : getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); + Any aName((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); + return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) @@ -119,7 +119,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); + return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -136,7 +136,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getBOOL((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); + return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } // ------------------------------------------------------------------------- @@ -153,20 +153,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQL sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } // ------------------------------------------------------------------------- @@ -179,8 +179,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - sal_Bool bReadOnly = (*m_xColumns)[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && - ::cppu::any2bool((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); + sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); return bReadOnly || m_pTable->isReadOnly(); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index f8608c2e4d7b..42828dcb75e7 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -136,7 +136,7 @@ void OStatement_BASE2::disposing() if(m_aRow.isValid()) { - m_aRow->clear(); + m_aRow->get().clear(); m_aRow = NULL; } @@ -352,7 +352,7 @@ void SAL_CALL OStatement_Base::disposing(void) { if(m_aEvaluateRow.isValid()) { - m_aEvaluateRow->clear(); + m_aEvaluateRow->get().clear(); m_aEvaluateRow = NULL; } delete m_pEvaluationKeySet; @@ -443,10 +443,10 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, { ::vos::ORef<OSQLColumns> aSelectColumns = m_aSQLIterator.getSelectColumns(); ::comphelper::UStringMixEqual aCase; - OSQLColumns::const_iterator aFind = ::connectivity::find(aSelectColumns->begin(),aSelectColumns->end(),aColumnName,aCase); - if ( aFind == aSelectColumns->end() ) + OSQLColumns::Vector::const_iterator aFind = ::connectivity::find(aSelectColumns->get().begin(),aSelectColumns->get().end(),aColumnName,aCase); + if ( aFind == aSelectColumns->get().end() ) throw SQLException(); - m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->begin()) + 1); + m_aOrderbyColumnNumber.push_back((aFind - aSelectColumns->get().begin()) + 1); } // Ascending or Descending? @@ -473,7 +473,7 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, // more than one table -> can't operate on them -> error m_pConnection->throwGenericSQLException(STR_QUERY_MORE_TABLES,*this); - if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->empty() ) + if ( (m_aSQLIterator.getStatementType() == SQL_STATEMENT_SELECT) && m_aSQLIterator.getSelectColumns()->get().empty() ) // SELECT statement without columns -> error m_pConnection->throwGenericSQLException(STR_QUERY_NO_COLUMN,*this); @@ -501,18 +501,18 @@ void OStatement_Base::construct(const ::rtl::OUString& sql) throw(SQLException, Reference<XIndexAccess> xNames(m_xColNames,UNO_QUERY); // set the binding of the resultrow m_aRow = new OValueRefVector(xNames->getCount()); - (*m_aRow)[0]->setBound(sal_True); - ::std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetRefBound(sal_False)); + (m_aRow->get())[0]->setBound(sal_True); + ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetRefBound(sal_False)); // set the binding of the resultrow m_aEvaluateRow = new OValueRefVector(xNames->getCount()); - (*m_aEvaluateRow)[0]->setBound(sal_True); - ::std::for_each(m_aEvaluateRow->begin()+1,m_aEvaluateRow->end(),TSetRefBound(sal_False)); + (m_aEvaluateRow->get())[0]->setBound(sal_True); + ::std::for_each(m_aEvaluateRow->get().begin()+1,m_aEvaluateRow->get().end(),TSetRefBound(sal_False)); // set the select row - m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->size()); - ::std::for_each(m_aSelectRow->begin(),m_aSelectRow->end(),TSetRefBound(sal_True)); + m_aSelectRow = new OValueRefVector(m_aSQLIterator.getSelectColumns()->get().size()); + ::std::for_each(m_aSelectRow->get().begin(),m_aSelectRow->get().end(),TSetRefBound(sal_True)); // create the column mapping createColumnMapping(); @@ -533,7 +533,7 @@ void OStatement_Base::createColumnMapping() { // initialize the column index map (mapping select columns to table columns) ::vos::ORef<connectivity::OSQLColumns> xColumns = m_aSQLIterator.getSelectColumns(); - m_aColMapping.resize(xColumns->size() + 1); + m_aColMapping.resize(xColumns->get().size() + 1); for (sal_Int32 i=0; i<(sal_Int32)m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -575,11 +575,11 @@ void OStatement_Base::GetAssignValues() { // Row fuer die zu setzenden Werte anlegen (Referenz durch new) if(m_aAssignValues.isValid()) - m_aAssignValues->clear(); + m_aAssignValues->get().clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(sal_False)); + ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -682,11 +682,11 @@ void OStatement_Base::GetAssignValues() else if (SQL_ISRULE(m_pParseTree,update_statement_searched)) { if(m_aAssignValues.isValid()) - m_aAssignValues->clear(); + m_aAssignValues->get().clear(); sal_Int32 nCount = Reference<XIndexAccess>(m_xColNames,UNO_QUERY)->getCount(); m_aAssignValues = new OAssignValues(nCount); // unbound all - ::std::for_each(m_aAssignValues->begin()+1,m_aAssignValues->end(),TSetRefBound(sal_False)); + ::std::for_each(m_aAssignValues->get().begin()+1,m_aAssignValues->get().end(),TSetRefBound(sal_False)); m_aParameterIndexes.resize(nCount+1,SQL_NO_PARAMETER); @@ -781,7 +781,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, // Alles geprueft und wir haben den Namen der Column. // Jetzt eine Value allozieren, den Wert setzen und die Value an die Row binden. if (bSetNull) - (*m_aAssignValues)[nId]->setNull(); + (m_aAssignValues->get())[nId]->setNull(); else { switch (::comphelper::getINT32(xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE)))) @@ -789,16 +789,16 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, // Kriterium je nach Typ als String oder double in die Variable packen ... case DataType::CHAR: case DataType::VARCHAR: - *(*m_aAssignValues)[nId] = ORowSetValue(aValue); + *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); // Zeichensatz ist bereits konvertiert, da ja das gesamte Statement konvertiert wurde break; case DataType::BIT: { if (aValue.EqualsIgnoreCaseAscii("TRUE") || aValue.GetChar(0) == '1') - *(*m_aAssignValues)[nId] = sal_True; + *(m_aAssignValues->get())[nId] = sal_True; else if (aValue.EqualsIgnoreCaseAscii("FALSE") || aValue.GetChar(0) == '0') - *(*m_aAssignValues)[nId] = sal_False; + *(m_aAssignValues->get())[nId] = sal_False; else { // aStatus.Set(SQL_STAT_ERROR); // nyi: genauer! @@ -817,7 +817,7 @@ void OStatement_Base::SetAssignValue(const String& aColumnName, case DataType::TIME: case DataType::TIMESTAMP: { - *(*m_aAssignValues)[nId] = ORowSetValue(aValue); // .ToDouble + *(m_aAssignValues->get())[nId] = ORowSetValue(aValue); // .ToDouble // try // { // double n = xValue->toDouble(); diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 40cf46b7a66f..c866db55275e 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -203,7 +203,7 @@ void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns) if (!rCodeList.size()) return; // kein Praedikat - if (!rParameterColumns->size()) + if (!rParameterColumns->get().size()) return; // keine Parameter // Anlegen von Columns, die eine genauere Beschreibung fuer die enthalten @@ -211,7 +211,7 @@ void OSQLAnalyzer::describeParam(::vos::ORef<OSQLColumns> rParameterColumns) // Anlegen einer Testzeile, wird benoetigt um die Parameter zu beschreiben - OValueRefRow aParameterRow = new OValueRefVector(rParameterColumns->size()); + OValueRefRow aParameterRow = new OValueRefVector(rParameterColumns->get().size()); bindParameterRow(aParameterRow); OValueRefRow aTestRow = new OValueRefVector(Reference< XIndexAccess>(m_aCompiler->getOrigColumns(),UNO_QUERY)->getCount()); @@ -295,7 +295,7 @@ void OSQLAnalyzer::setSelectionEvaluationResult(OValueRefRow& _pRow,const ::std: // the first column (index 0) is for convenience only. The first real select column is no 1. if ( (nPos > 0) && (nPos < static_cast<sal_Int32>(_rColumnMapping.size())) ) map = _rColumnMapping[nPos]; - aIter->second->startSelection((*_pRow)[map]); + aIter->second->startSelection((_pRow->get())[map]); } } } diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index c7ee72914dac..1cd8543cd5f7 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -103,20 +103,20 @@ void OOperandRow::bindValue(const OValueRefRow& _pRow) { OSL_ENSURE(_pRow.isValid(),"NO EMPTY row allowed!"); m_pRow = _pRow; - OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); - (*m_pRow)[m_nRowPos]->setBound(sal_True); + OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); + (m_pRow->get())[m_nRowPos]->setBound(sal_True); } // ----------------------------------------------------------------------------- void OOperandRow::setValue(const ORowSetValue& _rVal) { - OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); - (*(*m_pRow)[m_nRowPos]) = _rVal; + OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); + (*(m_pRow->get())[m_nRowPos]) = _rVal; } //------------------------------------------------------------------ const ORowSetValue& OOperandRow::getValue() const { - OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->size(),"Invalid RowPos is >= vector.size()"); - return (*m_pRow)[m_nRowPos]->getValue(); + OSL_ENSURE(m_pRow.isValid() && m_nRowPos < m_pRow->get().size(),"Invalid RowPos is >= vector.size()"); + return (m_pRow->get())[m_nRowPos]->getValue(); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/file/makefile.mk b/connectivity/source/drivers/file/makefile.mk index 5f00227479b3..0696b29b0144 100644 --- a/connectivity/source/drivers/file/makefile.mk +++ b/connectivity/source/drivers/file/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=file USE_DEFFILE=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" @@ -44,6 +45,8 @@ ENVCFLAGS+=/FR$(SLO)$/ .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/version.mk +CDEFS += -DOOO_DLLIMPLEMENTATION_FILE + # --- Files ------------------------------------- EXCEPTIONSFILES=\ $(SLO)$/FNoException.obj \ diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index e05271dd9432..eb274eb311d3 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -48,9 +48,9 @@ sdbcx::ObjectType OFlatColumns::createObject(const ::rtl::OUString& _rName) OFlatTable* pTable = (OFlatTable*)m_pTable; ::vos::ORef<OSQLColumns> aCols = pTable->getTableColumns(); - OSQLColumns::const_iterator aIter = find(aCols->begin(),aCols->end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); + OSQLColumns::Vector::const_iterator aIter = find(aCols->get().begin(),aCols->get().end(),_rName,::comphelper::UStringMixEqual(isCaseSensitive())); sdbcx::ObjectType xRet; - if(aIter != aCols->end()) + if(aIter != aCols->get().end()) xRet = sdbcx::ObjectType(*aIter,UNO_QUERY); return xRet; } diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 09ddeb35621b..631e1c7dd44c 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -120,7 +120,7 @@ Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeExcept checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return makeAny((sal_Int32)(*m_aRow)[0]->getValue()); + return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 4cc39c72a190..a4ab45c997c5 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -105,13 +105,13 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) if(!m_aColumns.isValid()) m_aColumns = new OSQLColumns(); else - m_aColumns->clear(); + m_aColumns->get().clear(); m_aTypes.clear(); m_aPrecisions.clear(); m_aScales.clear(); // reserve some space - m_aColumns->reserve(nFieldCount); + m_aColumns->get().reserve(nFieldCount); m_aTypes.reserve(nFieldCount); m_aPrecisions.reserve(nFieldCount); m_aScales.reserve(nFieldCount); @@ -277,12 +277,12 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) // check if the columname already exists String aAlias(aColumnName); - OSQLColumns::const_iterator aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); sal_Int32 nExprCnt = 0; - while(aFind != m_aColumns->end()) + while(aFind != m_aColumns->get().end()) { (aAlias = aColumnName) += String::CreateFromInt32(++nExprCnt); - aFind = connectivity::find(m_aColumns->begin(),m_aColumns->end(),aAlias,aCase); + aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase); } sdbcx::OColumn* pColumn = new sdbcx::OColumn(aAlias,aTypeName,::rtl::OUString(), @@ -295,7 +295,7 @@ void OFlatTable::fillColumns(const ::com::sun::star::lang::Locale& _aLocale) sal_False, bCase); Reference< XPropertySet> xCol = pColumn; - m_aColumns->push_back(xCol); + m_aColumns->get().push_back(xCol); m_aTypes.push_back(eType); m_aPrecisions.push_back(nPrecision); m_aScales.push_back(nScale); @@ -410,9 +410,9 @@ void OFlatTable::refreshColumns() ::osl::MutexGuard aGuard( m_aMutex ); TStringVector aVector; - aVector.reserve(m_aColumns->size()); + aVector.reserve(m_aColumns->get().size()); - for(OSQLColumns::const_iterator aIter = m_aColumns->begin();aIter != m_aColumns->end();++aIter) + for(OSQLColumns::Vector::const_iterator aIter = m_aColumns->get().begin();aIter != m_aColumns->get().end();++aIter) aVector.push_back(Reference< XNamed>(*aIter,UNO_QUERY)->getName()); if(m_pColumns) @@ -492,7 +492,7 @@ sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru //------------------------------------------------------------------ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal_Bool bIsTable,sal_Bool bRetrieveData) { - *(*_rRow)[0] = m_nFilePos; + *(_rRow->get())[0] = m_nFilePos; if (!bRetrieveData) return TRUE; @@ -501,15 +501,15 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal // Felder: xub_StrLen nStartPos = 0; String aStr; - OSQLColumns::const_iterator aIter = _rCols.begin(); - OSQLColumns::const_iterator aEnd = _rCols.end(); - for (OValueRefVector::size_type i = 1; aIter != aEnd && i < _rRow->size(); + OSQLColumns::Vector::const_iterator aIter = _rCols.get().begin(); + OSQLColumns::Vector::const_iterator aEnd = _rCols.get().end(); + for (OValueRefVector::Vector::size_type i = 1; aIter != aEnd && i < _rRow->get().size(); ++aIter, i++) { m_aCurrentLine.GetTokenSpecial(aStr,nStartPos,pConnection->getFieldDelimiter(),pConnection->getStringDelimiter()); if (aStr.Len() == 0) - (*_rRow)[i]->setNull(); + (_rRow->get())[i]->setNull(); else { // Laengen je nach Datentyp: @@ -543,18 +543,18 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal switch(nType) { case DataType::DATE: - *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); + *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDate(nRes,aDate)); break; case DataType::TIMESTAMP: - *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); + *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toDateTime(nRes,aDate)); break; default: - *(*_rRow)[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); + *(_rRow->get())[i] = ::dbtools::DBTypeConversion::toDouble(::dbtools::DBTypeConversion::toTime(nRes)); } } catch(Exception&) { - (*_rRow)[i]->setNull(); + (_rRow->get())[i]->setNull(); } } break; case DataType::DOUBLE: @@ -588,15 +588,15 @@ sal_Bool OFlatTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols,sal // #99178# OJ if ( DataType::DECIMAL == nType || DataType::NUMERIC == nType ) - *(*_rRow)[i] = ORowSetValue(String::CreateFromDouble(nVal)); + *(_rRow->get())[i] = ORowSetValue(String::CreateFromDouble(nVal)); else - *(*_rRow)[i] = nVal; + *(_rRow->get())[i] = nVal; } break; default: { // Wert als String in Variable der Row uebernehmen - *(*_rRow)[i] = ORowSetValue(aStr); + *(_rRow->get())[i] = ORowSetValue(aStr); } break; } diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx index 72ff3dd705b2..13505a6df129 100644 --- a/connectivity/source/drivers/flat/Eservices.cxx +++ b/connectivity/source/drivers/flat/Eservices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 4b153c3a1488..83ee3a885ba6 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -34,6 +34,8 @@ PRJINC=..$/.. PRJNAME=connectivity TARGET=flat +VISIBILITY_HIDDEN=TRUE + # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" ENVCFLAGS+=/FR$(SLO)$/ diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index fbf5c1460aa0..a5393afb2cc7 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx @@ -58,7 +58,7 @@ using namespace ::connectivity::hsqldb; * Method: openStream * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_openStream (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jint mode) { #ifdef HSQLDB_DBG @@ -76,7 +76,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_o * Method: close * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_close (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -115,7 +115,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_c * Method: getFilePointer * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ -JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer +SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_getFilePointer (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -139,7 +139,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_ * Method: length * Signature: (Ljava/lang/String;Ljava/lang/String;)J */ -JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length +SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_length (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -206,7 +206,7 @@ jint read_from_storage_stream( JNIEnv * env, jobject /*obj_this*/, jstring name, * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv* env, jobject obj_this, jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -279,7 +279,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -300,7 +300,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r * Method: readInt * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key) { #ifdef HSQLDB_DBG @@ -368,7 +368,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_r * Method: seek * Signature: (Ljava/lang/String;Ljava/lang/String;J)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek (JNIEnv * env, jobject /*obj_this*/,jstring name, jstring key, jlong position) { #ifdef HSQLDB_DBG @@ -484,7 +484,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst * Method: write * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write (JNIEnv * env, jobject obj_this,jstring name, jstring key, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -543,7 +543,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j * Method: writeInt * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt (JNIEnv * env, jobject obj_this,jstring name, jstring key, jint v) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index 19a6309b1ec6..da5ce1d733ee 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.cxx @@ -117,7 +117,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -126,7 +127,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -151,7 +152,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 917271152330..df9ea312c292 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -60,7 +60,7 @@ using namespace ::connectivity::hsqldb; * Method: isStreamElement * Signature: (Ljava/lang/String;Ljava/lang/String;)Z */ -JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement +SAL_DLLPUBLIC_EXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_isStreamElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { TStorages::mapped_type aStoragePair = StorageContainer::getRegisteredStorage(StorageContainer::jstring2ustring(env,key)); @@ -109,7 +109,7 @@ JNIEXPORT jboolean JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess * Method: removeElement * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_removeElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -144,7 +144,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_rem * Method: renameElement * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess_renameElement (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring oldname, jstring newname) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index c28f8801625f..5e1a79e9957e 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -71,7 +71,7 @@ using namespace ::connectivity::hsqldb; * Method: openStream * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jint mode) { #ifdef HSQLDB_DBG @@ -89,7 +89,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2 (JNIEnv * env, jobject obj_this,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -108,7 +108,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this,jstring key, jstring name, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -127,7 +127,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr * Method: close * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close +SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_close (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -147,7 +147,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr * Method: skip * Signature: (Ljava/lang/String;Ljava/lang/String;J)J */ -JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip +SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_skip (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jlong n) { #ifdef HSQLDB_DBG @@ -213,7 +213,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputSt * Method: available * Signature: (Ljava/lang/String;Ljava/lang/String;)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_available (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -255,7 +255,7 @@ JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStr * Method: read * Signature: (Ljava/lang/String;Ljava/lang/String;[B)I */ -JNIEXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B +SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject /*obj_this*/,jstring key, jstring name, jbyteArray buffer) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index c0af6147fbfe..a0b45149d3d6 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx @@ -34,7 +34,6 @@ #include <config.h> #endif -#include "StorageNativeOutputStream.h" #include "uno/mapping.hxx" #include "uno/environment.hxx" #include "cppuhelper/bootstrap.hxx" @@ -78,7 +77,7 @@ using namespace ::connectivity::hsqldb; * Method: openStream * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream (JNIEnv * env, jobject /*obj_this*/, jstring name, jstring key, jint mode) { #ifdef HSQLDB_DBG @@ -94,7 +93,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: write * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII (JNIEnv * env, jobject obj_this, jstring key, jstring name, jbyteArray buffer, jint off, jint len) { #ifdef HSQLDB_DBG @@ -112,7 +111,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: write * Signature: (Ljava/lang/String;Ljava/lang/String;[B)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3B +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3B (JNIEnv * env, jobject obj_this, jstring key, jstring name, jbyteArray buffer) { #ifdef HSQLDB_DBG @@ -130,7 +129,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: close * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_close +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_close (JNIEnv * env, jobject /*obj_this*/, jstring key, jstring name) { #ifdef HSQLDB_DBG @@ -162,7 +161,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: write * Signature: (Ljava/lang/String;Ljava/lang/String;I)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2I +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2I (JNIEnv * env, jobject obj_this, jstring key, jstring name,jint b) { #ifdef HSQLDB_DBG @@ -180,7 +179,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: flush * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush (JNIEnv * env, jobject /*obj_this*/, jstring key, jstring name) { OSL_UNUSED( env ); @@ -199,7 +198,7 @@ JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputSt * Method: sync * Signature: (Ljava/lang/String;Ljava/lang/String;)V */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_sync +extern "C" SAL_DLLPUBLIC_EXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_sync (JNIEnv * env, jobject /*obj_this*/, jstring key, jstring name) { #ifdef HSQLDB_DBG diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.h b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.h deleted file mode 100644 index a64ae9aeb647..000000000000 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.h +++ /dev/null @@ -1,70 +0,0 @@ -/* DO NOT EDIT THIS FILE - it is machine generated */ -#include <jni.h> -/* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream */ - -#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream -#define _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream -#ifdef __cplusplus -extern "C" { -#endif -/* Inaccessible static: class_00024com_00024sun_00024star_00024sdbcx_00024comp_00024hsqldb_00024StorageNativeOutputStream */ -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: openStream - * Signature: (Ljava/lang/String;Ljava/lang/String;I)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_openStream - (JNIEnv *, jobject, jstring, jstring, jint); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: write - * Signature: (Ljava/lang/String;Ljava/lang/String;[BII)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3BII - (JNIEnv *, jobject, jstring, jstring, jbyteArray, jint, jint); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: write - * Signature: (Ljava/lang/String;Ljava/lang/String;[B)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2_3B - (JNIEnv *, jobject, jstring, jstring, jbyteArray); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: close - * Signature: (Ljava/lang/String;Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_close - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: write - * Signature: (Ljava/lang/String;Ljava/lang/String;I)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_write__Ljava_lang_String_2Ljava_lang_String_2I - (JNIEnv *, jobject, jstring, jstring, jint); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: flush - * Signature: (Ljava/lang/String;Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_flush - (JNIEnv *, jobject, jstring, jstring); - -/* - * Class: com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream - * Method: sync - * Signature: (Ljava/lang/String;Ljava/lang/String;)V - */ -JNIEXPORT void JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeOutputStream_sync - (JNIEnv *, jobject, jstring, jstring); - -#ifdef __cplusplus -} -#endif -#endif diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 0b16410fa805..7d13b48550b6 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=hsqldb ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE USE_DEFFILE=TRUE # --- Settings ---------------------------------- diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx index 32210ce100e7..db5b235c44c8 100644 --- a/connectivity/source/drivers/jdbc/jservices.cxx +++ b/connectivity/source/drivers/jdbc/jservices.cxx @@ -115,7 +115,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -124,7 +125,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -149,7 +150,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index 042c47a8e1f0..58287b0bf86a 100644 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=jdbc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 72c7adc36a3d..f9389ef70b8c 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -53,8 +53,8 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL if (nParams < 1) ::dbtools::throwInvalidIndexException(*(KabPreparedStatement *) this,Any()); - if (nParams >= (sal_Int32) (*m_aParameterRow).size()) - (*m_aParameterRow).resize(nParams); + if (nParams >= (sal_Int32) (m_aParameterRow->get()).size()) + (m_aParameterRow->get()).resize(nParams); } // ------------------------------------------------------------------------- void KabPreparedStatement::setKabFields() const throw(SQLException) @@ -80,7 +80,7 @@ void KabPreparedStatement::resetParameters() const throw(SQLException) // ------------------------------------------------------------------------- void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) { - if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) + if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString( @@ -89,7 +89,7 @@ void KabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const t ::dbtools::throwGenericSQLException(sError,*(KabPreparedStatement *) this); } // if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) - rParameter = (*m_aParameterRow)[m_nParameterIndex]; + rParameter = (m_aParameterRow->get())[m_nParameterIndex]; m_nParameterIndex++; } @@ -115,7 +115,7 @@ void KabPreparedStatement::disposing() if (m_aParameterRow.isValid()) { - m_aParameterRow->clear(); + m_aParameterRow->get().clear(); m_aParameterRow = NULL; } } @@ -196,7 +196,7 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) checkAndResizeParameters(parameterIndex); - (*m_aParameterRow)[parameterIndex - 1].setNull(); + (m_aParameterRow->get())[parameterIndex - 1].setNull(); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) @@ -270,7 +270,7 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const :: checkAndResizeParameters(parameterIndex); - (*m_aParameterRow)[parameterIndex - 1] = x; + (m_aParameterRow->get())[parameterIndex - 1] = x; } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index e743e1b408c4..564e32553da8 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -53,10 +53,10 @@ KabResultSetMetaData::~KabResultSetMetaData() // ------------------------------------------------------------------------- void KabResultSetMetaData::setKabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException) { - OSQLColumns::const_iterator aIter; + OSQLColumns::Vector::const_iterator aIter; static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name")); - for (aIter = xColumns->begin(); aIter != xColumns->end(); ++aIter) + for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { ::rtl::OUString aFieldName; sal_uInt32 nFieldNumber; diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index e8a6a2ff44bb..b79b01ba0dff 100755 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -54,8 +54,8 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S if (nParams < 1) ::dbtools::throwInvalidIndexException(*(MacabPreparedStatement *) this,Any()); - if (nParams >= (sal_Int32) (*m_aParameterRow).size()) - (*m_aParameterRow).resize(nParams); + if (nParams >= (sal_Int32) (m_aParameterRow->get()).size()) + (m_aParameterRow->get()).resize(nParams); } // ------------------------------------------------------------------------- void MacabPreparedStatement::setMacabFields() const throw(SQLException) @@ -81,7 +81,7 @@ void MacabPreparedStatement::resetParameters() const throw(SQLException) // ------------------------------------------------------------------------- void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const throw(SQLException) { - if (m_nParameterIndex >= (sal_Int32) (*m_aParameterRow).size()) + if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { ::connectivity::SharedResources aResources; const ::rtl::OUString sError( aResources.getResourceString( @@ -90,7 +90,7 @@ void MacabPreparedStatement::getNextParameter(::rtl::OUString &rParameter) const ::dbtools::throwGenericSQLException(sError,*(MacabPreparedStatement *) this); } - rParameter = (*m_aParameterRow)[m_nParameterIndex]; + rParameter = (m_aParameterRow->get())[m_nParameterIndex]; m_nParameterIndex++; } @@ -117,7 +117,7 @@ void MacabPreparedStatement::disposing() if (m_aParameterRow.isValid()) { - m_aParameterRow->clear(); + m_aParameterRow->get().clear(); m_aParameterRow = NULL; } } @@ -209,7 +209,7 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 checkAndResizeParameters(parameterIndex); - (*m_aParameterRow)[parameterIndex - 1].setNull(); + (m_aParameterRow->get())[parameterIndex - 1].setNull(); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) @@ -283,7 +283,7 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const checkAndResizeParameters(parameterIndex); - (*m_aParameterRow)[parameterIndex - 1] = x; + (m_aParameterRow->get())[parameterIndex - 1] = x; } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 74c1c590b518..f5e53ca3c327 100755 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -56,7 +56,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData() // ------------------------------------------------------------------------- void MacabResultSetMetaData::setMacabFields(const ::vos::ORef<connectivity::OSQLColumns> &xColumns) throw(SQLException) { - OSQLColumns::const_iterator aIter; + OSQLColumns::Vector::const_iterator aIter; static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name")); MacabRecords *aRecords; MacabHeader *aHeader; @@ -71,7 +71,7 @@ void MacabResultSetMetaData::setMacabFields(const ::vos::ORef<connectivity::OSQL aHeader = aRecords->getHeader(); - for (aIter = xColumns->begin(); aIter != xColumns->end(); ++aIter) + for (aIter = xColumns->get().begin(); aIter != xColumns->get().end(); ++aIter) { ::rtl::OUString aFieldName; sal_uInt32 nFieldNumber; diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 5573191b2d7a..b1b957396045 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -247,7 +247,24 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) } //------------------------------------------------------------------------- -extern "C" void SAL_CALL setMozabServiceFactory( void* _pFactory ) +// MConfigAccess was invented to allow non-UNO parts access to the configuration. +// Unfortunately, configuration access requires a XMultiServiceFactory - which the +// mozilla side does not have. +// So we create a "library-local" service factory here: Every need for a service +// factory can be fullfilled by this factory (similar to the get/setProcessServiceFactory +// in comphelper). +// This is halfway valid, as usually, the mozabdrv library is invoked from the mozab library +// only. The latter contains the driver class (and only this class and nothing more), and +// the driver class is a singleton. The driver itself is created with a service factory, +// which (by definition) can and should be used for all subsequent service requests. +// And this is exactly what we're allowing with the following functions .... + +/** _pFactory must point to an XMultiServiceFactory, which must be aquired once + for purpose of safely transfering it. The callee will release this interface + when it has stored the pointer somewhere else. +*/ +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL setMozabServiceFactory( + void* _pFactory ) { Reference< XMultiServiceFactory > xFactory = static_cast< XMultiServiceFactory* >( _pFactory ); ::connectivity::mozab::setMozabServiceFactory( xFactory ); diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index cf103fdfad6e..2f9386b09f98 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -54,7 +54,8 @@ # define OUtoCStr( x ) ("dummy") #endif /* OSL_DEBUG_LEVEL */ -extern "C" void* SAL_CALL OMozabConnection_CreateInstance(void* _pDriver) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozabConnection_CreateInstance( + void* _pDriver) { return (new connectivity::mozab::OConnection( reinterpret_cast<connectivity::mozab::MozabDriver*>(_pDriver) )); } diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx index a0ea810ddbc7..041fcc38364b 100644 --- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx @@ -45,23 +45,5 @@ namespace connectivity } } -// MConfigAccess was invented to allow non-UNO parts access to the configuration. -// Unfortunately, configuration access requires a XMultiServiceFactory - which the -// mozilla side does not have. -// So we create a "library-local" service factory here: Every need for a service -// factory can be fullfilled by this factory (similar to the get/setProcessServiceFactory -// in comphelper). -// This is halfway valid, as usually, the mozabdrv library is invoked from the mozab library -// only. The latter contains the driver class (and only this class and nothing more), and -// the driver class is a singleton. The driver itself is created with a service factory, -// which (by definition) can and should be used for all subsequent service requests. -// And this is exactly what we're allowing with the following functions .... - -/** _pFactory must point to an XMultiServiceFactory, which must be aquired once - for purpose of safely transfering it. The callee will release this interface - when it has stored the pointer somewhere else. -*/ -extern "C" void SAL_CALL setMozabServiceFactory( void* _pFactory ); - #endif // CONNECTIVITY_MOZAB_MEXTCONFIGACCESS_HXX diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 195ad0e28567..79c58bc6a90c 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -98,7 +98,7 @@ void SAL_CALL OPreparedStatement::disposing() m_xMetaData = NULL; if(m_aParameterRow.isValid()) { - m_aParameterRow->clear(); + m_aParameterRow->get().clear(); m_aParameterRow = NULL; } m_xParamColumns = NULL; @@ -322,7 +322,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / checkAndResizeParameters(parameterIndex); - (*m_aParameterRow)[parameterIndex].setNull(); + (m_aParameterRow->get())[parameterIndex].setNull(); } // ------------------------------------------------------------------------- @@ -426,11 +426,11 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) if ( !m_aParameterRow.isValid() ) { m_aParameterRow = new OValueVector(); - m_aParameterRow->push_back(sal_Int32(0)); + m_aParameterRow->get().push_back(sal_Int32(0)); } - if ((sal_Int32)(*m_aParameterRow).size() <= parameterIndex) - (*m_aParameterRow).resize(parameterIndex+1); + if ((sal_Int32)(m_aParameterRow->get()).size() <= parameterIndex) + (m_aParameterRow->get()).resize(parameterIndex+1); } // ----------------------------------------------------------------------------- void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const @@ -440,7 +440,7 @@ ORowSetValue& x) checkAndResizeParameters(parameterIndex); OSL_TRACE("setParameter( %d, '%s')", parameterIndex, OUtoCStr(x) ); - (*m_aParameterRow)[parameterIndex] = x; + (m_aParameterRow->get())[parameterIndex] = x; } //------------------------------------------------------------------ @@ -448,7 +448,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re { OSL_UNUSED( pParameter ); // Nr. des neu hinzuzufuegenden Parameters: - sal_uInt32 nParameter = m_xParamColumns->size()+1; + sal_uInt32 nParameter = m_xParamColumns->get().size()+1; OSL_ENSURE(SQL_ISRULE(pParameter,parameter),"OResultSet::AddParameter: Argument ist kein Parameter"); OSL_ENSURE(pParameter->count() > 0,"OResultSet: Fehler im Parse Tree"); @@ -488,7 +488,7 @@ sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Re ,sal_False ,sal_False ,m_pSQLIterator->isCaseSensitive()); - m_xParamColumns->push_back(xParaColumn); + m_xParamColumns->get().push_back(xParaColumn); return nParameter; } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 48c2347a6b72..4ae7b695390a 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -320,7 +320,7 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLEx void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) { - if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->size()) + if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size()) ::dbtools::throwInvalidIndexException(*this); } // ------------------------------------------------------------------------- @@ -345,19 +345,19 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime if (cardNumber == 0) return sal_True; // Check whether we are storing the updated row - if ( (*m_aRow)[0].isNull() || (sal_Int32)(*m_aRow)[0] != (sal_Int32)cardNumber ) + if ( (m_aRow->get())[0].isNull() || (sal_Int32)(m_aRow->get())[0] != (sal_Int32)cardNumber ) return sal_False; sal_Int32 nCount = m_aColumnNames.getLength(); m_aQuery.setRowStates(cardNumber,m_RowStates); for( sal_Int32 i = 1; i <= nCount; i++ ) { - if ( (*m_aRow)[i].isBound() ) + if ( (m_aRow->get())[i].isBound() ) { // // Everything in the addressbook is a string! // - if ( !m_aQuery.setRowValue( (*m_aRow)[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { + if ( !m_aQuery.setRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwGenericSQLException( m_aQuery.getErrorResourceId(),*this ); } } @@ -372,7 +372,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( if (!bForceReload) { // Check whether we've already fetched the row... - if ( !(*m_aRow)[0].isNull() && (sal_Int32)(*m_aRow)[0] == (sal_Int32)cardNumber ) + if ( !(m_aRow->get())[0].isNull() && (sal_Int32)(m_aRow->get())[0] == (sal_Int32)cardNumber ) return sal_True; //Check whether the old row has been changed if (cardNumber == m_nUpdatedRow) @@ -388,17 +388,17 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( if ( validRow( cardNumber ) == sal_False ) return sal_False; - (*m_aRow)[0] = (sal_Int32)cardNumber; + (m_aRow->get())[0] = (sal_Int32)cardNumber; sal_Int32 nCount = m_aColumnNames.getLength(); m_RowStates = m_aQuery.getRowStates(cardNumber); for( sal_Int32 i = 1; i <= nCount; i++ ) { - if ( (*m_aRow)[i].isBound() ) + if ( (m_aRow->get())[i].isBound() ) { // // Everything in the addressbook is a string! // - if ( !m_aQuery.getRowValue( (*m_aRow)[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { + if ( !m_aQuery.getRowValue( (m_aRow->get())[i], cardNumber, m_aColumnNames[i-1], DataType::VARCHAR )) { m_pStatement->getOwnConnection()->throwGenericSQLException( m_aQuery.getErrorResourceId(),*this ); } } @@ -416,8 +416,8 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI return *ODatabaseMetaDataResultSet::getEmptyValue(); } - m_bWasNull = (*m_aRow)[columnIndex].isNull(); - return (*m_aRow)[columnIndex]; + m_bWasNull = (m_aRow->get())[columnIndex].isNull(); + return (m_aRow->get())[columnIndex]; } // ------------------------------------------------------------------------- @@ -428,7 +428,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI ResultSetEntryGuard aGuard( *this ); OSL_ENSURE(m_xColumns.isValid(), "Need the Columns!!"); - OSL_ENSURE(columnIndex <= (sal_Int32)m_xColumns->size(), "Trying to access invalid columns number"); + OSL_ENSURE(columnIndex <= (sal_Int32)m_xColumns->get().size(), "Trying to access invalid columns number"); checkIndex( columnIndex ); // If this query was sorted then we should have a valid KeySet, so use it @@ -725,8 +725,8 @@ void OResultSet::initializeRow(OValueRow& _rRow,sal_Int32 _nColumnCount) if(!_rRow.isValid()) { _rRow = new OValueVector(_nColumnCount); - (*_rRow)[0].setBound(sal_True); - ::std::for_each(_rRow->begin()+1,_rRow->end(),TSetBound(sal_False)); + (_rRow->get())[0].setBound(sal_True); + ::std::for_each(_rRow->get().begin()+1,_rRow->get().end(),TSetBound(sal_False)); } } @@ -751,8 +751,8 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, rtl::OUString& rMat OSL_TRACE("Parameter name [%d]: %s\n", m_nParamIndex,OUtoCStr(aParameterName) ); if ( m_aParameterRow.isValid() ) { - OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->size() + 1, "More parameters than values found" ); - rMatchString = (*m_aParameterRow)[(sal_uInt16)m_nParamIndex]; + OSL_ENSURE( m_nParamIndex < (sal_Int32)m_aParameterRow->get().size() + 1, "More parameters than values found" ); + rMatchString = (m_aParameterRow->get())[(sal_uInt16)m_nParamIndex]; #if OSL_DEBUG_LEVEL > 0 OSL_TRACE("Prop Value : %s\n", OUtoCStr( rMatchString ) ); #endif @@ -779,14 +779,14 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT if(xColumns.isValid()) { ::rtl::OUString aTabName,aColName,aParameterName,aParameterValue; - OSQLColumns::iterator aIter = xColumns->begin(); + OSQLColumns::Vector::iterator aIter = xColumns->get().begin(); sal_Int32 i = 1; - for(;aIter != xColumns->end();++aIter) + for(;aIter != xColumns->get().end();++aIter) { (*aIter)->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName; OSL_TRACE("Prop Column Name : %s\n", OUtoCStr( aColName ) ); if ( m_aParameterRow.isValid() ) { - aParameterValue = (*m_aParameterRow)[(sal_uInt16)i]; + aParameterValue = (m_aParameterRow->get())[(sal_uInt16)i]; #if OSL_DEBUG_LEVEL > 0 OSL_TRACE("Prop Value : %s\n", OUtoCStr( aParameterValue ) ); #endif @@ -1064,12 +1064,12 @@ void OResultSet::fillRowData() OSL_ENSURE(m_xColumns.isValid(), "Need the Columns!!"); - OSQLColumns::const_iterator aIter = m_xColumns->begin(); + OSQLColumns::Vector::const_iterator aIter = m_xColumns->get().begin(); const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); ::rtl::OUString sName; m_aAttributeStrings.clear(); - m_aAttributeStrings.reserve(m_xColumns->size()); - for (sal_Int32 i = 1; aIter != m_xColumns->end();++aIter, i++) + m_aAttributeStrings.reserve(m_xColumns->get().size()); + for (sal_Int32 i = 1; aIter != m_xColumns->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; #if OSL_DEBUG_LEVEL > 0 @@ -1146,10 +1146,10 @@ void OResultSet::fillRowData() // ----------------------------------------------------------------------------- static sal_Bool matchRow( OValueRow& row1, OValueRow& row2 ) { - OValueVector::iterator row1Iter = row1->begin(); - OValueVector::iterator row2Iter = row2->begin(); + OValueVector::Vector::iterator row1Iter = row1->get().begin(); + OValueVector::Vector::iterator row2Iter = row2->get().begin(); for ( ++row1Iter,++row2Iter; // the first column is the bookmark column - row1Iter != row1->end(); ++row1Iter,++row2Iter) + row1Iter != row1->get().end(); ++row1Iter,++row2Iter) { if ( row1Iter->isBound()) { @@ -1169,9 +1169,9 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) if ( m_pKeySet.isValid() ) { sal_Int32 nPos; - for(nPos=0;nPos < (sal_Int32)m_pKeySet->size();nPos++) + for(nPos=0;nPos < (sal_Int32)m_pKeySet->get().size();nPos++) { - if (nCardNum == (*m_pKeySet)[nPos]) + if (nCardNum == (m_pKeySet->get())[nPos]) { OSL_TRACE("In/Out: OResultSet::getRowForCardNumber, return = %u", nPos+1 ); return nPos+1; @@ -1242,8 +1242,8 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep ::std::vector<sal_Int32>::iterator aOrderByIter = m_aOrderbyColumnNumber.begin(); for ( ::std::vector<sal_Int16>::size_type i = 0; aOrderByIter != m_aOrderbyColumnNumber.end(); ++aOrderByIter,++i) { - OSL_ENSURE((sal_Int32)m_aRow->size() > *aOrderByIter,"Invalid Index"); - switch ((m_aRow->begin()+*aOrderByIter)->getTypeKind()) + OSL_ENSURE((sal_Int32)m_aRow->get().size() > *aOrderByIter,"Invalid Index"); + switch ((m_aRow->get().begin()+*aOrderByIter)->getTypeKind()) { case DataType::CHAR: case DataType::VARCHAR: @@ -1315,10 +1315,10 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep } m_pKeySet = m_pSortIndex->CreateKeySet(); - m_CurrentRowCount = m_pKeySet->size(); + m_CurrentRowCount = m_pKeySet->get().size(); #if OSL_DEBUG_LEVEL > 0 - for( OKeySet::size_type i = 0; i < m_pKeySet->size(); i++ ) - OSL_TRACE("Sorted: %d -> %d", i, (*m_pKeySet)[i] ); + for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ ) + OSL_TRACE("Sorted: %d -> %d", i, (m_pKeySet->get())[i] ); #endif m_pSortIndex = NULL; @@ -1330,14 +1330,14 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep // Handle the DISTINCT case if ( bDistinct && m_pKeySet.isValid() ) { - OValueRow aSearchRow = new OValueVector( m_aRow->size() ); + OValueRow aSearchRow = new OValueVector( m_aRow->get().size() ); - for( OKeySet::size_type i = 0; i < m_pKeySet->size(); i++ ) + for( OKeySet::Vector::size_type i = 0; i < m_pKeySet->get().size(); i++ ) { - fetchRow( (*m_pKeySet)[i] ); // Fills m_aRow + fetchRow( (m_pKeySet->get())[i] ); // Fills m_aRow if ( matchRow( m_aRow, aSearchRow ) ) { - (*m_pKeySet)[i] = 0; // Marker for later to be removed + (m_pKeySet->get())[i] = 0; // Marker for later to be removed } else { @@ -1347,9 +1347,9 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep } } // Now remove any keys marked with a 0 - m_pKeySet->erase(::std::remove_if(m_pKeySet->begin(),m_pKeySet->end() + m_pKeySet->get().erase(::std::remove_if(m_pKeySet->get().begin(),m_pKeySet->get().end() ,::std::bind2nd(::std::equal_to<sal_Int32>(),0)) - ,m_pKeySet->end()); + ,m_pKeySet->get().end()); } } @@ -1383,10 +1383,10 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, const ::rtl::OUString sRealName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_REALNAME); ::std::vector< ::rtl::OUString> aColumnNames; - aColumnNames.reserve(_rxColumns->size()); - OValueVector::iterator aRowIter = _rRow->begin()+1; + aColumnNames.reserve(_rxColumns->get().size()); + OValueVector::Vector::iterator aRowIter = _rRow->get().begin()+1; for (sal_Int32 i=0; // the first column is the bookmark column - aRowIter != _rRow->end(); + aRowIter != _rRow->get().end(); ++i, ++aRowIter ) { @@ -1403,8 +1403,8 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, // look if we have such a select column // TODO: would like to have a O(log n) search here ... sal_Int32 nColumnPos = 0; - for ( OSQLColumns::iterator aIter = _rxColumns->begin(); - aIter != _rxColumns->end(); + for ( OSQLColumns::Vector::iterator aIter = _rxColumns->get().begin(); + aIter != _rxColumns->get().end(); ++aIter,++nColumnPos ) { @@ -1423,7 +1423,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, { if(_bSetColumnMapping) { - sal_Int32 nSelectColumnPos = aIter - _rxColumns->begin() + 1; + sal_Int32 nSelectColumnPos = aIter - _rxColumns->get().begin() + 1; // the getXXX methods are 1-based ... sal_Int32 nTableColumnPos = i + 1; // get first table column is the bookmark column @@ -1494,11 +1494,11 @@ sal_Bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) if (m_CurrentRowCount < nMaxCardNumber) { sal_Int32 nKeyValue; - if ( (sal_Int32)m_pKeySet->capacity() < nMaxCardNumber ) - m_pKeySet->reserve(nMaxCardNumber + 20 ); + if ( (sal_Int32)m_pKeySet->get().capacity() < nMaxCardNumber ) + m_pKeySet->get().reserve(nMaxCardNumber + 20 ); for (nKeyValue = m_CurrentRowCount+1; nKeyValue <= nMaxCardNumber; nKeyValue ++) - m_pKeySet->push_back( nKeyValue ); + m_pKeySet->get().push_back( nKeyValue ); m_CurrentRowCount = nMaxCardNumber; } return sal_True; @@ -1507,7 +1507,7 @@ sal_Bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) sal_Int32 OResultSet::deletedCount() { impl_ensureKeySet(); - return m_CurrentRowCount - m_pKeySet->size(); + return m_CurrentRowCount - m_pKeySet->get().size(); } // ----------------------------------------------------------------------------- @@ -1558,9 +1558,9 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) return sal_False; } sal_Int32 nCurCard = nCurPos; - if ( nCurPos < (sal_Int32)m_pKeySet->size() ) //The requested row is exist in m_pKeySet, so we just use it + if ( nCurPos < (sal_Int32)m_pKeySet->get().size() ) //The requested row is exist in m_pKeySet, so we just use it { - nCurCard = (*m_pKeySet)[nCurPos-1]; + nCurCard = (m_pKeySet->get())[nCurPos-1]; } else //The requested row has not been retrived until now. We should get the right card for it. nCurCard = nCurPos + deletedCount(); @@ -1575,7 +1575,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) if ( nCurCard > nNumberOfRecords && m_aQuery.queryComplete()) { fillKeySet(nNumberOfRecords); - m_nRowPos = m_pKeySet->size() + 1; + m_nRowPos = m_pKeySet->get().size() + 1; OSL_TRACE("seekRow: return False, m_nRowPos = %u", m_nRowPos ); return sal_False; } @@ -1605,7 +1605,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin m_pStatement->getOwnConnection()->throwGenericSQLException(STR_ERROR_GET_ROW,*this); OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); - return makeAny((sal_Int32)(*m_aRow)[0]); + return makeAny((sal_Int32)(m_aRow->get())[0]); } sal_Bool OResultSet::moveToBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -1661,9 +1661,9 @@ sal_Int32 OResultSet::getCurrentCardNumber() { if ( ( m_nRowPos == 0 ) || !m_pKeySet.isValid() ) return 0; - if (m_pKeySet->size() < m_nRowPos) + if (m_pKeySet->get().size() < m_nRowPos) return 0; - return (*m_pKeySet)[m_nRowPos-1]; + return (m_pKeySet->get())[m_nRowPos-1]; } void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) { @@ -1694,8 +1694,8 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (*m_aRow)[columnIndex].setBound(sal_True); - (*m_aRow)[columnIndex] = x; + (m_aRow->get())[columnIndex].setBound(sal_True); + (m_aRow->get())[columnIndex] = x; m_nUpdatedRow = getCurrentCardNumber(); m_RowStates = m_RowStates | RowStates_Updated; } @@ -1712,8 +1712,8 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException checkIndex(columnIndex ); columnIndex = mapColumn(columnIndex); - (*m_aRow)[columnIndex].setBound(sal_True); - (*m_aRow)[columnIndex].setNull(); + (m_aRow->get())[columnIndex].setBound(sal_True); + (m_aRow->get())[columnIndex].setNull(); m_nUpdatedRow = getCurrentCardNumber(); m_RowStates = m_RowStates | RowStates_Updated; } @@ -1846,7 +1846,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLExcepti ResultSetEntryGuard aGuard( *this ); impl_ensureKeySet(); - if (!m_nRowPos || m_pKeySet->size() < m_nRowPos ) + if (!m_nRowPos || m_pKeySet->get().size() < m_nRowPos ) m_pStatement->getOwnConnection()->throwGenericSQLException(STR_INVALID_ROW_UPDATE,*this); const sal_Int32 nCurrentCard = getCurrentCardNumber(); @@ -1886,7 +1886,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLExcepti m_pStatement->getOwnConnection()->throwGenericSQLException( m_aQuery.getErrorResourceId() ,*this); m_aQuery.setRowStates(nCurrentRow,RowStates_Deleted); - m_pKeySet->erase(m_pKeySet->begin() + m_nRowPos -1); + m_pKeySet->get().erase(m_pKeySet->get().begin() + m_nRowPos -1); m_RowStates = RowStates_Deleted; OSL_TRACE("deleteRow out, m_nRowPos = %u", m_nRowPos ); } @@ -1924,7 +1924,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE else m_nUpdatedRow = 0; - m_nRowPos = m_pKeySet->size(); + m_nRowPos = m_pKeySet->get().size(); fetchCurrentRow(); OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos ); } diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index bb1330775b01..b0caef93c15c 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -56,7 +56,7 @@ OResultSetMetaData::~OResultSetMetaData() // ----------------------------------------------------------------------------- void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) { - if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->size()) + if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } // ------------------------------------------------------------------------- @@ -74,7 +74,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) thr sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) { - return (*m_xColumns).size(); + return (m_xColumns->get()).size(); } // ------------------------------------------------------------------------- @@ -97,7 +97,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th ::rtl::OUString sColumnName; try { - Reference< XPropertySet > xColumnProps( (*m_xColumns)[column-1], UNO_QUERY_THROW ); + Reference< XPropertySet > xColumnProps( (m_xColumns->get())[column-1], UNO_QUERY_THROW ); OSL_VERIFY( xColumnProps->getPropertyValue( OMetaConnection::getPropMap().getNameByIndex( PROPERTY_ID_NAME ) ) >>= sColumnName ); } catch( const Exception& ) @@ -120,7 +120,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getString((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); + return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) @@ -137,7 +137,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getBOOL((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); + return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } // ------------------------------------------------------------------------- @@ -154,20 +154,20 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQL sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - return getINT32((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); + return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } // ------------------------------------------------------------------------- @@ -200,8 +200,8 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - sal_Bool bReadOnly = (*m_xColumns)[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && - ::cppu::any2bool((*m_xColumns)[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); + sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); return m_bReadOnly || bReadOnly || m_pTable->isReadOnly(); } diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 497b23ab2c39..ccedeafa6727 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -121,7 +121,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -130,7 +131,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -190,7 +191,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere return NULL; } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index a916d29c508c..a74128532dc6 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -203,10 +203,10 @@ void OStatement_Base::createTable( ) const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); - OSQLColumns::const_iterator aIter = xCreateColumn->begin(); + OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); ::rtl::OUString sName; - for (sal_Int32 i = 1; aIter != xCreateColumn->end();++aIter, i++) + for (sal_Int32 i = 1; aIter != xCreateColumn->get().end();++aIter, i++) { (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) @@ -279,8 +279,8 @@ sal_Bool OStatement_Base::parseSql( const ::rtl::OUString& sql , sal_Bool bAdjus xNames = Reference<XIndexAccess>(m_xColNames,UNO_QUERY); // set the binding of the resultrow m_aRow = new OValueVector(xNames->getCount()); - (*m_aRow)[0].setBound(sal_True); - ::std::for_each(m_aRow->begin()+1,m_aRow->end(),TSetBound(sal_False)); + (m_aRow->get())[0].setBound(sal_True); + ::std::for_each(m_aRow->get().begin()+1,m_aRow->get().end(),TSetBound(sal_False)); // create the column mapping createColumnMapping(); @@ -506,7 +506,7 @@ void OStatement_Base::createColumnMapping() // initialize the column index map (mapping select columns to table columns) ::vos::ORef<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); - m_aColMapping.resize(xColumns->size() + 1); + m_aColMapping.resize(xColumns->get().size() + 1); for (i=0; i<m_aColMapping.size(); ++i) m_aColMapping[i] = i; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index fca6c281979d..4853a9796898 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -46,7 +46,7 @@ using namespace connectivity::mozab; static MozillaBootstrap *pMozillaBootstrap=NULL; static Reference<XMozillaBootstrap> xMozillaBootstrap; -extern "C" void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozillaBootstrap_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) { if (!pMozillaBootstrap) { @@ -244,7 +244,8 @@ using ::com::sun::star::registry::XRegistryKey; using ::com::sun::star::lang::XSingleServiceFactory; using ::com::sun::star::lang::XMultiServiceFactory; -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -270,7 +271,7 @@ void REGISTER_PROVIDER( xNewKey->createKey(Services[i]); } -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -302,7 +303,7 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS return *pBootstrap; } -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 7e1685abacd8..8b56b62f9181 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -49,6 +49,7 @@ all: USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index d0521e3468f9..6d7ce287c24c 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -79,6 +79,7 @@ LINKFLAGSDEFS=$(0) USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- diff --git a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk index fce7c478f9e0..764081619770 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/makefile.mk +++ b/connectivity/source/drivers/mozab/mozillasrc/makefile.mk @@ -42,6 +42,7 @@ TARGET=mozabsrc USE_DEFFILE=TRUE ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx index a63ff26908d7..dc4fb4a30307 100644 --- a/connectivity/source/drivers/mysql/Yservices.cxx +++ b/connectivity/source/drivers/mysql/Yservices.cxx @@ -116,7 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +126,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +151,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index 1d65c49c703b..0be17c1e91ed 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -35,6 +35,7 @@ PRJNAME=connectivity TARGET=mysql ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE # --- Settings ---------------------------------- .IF "$(DBGUTIL_OJ)"!="" diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index e1e2dd97ae83..968205d3f8da 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -30,6 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" +#include "ORealDriver.hxx" #include "odbc/ODriver.hxx" #include "odbc/OTools.hxx" #include "odbc/OFunctions.hxx" diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx new file mode 100644 index 000000000000..beabeae1da47 --- /dev/null +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -0,0 +1,53 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: code,v $ +* +* $Revision: 1.4 $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX + +#include "sal/config.h" + +#include "com/sun/star/uno/Exception.hpp" +#include "com/sun/star/uno/Reference.hxx" + +namespace com { namespace sun { namespace star { + namespace lang { class XMultiServiceFactory; } + namespace uno { class XInterface; } +} } } + +namespace connectivity { namespace odbc { + +com::sun::star::uno::Reference< com::sun::star::uno::XInterface > +ODBCDriver_CreateInstance( + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > + const & factory) + throw (com::sun::star::uno::Exception); + +} } + +#endif diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index 367300c26a18..f84f2a725d67 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -32,10 +32,10 @@ PRJ=..$/..$/.. PRJINC=..$/.. PRJNAME=connectivity -TARGET=odbcbase -TARGET2=odbc +TARGET=odbc ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE USE_DEFFILE=TRUE LDUMP=ldump2.exe @@ -52,83 +52,31 @@ ENVCFLAGS+=/FR$(SLO)$/ CFLAGS+=-DSYSTEM_ODBC_HEADERS .ENDIF -# --- Files ------------------------------------- - -SLOFILES=\ - $(SLO)$/OPreparedStatement.obj \ - $(SLO)$/OStatement.obj \ - $(SLO)$/OResultSetMetaData.obj \ - $(SLO)$/OResultSet.obj \ - $(SLO)$/OTools.obj \ - $(SLO)$/ODatabaseMetaDataResultSet.obj \ - $(SLO)$/ODatabaseMetaData.obj \ - $(SLO)$/ODriver.obj \ - $(SLO)$/OConnection.obj - -# --- ODBC BASE Library ----------------------------------- - -SHL1TARGET= $(ODBC2_TARGET)$(DLLPOSTFIX) -SHL1OBJS=$(SLOFILES) -SHL1STDLIBS=\ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) - -SHL1DEPN= -SHL1IMPLIB= i$(ODBC2_TARGET) - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ - $(SLB)$/$(TARGET).lib -DEFLIB1NAME=$(TARGET) - # --- ODBC Library ----------------------------------- # --- Files ------------------------------------- -SLO2FILES=\ +SLOFILES=\ $(SLO)$/oservices.obj \ $(SLO)$/ORealDriver.obj \ $(SLO)$/OFunctions.obj # --- ODBC Library ----------------------------------- -SHL2TARGET= $(ODBC_TARGET)$(DLLPOSTFIX) -SHL2OBJS=$(SLO2FILES) -SHL2STDLIBS=\ +SHL1TARGET= $(ODBC_TARGET)$(DLLPOSTFIX) +SHL1OBJS=$(SLOFILES) +SHL1STDLIBS=\ $(ODBCBASELIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ $(SALLIB) -.IF "$(ODBCBASELIB)" == "" -SHL2STDLIBS+= $(ODBCBASELIB) -.ENDIF - -SHL2DEPN=$(SHL1TARGETN) -SHL2IMPLIB= i$(ODBC_TARGET) +SHL1IMPLIB= i$(ODBC_TARGET) -SHL2DEF= $(MISC)$/$(SHL2TARGET).def +SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF2NAME= $(SHL2TARGET) -SHL2VERSIONMAP=odbc.map +DEF1NAME= $(SHL1TARGET) +SHL1VERSIONMAP=odbc.map # --- Targets ---------------------------------- .INCLUDE : target.mk - -# --- filter file ------------------------------ - -.IF "$(depend)"=="" - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo CLEAR_THE_FILE > $@ - @echo _TI >>$@ - @echo _real >>$@ -.ENDIF - diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx index 0db3d2b49dd3..42ba50561446 100644 --- a/connectivity/source/drivers/odbc/oservices.cxx +++ b/connectivity/source/drivers/odbc/oservices.cxx @@ -30,6 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" +#include "ORealDriver.hxx" #include "odbc/ODriver.hxx" #include <cppuhelper/factory.hxx> #include <osl/diagnose.h> @@ -116,7 +117,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL +component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** /*ppEnv*/ ) @@ -125,7 +127,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/, void* pRegistryKey ) @@ -150,7 +152,7 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbcbase/OConnection.cxx index 40a14531553c..40a14531553c 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbcbase/OConnection.cxx diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx index 79baeac3cadc..79baeac3cadc 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index dd91861062b6..dd91861062b6 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbcbase/ODriver.cxx index 790972b1e9d6..790972b1e9d6 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbcbase/ODriver.cxx diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx index 0a798092c742..0a798092c742 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbcbase/OResultSet.cxx index 4ff581eed299..d8219e9c8d80 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx @@ -48,7 +48,6 @@ #include "connectivity/dbtools.hxx" #include "connectivity/dbexception.hxx" #include "diagnose_ex.h" -#include <rtl/logfile.hxx> using namespace ::comphelper; using namespace connectivity; @@ -63,8 +62,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::io; using namespace com::sun::star::util; -#define ODBC_SQL_NOT_DEFINED 99UL - //------------------------------------------------------------------------------ // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); ::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) @@ -104,7 +101,6 @@ OResultSet::OResultSet(SQLHANDLE _pStatementHandle ,OStatement_Base* pStmt) : ,m_nTextEncoding(pStmt->getOwnConnection()->getTextEncoding()) ,m_nRowPos(0) ,m_nLastColumnPos(0) - ,m_nUseBookmarks(ODBC_SQL_NOT_DEFINED) ,m_nCurrentFetchState(0) ,m_bWasNull(sal_True) ,m_bEOF(sal_True) @@ -191,10 +187,23 @@ void OResultSet::disposing(void) m_xStatement = NULL; m_xMetaData = NULL; } +// ----------------------------------------------------------------------------- +sal_Int32 OResultSet::mapColumn (sal_Int32 column) +{ + sal_Int32 map = column; + + if (!m_aColMapping.empty()) + { + // Validate column number + OSL_ENSURE(column>0,"OResultSet::mapColumn column <= 0"); + map = m_aColMapping[column]; + } + + return map; +} // ------------------------------------------------------------------------- SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::unbind" ); SQLRETURN nRet = 0; if ( _bUnbindHandle ) nRet = N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND); @@ -264,7 +273,6 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle) // ------------------------------------------------------------------------- TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::allocBindColumn" ); TVoidPtr aPair; switch (_nType) { @@ -324,7 +332,6 @@ TVoidPtr OResultSet::allocBindColumn(sal_Int32 _nType,sal_Int32 _nColumnIndex) // ------------------------------------------------------------------------- void OResultSet::allocBuffer() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::allocBuffer" ); Reference< XResultSetMetaData > xMeta = getMetaData(); sal_Int32 nLen = xMeta->getColumnCount(); @@ -342,7 +349,6 @@ void OResultSet::allocBuffer() // ------------------------------------------------------------------------- void OResultSet::releaseBuffer() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::releaseBuffer" ); unbind(sal_False); m_aLengthVector.clear(); } @@ -365,7 +371,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); + checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -381,32 +387,36 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const ::rtl::OUString& columnName ) t return i; } // ------------------------------------------------------------------------- -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + columnIndex = mapColumn(columnIndex); // TODO use getBytes instead of return NULL; } // ------------------------------------------------------------------------- -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + columnIndex = mapColumn(columnIndex); // TODO use getBytes instead of return NULL; } // ----------------------------------------------------------------------------- const ORowSetValue& OResultSet::getValue(sal_Int32 _nColumnIndex,SQLSMALLINT _nType,void* _pValue,SQLINTEGER _rSize) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getValue" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + + _nColumnIndex = mapColumn(_nColumnIndex); + if(m_bFetchData) { if(_nColumnIndex > m_nLastColumnPos) @@ -437,12 +447,12 @@ sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLExceptio Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getBytes" ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); + columnIndex = mapColumn(columnIndex); if(m_bFetchData) { if(columnIndex > m_nLastColumnPos) @@ -465,11 +475,8 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro return nRet; } - ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex); - if ( aFind == m_aODBCColumnTypes.end() ) - aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex))).first; - - switch(aFind->second) + SWORD nType = OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex); + switch(nType) { case SQL_WVARCHAR: case SQL_WCHAR: @@ -478,7 +485,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro case SQL_CHAR: case SQL_LONGVARCHAR: { - ::rtl::OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,aFind->second,m_bWasNull,**this,m_nTextEncoding); + ::rtl::OUString aRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nType,m_bWasNull,**this,m_nTextEncoding); return Sequence<sal_Int8>(reinterpret_cast<const sal_Int8*>(aRet.getStr()),sizeof(sal_Unicode)*aRet.getLength()); } default: @@ -490,7 +497,6 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getDate" ); DATE_STRUCT aDate; aDate.day = 0; aDate.month = 0; @@ -554,7 +560,6 @@ sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLExcepti Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getMetaData" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -594,10 +599,10 @@ Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getObject" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + columnIndex = mapColumn(columnIndex); fillRow(columnIndex); return m_aRow[columnIndex].makeAny(); } @@ -614,19 +619,17 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept ::rtl::OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getString" ); ::osl::MutexGuard aGuard( m_aMutex ); + checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + + columnIndex = mapColumn(columnIndex); ::rtl::OUString nRet; - if ( m_bFetchData ) + if(m_bFetchData) nRet = getValue(columnIndex,0,NULL,0); else { - checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(columnIndex); - if ( aFind == m_aODBCColumnTypes.end() ) - aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex))).first; - nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,aFind->second,m_bWasNull,**this,m_nTextEncoding); + nRet = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,columnIndex),m_bWasNull,**this,m_nTextEncoding); } return nRet; } @@ -634,7 +637,6 @@ sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLExcept Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getTime" ); TIME_STRUCT aTime={0,0,0}; const ORowSetValue& aValue = getValue(columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME, @@ -646,7 +648,6 @@ Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, R DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getTimestamp" ); TIMESTAMP_STRUCT aTime={0,0,0,0,0,0,0}; const ORowSetValue& aValue = getValue(columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIMESTAMP : SQL_C_TYPE_TIMESTAMP, @@ -693,7 +694,6 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::beforeFirst" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -705,7 +705,6 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::afterLast" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -728,32 +727,27 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::first" ); return moveImpl(IResultSetHelper::FIRST,0,sal_True); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::last" ); return moveImpl(IResultSetHelper::LAST,0,sal_True); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::absolute" ); return moveImpl(IResultSetHelper::ABSOLUTE,row,sal_True); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::relative" ); return moveImpl(IResultSetHelper::RELATIVE,row,sal_True); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::previous" ); return moveImpl(IResultSetHelper::PRIOR,0,sal_True); } // ------------------------------------------------------------------------- @@ -767,7 +761,6 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::rowDeleted" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -779,7 +772,6 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::rowInserted" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -791,7 +783,6 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::rowUpdated" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -802,14 +793,12 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::next" ); return moveImpl(IResultSetHelper::NEXT,1,sal_True); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::wasNull" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -838,7 +827,6 @@ Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::insertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -916,7 +904,6 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::updateRow" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -945,7 +932,6 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) // ------------------------------------------------------------------------- void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::deleteRow" ); SQLRETURN nRet = SQL_SUCCESS; sal_Int32 nPos = getDriverPos(); nRet = N3SQLSetPos(m_aStatementHandle,1,SQL_DELETE,SQL_LOCK_NO_CHANGE); @@ -977,7 +963,6 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::moveToInsertRow" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -997,10 +982,10 @@ void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept // ------------------------------------------------------------------------- void OResultSet::updateValue(sal_Int32 columnIndex,SQLSMALLINT _nType,void* _pValue) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::updateValue" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + columnIndex = mapColumn(columnIndex); m_aBindVector.push_back(allocBindColumn(OTools::MapOdbcType2Jdbc(_nType),columnIndex)); void* pData = reinterpret_cast<void*>(m_aBindVector.rbegin()->first); OSL_ENSURE(pData != NULL,"Data for update is NULL!"); @@ -1022,6 +1007,8 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); + + columnIndex = mapColumn(columnIndex); m_aBindVector.push_back(allocBindColumn(DataType::CHAR,columnIndex)); void* pData = reinterpret_cast<void*>(m_aBindVector.rbegin()->first); OTools::bindValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,SQL_CHAR,0,(sal_Int8*)NULL,pData,&m_aLengthVector[columnIndex],**this,m_nTextEncoding,m_pStatement->getOwnConnection()->useOldDateFormat()); @@ -1121,7 +1108,6 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re // ------------------------------------------------------------------------- void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::refreshRow" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1147,7 +1133,6 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& // XRowLocate Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::getBookmark" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1156,14 +1141,10 @@ Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException) if ( aFind == m_aPosToBookmarks.end() ) { - if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED ) - { - RTL_LOGFILE_CONTEXT_TRACE( aLogger, "SQLGetStmtAttr" ); - m_nUseBookmarks = SQL_UB_OFF; - SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&m_nUseBookmarks,SQL_IS_UINTEGER,NULL); - OSL_UNUSED( nRet ); - } - if(m_nUseBookmarks == SQL_UB_OFF) + sal_uInt32 nValue = SQL_UB_OFF; + SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&nValue,SQL_IS_UINTEGER,NULL); + OSL_UNUSED( nRet ); + if(nValue == SQL_UB_OFF) throw SQLException(); m_aBookmark = OTools::getBytesValue(m_pStatement->getOwnConnection(),m_aStatementHandle,0,SQL_C_VARBOOKMARK,m_bWasNull,**this); @@ -1177,7 +1158,6 @@ Any SAL_CALL OResultSet::getBookmark( ) throw( SQLException, RuntimeException) // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::moveToBookmark" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1206,7 +1186,6 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw( SQLE // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::moveRelativeToBookmark" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1223,7 +1202,6 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_ // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::compareBookmarks" ); ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1355,15 +1333,10 @@ sal_Bool OResultSet::isBookmarkable() const { return sal_False; } + sal_uInt32 nUseBookmark = SQL_UB_OFF; + N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&nUseBookmark,SQL_IS_UINTEGER,NULL); - if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED ) - { - m_nUseBookmarks = SQL_UB_OFF; - SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&m_nUseBookmarks,SQL_IS_UINTEGER,NULL); - OSL_UNUSED( nRet ); - } - - return (m_nUseBookmarks != SQL_UB_OFF) && (nAttr & SQL_CA1_BOOKMARK) == SQL_CA1_BOOKMARK; + return (nUseBookmark != SQL_UB_OFF) && (nAttr & SQL_CA1_BOOKMARK) == SQL_CA1_BOOKMARK; } //------------------------------------------------------------------------------ void OResultSet::setFetchDirection(sal_Int32 _par0) @@ -1477,7 +1450,6 @@ void OResultSet::getFastPropertyValue( // ------------------------------------------------------------------------- void OResultSet::fillRow(sal_Int32 _nToColumn) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::fillRow" ); if((sal_Int32)m_aRow.size() <= _nToColumn) { m_aRow.resize(_nToColumn+1); @@ -1496,15 +1468,11 @@ void OResultSet::fillRow(sal_Int32 _nToColumn) { case DataType::CHAR: case DataType::VARCHAR: + *pColumn = getString(nColumn); + break; case DataType::DECIMAL: case DataType::NUMERIC: - case DataType::LONGVARCHAR: - { - ::std::map<sal_Int32,SWORD>::iterator aFind = m_aODBCColumnTypes.find(nColumn); - if ( aFind == m_aODBCColumnTypes.end() ) - aFind = m_aODBCColumnTypes.insert(::std::map<sal_Int32,SWORD>::value_type(nColumn,OResultSetMetaData::getColumnODBCType(m_pStatement->getOwnConnection(),m_aStatementHandle,*this,nColumn))).first; - *pColumn = OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,nColumn,aFind->second,m_bWasNull,**this,m_nTextEncoding); - } + *pColumn = getString(nColumn); break; case DataType::BIGINT: *pColumn = getLong(nColumn); @@ -1513,6 +1481,9 @@ void OResultSet::fillRow(sal_Int32 _nToColumn) case DataType::DOUBLE: *pColumn = getDouble(nColumn); break; + case DataType::LONGVARCHAR: + *pColumn = getString(nColumn); + break; case DataType::LONGVARBINARY: *pColumn = getBytes(nColumn); break; @@ -1546,7 +1517,7 @@ void OResultSet::fillRow(sal_Int32 _nToColumn) break; } - if ( m_bWasNull ) + if(wasNull()) pColumn->setNull(); if(nType != pColumn->getTypeKind()) { @@ -1574,7 +1545,6 @@ void SAL_CALL OResultSet::release() throw() // ----------------------------------------------------------------------------- sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool /*_bRetrieveData*/) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::move" ); SQLSMALLINT nFetchOrientation = SQL_FETCH_NEXT; switch(_eCursorPosition) { @@ -1622,8 +1592,7 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 OSL_TRACE( __FILE__": OSkipDeletedSet::OResultSet::move(%d,%d), FetchState = %d",nFetchOrientation,_nOffset,m_nCurrentFetchState); OTools::ThrowException(m_pStatement->getOwnConnection(),m_nCurrentFetchState,m_aStatementHandle,SQL_HANDLE_STMT,*this); - const bool bSuccess = m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; - if ( bSuccess ) + if ( m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO ) { switch(_eCursorPosition) { @@ -1646,17 +1615,12 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 case IResultSetHelper::BOOKMARK: // special case here because we are only called with position numbers m_nRowPos = _nOffset; break; - } // switch(_eCursorPosition) - if ( m_nUseBookmarks == ODBC_SQL_NOT_DEFINED ) - { - RTL_LOGFILE_CONTEXT_TRACE( aLogger, "SQLGetStmtAttr" ); - m_nUseBookmarks = SQL_UB_OFF; - SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&m_nUseBookmarks,SQL_IS_UINTEGER,NULL); - OSL_UNUSED( nRet ); } - if ( m_nUseBookmarks != SQL_UB_OFF ) + sal_uInt32 nValue = SQL_UB_OFF; + SQLRETURN nRet = N3SQLGetStmtAttr(m_aStatementHandle,SQL_ATTR_USE_BOOKMARKS,&nValue,SQL_IS_UINTEGER,NULL); + OSL_UNUSED( nRet ); + if ( nValue != SQL_UB_OFF ) { - RTL_LOGFILE_CONTEXT_TRACE( aLogger, "OTools::getBytesValue" ); m_aBookmark = OTools::getBytesValue(m_pStatement->getOwnConnection(),m_aStatementHandle,0,SQL_C_VARBOOKMARK,m_bWasNull,**this); m_aPosToBookmarks[m_aBookmark] = m_nRowPos; OSL_ENSURE(m_aBookmark.getLength(),"Invalid bookmark from length 0!"); @@ -1667,7 +1631,7 @@ sal_Bool OResultSet::move(IResultSetHelper::Movement _eCursorPosition, sal_Int32 else if(IResultSetHelper::NEXT == _eCursorPosition && m_nCurrentFetchState == SQL_NO_DATA && nOldFetchStatus != SQL_NO_DATA) ++m_nRowPos; - return bSuccess; + return m_nCurrentFetchState == SQL_SUCCESS || m_nCurrentFetchState == SQL_SUCCESS_WITH_INFO; } // ----------------------------------------------------------------------------- sal_Int32 OResultSet::getDriverPos() const @@ -1700,7 +1664,6 @@ sal_Bool OResultSet::moveImpl(IResultSetHelper::Movement _eCursorPosition, sal_I // ----------------------------------------------------------------------------- void OResultSet::fillNeededData(SQLRETURN _nRet) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSet::fillNeededData" ); SQLRETURN nRet = _nRet; if( nRet == SQL_NEED_DATA) { diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx index de5243c93d5a..35e6a09e3189 100644 --- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx +++ b/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx @@ -32,7 +32,6 @@ #include "precompiled_connectivity.hxx" #include "odbc/OResultSetMetaData.hxx" #include "odbc/OTools.hxx" -#include <rtl/logfile.hxx> using namespace connectivity::odbc; using namespace com::sun::star::uno; @@ -167,7 +166,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru { if(m_nColCount != -1) return m_nColCount; - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnCount" ); sal_Int16 nNumResultCols=0; OTools::ThrowException(m_pConnection,N3SQLNumResultCols(m_aStatementHandle,&nNumResultCols),m_aStatementHandle,SQL_HANDLE_STMT,*this); return m_nColCount = nNumResultCols; @@ -203,19 +201,16 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnTypeName" ); return getCharColAttrib(column,SQL_DESC_TYPE_NAME); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnLabel" ); return getCharColAttrib(column,SQL_DESC_LABEL); } // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getColumnServiceName" ); return ::rtl::OUString(); } // ------------------------------------------------------------------------- @@ -235,13 +230,11 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isSigned" ); return getNumColAttrib(column,SQL_DESC_UNSIGNED) == SQL_FALSE; } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getPrecision" ); sal_Int32 nType = 0; try { @@ -257,7 +250,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::getScale" ); sal_Int32 nType = 0; try { @@ -274,35 +266,30 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com: sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isNullable" ); return getNumColAttrib(column,SQL_DESC_NULLABLE); } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isSearchable" ); return getNumColAttrib(column,SQL_DESC_SEARCHABLE) != SQL_PRED_NONE; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isReadOnly" ); return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_READONLY; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isDefinitelyWritable" ); return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE; ; } // ------------------------------------------------------------------------- sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OResultSetMetaData::isWritable" ); return getNumColAttrib(column,SQL_DESC_UPDATABLE) == SQL_ATTR_WRITE; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbcbase/OStatement.cxx index 16756052d571..16756052d571 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbcbase/OStatement.cxx diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbcbase/OTools.cxx index ce03fa325019..1b6ea0829926 100644 --- a/connectivity/source/drivers/odbc/OTools.cxx +++ b/connectivity/source/drivers/odbcbase/OTools.cxx @@ -36,7 +36,6 @@ #include <osl/diagnose.h> #include "odbc/OConnection.hxx" #include "diagnose_ex.h" -#include <rtl/logfile.hxx> #include <string.h> #include <string> @@ -56,7 +55,6 @@ void OTools::getValue( OConnection* _pConnection, void* _pValue, SQLINTEGER _rSize) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getValue" ); SQLINTEGER pcbValue = SQL_NULL_DATA; OTools::ThrowException(_pConnection, (*(T3SQLGetData)_pConnection->getOdbcFunction(ODBC3SQLGetData))(_aStatementHandle, @@ -82,7 +80,6 @@ void OTools::bindParameter( OConnection* _pConnection, rtl_TextEncoding _nTextEncoding) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindParameter" ); SQLRETURN nRetcode; SWORD fSqlType; SWORD fCType; @@ -126,7 +123,6 @@ void OTools::bindData( SQLSMALLINT _nOdbcType, rtl_TextEncoding _nTextEncoding, SQLUINTEGER& _nColumnSize) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindData" ); _nColumnSize = 0; switch (_nOdbcType) @@ -265,7 +261,6 @@ void OTools::bindValue( OConnection* _pConnection, rtl_TextEncoding _nTextEncoding, sal_Bool _bUseOldTimeDate) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::bindValue" ); SQLRETURN nRetcode; SQLSMALLINT fSqlType; SQLSMALLINT fCType; @@ -441,7 +436,6 @@ void OTools::ThrowException(OConnection* _pConnection, // Zusaetliche Informationen zum letzten ODBC-Funktionsaufruf vorhanden. // SQLError liefert diese Informationen. - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::ThrowException" ); SDB_ODBC_CHAR szSqlState[5]; SDWORD pfNativeError; @@ -480,7 +474,6 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, sal_Bool &_bWasNull, const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getBytesValue" ); char aCharArray[2048]; // Erstmal versuchen, die Daten mit dem kleinen Puffer // abzuholen: @@ -543,7 +536,6 @@ Sequence<sal_Int8> OTools::getBytesValue(OConnection* _pConnection, const Reference< XInterface >& _xInterface, rtl_TextEncoding _nTextEncoding) throw(SQLException, RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getStringValue" ); ::rtl::OUString aData; switch(_fSqlType) { @@ -806,7 +798,6 @@ sal_Int32 OTools::MapOdbcType2Jdbc(sal_Int32 _nType) //-------------------------------------------------------------------- sal_Int32 OTools::jdbcTypeToOdbc(sal_Int32 jdbcType) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::jdbcTypeToOdbc" ); // For the most part, JDBC types match ODBC types. We'll // just convert the ones that we know are different @@ -835,7 +826,6 @@ void OTools::getBindTypes(sal_Bool _bUseWChar, SQLSMALLINT& fSqlType ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "odbc", "Ocke.Janssen@sun.com", "OTools::getBindTypes" ); switch(_nOdbcType) { case SQL_CHAR: if(_bUseWChar) diff --git a/connectivity/source/drivers/odbcbase/makefile.mk b/connectivity/source/drivers/odbcbase/makefile.mk new file mode 100644 index 000000000000..64ffd1f72fbe --- /dev/null +++ b/connectivity/source/drivers/odbcbase/makefile.mk @@ -0,0 +1,94 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: makefile.mk,v $ +# +# $Revision: 1.17 $ +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=..$/..$/.. +PRJINC=..$/.. +PRJNAME=connectivity +TARGET=odbcbase + +ENABLE_EXCEPTIONS=TRUE +VISIBILITY_HIDDEN=TRUE + +# --- Settings ---------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/version.mk + +CDEFS += -DOOO_DLLIMPLEMENTATION_ODBCBASE + +.IF "$(SYSTEM_ODBC_HEADERS)" == "YES" +CFLAGS+=-DSYSTEM_ODBC_HEADERS +.ENDIF + +# --- Files ------------------------------------- + +SLOFILES=\ + $(SLO)$/OPreparedStatement.obj \ + $(SLO)$/OStatement.obj \ + $(SLO)$/OResultSetMetaData.obj \ + $(SLO)$/OResultSet.obj \ + $(SLO)$/OTools.obj \ + $(SLO)$/ODatabaseMetaDataResultSet.obj \ + $(SLO)$/ODatabaseMetaData.obj \ + $(SLO)$/ODriver.obj \ + $(SLO)$/OConnection.obj + +# --- ODBC BASE Library ----------------------------------- + +SHL1TARGET= $(ODBC2_TARGET)$(DLLPOSTFIX) +SHL1OBJS=$(SLOFILES) +SHL1STDLIBS=\ + $(DBTOOLSLIB) \ + $(COMPHELPERLIB) \ + $(CPPUHELPERLIB) \ + $(CPPULIB) \ + $(VOSLIB) \ + $(SALLIB) + +SHL1DEPN= +SHL1IMPLIB= i$(ODBC2_TARGET) +SHL1USE_EXPORTS=name + +SHL1DEF= $(MISC)$/$(SHL1TARGET).def + +DEF1NAME= $(SHL1TARGET) +DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ + $(SLB)$/$(TARGET).lib +DEFLIB1NAME=$(TARGET) + +# --- Targets ---------------------------------- + +.INCLUDE : target.mk + +# --- filter file ------------------------------ + +$(MISC)$/$(SHL1TARGET).flt: makefile.mk + @echo CLEAR_THE_FILE > $@ diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index de91b27b0fa6..ab3537857a88 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -31,10 +31,11 @@ #define _CONNECTIVITY_AUTOKEYRETRIEVINGBASE_HXX_ #include <rtl/ustring.hxx> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class OAutoRetrievingBase + class OOO_DLLPUBLIC_DBTOOLS OAutoRetrievingBase { ::rtl::OUString m_sGeneratedValueStatement; // contains the statement which should be used when query for automatically generated values sal_Bool m_bAutoRetrievingEnabled; // set to when we should allow to query for generated values diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index cc88e0b85065..bfe138556061 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -47,6 +47,7 @@ #include "connectivity/CommonTools.hxx" #include <comphelper/propertycontainer.hxx> #include "connectivity/FValue.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include <comphelper/broadcasthelper.hxx> #include <vos/refernce.hxx> @@ -66,7 +67,8 @@ namespace connectivity // typedef ORefVector<ORowSetValue> ORow; // typedef ORefVector<ORow> ORows; - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSet : + public comphelper::OBaseMutex, public ODatabaseMetaDataResultSet_BASE, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index c1ffe8084095..2002c615d0bc 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -39,6 +39,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include "OColumn.hxx" #include "connectivity/StdTypeDefs.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -47,7 +48,7 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> ODatabaseMetaResultSetMetaData_BASE; - class ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE + class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataResultSetMetaData : public ODatabaseMetaResultSetMetaData_BASE { TIntVector m_vMapping; // when not every column is needed ::std::map<sal_Int32,connectivity::OColumn> m_mColumns; diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index bca9d87dc3e4..93332ad27bdb 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -33,10 +33,11 @@ #include <rtl/ustring.hxx> #include <sal/types.h> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class OColumn + class OOO_DLLPUBLIC_DBTOOLS OColumn { ::rtl::OUString m_CatalogName; ::rtl::OUString m_SchemaName; diff --git a/connectivity/source/inc/OSubComponent.hxx b/connectivity/source/inc/OSubComponent.hxx index 45e6af0b6933..1ea9708e5a27 100644 --- a/connectivity/source/inc/OSubComponent.hxx +++ b/connectivity/source/inc/OSubComponent.hxx @@ -32,6 +32,8 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.h> +#include "connectivity/dbtoolsdllapi.hxx" + namespace com { namespace sun @@ -47,7 +49,7 @@ namespace com } namespace connectivity { - + OOO_DLLPUBLIC_DBTOOLS void release(oslInterlockedCount& _refCount, ::cppu::OBroadcastHelper& rBHelper, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xInterface, diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index d700484daef8..93f2ea5a7c75 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 6a87fba98261..9142083d8762 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -37,12 +37,13 @@ #endif #include "FDatabaseMetaDataResultSet.hxx" #include <vector> +#include "connectivity/dbtoolsdllapi.hxx" // ------------------------------------------------------------------------- namespace connectivity { // ------------------------------------------------------------------------- -struct RowEquation +struct OOO_DLLPUBLIC_DBTOOLS RowEquation { sal_Int32 nOperation; ORowSetValueDecoratorRef nPara[ 3 ]; @@ -66,7 +67,7 @@ enum ExpressionFunct #define EXPRESSION_FLAG_SUMANGLE_MODE 1 -class SAL_NO_VTABLE ExpressionNode +class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE ExpressionNode { public: virtual ~ExpressionNode(){} @@ -93,13 +94,13 @@ typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; /** This exception is thrown, when the arithmetic expression parser failed to parse a string. */ -struct ParseError +struct OOO_DLLPUBLIC_DBTOOLS ParseError { ParseError() {} ParseError( const char* ) {} }; -class FunctionParser +class OOO_DLLPUBLIC_DBTOOLS FunctionParser { public: diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index b8fa092545a4..2a22f64fb862 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -39,6 +39,7 @@ #include <cppuhelper/compbase4.hxx> #include "propertyids.hxx" #include "connectivity/CommonTools.hxx" +#include "connectivity/dbtoolsdllapi.hxx" #include "resource/sharedresources.hxx" namespace connectivity @@ -51,7 +52,7 @@ namespace connectivity typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; - class OMetaConnection : public OMetaConnection_BASE + class OOO_DLLPUBLIC_DBTOOLS OMetaConnection : public OMetaConnection_BASE { protected: ::osl::Mutex m_aMutex; diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 7abe91c18b57..c96413028ca4 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -37,11 +37,13 @@ #include <com/sun/star/lang/XEventListener.hpp> #include "FDatabaseMetaDataResultSet.hxx" #include <functional> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > TConditions; - class ODatabaseMetaDataBase : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_DBTOOLS ODatabaseMetaDataBase : + public comphelper::OBaseMutex, public ::cppu::WeakImplHelper2< ::com::sun::star::sdbc::XDatabaseMetaData2, ::com::sun::star::lang::XEventListener> { diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index e468821322be..f8a7252b7b7c 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -31,10 +31,11 @@ #define CONNECTIVITY_TKEYVALUE_HXX #include "connectivity/FValue.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class OKeyValue + class OOO_DLLPUBLIC_DBTOOLS OKeyValue { private: ::std::vector<ORowSetValueDecoratorRef> m_aKeys; diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index d54f92041858..fd6c8b7bde63 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -32,10 +32,12 @@ #include "FDatabaseMetaDataResultSet.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class OResultSetPrivileges : public ODatabaseMetaDataResultSet + class OOO_DLLPUBLIC_DBTOOLS OResultSetPrivileges : + public ODatabaseMetaDataResultSet { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xTables; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 056bcbd63d2c..37c70bc1d7f1 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.hxx @@ -32,10 +32,11 @@ #define CONNECTIVITY_TRESULTSETHELPER_HXX #include <sal/types.h> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { - class SAL_NO_VTABLE IResultSetHelper + class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IResultSetHelper { public: enum Movement diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 0c75dab3816c..4e06e90267a3 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -34,13 +34,14 @@ #include <rtl/alloc.h> #include <hash_map> #include <vector> +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { /** the class OSkipDeletedSet supports a general method to skip deleted rows */ - class OSkipDeletedSet + class OOO_DLLPUBLIC_DBTOOLS OSkipDeletedSet { ::std::vector<sal_Int32> m_aBookmarksPositions;// vector of iterators to position map, the order is the logical position IResultSetHelper* m_pHelper; // used for moving in the resultset diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index c559c0cd2384..2b561eb7e96b 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -30,6 +30,7 @@ #ifndef CONNECTIVITY_TSORTINDEX_HXX #define CONNECTIVITY_TSORTINDEX_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include "TKeyValue.hxx" namespace connectivity @@ -54,7 +55,7 @@ namespace connectivity The class OSortIndex can be used to implement a sorted index. This can depend on the fields which should be sorted. */ - class OSortIndex + class OOO_DLLPUBLIC_DBTOOLS OSortIndex { public: typedef ::std::vector< ::std::pair<sal_Int32,OKeyValue*> > TIntValuePairVector; @@ -123,14 +124,14 @@ namespace connectivity The class OKeySet is a refcountable vector which also has a state. This state gives information about if the keyset is fixed. */ - class OKeySet : public ORefVector<sal_Int32> + class OOO_DLLPUBLIC_DBTOOLS OKeySet : public ORefVector<sal_Int32> { sal_Bool m_bFrozen; public: OKeySet() : ORefVector<sal_Int32>() , m_bFrozen(sal_False){} - OKeySet(size_type _nSize) + OKeySet(Vector::size_type _nSize) : ORefVector<sal_Int32>(_nSize) , m_bFrozen(sal_False){} diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 8add5e0e632f..bb17efc2d71e 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -33,12 +33,15 @@ #include "connectivity/sdbcx/VCatalog.hxx" +#include "file/filedllapi.hxx" + namespace connectivity { namespace file { class OConnection; - class SAL_NO_VTABLE OFileCatalog : public connectivity::sdbcx::OCatalog + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileCatalog : + public connectivity::sdbcx::OCatalog { protected: OConnection* m_pConnection; diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index c6414450eded..7dd80f27de26 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -35,12 +35,13 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include "connectivity/sdbcx/IRefreshable.hxx" #include "file/FTable.hxx" +#include "file/filedllapi.hxx" namespace connectivity { namespace file { - class OColumns : public sdbcx::OCollection + class OOO_DLLPUBLIC_FILE OColumns : public sdbcx::OCollection { protected: OFileTable* m_pTable; diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index 3da5805b118c..58cc180601fb 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -45,7 +45,7 @@ #include "connectivity/sqlparse.hxx" #include "connectivity/sqliterator.hxx" #include "TConnection.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -56,7 +56,8 @@ namespace connectivity class ODatabaseMetaData; class OFileDriver; - class OConnection : public connectivity::OMetaConnection, + class OOO_DLLPUBLIC_FILE OConnection : + public connectivity::OMetaConnection, public connectivity::OSubComponent<OConnection, connectivity::OMetaConnection> { friend class connectivity::OSubComponent<OConnection, connectivity::OMetaConnection>; diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx index 44b568e38814..c0711e9f8eb2 100644 --- a/connectivity/source/inc/file/FDatabaseMetaData.hxx +++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx @@ -33,7 +33,7 @@ #include "TDatabaseMetaDataBase.hxx" #include "file/FConnection.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -43,7 +43,8 @@ namespace connectivity //************ Class: ODatabaseMetaData //************************************************************** - class SAL_NO_VTABLE ODatabaseMetaData : public ODatabaseMetaDataBase + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE ODatabaseMetaData : + public ODatabaseMetaDataBase { virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx index 62eb5c49f96a..91c8f887ecb2 100644 --- a/connectivity/source/inc/file/FDateFunctions.hxx +++ b/connectivity/source/inc/file/FDateFunctions.hxx @@ -32,7 +32,7 @@ #define _CONNECTIVITY_FILE_FDATEFUNCTIONS_HXX_ #include "file/fcode.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -45,7 +45,7 @@ namespace connectivity > SELECT DAYOFWEEK('1998-02-03'); -> 3 */ - class OOp_DayOfWeek : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_DayOfWeek : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -57,7 +57,7 @@ namespace connectivity > SELECT DAYOFMONTH('1998-02-03'); -> 3 */ - class OOp_DayOfMonth : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_DayOfMonth : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -70,7 +70,7 @@ namespace connectivity -> 34 */ - class OOp_DayOfYear : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_DayOfYear : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -82,7 +82,7 @@ namespace connectivity > SELECT MONTH('1998-02-03'); -> 2 */ - class OOp_Month : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Month : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -95,7 +95,7 @@ namespace connectivity -> 'Thursday' */ - class OOp_DayName : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_DayName : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -108,7 +108,7 @@ namespace connectivity -> 'February' */ - class OOp_MonthName : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_MonthName : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -121,7 +121,7 @@ namespace connectivity -> 2 */ - class OOp_Quarter : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Quarter : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -146,7 +146,7 @@ namespace connectivity -> 53 */ - class OOp_Week : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Week : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -158,7 +158,7 @@ namespace connectivity > SELECT YEAR('98-02-03'); -> 1998 */ - class OOp_Year : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Year : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -170,7 +170,7 @@ namespace connectivity > SELECT HOUR('10:05:03'); -> 10 */ - class OOp_Hour : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Hour : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -183,7 +183,7 @@ namespace connectivity -> 5 */ - class OOp_Minute : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Minute : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -195,7 +195,7 @@ namespace connectivity > SELECT SECOND('10:05:03'); -> 3 */ - class OOp_Second : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Second : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -208,7 +208,7 @@ namespace connectivity > SELECT CURDATE(); -> '1997-12-15' */ - class OOp_CurDate : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_CurDate : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -221,7 +221,7 @@ namespace connectivity > SELECT CURTIME(); -> '23:50:26' */ - class OOp_CurTime : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_CurTime : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -233,7 +233,7 @@ namespace connectivity > SELECT NOW(); -> '1997-12-15 23:50:26' */ - class OOp_Now : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Now : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index 8eaf2d76a934..5fd8f2a970d2 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <cppuhelper/compbase3.hxx> #include "connectivity/CommonTools.hxx" +#include "file/filedllapi.hxx" namespace connectivity { @@ -45,7 +46,7 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo, ::com::sun::star::sdbcx::XDataDefinitionSupplier> ODriver_BASE; - class SAL_NO_VTABLE OFileDriver : public ODriver_BASE + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OFileDriver : public ODriver_BASE { protected: ::osl::Mutex m_aMutex; diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx index 9cd710199442..85bde51a25b4 100644 --- a/connectivity/source/inc/file/FNumericFunctions.hxx +++ b/connectivity/source/inc/file/FNumericFunctions.hxx @@ -32,7 +32,7 @@ #define _CONNECTIVITY_FILE_FNUMERICFUNCTIONS_HXX_ #include "file/fcode.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -48,7 +48,7 @@ namespace connectivity -> 32 */ - class OOp_Abs : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Abs : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -65,7 +65,7 @@ namespace connectivity -> 1 */ - class OOp_Sign : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Sign : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -84,7 +84,7 @@ namespace connectivity > SELECT 29 MOD 9; -> 2 */ - class OOp_Mod : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_Mod : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; @@ -99,7 +99,7 @@ namespace connectivity -> -2 */ - class OOp_Floor : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Floor : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -114,7 +114,7 @@ namespace connectivity -> -1 */ - class OOp_Ceiling : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Ceiling : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -137,7 +137,7 @@ namespace connectivity > SELECT ROUND(23.298, -1); -> 20 */ - class OOp_Round : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Round : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -151,7 +151,7 @@ namespace connectivity > SELECT EXP(-2); -> 0.135335 */ - class OOp_Exp : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Exp : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -166,7 +166,7 @@ namespace connectivity -> NULL */ - class OOp_Ln : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Ln : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -188,7 +188,7 @@ namespace connectivity > SELECT LOG(1,100); -> NULL */ - class OOp_Log : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Log : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -204,7 +204,7 @@ namespace connectivity > SELECT LOG10(-100); -> NULL */ - class OOp_Log10 : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Log10 : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -218,7 +218,7 @@ namespace connectivity > SELECT POW(2,-2); -> 0.250000 */ - class OOp_Pow : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_Pow : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; @@ -232,7 +232,7 @@ namespace connectivity > SELECT SQRT(20); -> 4.472136 */ - class OOp_Sqrt : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Sqrt : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -247,7 +247,7 @@ namespace connectivity -> 3.141592653589793116 */ - class OOp_Pi : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Pi : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -259,7 +259,7 @@ namespace connectivity > SELECT COS(PI()); -> -1.000000 */ - class OOp_Cos : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Cos : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -272,7 +272,7 @@ namespace connectivity -> 0.000000 */ - class OOp_Sin : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Sin : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -283,7 +283,7 @@ namespace connectivity > SELECT TAN(PI()+1); -> 1.557408 */ - class OOp_Tan : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Tan : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -299,7 +299,7 @@ namespace connectivity > SELECT ACOS(0); -> 1.570796 */ - class OOp_ACos : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_ACos : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -313,7 +313,7 @@ namespace connectivity > SELECT ASIN('foo'); -> 0.000000 */ - class OOp_ASin : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_ASin : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -327,7 +327,7 @@ namespace connectivity > SELECT ATAN(-2); -> -1.107149 */ - class OOp_ATan : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_ATan : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -342,7 +342,7 @@ namespace connectivity -> 1.570796 */ - class OOp_ATan2 : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_ATan2 : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; @@ -354,7 +354,7 @@ namespace connectivity > SELECT DEGREES(PI()); -> 180.000000 */ - class OOp_Degrees : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Degrees : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; @@ -367,7 +367,7 @@ namespace connectivity -> 1.570796 */ - class OOp_Radians : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Radians : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs = ORowSetValue()) const; diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx index 7fd1d7874819..3a01c439fad4 100644 --- a/connectivity/source/inc/file/FPreparedStatement.hxx +++ b/connectivity/source/inc/file/FPreparedStatement.hxx @@ -31,7 +31,7 @@ #ifndef _CONNECTIVITY_FILE_OPREPAREDSTATEMENT_HXX_ #define _CONNECTIVITY_FILE_OPREPAREDSTATEMENT_HXX_ - +#include "file/filedllapi.hxx" #include "file/FStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> @@ -46,7 +46,7 @@ namespace connectivity namespace file { - class SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OPreparedStatement : public OStatement_BASE2, public ::com::sun::star::sdbc::XPreparedStatement, public ::com::sun::star::sdbc::XParameters, public ::com::sun::star::sdbc::XResultSetMetaDataSupplier, diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 87381a857743..be1d03b79262 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -63,6 +63,7 @@ #include <comphelper/propertycontainer.hxx> #include "file/fanalyzer.hxx" #include "file/FTable.hxx" +#include "file/filedllapi.hxx" #include <comphelper/broadcasthelper.hxx> #include "connectivity/StdTypeDefs.hxx" #include "TSortIndex.hxx" @@ -89,7 +90,8 @@ namespace connectivity ::com::sun::star::lang::XEventListener, ::com::sun::star::lang::XUnoTunnel> OResultSet_BASE; - class OResultSet : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_FILE OResultSet : + public comphelper::OBaseMutex, public ::connectivity::IResultSetHelper, public OResultSet_BASE, public ::comphelper::OPropertyContainer, @@ -119,7 +121,7 @@ namespace connectivity OSkipDeletedSet m_aSkipDeletedSet; ::vos::ORef<OKeySet> m_pFileSet; - OKeySet::iterator m_aFileSetIter; + OKeySet::Vector::iterator m_aFileSetIter; diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index 2652ac3c6362..192d46bd448f 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -35,6 +35,7 @@ #include <cppuhelper/implbase1.hxx> #include "connectivity/CommonTools.hxx" #include <vos/ref.hxx> +#include "file/filedllapi.hxx" namespace connectivity { @@ -46,7 +47,8 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OOO_DLLPUBLIC_FILE OResultSetMetaData : + public OResultSetMetaData_BASE { ::rtl::OUString m_aTableName; ::vos::ORef<connectivity::OSQLColumns> m_xColumns; diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 7236fca192bb..1876cc76f95a 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -44,6 +44,7 @@ #include <comphelper/uno3.hxx> #include "connectivity/CommonTools.hxx" #include "file/FConnection.hxx" +#include "file/filedllapi.hxx" #ifndef _LIST_ #include <list> #endif @@ -68,7 +69,8 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Statement //************************************************************** - class OStatement_Base : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_FILE OStatement_Base : + public comphelper::OBaseMutex, public OStatement_BASE, public ::comphelper::OPropertyContainer, public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> @@ -180,7 +182,8 @@ namespace connectivity virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; - class OStatement_BASE2 : public OStatement_Base, + class OOO_DLLPUBLIC_FILE OStatement_BASE2 : + public OStatement_Base, public connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE> { @@ -195,7 +198,8 @@ namespace connectivity }; typedef ::cppu::ImplHelper2< ::com::sun::star::sdbc::XStatement,::com::sun::star::lang::XServiceInfo > OStatement_XStatement; - class OStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_FILE OStatement : + public OStatement_BASE2, public OStatement_XStatement { protected: diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx index 8cbd16e7d8fa..aa7b48b94462 100644 --- a/connectivity/source/inc/file/FStringFunctions.hxx +++ b/connectivity/source/inc/file/FStringFunctions.hxx @@ -32,7 +32,7 @@ #define _CONNECTIVITY_FILE_FSTRINGFUNCTIONS_HXX_ #include "file/fcode.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -47,7 +47,7 @@ namespace connectivity -> 'HEJ' */ - class OOp_Upper : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Upper : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -61,7 +61,7 @@ namespace connectivity -> 'quadratically' */ - class OOp_Lower : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Lower : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -78,7 +78,7 @@ namespace connectivity -> 100 */ - class OOp_Ascii : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Ascii : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -96,7 +96,7 @@ namespace connectivity -> 4 */ - class OOp_CharLength : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_CharLength : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -111,7 +111,7 @@ namespace connectivity -> 'MMM' */ - class OOp_Char : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Char : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -128,7 +128,7 @@ namespace connectivity -> '14.3' */ - class OOp_Concat : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Concat : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -149,7 +149,7 @@ namespace connectivity -> 7 */ - class OOp_Locate : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Locate : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -171,7 +171,7 @@ namespace connectivity -> 'ratica' */ - class OOp_SubString : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_SubString : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -184,7 +184,7 @@ namespace connectivity -> 'barbar' */ - class OOp_LTrim : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_LTrim : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -197,7 +197,7 @@ namespace connectivity -> 'barbar' */ - class OOp_RTrim : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_RTrim : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -210,7 +210,7 @@ namespace connectivity -> ' ' */ - class OOp_Space : public OUnaryOperator + class OOO_DLLPUBLIC_FILE OOp_Space : public OUnaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs) const; @@ -223,7 +223,7 @@ namespace connectivity -> 'WwWwWw.OOo.com' */ - class OOp_Replace : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Replace : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -236,7 +236,7 @@ namespace connectivity -> 'OOoOOoOOo' */ - class OOp_Repeat : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_Repeat : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; @@ -249,7 +249,7 @@ namespace connectivity -> 'QuWhattic' */ - class OOp_Insert : public ONthOperator + class OOO_DLLPUBLIC_FILE OOp_Insert : public ONthOperator { protected: virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const; @@ -262,7 +262,7 @@ namespace connectivity -> 'fooba' */ - class OOp_Left : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_Left : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; @@ -274,7 +274,7 @@ namespace connectivity > SELECT RIGHT('foobarbar', 4); -> 'rbar' */ - class OOp_Right : public OBinaryOperator + class OOO_DLLPUBLIC_FILE OOp_Right : public OBinaryOperator { protected: virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const; diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 54265adc7b1a..4a0fb999bf53 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -37,6 +37,7 @@ #ifndef _CONNECTIVITY_FILE_BCONNECTION_HXX_ #include "file/FConnection.hxx" #endif +#include "file/filedllapi.hxx" #include <tools/stream.hxx> #include "connectivity/FValue.hxx" #include "TResultSetHelper.hxx" @@ -47,7 +48,7 @@ namespace connectivity { typedef connectivity::sdbcx::OTable OTable_TYPEDEF; - class OFileTable : public OTable_TYPEDEF + class OOO_DLLPUBLIC_FILE OFileTable : public OTable_TYPEDEF { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index f7367f8702af..71d7ef6b552f 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -31,6 +31,7 @@ #ifndef _CONNECTIVITY_FILE_TABLES_HXX_ #define _CONNECTIVITY_FILE_TABLES_HXX_ +#include "file/filedllapi.hxx" #include "connectivity/sdbcx/VCollection.hxx" #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> @@ -38,7 +39,8 @@ namespace connectivity { namespace file { - class SAL_NO_VTABLE OTables : public sdbcx::OCollection + class OOO_DLLPUBLIC_FILE SAL_NO_VTABLE OTables : + public sdbcx::OCollection { protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx index 60f5c79188e6..8cef84fcc0fc 100644 --- a/connectivity/source/inc/file/fanalyzer.hxx +++ b/connectivity/source/inc/file/fanalyzer.hxx @@ -32,13 +32,14 @@ #define _CONNECTIVITY_FILE_FANALYZER_HXX_ #include "file/fcomp.hxx" +#include "file/filedllapi.hxx" namespace connectivity { namespace file { class OConnection; - class OSQLAnalyzer + class OOO_DLLPUBLIC_FILE OSQLAnalyzer { typedef ::std::list<OEvaluateSet*> OEvaluateSetList; typedef ::std::pair< ::vos::ORef<OPredicateCompiler>,::vos::ORef<OPredicateInterpreter> > TPredicates; diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 2e3e3704dcf8..ebb1984a080c 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "connectivity/FValue.hxx" - +#include "file/filedllapi.hxx" namespace connectivity { @@ -58,7 +58,7 @@ namespace connectivity typedef ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> OFileColumns; - class OCode + class OOO_DLLPUBLIC_FILE OCode { public: OCode(); @@ -78,7 +78,7 @@ namespace connectivity // operands that the parsetree generate - class OOperand : public OCode + class OOO_DLLPUBLIC_FILE OOperand : public OCode { protected: sal_Int32 m_eDBType; @@ -97,7 +97,7 @@ namespace connectivity TYPEINFO(); }; - class OOperandRow : public OOperand + class OOO_DLLPUBLIC_FILE OOperandRow : public OOperand { sal_uInt16 m_nRowPos; protected: @@ -114,7 +114,7 @@ namespace connectivity }; // Attribute aus einer Ergebniszeile - class OOperandAttr : public OOperandRow + class OOO_DLLPUBLIC_FILE OOperandAttr : public OOperandRow { protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xColumn; @@ -129,7 +129,7 @@ namespace connectivity }; // Parameter fuer ein Praedikat - class OOperandParam : public OOperandRow + class OOO_DLLPUBLIC_FILE OOperandParam : public OOperandRow { public: OOperandParam(connectivity::OSQLParseNode* pNode, sal_Int32 _nPos); @@ -139,7 +139,7 @@ namespace connectivity }; // WerteOperanden - class OOperandValue : public OOperand + class OOO_DLLPUBLIC_FILE OOperandValue : public OOperand { protected: ORowSetValue m_aValue; @@ -161,7 +161,7 @@ namespace connectivity // Konstanten - class OOperandConst : public OOperandValue + class OOO_DLLPUBLIC_FILE OOperandConst : public OOperandValue { public: OOperandConst(const connectivity::OSQLParseNode& rColumnRef, const rtl::OUString& aStrValue); @@ -171,7 +171,7 @@ namespace connectivity // Ergebnis Operanden - class OOperandResult : public OOperandValue + class OOO_DLLPUBLIC_FILE OOperandResult : public OOperandValue { protected: OOperandResult(const ORowSetValue& _rVar, sal_Int32 eDbType) @@ -185,7 +185,7 @@ namespace connectivity }; - class OOperandResultBOOL : public OOperandResult + class OOO_DLLPUBLIC_FILE OOperandResultBOOL : public OOperandResult { public: OOperandResultBOOL(sal_Bool bResult) : OOperandResult(::com::sun::star::sdbc::DataType::BIT) @@ -195,7 +195,7 @@ namespace connectivity } }; - class OOperandResultNUM : public OOperandResult + class OOO_DLLPUBLIC_FILE OOperandResultNUM : public OOperandResult { public: OOperandResultNUM(double fNum) : OOperandResult(::com::sun::star::sdbc::DataType::DOUBLE) @@ -208,7 +208,7 @@ namespace connectivity /** special stop operand is appended when a list of arguments ends */ - class OStopOperand : public OOperandValue + class OOO_DLLPUBLIC_FILE OStopOperand : public OOperandValue { public: OStopOperand(){} @@ -216,7 +216,7 @@ namespace connectivity }; // Operatoren - class OOperator : public OCode + class OOO_DLLPUBLIC_FILE OOperator : public OCode { public: virtual void Exec(OCodeStack&) = 0; @@ -228,7 +228,7 @@ namespace connectivity // boolsche Operatoren - class OBoolOperator : public OOperator + class OOO_DLLPUBLIC_FILE OBoolOperator : public OOperator { public: TYPEINFO(); @@ -237,7 +237,7 @@ namespace connectivity }; - class OOp_AND : public OBoolOperator + class OOO_DLLPUBLIC_FILE OOp_AND : public OBoolOperator { public: TYPEINFO(); @@ -246,7 +246,7 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; - class OOp_OR : public OBoolOperator + class OOO_DLLPUBLIC_FILE OOp_OR : public OBoolOperator { public: TYPEINFO(); @@ -254,7 +254,7 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; - class OOp_ISNULL : public OBoolOperator + class OOO_DLLPUBLIC_FILE OOp_ISNULL : public OBoolOperator { public: TYPEINFO(); @@ -264,14 +264,14 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const; }; - class OOp_ISNOTNULL : public OOp_ISNULL + class OOO_DLLPUBLIC_FILE OOp_ISNOTNULL : public OOp_ISNULL { public: TYPEINFO(); virtual sal_Bool operate(const OOperand*, const OOperand* = NULL) const; }; - class OOp_LIKE : public OBoolOperator + class OOO_DLLPUBLIC_FILE OOp_LIKE : public OBoolOperator { public: TYPEINFO(); @@ -284,7 +284,7 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; - class OOp_NOTLIKE : public OOp_LIKE + class OOO_DLLPUBLIC_FILE OOp_NOTLIKE : public OOp_LIKE { public: TYPEINFO(); @@ -294,7 +294,7 @@ namespace connectivity virtual sal_Bool operate(const OOperand*, const OOperand*) const; }; - class OOp_COMPARE : public OBoolOperator + class OOO_DLLPUBLIC_FILE OOp_COMPARE : public OBoolOperator { sal_Int32 aPredicateType; @@ -309,7 +309,7 @@ namespace connectivity // numerische Operatoren - class ONumOperator : public OOperator + class OOO_DLLPUBLIC_FILE ONumOperator : public OOperator { public: virtual void Exec(OCodeStack&); @@ -320,25 +320,25 @@ namespace connectivity virtual double operate(const double& fLeft,const double& fRight) const = 0; }; - class OOp_ADD : public ONumOperator + class OOO_DLLPUBLIC_FILE OOp_ADD : public ONumOperator { protected: virtual double operate(const double& fLeft,const double& fRight) const; }; - class OOp_SUB : public ONumOperator + class OOO_DLLPUBLIC_FILE OOp_SUB : public ONumOperator { protected: virtual double operate(const double& fLeft,const double& fRight) const; }; - class OOp_MUL : public ONumOperator + class OOO_DLLPUBLIC_FILE OOp_MUL : public ONumOperator { protected: virtual double operate(const double& fLeft,const double& fRight) const; }; - class OOp_DIV : public ONumOperator + class OOO_DLLPUBLIC_FILE OOp_DIV : public ONumOperator { protected: virtual double operate(const double& fLeft,const double& fRight) const; @@ -350,7 +350,7 @@ namespace connectivity } // operator - class ONthOperator : public OOperator + class OOO_DLLPUBLIC_FILE ONthOperator : public OOperator { public: virtual void Exec(OCodeStack&); @@ -361,7 +361,7 @@ namespace connectivity virtual ORowSetValue operate(const ::std::vector<ORowSetValue>& lhs) const = 0; }; - class OBinaryOperator : public OOperator + class OOO_DLLPUBLIC_FILE OBinaryOperator : public OOperator { public: virtual void Exec(OCodeStack&); @@ -372,7 +372,7 @@ namespace connectivity virtual ORowSetValue operate(const ORowSetValue& lhs,const ORowSetValue& rhs) const = 0; }; - class OUnaryOperator : public OOperator + class OOO_DLLPUBLIC_FILE OUnaryOperator : public OOperator { public: virtual void Exec(OCodeStack&); diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx index f09a3af6d7a8..713238abd949 100644 --- a/connectivity/source/inc/file/fcomp.hxx +++ b/connectivity/source/inc/file/fcomp.hxx @@ -31,6 +31,7 @@ #define _CONNECTIVITY_FILE_FCOMP_HXX_ #include "file/fcode.hxx" +#include "file/filedllapi.hxx" #ifndef _LIST_ #include <list> #endif @@ -45,7 +46,7 @@ namespace connectivity class OSQLAnalyzer; typedef::std::vector<OCode*> OCodeList; - class OPredicateCompiler : public ::vos::OReference + class OOO_DLLPUBLIC_FILE OPredicateCompiler : public ::vos::OReference { friend class OPredicateInterpreter; friend class OSQLAnalyzer; @@ -91,7 +92,8 @@ namespace connectivity }; - class OPredicateInterpreter : public ::vos::OReference + class OOO_DLLPUBLIC_FILE OPredicateInterpreter : + public ::vos::OReference { OCodeStack m_aStack; ::vos::ORef<OPredicateCompiler> m_rCompiler; diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx new file mode 100644 index 000000000000..42f7da2958fe --- /dev/null +++ b/connectivity/source/inc/file/filedllapi.hxx @@ -0,0 +1,43 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: $ +* +* $Revision: $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_FILE +#define OOO_DLLPUBLIC_FILE SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_FILE SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx index 2375a2e78dc4..fa5b468275e1 100644 --- a/connectivity/source/inc/file/quotedstring.hxx +++ b/connectivity/source/inc/file/quotedstring.hxx @@ -32,6 +32,7 @@ #define CONNECTIVITY_QUOTED_STRING_HXX #include <tools/string.hxx> +#include "file/filedllapi.hxx" namespace connectivity { @@ -39,7 +40,7 @@ namespace connectivity // Ableitung von String mit ueberladenen GetToken/GetTokenCount-Methoden // Speziell fuer FLAT FILE-Format: Strings koennen gequotet sein //================================================================== - class QuotedTokenizedString : public String + class OOO_DLLPUBLIC_FILE QuotedTokenizedString : public String { public: QuotedTokenizedString(){} diff --git a/connectivity/source/inc/internalnode.hxx b/connectivity/source/inc/internalnode.hxx index 381d2c8c0d24..bb2f32c24d69 100644 --- a/connectivity/source/inc/internalnode.hxx +++ b/connectivity/source/inc/internalnode.hxx @@ -30,6 +30,7 @@ #ifndef _CONNECTIVITY_SQLINTERNALNODE_HXX #define _CONNECTIVITY_SQLINTERNALNODE_HXX +#include "connectivity/dbtoolsdllapi.hxx" #include <connectivity/sqlnode.hxx> namespace connectivity @@ -39,7 +40,7 @@ namespace connectivity //========================================================================== /** special node for avoiding memory leaks */ - class OSQLInternalNode : public OSQLParseNode + class OOO_DLLPUBLIC_DBTOOLS OSQLInternalNode : public OSQLParseNode { public: OSQLInternalNode(const sal_Char* pNewValue, diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx index 3788398168eb..c71977a94910 100644 --- a/connectivity/source/inc/odbc/OBoundParam.hxx +++ b/connectivity/source/inc/odbc/OBoundParam.hxx @@ -31,12 +31,13 @@ #define _CONNECTIVITY_OBOUNPARAM_HXX_ #include <com/sun/star/io/XInputStream.hpp> +#include "odbc/odbcbasedllapi.hxx" namespace connectivity { namespace odbc { - class OBoundParam + class OOO_DLLPUBLIC_ODBCBASE OBoundParam { public: diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 41a659a6bbf7..4f70dcfe0634 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -33,6 +33,7 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include "odbc/OFunctiondefs.hxx" +#include "odbc/odbcbasedllapi.hxx" #include "OSubComponent.hxx" #include "connectivity/CommonTools.hxx" #include "TConnection.hxx" @@ -56,7 +57,8 @@ namespace connectivity typedef connectivity::OMetaConnection OConnection_BASE; typedef ::std::vector< ::connectivity::OTypeInfo> TTypeInfoVector; - class OConnection : public OConnection_BASE, + class OOO_DLLPUBLIC_ODBCBASE OConnection : + public OConnection_BASE, public connectivity::OSubComponent<OConnection, OConnection_BASE>, public OAutoRetrievingBase { diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx index bca231c4a2ad..dcb5780e4c10 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx @@ -32,6 +32,7 @@ #define _CONNECTIVITY_ODBC_ODATABASEMETADATA_HXX_ #include "odbc/OConnection.hxx" +#include "odbc/odbcbasedllapi.hxx" #include "TDatabaseMetaDataBase.hxx" namespace connectivity @@ -42,7 +43,8 @@ namespace connectivity //************ Class: ODatabaseMetaData //************************************************************** - class ODatabaseMetaData : public ODatabaseMetaDataBase + class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaData : + public ODatabaseMetaDataBase { SQLHANDLE m_aConnectionHandle; OConnection* m_pConnection; diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index ea1d5bca8c9c..e077fafe1b27 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -44,6 +44,7 @@ #include <comphelper/proparrhlp.hxx> #include "odbc/OStatement.hxx" #include "odbc/ODatabaseMetaData.hxx" +#include "odbc/odbcbasedllapi.hxx" #include <comphelper/broadcasthelper.hxx> #include "connectivity/StdTypeDefs.hxx" @@ -63,7 +64,8 @@ namespace connectivity ::com::sun::star::sdbc::XCloseable, ::com::sun::star::sdbc::XColumnLocate> ODatabaseMetaDataResultSet_BASE; - class ODatabaseMetaDataResultSet : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_ODBCBASE ODatabaseMetaDataResultSet : + public comphelper::OBaseMutex, public ODatabaseMetaDataResultSet_BASE, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper<ODatabaseMetaDataResultSet> diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 7aca81f0b2f0..4cd78621897d 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -35,6 +35,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase2.hxx> #include "odbc/OFunctiondefs.hxx" +#include "odbc/odbcbasedllapi.hxx" #include "connectivity/CommonTools.hxx" #include <osl/module.h> @@ -42,11 +43,9 @@ namespace connectivity { namespace odbc { - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; - class SAL_NO_VTABLE ODBCDriver : public ODriver_BASE + class OOO_DLLPUBLIC_ODBCBASE SAL_NO_VTABLE ODBCDriver : public ODriver_BASE { protected: ::osl::Mutex m_aMutex; diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index e537c134decd..c9d8ff272163 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -31,7 +31,7 @@ #ifndef _CONNECTIVITY_ODBC_OPREPAREDSTATEMENT_HXX_ #define _CONNECTIVITY_ODBC_OPREPAREDSTATEMENT_HXX_ - +#include "odbc/odbcbasedllapi.hxx" #include "odbc/OStatement.hxx" #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> @@ -52,7 +52,8 @@ namespace connectivity ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::lang::XServiceInfo> OPreparedStatement_BASE; - class OPreparedStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_ODBCBASE OPreparedStatement : + public OStatement_BASE2, public OPreparedStatement_BASE { protected: diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index c57423617ba0..cf9fdce56115 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -46,6 +46,7 @@ #include <comphelper/proparrhlp.hxx> #include "odbc/OFunctions.hxx" #include "odbc/OStatement.hxx" +#include "odbc/odbcbasedllapi.hxx" #include "connectivity/CommonTools.hxx" #include "connectivity/FValue.hxx" #include "TSkipDeletedSet.hxx" @@ -77,7 +78,7 @@ namespace connectivity typedef ::std::vector<TVoidPtr> TVoidVector; // typedef ::com::sun::star::uno::Sequence<TVoidPtr> TVoidVector; /// unary_function Functor object for class ZZ returntype is void - struct TBookmarkPosMapCompare : ::std::less< ::com::sun::star::uno::Sequence<sal_Int8> > + struct OOO_DLLPUBLIC_ODBCBASE TBookmarkPosMapCompare : ::std::binary_function< ::com::sun::star::uno::Sequence<sal_Int8>, ::com::sun::star::uno::Sequence<sal_Int8>, bool > { inline bool operator()( const ::com::sun::star::uno::Sequence<sal_Int8>& _rLH, const ::com::sun::star::uno::Sequence<sal_Int8>& _rRH) const @@ -114,7 +115,8 @@ namespace connectivity typedef ::std::map< ::com::sun::star::uno::Sequence<sal_Int8>, sal_Int32,TBookmarkPosMapCompare > TBookmarkPosMap; - class OResultSet : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_ODBCBASE OResultSet : + public comphelper::OBaseMutex, public ::connectivity::IResultSetHelper, public OResultSet_BASE, public ::cppu::OPropertySetHelper, diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx index c082e33e1675..fdf0ed93b0a4 100644 --- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx +++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> #include "odbc/OFunctions.hxx" +#include "odbc/odbcbasedllapi.hxx" #ifndef _VECTOR_ #include <vector> #endif @@ -48,7 +49,8 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OOO_DLLPUBLIC_ODBCBASE OResultSetMetaData : + public OResultSetMetaData_BASE { protected: ::std::vector<sal_Int32> m_vMapping; // when not every column is needed diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 7c25c66c206d..5d3e71c5e42d 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -45,6 +45,7 @@ #include "connectivity/CommonTools.hxx" #include "odbc/OFunctions.hxx" #include "odbc/OConnection.hxx" +#include "odbc/odbcbasedllapi.hxx" #include <list> #include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/broadcasthelper.hxx> @@ -65,7 +66,8 @@ namespace connectivity //************************************************************** //************ Class: java.sql.Statement //************************************************************** - class OStatement_Base : public comphelper::OBaseMutex, + class OOO_DLLPUBLIC_ODBCBASE OStatement_Base : + public comphelper::OBaseMutex, public OStatement_BASE, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper<OStatement_Base> @@ -208,7 +210,8 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; }; - class OStatement_BASE2 :public OStatement_Base + class OOO_DLLPUBLIC_ODBCBASE OStatement_BASE2 : + public OStatement_Base ,public ::connectivity::OSubComponent<OStatement_BASE2, OStatement_BASE> { @@ -222,7 +225,8 @@ namespace connectivity virtual void SAL_CALL release() throw(); }; - class OStatement : public OStatement_BASE2, + class OOO_DLLPUBLIC_ODBCBASE OStatement : + public OStatement_BASE2, public ::com::sun::star::sdbc::XBatchExecution, public ::com::sun::star::lang::XServiceInfo { diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx index 6ef9fd0f5325..0d73ea3530c7 100644 --- a/connectivity/source/inc/odbc/OTools.hxx +++ b/connectivity/source/inc/odbc/OTools.hxx @@ -31,6 +31,7 @@ #define _CONNECTIVITY_OTOOLS_HXX_ #include "odbc/OFunctiondefs.hxx" +#include "odbc/odbcbasedllapi.hxx" #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> @@ -104,7 +105,7 @@ namespace connectivity const sal_uInt32 ODBC_FRACTION_UNITS_PER_HSECOND = 10000000L; const sal_Int32 MAX_PUT_DATA_LENGTH = 2000; - class OTools + class OOO_DLLPUBLIC_ODBCBASE OTools { public: static void ThrowException( OConnection* _pConnection, diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx new file mode 100644 index 000000000000..5d716c2ca09b --- /dev/null +++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx @@ -0,0 +1,43 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2008 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* $RCSfile: $ +* +* $Revision: $ +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX +#define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX + +#include "sal/config.h" + +#include "sal/types.h" + +#if defined OOO_DLLIMPLEMENTATION_ODBCBASE +#define OOO_DLLPUBLIC_ODBCBASE SAL_DLLPUBLIC_EXPORT +#else +#define OOO_DLLPUBLIC_ODBCBASE SAL_DLLPUBLIC_IMPORT +#endif + +#endif diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index 0584625cac4a..27b2008fc7a6 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -36,10 +36,11 @@ #ifndef _MAP_ #include <map> #endif +#include "connectivity/dbtoolsdllapi.hxx" namespace dbtools { - class OPropertyMap + class OOO_DLLPUBLIC_DBTOOLS OPropertyMap { ::std::map<sal_Int32 , rtl_uString*> m_aPropertyMap; @@ -59,7 +60,7 @@ namespace connectivity { typedef const sal_Char* (*PVFN)(); - struct UStringDescription + struct OOO_DLLPUBLIC_DBTOOLS UStringDescription { const sal_Char* pZeroTerminatedName; sal_Int32 nLength; diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index 9a75e40315fc..9a115431bb6d 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -36,6 +36,7 @@ #include <rtl/ustring.hxx> #include <list> +#include "connectivity/dbtoolsdllapi.hxx" //........................................................................ namespace connectivity @@ -49,7 +50,7 @@ namespace connectivity /** helper class for accessing resources shared by different libraries in the connectivity module */ - class SharedResources + class OOO_DLLPUBLIC_DBTOOLS SharedResources { public: SharedResources(); diff --git a/connectivity/source/inc/sqlscan.hxx b/connectivity/source/inc/sqlscan.hxx index 62f0ebcf97db..77bd8b99274b 100644 --- a/connectivity/source/inc/sqlscan.hxx +++ b/connectivity/source/inc/sqlscan.hxx @@ -32,6 +32,7 @@ #include <stdarg.h> #include "connectivity/IParseContext.hxx" +#include "connectivity/dbtoolsdllapi.hxx" namespace connectivity { @@ -40,7 +41,7 @@ namespace connectivity //========================================================================== /** Scanner for SQL92 */ - class OSQLScanner + class OOO_DLLPUBLIC_DBTOOLS OSQLScanner { const IParseContext* m_pContext; // context for parse, knows all international stuff ::rtl::OString m_sStatement; // statement to parse diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index d0f8b8b61008..d8372ca69167 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -103,10 +103,10 @@ OParseColumn::OParseColumn( const ::rtl::OUString& _Name, const Reference< XDatabaseMetaData >& _rxDBMetaData ) { sal_Int32 nColumnCount = _rxResMetaData->getColumnCount(); - ::vos::ORef< OSQLColumns > aReturn( new OSQLColumns ); aReturn->reserve( nColumnCount ); + ::vos::ORef< OSQLColumns > aReturn( new OSQLColumns ); aReturn->get().reserve( nColumnCount ); for ( sal_Int32 i = 1; i <= nColumnCount; ++i ) - aReturn->push_back( createColumnForResultSet( _rxResMetaData, _rxDBMetaData, i ) ); + aReturn->get().push_back( createColumnForResultSet( _rxResMetaData, _rxDBMetaData, i ) ); return aReturn; } diff --git a/connectivity/source/parse/makefile.mk b/connectivity/source/parse/makefile.mk index 663543df031d..bd84092f9c7b 100644 --- a/connectivity/source/parse/makefile.mk +++ b/connectivity/source/parse/makefile.mk @@ -38,6 +38,7 @@ INCPRE=$(MISC) # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/dbtools.pmk # --- Files -------------------------------------------------------- diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index ac64a5235deb..7263652184cf 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -439,6 +439,10 @@ VAR_SAMP {SQL_NEW_KEYWORD(SQL_TOKEN_VAR_S #endif +// Versions of flex apparently differ in whether input() resp. yyinput() returns +// zero or EOF upon end of file: +inline bool checkeof(int c) { return c == 0 || c == EOF; } + /* * Read SQL string literal * Valid strings: @@ -459,13 +463,13 @@ sal_Int32 gatherString( sal_Int32 delim, sal_Int32 nTyp) sal_Char *s = Buffer; sal_Int32 nPos = 0; - while ((ch = yyinput()) != EOF) + while (!checkeof(ch = yyinput())) { if (ch == delim) { if ((ch = yyinput()) != delim) { - if (ch != EOF) + if (!checkeof(ch)) unput(ch); *s = '\0'; @@ -715,13 +719,13 @@ void OSQLScanner::SQLyyerror(sal_Char *fmt) sal_Int32 nPos = 1; sal_Int32 ch = SQLyytext ? (SQLyytext[0] == 0 ? ' ' : SQLyytext[0]): ' '; *s++ = ch; - while ((ch = yyinput()) != EOF) + while (!checkeof(ch = yyinput())) { if (ch == ' ') { if ((ch = yyinput()) != ' ') { - if (ch != EOF) + if (!checkeof(ch)) unput(ch); } *s = '\0'; diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index e4753fdb10a9..c1432d90c3f8 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -355,8 +355,8 @@ void OSQLParseTreeIterator::impl_getQueryParameterColumns( const OSQLTable& _rQu } while ( false ); // copy the parameters of the sub query to our own parameter array - ::std::copy( pSubQueryParameterColumns->begin(), pSubQueryParameterColumns->end(), - ::std::insert_iterator< OSQLColumns >( *m_aParameters, m_aParameters->end() ) ); + ::std::copy( pSubQueryParameterColumns->get().begin(), pSubQueryParameterColumns->get().end(), + ::std::insert_iterator< OSQLColumns::Vector >( m_aParameters->get(), m_aParameters->get().end() ) ); } //----------------------------------------------------------------------------- @@ -671,8 +671,8 @@ namespace // look up the column in the select column, to find an possible alias if ( _pSelectColumns ) { - for ( OSQLColumns::const_iterator lookupColumn = _pSelectColumns->begin(); - lookupColumn != _pSelectColumns->end(); + for ( OSQLColumns::Vector::const_iterator lookupColumn = _pSelectColumns->get().begin(); + lookupColumn != _pSelectColumns->get().end(); ++lookupColumn ) { @@ -836,7 +836,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo pColumn->setRealName(aColumnName); Reference< XPropertySet> xCol = pColumn; - m_aCreateColumns->push_back(xCol); + m_aCreateColumns->get().push_back(xCol); } } @@ -1409,22 +1409,22 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode pColumn->setFunction(sal_True); pColumn->setAggregateFunction(sal_True); pColumn->setRealName(sFunctionName); - m_aParameters->push_back(pColumn); + m_aParameters->get().push_back(pColumn); } else { sal_Bool bNotFound = sal_True; - OSQLColumns::const_iterator aIter = ::connectivity::find( - m_aSelectColumns->begin(), - m_aSelectColumns->end(), + OSQLColumns::Vector::const_iterator aIter = ::connectivity::find( + m_aSelectColumns->get().begin(), + m_aSelectColumns->get().end(), _aColumnName,::comphelper::UStringMixEqual( isCaseSensitive() ) ); - if(aIter != m_aSelectColumns->end()) + if(aIter != m_aSelectColumns->get().end()) { OParseColumn* pNewColumn = new OParseColumn(*aIter,isCaseSensitive()); pNewColumn->setName(sParameterName); pNewColumn->setRealName(_aColumnName); - m_aParameters->push_back(pNewColumn); + m_aParameters->get().push_back(pNewColumn); bNotFound = sal_False; } else if(_aColumnName.getLength())// search in the tables for the right one @@ -1437,7 +1437,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode OParseColumn* pNewColumn = new OParseColumn(xColumn,isCaseSensitive()); pNewColumn->setName(sParameterName); pNewColumn->setRealName(_aColumnName); - m_aParameters->push_back(pNewColumn); + m_aParameters->get().push_back(pNewColumn); bNotFound = sal_False; } } @@ -1457,7 +1457,7 @@ void OSQLParseTreeIterator::traverseParameter(const OSQLParseNode* _pParseNode isCaseSensitive() ); pColumn->setName(aNewColName); pColumn->setRealName(sParameterName); - m_aParameters->push_back(pColumn); + m_aParameters->get().push_back(pColumn); } } } @@ -1596,7 +1596,7 @@ void OSQLParseTreeIterator::appendColumns(::vos::ORef<OSQLColumns>& _rColumns,co pColumn->setTableName(_rTableAlias); pColumn->setRealName(*pBegin); Reference< XPropertySet> xCol = pColumn; - _rColumns->push_back(xCol); + _rColumns->get().push_back(xCol); } else impl_appendError( IParseContext::ERROR_INVALID_COLUMN, pBegin, &_rTableAlias ); @@ -1680,7 +1680,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu pColumn->setRealName( rColumnName ); } - _rColumns->push_back( xNewColumn ); + _rColumns->get().push_back( xNewColumn ); } else { @@ -1693,7 +1693,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu pColumn->setRealName(rColumnName); Reference< XPropertySet> xCol = pColumn; - _rColumns->push_back(xCol); + _rColumns->get().push_back(xCol); } } else // ColumnName und Tablename vorhanden @@ -1715,7 +1715,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu pColumn->setTableName(aFind->first); Reference< XPropertySet> xCol = pColumn; - _rColumns->push_back(xCol); + _rColumns->get().push_back(xCol); } else { @@ -1730,7 +1730,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu pColumn->setTableName(aFind->first); Reference< XPropertySet> xCol = pColumn; - _rColumns->push_back(xCol); + _rColumns->get().push_back(xCol); } else bError = sal_True; @@ -1755,7 +1755,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu pColumn->setAggregateFunction(bAggFkt); Reference< XPropertySet> xCol = pColumn; - _rColumns->push_back(xCol); + _rColumns->get().push_back(xCol); } } } @@ -1764,19 +1764,19 @@ void OSQLParseTreeIterator::setSelectColumnName(::vos::ORef<OSQLColumns>& _rColu { ::rtl::OUString aAlias(rColumnName); - OSQLColumns::const_iterator aIter = find( - m_aSelectColumns->begin(), - m_aSelectColumns->end(), + OSQLColumns::Vector::const_iterator aIter = find( + m_aSelectColumns->get().begin(), + m_aSelectColumns->get().end(), aAlias, ::comphelper::UStringMixEqual( isCaseSensitive() ) ); sal_Int32 i=1; - while(aIter != m_aSelectColumns->end()) + while(aIter != m_aSelectColumns->get().end()) { (aAlias = rColumnName) += ::rtl::OUString::valueOf(i++); aIter = find( - m_aSelectColumns->begin(), - m_aSelectColumns->end(), + m_aSelectColumns->get().begin(), + m_aSelectColumns->get().end(), aAlias, ::comphelper::UStringMixEqual( isCaseSensitive() ) ); @@ -1788,12 +1788,12 @@ void OSQLParseTreeIterator::setOrderByColumnName(const ::rtl::OUString & rColumn { Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false ); if ( xColumn.is() ) - m_aOrderColumns->push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending)); + m_aOrderColumns->get().push_back(new OOrderColumn(xColumn,isCaseSensitive(),bAscending)); else { sal_Int32 nId = rColumnName.toInt32(); - if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->size()) ) - m_aOrderColumns->push_back(new OOrderColumn((*m_aSelectColumns)[nId-1],isCaseSensitive(),bAscending)); + if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) + m_aOrderColumns->get().push_back(new OOrderColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive(),bAscending)); } #ifdef SQL_TEST_PARSETREEITERATOR @@ -1809,12 +1809,12 @@ void OSQLParseTreeIterator::setGroupByColumnName(const ::rtl::OUString & rColumn { Reference<XPropertySet> xColumn = findColumn( rColumnName, rTableRange, false ); if ( xColumn.is() ) - m_aGroupColumns->push_back(new OParseColumn(xColumn,isCaseSensitive())); + m_aGroupColumns->get().push_back(new OParseColumn(xColumn,isCaseSensitive())); else { sal_Int32 nId = rColumnName.toInt32(); - if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->size()) ) - m_aGroupColumns->push_back(new OParseColumn((*m_aSelectColumns)[nId-1],isCaseSensitive())); + if ( nId > 0 && nId < static_cast<sal_Int32>(m_aSelectColumns->get().size()) ) + m_aGroupColumns->get().push_back(new OParseColumn((m_aSelectColumns->get())[nId-1],isCaseSensitive())); } #ifdef SQL_TEST_PARSETREEITERATOR diff --git a/connectivity/source/resource/makefile.mk b/connectivity/source/resource/makefile.mk index bf52916a8410..1b01093aecbd 100644 --- a/connectivity/source/resource/makefile.mk +++ b/connectivity/source/resource/makefile.mk @@ -49,6 +49,7 @@ ENVCFLAGS+=/FR$(SLO)$/ CDEFS+=-DCONN_SHARED_RESOURCE_FILE=$(TARGET) .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/dbtools.pmk .INCLUDE : $(PRJ)$/version.mk diff --git a/connectivity/source/sdbcx/makefile.mk b/connectivity/source/sdbcx/makefile.mk index 80efe730c1c3..0d791ee23567 100644 --- a/connectivity/source/sdbcx/makefile.mk +++ b/connectivity/source/sdbcx/makefile.mk @@ -42,7 +42,7 @@ ENVCFLAGS+=/FR$(SLO)$/ .ENDIF .INCLUDE : settings.mk - +.INCLUDE : $(PRJ)$/dbtools.pmk # --- Files ------------------------------------- diff --git a/connectivity/source/simpledbt/makefile.mk b/connectivity/source/simpledbt/makefile.mk index 80544796bfa6..9354a1c7e406 100644 --- a/connectivity/source/simpledbt/makefile.mk +++ b/connectivity/source/simpledbt/makefile.mk @@ -35,6 +35,8 @@ PRJNAME=connectivity TARGET=simpledbt .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/dbtools.pmk + # --- Files -------------------------------------------------------- EXCEPTIONSFILES=\ |