diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-21 11:00:40 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-21 11:00:40 +0000 |
| commit | cc806cc2e4f074eccd40131f3413b1419ffe531f (patch) | |
| tree | 82c111b08e22e84055538ddc5cbd2961daa1d299 | |
| parent | 2579286223cea7ff67a38ebb1ead2296fb40cff5 (diff) | |
INTEGRATION: CWS chart29 (1.9.40); FILE MERGED
2008/07/14 13:31:00 iha 1.9.40.1: #i91636# Donuts from older version are loaded wrong
| -rw-r--r-- | xmloff/source/chart/SchXMLTools.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index a174f4e157..93fcbcb783 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: SchXMLTools.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -596,6 +596,14 @@ bool isDocumentGeneratedWithOpenOfficeOlderThan2_3( const uno::Reference< frame: ::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; + else if( + ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("OpenOffice.org 1") ) ) == 0 ) + || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 6") ) ) == 0 ) + || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarOffice 7") ) ) == 0 ) + || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 6") ) ) == 0 ) + || ( aParentGenerator.indexOf( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("StarSuite 7") ) ) == 0 ) + ) + bResult= true; } } return bResult; |