diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-03-01 19:06:15 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-02 17:56:14 +0100 |
| commit | b7381c519794b4959b1993e98ecb11e2ab0d518a (patch) | |
| tree | 70ac878524202cdd17097bb03afd015ecf193892 /oox/source/docprop | |
| parent | 54ca9821b2aec23224f4d5559fe6d656affdf315 (diff) | |
make more places aware of OOXML strict relations
Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442
Diffstat (limited to 'oox/source/docprop')
| -rw-r--r-- | oox/source/docprop/ooxmldocpropimport.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 1e5a392fffd0..51bd6d5c3925 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -131,12 +131,21 @@ void SAL_CALL DocumentPropertiesImport::importProperties( throw IllegalArgumentException(); Sequence< InputSource > aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "metadata/core-properties" ) ); + // OOXML strict + if( !aCoreStreams.hasElements() ) + aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE_STRICT( "metadata/core-properties" ) ); // MS Office seems to have a bug, so we have to do similar handling if( !aCoreStreams.hasElements() ) aCoreStreams = lclGetRelatedStreams( rxSource, CREATE_PACKAGE_RELATION_TYPE( "metadata/core-properties" ) ); Sequence< InputSource > aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "extended-properties" ) ); + // OOXML strict + if( !aExtStreams.hasElements() ) + aExtStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE_STRICT( "extended-properties" ) ); Sequence< InputSource > aCustomStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE( "custom-properties" ) ); + // OOXML strict + if( !aCustomStreams.hasElements() ) + aCustomStreams = lclGetRelatedStreams( rxSource, CREATE_OFFICEDOC_RELATION_TYPE_STRICT( "custom-properties" ) ); if( aCoreStreams.hasElements() || aExtStreams.hasElements() || aCustomStreams.hasElements() ) { |