diff options
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/inc/ReportControlModel.hxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlEnums.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlExport.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlReportElement.cxx | 8 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlfilter.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index c327cfc3f754..43a8f73f89ca 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -100,7 +100,7 @@ namespace reportdesign ,aComponent(_xContext) ,m_pOwner(_pOwner) ,m_rMutex(_rMutex) - ,bPrintWhenGroupChange(sal_False) + ,bPrintWhenGroupChange(sal_True) {} // XContainer diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 120c153aa13b..53df992246ea 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -116,9 +116,9 @@ namespace rptxml }; enum XMLReportElement { - XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE + XML_TOK_PRINT_WHEN_GROUP_CHANGE ,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION - ,XML_TOK_PRINT_REPEATED_VALUES + ,XML_TOK_PRINT_REPEATED_VALUES ,XML_TOK_COMPONENT ,XML_TOK_FORMATCONDITION }; diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index f6379026a3bb..df6a24eae2ee 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -472,7 +472,7 @@ void ORptExport::exportReportElement(const Reference<XReportControlModel>& _xRep { OSL_ENSURE(_xReportElement.is(),"_xReportElement is NULL -> GPF"); if ( _xReportElement->getPrintWhenGroupChange() ) - AddAttribute(XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE, XML_TRUE ); + AddAttribute(XML_NAMESPACE_REPORT, XML_PRINT_WHEN_GROUP_CHANGE, XML_TRUE ); if ( !_xReportElement->getPrintRepeatedValues() ) AddAttribute(XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES,XML_FALSE); diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index c857e8af7a18..2c4d6c893feb 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -55,18 +55,18 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, { for(sal_Int16 i = 0; i < nLength; ++i) { - ::rtl::OUString sLocalName; + ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { - case XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE: + case XML_TOK_PRINT_WHEN_GROUP_CHANGE: m_xComponent->setPrintWhenGroupChange(s_sTRUE == sValue); break; - case XML_TOK_PRINT_REPEATED_VALUES: - m_xComponent->setPrintRepeatedValues(sValue == s_sTRUE ? sal_True : sal_False); + case XML_TOK_PRINT_REPEATED_VALUES: + m_xComponent->setPrintRepeatedValues(sValue == s_sTRUE); break; default: break; diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 2854a66ee6f4..a3d0cc7a312f 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -820,7 +820,7 @@ const SvXMLTokenMap& ORptFilter::GetReportElementElemTokenMap() const static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_REPORT, XML_PRINT_REPEATED_VALUES ,XML_TOK_PRINT_REPEATED_VALUES }, - { XML_NAMESPACE_REPORT, XML_PRINT_ONLY_WHEN_GROUP_CHANGE,XML_TOK_PRINT_ONLY_WHEN_GROUP_CHANGE }, + { XML_NAMESPACE_REPORT, XML_PRINT_WHEN_GROUP_CHANGE ,XML_TOK_PRINT_WHEN_GROUP_CHANGE }, { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION,XML_TOK_REP_CONDITIONAL_PRINT_EXPRESSION }, { XML_NAMESPACE_REPORT, XML_REPORT_COMPONENT ,XML_TOK_COMPONENT }, { XML_NAMESPACE_REPORT, XML_FORMAT_CONDITION ,XML_TOK_FORMATCONDITION }, |