diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 15:36:37 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2009-03-23 15:36:37 +0000 |
| commit | e0998491a09e682106574806eaf8274728817da6 (patch) | |
| tree | 54b5dba44665b81f4c5d938282af1ad343e25766 /xmloff | |
| parent | d9fc2ae555d5da6be68f8baec950b022d3a5a9f3 (diff) | |
CWS-TOOLING: integrate CWS dba31j_DEV300
2009-03-11 12:24:24 +0100 iha r269311 : #i100102# report donut charts crash on load
2009-03-11 10:44:35 +0100 oj r269302 : #i100102# export meta.xml
2009-03-11 07:35:03 +0100 oj r269296 : #i99686# not used anymore
2009-03-11 07:34:27 +0100 oj r269295 : #i99686# not used anymore
2009-03-11 07:33:57 +0100 oj r269294 : #i99686# change storage usage
2009-03-10 15:21:41 +0100 mav r269275 : #i99686# test additional scenario
2009-03-10 08:37:10 +0100 mav r269239 : #i100040# calculate the name length correctly
2009-03-10 08:25:16 +0100 mav r269236 : #i99686# workaround to prevent crash while disposing the hierarchical stream
2009-03-10 07:14:05 +0100 oj r269235 : #i99686# fix usage of storage api
2009-03-10 07:13:17 +0100 oj r269234 : #i99686# fix usage of storage api
2009-03-09 13:33:26 +0100 fs r269085 : #i100012#
2009-03-09 13:11:08 +0100 fs r269081 : #i100036# don't store sub documents which have not been touched
2009-03-09 11:21:17 +0100 fs r269070 : #i100040# don't silence errors in impl_storeToStorage_throw
2009-03-09 10:28:48 +0100 oj r269065 : #i100036# throw exception when no activeConnection exists
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 1650da2e3623..7915c9e4e8c1 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -613,18 +613,21 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: { bool bResult = false; ::rtl::OUString aGenerator( lcl_getGeneratorFromModel(xChartModel) ); + //if there is a meta stream at the chart object it was not written with an older OpenOffice version < 2.3 if( !aGenerator.getLength() ) { - //if there is no meta stream at the chart object it was not written with a newer OpenOffice version >= 2.3 - - //so it is sufficient to check now whether it was written by an OpenOffice version at all - //->check the meta information at the parent document + //if there is no meta stream at the chart object we need to check the version from the parent document + //and we need to check whether the document was created with OpenOffice.org at all uno::Reference< container::XChild > xChild( xChartModel, uno::UNO_QUERY ); if( xChild.is() ) { ::rtl::OUString aParentGenerator( lcl_getGeneratorFromModel( uno::Reference< frame::XModel >( xChild->getParent(), uno::UNO_QUERY) ) ); if( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org_project") ) ) != -1 ) - bResult= true; + { + sal_Int32 nBuilId = lcl_getBuildIDFromGenerator( aParentGenerator ); + if( nBuilId<=9161 ) //9161 is build id of OpenOffice.org 2.2.1 + bResult= true; + } else if( ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 ) || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 ) |