User: hr Date: 2007-08-02 14:34:38+0000 Modified: dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: INTEGRATION: CWS rpt23fix01 (1.2.2); FILE MERGED 2007/07/12 12:59:57 oj 1.2.2.2: #i77832# #i77146# impl group on and interval 2007/07/11 10:31:01 oj 1.2.2.1: #i78377# reportdefinition now is a numberformatssupplier as ell File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.2&r2=1.3 Delta lines: +23 -12 --------------------- --- xmlfilter.cxx 2007-07-09 11:56:18+0000 1.2 +++ xmlfilter.cxx 2007-08-02 14:34:35+0000 1.3 @@ -557,13 +557,13 @@ if ( !m_xReportDefinition.is() ) return sal_False; - m_pReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); - if ( !m_pReportModel ) - return sal_False; - - if ( !xNumberFormatsSupplier.is() ) - xNumberFormatsSupplier = OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition); - SetNumberFormatsSupplier(xNumberFormatsSupplier); + //m_pReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); + //if ( !m_pReportModel ) + // return sal_False; + + //if ( !xNumberFormatsSupplier.is() ) + // xNumberFormatsSupplier = OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition); + //SetNumberFormatsSupplier(xNumberFormatsSupplier); uno::Reference<XComponent> xModel(GetModel(),UNO_QUERY); @@ -1040,8 +1040,9 @@ m_pReportModel = reportdesign::OReportDefinition::getSdrModel(m_xReportDefinition); OSL_ENSURE(m_pReportModel,"Report model is NULL!"); - uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier = OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition); - SetNumberFormatsSupplier(xNumberFormatsSupplier); + //uno::Reference< util::XNumberFormatsSupplier > xNumberFormatsSupplier = OXMLHelper::GetNumberFormatsSupplier(m_xReportDefinition); + //if ( xNumberFormatsSupplier.is() ) + // SetNumberFormatsSupplier(xNumberFormatsSupplier); } } // ----------------------------------------------------------------------------- @@ -1064,5 +1065,15 @@ SvXMLImport::endDocument(); } // ----------------------------------------------------------------------------- +void ORptFilter::removeFunction(const ::rtl::OUString& _sFunctionName) +{ + m_aFunctions.erase(_sFunctionName); +} +// ----------------------------------------------------------------------------- +void ORptFilter::insertFunction(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XFunction > & _xFunction) +{ + m_aFunctions.insert(TGroupFunctionMap::value_type(_xFunction->getName(),_xFunction)); +} +// ----------------------------------------------------------------------------- }// rptxml // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
