User: kz Date: 2008-03-05 16:33:49+0000 Modified: dba/dbaccess/source/ui/dlg/dbwizsetup.cxx
Log: INTEGRATION: CWS directsbasemacros_DEV300 (1.29.66); FILE MERGED 2008/03/03 22:06:53 fs 1.29.66.2: #i10000# (NamedValueCollection::getPropertyValues does not yet exist on this branch) 2008/03/03 22:03:23 fs 1.29.66.1: #i86585# pass an InteractionHandler and a MacroExecMode when loading an existing DB doc File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: dbwizsetup.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/dbwizsetup.cxx?r1=1.29&r2=1.30 Delta lines: +30 -5 -------------------- --- dbwizsetup.cxx 2007-11-21 17:00:03+0000 1.29 +++ dbwizsetup.cxx 2008-03-05 16:33:46+0000 1.30 @@ -162,6 +162,9 @@ #ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_ #include <com/sun/star/sdbc/XDriverAccess.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_MACROEXECMODE_HPP_ +#include <com/sun/star/document/MacroExecMode.hpp> +#endif /** === end UNO includes === **/ #ifndef _DBAUI_LINKEDDOCUMENTS_HXX_ @@ -173,6 +176,9 @@ #ifndef _COMPHELPER_INTERACTION_HXX_ #include <comphelper/interaction.hxx> #endif +#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX +#include <comphelper/namedvaluecollection.hxx> +#endif #ifndef _COMPHELPER_SEQUENCEASHASHMAP_HXX_ #include <comphelper/sequenceashashmap.hxx> #endif @@ -210,6 +216,7 @@ using namespace com::sun::star::frame; using namespace com::sun::star::ucb; using namespace ::com::sun::star::sdb; +using namespace ::com::sun::star::document; using namespace ::comphelper; using namespace ::cppu; @@ -1146,6 +1153,7 @@ private: Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop > m_xDesktop; + Reference< XInteractionHandler > m_xInteractionHandler; ::rtl::OUString m_sURL; OAsyncronousLink m_aAsyncCaller; @@ -1173,6 +1181,11 @@ { m_xDesktop.set( _rxORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); + m_xInteractionHandler.set( + _rxORB->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.InteractionHandler" ) ) + ), + UNO_QUERY_THROW ); } catch( const Exception& ) { @@ -1202,8 +1215,20 @@ try { if ( m_xFrameLoader.is() ) + { + ::comphelper::NamedValueCollection aLoadArgs; + aLoadArgs.put( "InteractionHandler", m_xInteractionHandler ); + aLoadArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); + + Sequence< PropertyValue > aLoadArgPV; + aLoadArgs >>= aLoadArgPV; + m_xFrameLoader->loadComponentFromURL( m_sURL, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), FrameSearchFlag::ALL, Sequence<PropertyValue >() ); + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_default" ) ), + FrameSearchFlag::ALL, + aLoadArgPV + ); + } } catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
