User: hr Date: 2007-08-02 14:33:03+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.hxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/12 12:59:57 oj 1.2.2.1: #i77832# #i77146# impl group on and interval File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.hxx?r1=1.2&r2=1.3 Delta lines: +8 -4 ------------------- --- xmlExport.hxx 2007-07-09 11:56:17+0000 1.2 +++ xmlExport.hxx 2007-08-02 14:33:01+0000 1.3 @@ -174,6 +174,7 @@ typedef ::std::vector< TCell > TRow; typedef ::std::vector< ::std::pair< sal_Bool, TRow > > TGrid; typedef ::std::map< Reference<XPropertySet> ,TGrid > TSectionsGrid; + typedef ::std::map< Reference<XGroup> ,Reference<XFunction> > TGroupFunctionMap; private: ::std::auto_ptr< TStringPair > m_aAutoIncrement; ::std::auto_ptr< TDelimiter > m_aDelimiter; @@ -183,6 +184,7 @@ TPropertyStyleMap m_aAutoStyleNames; TGridStyleMap m_aColumnStyleNames; TGridStyleMap m_aRowStyleNames; + TGroupFunctionMap m_aGroupFunctionMap; ::rtl::OUString m_sCharSet; ::rtl::OUString m_sTableStyle; @@ -206,6 +208,7 @@ void exportReport(const Reference<XReportDefinition>& _xReportDefinition); /// <element name="office:report"> void exportFunctions(const Reference<XIndexAccess>& _xFunctions); /// <ref name="rpt-function"/> + void exportFunction(const Reference< XFunction>& _xFunction); void exportMasterDetailFields(const Reference<XReportDefinition>& _xReportDefinition); void exportComponent(const Reference<XReportComponent>& _xReportComponent); void exportImagePosition(sal_Int16 _nImagePosition); @@ -225,6 +228,7 @@ void collectStyleNames(sal_Int32 _nFamily,const ::std::vector< sal_Int32>& _aSize, ORptExport::TStringVec& _rStyleNames); void exportParagraph(const Reference< XReportControlModel >& _xReportElement); bool exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const ::rtl::OUString& _sFormula); + void exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups); ::rtl::OUString convertFormula(const ::rtl::OUString& _sFormula); ::rtl::OUString implConvertAny(const Any& _rValue); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
