User: hr Date: 05/09/23 05:13:50 Modified: /dba/dbaccess/source/filter/xml/ xmlfilter.cxx
Log: INTEGRATION: CWS dba201b (1.9.38); FILE MERGED 2005/09/21 07:35:06 oj 1.9.38.4: RESYNC: (1.9-1.10); FILE MERGED 2005/07/11 13:56:43 fs 1.9.38.3: merging CWS dba201a into CWS dba201b 2005/07/11 13:37:07 fs 1.9.38.2: merging CWS dba201 into CWS dba201b 2005/06/06 06:47:19 oj 1.9.38.1: #i50347# insert unit convert for 10thmm File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.10&r2=1.11 Delta lines: +25 -6 -------------------- --- xmlfilter.cxx 8 Sep 2005 14:11:18 -0000 1.10 +++ xmlfilter.cxx 23 Sep 2005 12:13:46 -0000 1.11 @@ -123,6 +123,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; @@ -293,11 +296,15 @@ // ------------- // - ODBFilter - // ------------- +DBG_NAME(ODBFilter) ODBFilter::ODBFilter( const Reference< XMultiServiceFactory >& _rxMSF ) :SvXMLImport(_rxMSF) { + DBG_CTOR(ODBFilter,NULL); + GetMM100UnitConverter().setCoreMeasureUnit(MAP_10TH_MM); + GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); GetNamespaceMap().Add( OUString( RTL_CONSTASCII_USTRINGPARAM ( sXML_np__db) ), GetXMLToken(XML_N_DB), XML_NAMESPACE_DB ); @@ -311,6 +318,8 @@ ODBFilter::~ODBFilter() throw() { + + DBG_DTOR(ODBFilter,NULL); } // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO1_STATIC( ODBFilter, "com.sun.star.comp.sdb.DBFilter", "com.sun.star.document.ImportFilter") @@ -318,17 +327,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]
