User: hr Date: 2007-08-06 10:47:25+0000 Modified: dba/reportdesign/source/filter/xml/xmlExport.cxx
Log: #i10000#,#i80354#: remove merge conflict resolution error File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.4&r2=1.5 Delta lines: +3 -85 -------------------- --- xmlExport.cxx 2007-08-03 09:56:28+0000 1.4 +++ xmlExport.cxx 2007-08-06 10:47:23+0000 1.5 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2007/08/03 09:56:28 $ + * last change: $Author: hr $ $Date: 2007/08/06 10:47:23 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1765,88 +1765,6 @@ } } } -// ----------------------------------------------------------------------------- -void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xGroups) -{ - if ( _xGroups.is() ) - { - uno::Reference< XFunctions> xFunctions = _xGroups->getReportDefinition()->getFunctions(); - const sal_Int32 nCount = _xGroups->getCount(); - for (sal_Int32 i = 0; i < nCount; ++i) - { - uno::Reference< XGroup> xGroup(_xGroups->getByIndex(i),uno::UNO_QUERY_THROW); - const ::sal_Int16 nGroupOn = xGroup->getGroupOn(); - if ( nGroupOn != report::GroupOn::DEFAULT ) - { - uno::Reference< XFunction> xFunction = xFunctions->createFunction(); - ::rtl::OUString sFunction,sPrefix,sPostfix; - ::rtl::OUString sExpression = xGroup->getExpression(); - switch(nGroupOn) - { - case report::GroupOn::PREFIX_CHARACTERS: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LEFT")); - sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(";")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); - break; - case report::GroupOn::YEAR: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YEAR")); - break; - case report::GroupOn::QUARTAL: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH")); - sPostfix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/4")); - break; - case report::GroupOn::MONTH: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MONTH")); - break; - case report::GroupOn::WEEK: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WEEK")); - break; - case report::GroupOn::DAY: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DAY")); - break; - case report::GroupOn::HOUR: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HOUR")); - break; - case report::GroupOn::MINUTE: - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MINUTE")); - break; - case report::GroupOn::INTERVAL: - { - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INT")); - uno::Reference< XFunction> xCountFunction = xFunctions->createFunction(); - xCountFunction->setInitialFormula(beans::Optional< ::rtl::OUString>(sal_True,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1")))); - ::rtl::OUString sCountName = sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_count_")) + sExpression; - xCountFunction->setName(sCountName); - xCountFunction->setFormula(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[")) + sCountName + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("] + 1"))); - exportFunction(xCountFunction); - sExpression = sCountName; - sPrefix = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" / ")) + ::rtl::OUString::valueOf(xGroup->getGroupInterval()); - } - break; - default: - ; - } - if ( sFunction.getLength() ) - { - - xFunction->setName(sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("_")) + sExpression); - sFunction = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:")) + sFunction; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("([")); - sFunction += sExpression; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]")); - - if ( sPrefix.getLength() ) - sFunction += sPrefix; - sFunction += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); - if ( sPostfix.getLength() ) - sFunction += sPostfix; - xFunction->setFormula(sFunction); - exportFunction(xFunction); - m_aGroupFunctionMap.insert(TGroupFunctionMap::value_type(xGroup,xFunction)); - } - } - } - } -} // ----------------------------------------------------------------------------- }// rptxml --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
