User: kz      
Date: 2008-03-05 18:06:21+0000
Modified:
   dba/reportdesign/source/filter/xml/xmlSubDocument.hxx

Log:
 INTEGRATION: CWS rptchart01_DEV300 (1.2.70); FILE MERGED
 2008/02/13 07:12:30 oj 1.2.70.2: #i85225# impl sub-document
 2008/01/25 13:56:45 oj 1.2.70.1: #i85225# removed

File Changes:

Directory: /dba/reportdesign/source/filter/xml/
===============================================

File [changed]: xmlSubDocument.hxx
Url: 
http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlSubDocument.hxx?r1=1.2&r2=1.3
Delta lines:  +16 -15
---------------------
--- xmlSubDocument.hxx  2007-07-09 11:56:18+0000        1.2
+++ xmlSubDocument.hxx  2008-03-05 18:06:18+0000        1.3
@@ -38,37 +38,38 @@
 #ifndef RPT_XMLREPORTELEMENTBASE_HXX
 #include "xmlReportElementBase.hxx"
 #endif
-#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_
-#include <com/sun/star/report/XReportDefinition.hpp>
-#endif
+#include <com/sun/star/report/XReportComponent.hpp>
 #include <vector>
 
 namespace rptxml
 {
        class ORptFilter;
-       class OXMLSubDocument : public OXMLReportElementBase
+       class OXMLSubDocument : public OXMLReportElementBase, public 
IMasterDetailFieds
        {
-               ::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportDefinition > m_xComponent;
+               ::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent>   m_xComponent;
+        ::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent>  m_xFake;
         ::std::vector< ::rtl::OUString> m_aMasterFields;
         ::std::vector< ::rtl::OUString> m_aDetailFields;
+        sal_Int32       m_nCurrentCount;
+        bool            m_bContainsShape;
+
         OXMLSubDocument(const OXMLSubDocument&);
         void operator =(const OXMLSubDocument&);
+
+        virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
+                                       const ::rtl::OUString& rLocalName,
+                                       const ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
        public:
 
                OXMLSubDocument( ORptFilter& rImport
                     ,sal_uInt16 nPrfx
                                        ,const ::rtl::OUString& rLName
-                                       ,const 
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition 
>& _xComponent
+                                       ,const 
::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& 
_xComponent
                     ,OXMLTable* _pContainer);
                virtual ~OXMLSubDocument();
 
-        virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix,
-                                       const ::rtl::OUString& rLocalName,
-                                       const ::com::sun::star::uno::Reference< 
::com::sun::star::xml::sax::XAttributeList > & xAttrList );
-
         virtual void EndElement();
-
-        void addFieldPair(const ::std::pair< ::rtl::OUString,::rtl::OUString 
>& _aPair);
+        virtual void addMasterDetailPair(const ::std::pair< 
::rtl::OUString,::rtl::OUString >& _aPair);
        };
 // 
-----------------------------------------------------------------------------
 } // namespace rptxml




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to