Tag: cws_src680_odbmacros2 User: fs Date: 2008-03-06 09:59:20+0000 Modified: dba/dbaccess/source/ui/browser/unodatbr.cxx
Log: manual resync to 1.195 to prevent conflicts at integration time File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: unodatbr.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/unodatbr.cxx?r1=1.192.2.13&r2=1.192.2.14 Delta lines: +19 -7 -------------------- --- unodatbr.cxx 2008-02-18 13:56:24+0000 1.192.2.13 +++ unodatbr.cxx 2008-03-06 09:59:17+0000 1.192.2.14 @@ -4,9 +4,9 @@ * * $RCSfile: unodatbr.cxx,v $ * - * $Revision: 1.192.2.13 $ + * $Revision: 1.192.2.14 $ * - * last change: $Author: fs $ $Date: 2008/02/18 13:56:24 $ + * last change: $Author: fs $ $Date: 2008/03/06 09:59:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,6 +102,7 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/XFlushable.hpp> #include <com/sun/star/sdb/XDocumentDataSource.hpp> +#include <com/sun/star/document/MacroExecMode.hpp> /** === end UNO includes === **/ #include <comphelper/extract.hxx> @@ -3257,14 +3258,25 @@ if ( xDocumentModel.is() ) { - Sequence<PropertyValue > aArgs(1); - aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")); - aArgs[0].Value <<= xDocumentModel; + Reference< XInteractionHandler > xInteractionHandler( + getORB()->createInstance( + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.InteractionHandler" ) ) ), + UNO_QUERY ); + OSL_ENSURE( xInteractionHandler.is(), "SbaTableQueryBrowser::implAdministrate: no interaction handler available!" ); + + ::comphelper::NamedValueCollection aLoadArgs; + aLoadArgs.put( "Model", xDocumentModel ); + aLoadArgs.put( "InteractionHandler", xInteractionHandler ); + aLoadArgs.put( "MacroExecutionMode", MacroExecMode::USE_CONFIG ); + + Sequence< PropertyValue > aLoadArgPV; + aLoadArgs >>= aLoadArgPV; + xFrameLoader->loadComponentFromURL( xDocumentModel->getURL(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_default")), nFrameSearchFlag, - aArgs + aLoadArgPV ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
