User: hr Date: 05/09/23 05:40:36 Modified: /dba/dbaccess/source/ui/misc/ linkeddocuments.cxx
Log: INTEGRATION: CWS dba201b (1.15.20); FILE MERGED 2005/09/21 09:58:51 oj 1.15.20.2: RESYNC: (1.15-1.16); FILE MERGED 2005/07/11 13:37:25 fs 1.15.20.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: linkeddocuments.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/linkeddocuments.cxx?r1=1.16&r2=1.17 Delta lines: +24 -8 -------------------- --- linkeddocuments.cxx 8 Sep 2005 16:14:53 -0000 1.16 +++ linkeddocuments.cxx 23 Sep 2005 12:40:33 -0000 1.17 @@ -184,6 +184,7 @@ //================================================================== //= OLinkedDocumentsAccess //================================================================== + DBG_NAME(OLinkedDocumentsAccess) //------------------------------------------------------------------ OLinkedDocumentsAccess::OLinkedDocumentsAccess(Window* _pDialogParent , const Reference< XMultiServiceFactory >& _rxORB @@ -197,10 +198,16 @@ ,m_xConnection(_xConnection) ,m_sDataSourceName(_sDataSourceName) { + DBG_CTOR(OLinkedDocumentsAccess,NULL); OSL_ENSURE(m_xORB.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid service factory!"); OSL_ENSURE(m_pDialogParent, "OLinkedDocumentsAccess::OLinkedDocumentsAccess: really need a dialog parent!"); } //------------------------------------------------------------------ + OLinkedDocumentsAccess::~OLinkedDocumentsAccess() + { + DBG_DTOR(OLinkedDocumentsAccess,NULL); + } + //------------------------------------------------------------------ void OLinkedDocumentsAccess::implDrop(const ::rtl::OUString& _rLinkName) { OSL_ENSURE(m_xDocumentContainer.is(), "OLinkedDocumentsAccess::OLinkedDocumentsAccess: invalid document container!"); @@ -280,22 +287,31 @@ aDesc[::svx::daCommand] <<= _rObjectName; if ( m_xConnection.is() ) aDesc[::svx::daConnection] <<= m_xConnection; + Sequence<Any> aSeq = aDesc.createAnySequence(); + sal_Int32 nPos = aSeq.getLength(); + aSeq.realloc(nPos+1); + PropertyValue aProp; + aProp.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentDefinition")); + aSeq[nPos] <<= aProp; Reference< XJobExecutor > xFormWizard; { WaitObject aWaitCursor( m_pDialogParent ); - xFormWizard.set(m_xORB->createInstanceWithArguments(::rtl::OUString::createFromAscii(_pWizardService),aDesc.createAnySequence()),UNO_QUERY); + xFormWizard.set(m_xORB->createInstanceWithArguments(::rtl::OUString::createFromAscii(_pWizardService),aSeq),UNO_QUERY); } if ( xFormWizard.is() ) { xFormWizard->trigger(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("start"))); - Reference<XPropertySet> xProp(xFormWizard,UNO_QUERY_THROW); + Reference<XPropertySet> xProp(xFormWizard,UNO_QUERY); + if ( xProp.is() ) + { Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); if ( xInfo->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Document"))) ) { _xDefinition.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentDefinition"))),UNO_QUERY); xRet.set(xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Document"))),UNO_QUERY); } + } } } catch(const Exception&) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
