diff options
Diffstat (limited to 'connectivity/source/commontools')
4 files changed, 13 insertions, 11 deletions
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"), |