Tag: cws_src680_dba25
User: fs      
Date: 05/03/14 05:28:33

Modified:
 /dba/dbaccess/source/filter/xml/
  xmlfilter.cxx

Log:
 RESYNC: (1.7-1.8); FILE MERGED

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.50.2&r2=1.7.50.3
Delta lines:  +11 -7
--------------------
--- xmlfilter.cxx       9 Mar 2005 08:25:28 -0000       1.7.50.2
+++ xmlfilter.cxx       14 Mar 2005 13:28:31 -0000      1.7.50.3
@@ -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]

Reply via email to