Tag: cws_src680_reportdesign01 User: oj Date: 2007-10-16 06:09:02+0000 Modified: dba/reportdesign/source/filter/xml/xmlCell.cxx dba/reportdesign/source/filter/xml/xmlColumn.cxx dba/reportdesign/source/filter/xml/xmlComponent.cxx dba/reportdesign/source/filter/xml/xmlControlProperty.cxx dba/reportdesign/source/filter/xml/xmlEnums.hxx dba/reportdesign/source/filter/xml/xmlExport.cxx dba/reportdesign/source/filter/xml/xmlFixedContent.cxx dba/reportdesign/source/filter/xml/xmlFormatCondition.cxx dba/reportdesign/source/filter/xml/xmlFormattedField.cxx dba/reportdesign/source/filter/xml/xmlFunction.cxx dba/reportdesign/source/filter/xml/xmlImage.cxx dba/reportdesign/source/filter/xml/xmlMasterFields.cxx dba/reportdesign/source/filter/xml/xmlReport.cxx dba/reportdesign/source/filter/xml/xmlReportElement.cxx dba/reportdesign/source/filter/xml/xmlRow.cxx dba/reportdesign/source/filter/xml/xmlSection.cxx dba/reportdesign/source/filter/xml/xmlTable.cxx dba/reportdesign/source/filter/xml/xmlfilter.cxx
Log: #i82574# import print condition for section File Changes: Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlCell.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlCell.cxx?r1=1.4&r2=1.4.6.1 Delta lines: +5 -5 ------------------- --- xmlCell.cxx 2007-09-26 14:20:36+0000 1.4 +++ xmlCell.cxx 2007-10-16 06:08:57+0000 1.4.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlCell.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:20:36 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -134,7 +134,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -169,7 +169,7 @@ Reference<XMultiServiceFactory> xFactor(rImport.GetModel(),uno::UNO_QUERY); static const ::rtl::OUString s_sStringConcat(RTL_CONSTASCII_USTRINGPARAM(" & ")); - sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); + const sal_uInt16 nToken = rTokenMap.Get( _nPrefix, _rLocalName ); switch( nToken ) { case XML_TOK_FIXED_CONTENT: File [changed]: xmlColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlColumn.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlColumn.cxx 2007-09-26 14:20:51+0000 1.3 +++ xmlColumn.cxx 2007-10-16 06:08:57+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlColumn.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:20:51 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlComponent.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlComponent.cxx?r1=1.2&r2=1.2.28.1 Delta lines: +3 -3 ------------------- --- xmlComponent.cxx 2007-07-09 11:56:17+0000 1.2 +++ xmlComponent.cxx 2007-10-16 06:08:57+0000 1.2.28.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlComponent.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.28.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:17 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -124,7 +124,7 @@ ::rtl::OUString sLocalName; const ::rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const ::rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlControlProperty.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlControlProperty.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlControlProperty.cxx 2007-09-26 14:21:17+0000 1.3 +++ xmlControlProperty.cxx 2007-10-16 06:08:57+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlControlProperty.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:21:17 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,7 +107,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlEnums.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlEnums.hxx?r1=1.2.28.1&r2=1.2.28.2 Delta lines: +3 -3 ------------------- --- xmlEnums.hxx 2007-09-20 10:13:00+0000 1.2.28.1 +++ xmlEnums.hxx 2007-10-16 06:08:57+0000 1.2.28.2 @@ -6,9 +6,9 @@ * * $RCSfile: xmlEnums.hxx,v $ * - * $Revision: 1.2.28.1 $ + * $Revision: 1.2.28.2 $ * - * last change: $Author: oj $ $Date: 2007/09/20 10:13:00 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -86,7 +86,6 @@ { XML_TOK_SECTION_NAME, XML_TOK_TABLE, - XML_TOK_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_VISIBLE , XML_TOK_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_COLUMN , @@ -125,6 +124,7 @@ ,XML_TOK_NUMBER_ROWS_SPANNED ,XML_TOK_TEXT_STYLE_NAME ,XML_TOK_TRANSFORM + ,XML_TOK_CONDITIONAL_PRINT_EXPRESSION }; enum XMLReportElement { File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlExport.cxx?r1=1.5.20.4&r2=1.5.20.5 Delta lines: +4 -5 ------------------- --- xmlExport.cxx 2007-10-11 09:05:51+0000 1.5.20.4 +++ xmlExport.cxx 2007-10-16 06:08:58+0000 1.5.20.5 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.5.20.4 $ + * $Revision: 1.5.20.5 $ * - * last change: $Author: lla $ $Date: 2007/10/11 09:05:51 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1011,15 +1011,14 @@ else if ( xElement->supportsService(SERVICE_IMAGECONTROL) ) { eToken = XML_IMAGE; - Reference< XImageControl > xImageC(xElement,uno::UNO_QUERY); - ::rtl::OUString sTargetLocation = xImageC->getImageURL(); + ::rtl::OUString sTargetLocation = xImage->getImageURL(); if ( sTargetLocation.getLength() ) { sTargetLocation = GetRelativeReference(sTargetLocation); AddAttribute(XML_NAMESPACE_FORM, XML_IMAGE_DATA,sTargetLocation); } bExportData = sal_True; - if ( xImageC->getScaleImage() ) + if ( xImage->getScaleImage() ) AddAttribute(XML_NAMESPACE_REPORT, XML_SCALE, XML_TRUE ); } else if ( xReportDefinition.is() ) File [changed]: xmlFixedContent.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFixedContent.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +5 -5 ------------------- --- xmlFixedContent.cxx 2007-09-26 14:21:43+0000 1.3 +++ xmlFixedContent.cxx 2007-10-16 06:08:58+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFixedContent.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:21:43 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -186,7 +186,7 @@ Reference<XMultiServiceFactory> xFactor = m_rImport.getServiceFactory(); m_rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); + const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); switch( nToken ) { case XML_TOK_P: @@ -217,7 +217,7 @@ { if ( m_bInP ) { - Reference<XMultiServiceFactory> xFactor(m_rImport.GetModel(),uno::UNO_QUERY); + const Reference<XMultiServiceFactory> xFactor(m_rImport.GetModel(),uno::UNO_QUERY); Reference< XFixedText > xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY); OSL_ENSURE(xControl.is(),"Could not create FixedContent!"); m_xComponent = xControl.get(); File [changed]: xmlFormatCondition.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFormatCondition.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlFormatCondition.cxx 2007-09-26 14:22:07+0000 1.3 +++ xmlFormatCondition.cxx 2007-10-16 06:08:58+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFormatCondition.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:22:07 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -112,7 +112,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlFormattedField.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFormattedField.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlFormattedField.cxx 2007-09-26 14:22:20+0000 1.3 +++ xmlFormattedField.cxx 2007-10-16 06:08:58+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFormattedField.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:22:20 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -99,7 +99,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlFunction.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlFunction.cxx?r1=1.4&r2=1.4.6.1 Delta lines: +4 -4 ------------------- --- xmlFunction.cxx 2007-09-26 14:22:32+0000 1.4 +++ xmlFunction.cxx 2007-10-16 06:08:58+0000 1.4.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlFunction.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:22:32 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,7 +97,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); try { File [changed]: xmlImage.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlImage.cxx?r1=1.4&r2=1.4.6.1 Delta lines: +4 -4 ------------------- --- xmlImage.cxx 2007-09-26 14:22:44+0000 1.4 +++ xmlImage.cxx 2007-10-16 06:08:58+0000 1.4.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlImage.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:22:44 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,7 +94,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlMasterFields.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlMasterFields.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlMasterFields.cxx 2007-09-26 14:22:56+0000 1.3 +++ xmlMasterFields.cxx 2007-10-16 06:08:58+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlMasterFields.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:22:56 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -88,7 +88,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlReport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReport.cxx?r1=1.3.18.2&r2=1.3.18.3 Delta lines: +4 -4 ------------------- --- xmlReport.cxx 2007-10-15 07:50:47+0000 1.3.18.2 +++ xmlReport.cxx 2007-10-16 06:08:58+0000 1.3.18.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlReport.cxx,v $ * - * $Revision: 1.3.18.2 $ + * $Revision: 1.3.18.3 $ * - * last change: $Author: oj $ $Date: 2007/10/15 07:50:47 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -117,7 +117,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlReportElement.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlReportElement.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlReportElement.cxx 2007-09-26 14:23:21+0000 1.3 +++ xmlReportElement.cxx 2007-10-16 06:08:58+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlReportElement.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:23:21 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:58 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -96,7 +96,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlRow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlRow.cxx?r1=1.3&r2=1.3.6.1 Delta lines: +4 -4 ------------------- --- xmlRow.cxx 2007-09-26 14:23:46+0000 1.3 +++ xmlRow.cxx 2007-10-16 06:08:59+0000 1.3.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlRow.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:23:46 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -104,7 +104,7 @@ ::rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { File [changed]: xmlSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlSection.cxx?r1=1.4&r2=1.4.6.1 Delta lines: +4 -7 ------------------- --- xmlSection.cxx 2007-09-26 14:23:58+0000 1.4 +++ xmlSection.cxx 2007-10-16 06:08:59+0000 1.4.6.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlSection.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.6.1 $ * - * last change: $Author: hr $ $Date: 2007/09/26 14:23:58 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,7 +126,7 @@ rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -170,9 +170,6 @@ switch( rTokenMap.Get( _nPrefix, _rLocalName ) ) { - case XML_TOK_CONDITIONAL_PRINT_EXPRESSION: - pContext = new OXMLCondPrtExpr( rImport, _nPrefix, _rLocalName,xAttrList,m_xSection.get()); - break; case XML_TOK_TABLE: pContext = new OXMLTable( rImport, _nPrefix, _rLocalName,xAttrList,m_xSection); break; File [changed]: xmlTable.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlTable.cxx?r1=1.3.18.2&r2=1.3.18.3 Delta lines: +7 -5 ------------------- --- xmlTable.cxx 2007-10-15 07:51:50+0000 1.3.18.2 +++ xmlTable.cxx 2007-10-16 06:08:59+0000 1.3.18.3 @@ -4,9 +4,9 @@ * * $RCSfile: xmlTable.cxx,v $ * - * $Revision: 1.3.18.2 $ + * $Revision: 1.3.18.3 $ * - * last change: $Author: oj $ $Date: 2007/10/15 07:51:50 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -133,7 +133,7 @@ rtl::OUString sLocalName; const rtl::OUString sAttrName = _xAttrList->getNameByIndex( i ); const sal_uInt16 nPrefix = rMap.GetKeyByAttrName( sAttrName,&sLocalName ); - rtl::OUString sValue = _xAttrList->getValueByIndex( i ); + const rtl::OUString sValue = _xAttrList->getValueByIndex( i ); switch( rTokenMap.Get( nPrefix, sLocalName ) ) { @@ -149,7 +149,6 @@ case XML_TOK_KEEP_TOGETHER: m_xSection->setKeepTogether(sValue == s_sTRUE); break; - case XML_TOK_SECTION_NAME: m_xSection->setName(sValue); break; @@ -198,6 +197,9 @@ rImport.GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLRowColumn( rImport, _nPrefix, _rLocalName,xAttrList,this); break; + case XML_TOK_CONDITIONAL_PRINT_EXPRESSION: + pContext = new OXMLCondPrtExpr( rImport, _nPrefix, _rLocalName,xAttrList,m_xSection.get()); + break; default: break; } File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlfilter.cxx?r1=1.4.20.1&r2=1.4.20.2 Delta lines: +4 -5 ------------------- --- xmlfilter.cxx 2007-09-20 10:13:01+0000 1.4.20.1 +++ xmlfilter.cxx 2007-10-16 06:08:59+0000 1.4.20.2 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.4.20.1 $ + * $Revision: 1.4.20.2 $ * - * last change: $Author: oj $ $Date: 2007/09/20 10:13:01 $ + * last change: $Author: oj $ $Date: 2007/10/16 06:08:59 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -331,8 +331,7 @@ xDocStream = xStorage->openStreamElement( sStreamName, embed::ElementModes::READ ); uno::Reference< beans::XPropertySet > xProps( xDocStream, uno::UNO_QUERY_THROW ); - uno::Any aAny = xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ); - aAny >>= bEncrypted; + xProps->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Encrypted") ) ) >>= bEncrypted; } catch( packages::WrongPasswordException& ) { @@ -910,6 +909,7 @@ { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL , XML_TOK_COV_CELL }, { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_SPANNED , XML_TOK_NUMBER_COLUMNS_SPANNED }, { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_SPANNED , XML_TOK_NUMBER_ROWS_SPANNED }, + { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, XML_TOKEN_MAP_END }; m_pColumnTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -925,7 +925,6 @@ { { XML_NAMESPACE_TABLE, XML_TABLE , XML_TOK_TABLE }, { XML_NAMESPACE_TABLE, XML_NAME , XML_TOK_SECTION_NAME }, - { XML_NAMESPACE_REPORT, XML_CONDITIONAL_PRINT_EXPRESSION, XML_TOK_CONDITIONAL_PRINT_EXPRESSION}, { XML_NAMESPACE_REPORT, XML_VISIBLE , XML_TOK_VISIBLE }, { XML_NAMESPACE_REPORT, XML_FORCE_NEW_PAGE , XML_TOK_FORCE_NEW_PAGE }, { XML_NAMESPACE_REPORT, XML_FORCE_NEW_COLUMN , XML_TOK_FORCE_NEW_COLUMN }, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
