User: kz Date: 2008-06-25 14:51:32+0000 Modified: dba/dbaccess/source/core/dataaccess/documentcontainer.cxx
Log: INTEGRATION: CWS rptwizard01 (1.26.48); FILE MERGED 2008/05/21 10:59:50 lla 1.26.48.4: RESYNC: (1.28-1.29); FILE MERGED 2008/04/14 10:41:04 lla 1.26.48.3: RESYNC: (1.27-1.28); FILE MERGED 2008/02/15 07:37:11 lla 1.26.48.2: RESYNC: (1.26-1.27); FILE MERGED 2008/02/14 13:20:23 lla 1.26.48.1: #i86092# change a mutex to a clearable mutex or it could be possible to hang in report wizard File Changes: Directory: /dba/dbaccess/source/core/dataaccess/ ================================================ File [changed]: documentcontainer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/dataaccess/documentcontainer.cxx?r1=1.29&r2=1.30 Delta lines: +18 -1 -------------------- --- documentcontainer.cxx 2008-04-10 12:45:51+0000 1.29 +++ documentcontainer.cxx 2008-06-25 14:51:30+0000 1.30 @@ -73,6 +73,7 @@ #ifndef _DBA_COREDATAACCESS_DATASOURCE_HXX_ #include "datasource.hxx" #endif +#include <comphelper/classids.hxx> #ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_ #include <comphelper/mimeconfighelper.hxx> #endif @@ -83,6 +84,9 @@ #include <connectivity/sqlerror.hxx> #endif +#include <vcl/svapp.hxx> +#include <vos/mutex.hxx> + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::embed; @@ -234,7 +238,18 @@ } else if ( aValue.Name.equalsAscii("ClassID") ) { - aValue.Value >>= aClassID; + if (! ( aValue.Value >>= aClassID ) ) + { + // Extended for usage also with a string + ::rtl::OUString suValue; + aValue.Value >>= suValue; + aClassID = ::comphelper::MimeConfigurationHelper::GetSequenceClassIDRepresentation( suValue ); + + } + rtl::OUString suClassID = ::comphelper::MimeConfigurationHelper::GetStringClassIDRepresentation(aClassID); + volatile int dummy = 0; + (void)dummy; + (void)suClassID; } else if ( aValue.Name.equalsAscii(PROPERTY_AS_TEMPLATE) ) { @@ -521,6 +536,8 @@ , sal_Int32 /*SearchFlags*/ , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException) { + vos::OGuard aSolarGuard(Application::GetSolarMutex()); + MutexGuard aGuard(m_aMutex); Reference< XComponent > xComp; try --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
