Tag: cws_src680_dba201a User: oj Date: 05/05/06 01:08:05 Modified: /dba/dbaccess/source/filter/xml/ makefile.mk, xmlDataSourceSetting.cxx, xmlfilter.cxx
Log: #i42060# lock solar mutex File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/makefile.mk?r1=1.2&r2=1.2.136.1 Delta lines: +3 -2 ------------------- --- makefile.mk 2 Aug 2004 15:18:11 -0000 1.2 +++ makefile.mk 6 May 2005 08:08:02 -0000 1.2.136.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.136.1 $ # -# last change: $Author: hr $ $Date: 2004/08/02 15:18:11 $ +# last change: $Author: oj $ $Date: 2005/05/06 08:08:02 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -133,6 +133,7 @@ $(VCLLIB) \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ + $(TKLIB) \ $(COMPHELPERLIB) \ $(CPPUHELPERLIB) \ $(CPPULIB) \ File [changed]: xmlDataSourceSetting.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx?r1=1.5&r2=1.5.34.1 Delta lines: +4 -3 ------------------- --- xmlDataSourceSetting.cxx 10 Mar 2005 16:39:37 -0000 1.5 +++ xmlDataSourceSetting.cxx 6 May 2005 08:08:02 -0000 1.5.34.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlDataSourceSetting.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.5.34.1 $ * - * last change: $Author: vg $ $Date: 2005/03/10 16:39:37 $ + * last change: $Author: oj $ $Date: 2005/05/06 08:08:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -131,6 +131,7 @@ { s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.9&r2=1.9.28.1 Delta lines: +22 -9 -------------------- --- xmlfilter.cxx 18 Mar 2005 10:06:53 -0000 1.9 +++ xmlfilter.cxx 6 May 2005 08:08:03 -0000 1.9.28.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.9.28.1 $ * - * last change: $Author: obo $ $Date: 2005/03/18 10:06:53 $ + * last change: $Author: oj $ $Date: 2005/05/06 08:08:03 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -149,6 +149,9 @@ #ifndef _SFXECODE_HXX #include <svtools/sfxecode.hxx> #endif +#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ +#include <toolkit/helper/vclunohelper.hxx> +#endif using namespace ::com::sun::star; @@ -344,17 +347,27 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException) { + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; + { + ::vos::OGuard aGuard(Application::GetSolarMutex()); Window* pFocusWindow = Application::GetFocusWindow(); - sal_Bool bRet = sal_False; - + xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) pFocusWindow->EnterWait(); + } + sal_Bool bRet = sal_False; if ( GetModel().is() ) bRet = implImport( rDescriptor ); + if ( xWindow.is() ) + { + ::vos::OGuard aGuard(Application::GetSolarMutex()); + Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); + } + return bRet; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
