User: vg Date: 05/03/10 08:41:53 Modified: /dba/dbaccess/source/filter/xml/ xmlfilter.cxx
Log: INTEGRATION: CWS dba24 (1.7.26); FILE MERGED 2005/02/18 12:44:42 oj 1.7.26.1: #i42460# changes for the separation of datasource and database document(model) 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.7&r2=1.8 Delta lines: +8 -4 ------------------- --- xmlfilter.cxx 17 Nov 2004 14:45:28 -0000 1.7 +++ xmlfilter.cxx 10 Mar 2005 16:41:50 -0000 1.8 @@ -65,7 +65,9 @@ #ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> #endif - +#ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ +#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> +#endif #ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" #endif @@ -394,8 +396,10 @@ OSL_ENSURE(xStorage.is(),"No Storage for read!"); if ( xStorage.is() ) { - Reference<XPropertySet> xProp(GetModel(),UNO_QUERY); - Reference< XNumberFormatsSupplier > xNum(xProp->getPropertyValue(PROPERTY_NUMBERFORMATSSUPPLIER),UNO_QUERY); + Reference<sdb::XOfficeDatabaseDocument> xOfficeDoc(GetModel(),UNO_QUERY_THROW); + m_xDataSource.set(xOfficeDoc->getDataSource(),UNO_QUERY_THROW); + OSL_ENSURE(m_xDataSource.is(),"DataSource is NULL!"); + Reference< XNumberFormatsSupplier > xNum(m_xDataSource->getPropertyValue(PROPERTY_NUMBERFORMATSSUPPLIER),UNO_QUERY); SetNumberFormatsSupplier(xNum); @@ -511,7 +515,7 @@ { Sequence<PropertyValue> aWindows; pIter->Value >>= aWindows; - Reference<XPropertySet> xProp(GetModel(),UNO_QUERY); + Reference<XPropertySet> xProp(getDataSource()); if ( xProp.is() ) xProp->setPropertyValue(PROPERTY_LAYOUTINFORMATION,makeAny(aWindows)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
