diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-02-28 10:39:56 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-03-25 11:37:12 +0200 |
| commit | f05659f0e32938d51d4331b9a0cf748b8da848c3 (patch) | |
| tree | e2cccbe41a8e6b978610a282737c7586b6bd8676 /oox/source/shape | |
| parent | 30c4cf81c3de3c9bac2692a9a156030b063cb663 (diff) | |
handle OOXML strict namespaces
Change-Id: I198862388426161e3f054a5f128639c59f3c9d24
support OOXML strict documents in Calc
Conflicts:
oox/source/core/relations.cxx
Change-Id: I277d76aeec28e173d913ccc1506464afe4d09c6d
import date cells from OOXML
Change-Id: Id0b9ec034d559d489ca4ee2d1d6aca1bdf1beb9d
no need to add another layer of macros
Change-Id: I49992559a7d10127d55dbf0c7e257c86619fd8d6
fix one more relation type for OOXML strict
Change-Id: Ia63309271ac225883540ca0453fc5da21844d3ad
make more places aware of OOXML strict relations
Change-Id: I292217537eb592cbad9af11f87402baa9f4cc442
fix strict namespace list generation
The two perl scripts were apparently only generating the same order by
luck. It did not work on all systems.
Change-Id: Ib83ee5c6572d3bae2e2ac1846850bd65303e7d43
allow OOXML strict relationships in writer
Conflicts:
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
Change-Id: I1c09280f68467748faedee19c4a66be3bc7d7aa3
make sure the two namespace lists are sorted the same way
Change-Id: I90b3182e10dbbfc8993010dd885509537d2fe537
fix OOXML strict chart import
Change-Id: I84a2fd575ced64d4774147063f13ebb8605c100f
add the xml strict namespaces to misc/namespaces.txt
Change-Id: Ie83b5c94f1f002851bff3b39b1d9b676a3e44aa1
Reviewed-on: https://gerrit.libreoffice.org/8515
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 8286def8ffe4..54fed81d0e91 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -246,7 +246,7 @@ void SAL_CALL ShapeContextHandler::startFastElement if (!msRelationFragmentPath.isEmpty()) { FragmentHandlerRef rFragmentHandler(new ShapeFragmentHandler(*mxFilterBase, msRelationFragmentPath)); - OUString aThemeFragmentPath = rFragmentHandler->getFragmentPathFromFirstType( CREATE_OFFICEDOC_RELATION_TYPE( "theme" ) ); + OUString aThemeFragmentPath = rFragmentHandler->getFragmentPathFromFirstTypeFromOfficeDoc( "theme" ); if(!aThemeFragmentPath.isEmpty()) { uno::Reference<xml::sax::XFastSAXSerializable> xDoc(mxFilterBase->importFragment(aThemeFragmentPath), uno::UNO_QUERY_THROW); |