Tag: cws_src680_dba30 User: oj Date: 06/04/19 23:47:20 Modified: /dba/dbaccess/source/filter/xml/ dbloader2.cxx
Log: RESYNC: (1.17-1.18); FILE MERGED File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: dbloader2.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/dbloader2.cxx?r1=1.7.6.7&r2=1.7.6.8 Delta lines: +22 -11 --------------------- --- dbloader2.cxx 21 Mar 2006 18:25:20 -0000 1.7.6.7 +++ dbloader2.cxx 20 Apr 2006 06:47:17 -0000 1.7.6.8 @@ -230,12 +230,24 @@ try { ::comphelper::SequenceAsHashMap aTemp(Descriptor); + Reference< XInputStream > xInStream = aTemp.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputStream")), Reference< XInputStream >() ); + + Reference<XPropertySet> xProp; + if ( xInStream.is() ) + { + xProp.set(::comphelper::OStorageHelper::GetStorageFromInputStream(xInStream,m_xServiceFactory),UNO_QUERY); + } + else + { ::rtl::OUString sTemp = aTemp.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL")),::rtl::OUString()); if ( sTemp.getLength() ) { INetURLObject aURL(sTemp); - Reference<XPropertySet> xProp(::comphelper::OStorageHelper::GetStorageFromURL(sTemp,ElementModes::READ,m_xServiceFactory),UNO_QUERY); + xProp.set(::comphelper::OStorageHelper::GetStorageFromURL(sTemp,ElementModes::READ,m_xServiceFactory),UNO_QUERY); + } + } + if ( xProp.is() ) { ::rtl::OUString sMediaType; @@ -244,7 +256,6 @@ return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StarBase")); ::comphelper::disposeComponent(xProp); } - } // if ( sTemp.getLength() ) } catch(Exception&){} return ::rtl::OUString(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
