Tag: cws_dev300_rptchart02 User: oj Date: 2008-05-21 11:57:09+0000 Removed: dba/reportdesign/util/defs/wntmsci11
Modified: dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java dba/reportdesign/source/filter/xml/xmlStyleImport.cxx Log: RESYNC: (1.4-1.5); FILE MERGED File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/ ====================================================== File [changed]: SDBCReportDataFactory.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/SDBCReportDataFactory.java?r1=1.3.4.5&r2=1.3.4.6 Delta lines: +3 -3 ------------------- --- SDBCReportDataFactory.java 2008-05-20 08:15:46+0000 1.3.4.5 +++ SDBCReportDataFactory.java 2008-05-21 11:56:37+0000 1.3.4.6 @@ -400,7 +400,6 @@ final XSingleSelectQueryComposer composer = tools.getComposer(commandType, command); if (composer != null) { - // get old parameter count final XParametersSupplier paraSup = (XParametersSupplier) UnoRuntime.queryInterface(XParametersSupplier.class, composer); if (paraSup != null) @@ -547,3 +546,4 @@ rowSetProp.setPropertyValue("Order", order.toString()); } } + Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/ ================================================================================= File [changed]: SpreadsheetRawReportTarget.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/output/spreadsheet/SpreadsheetRawReportTarget.java?r1=1.5.4.6&r2=1.5.4.7 Delta lines: +3 -3 ------------------- --- SpreadsheetRawReportTarget.java 2008-04-25 06:37:59+0000 1.5.4.6 +++ SpreadsheetRawReportTarget.java 2008-05-21 11:56:42+0000 1.5.4.7 @@ -655,7 +655,7 @@ return; } - if (OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType)) + if ( !paragraphHandled && OfficeNamespaces.TEXT_NS.equals(namespace) && OfficeToken.P.equals(elementType)) { if (!paragraphHandled) { Directory: /dba/reportdesign/source/filter/xml/ =============================================== File [changed]: xmlStyleImport.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/filter/xml/xmlStyleImport.cxx?r1=1.5.2.1&r2=1.5.2.2 Delta lines: +4 -3 ------------------- --- xmlStyleImport.cxx 2008-05-16 10:01:31+0000 1.5.2.1 +++ xmlStyleImport.cxx 2008-05-21 11:56:46+0000 1.5.2.2 @@ -130,9 +130,10 @@ if ( pMyStyles ) pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles-> FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True)); - else + else { DBG_ERROR("not possible to get style"); } + } if ( pStyle ) { m_nNumberFormat = pStyle->GetKey(); Directory: /dba/reportdesign/util/defs/ ======================================= File [removed]: wntmsci11 --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
