diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-06-21 15:02:47 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-06-21 15:09:26 +0200 |
| commit | f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2 (patch) | |
| tree | 05ef9c9408a6cb9a937956762abc0ae36284fe9c /writerfilter | |
| parent | Remove commented out code (diff) | |
| download | core-f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2.tar.gz core-f837c4288cdae4921b3fb6747ba2e2cd5ce2dcd2.zip | |
n#758883 oox: anchor vml shapes without anchor info as at-character
w10:wrap was originally arrived to
writerfilter::dmapper::WrapHandler::lcl_attribute(), but
writerfilter::dmapper::DomainMapper_Impl::PushShapeContext() was called
already and set the anchor type. Fix this, then we can set a a suitable
anchor type in lcl_SetAnchorType() based on the type model.
Change-Id: Ib411450b10f29f814bc13d81eaec434971b2e52a
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index 0724c659f4ec..6efa44c4e671 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -2241,7 +2241,12 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext bool bInNamespaces = mMyNamespaces.find(nNameSpace) != mMyNamespaces.end(); bool bInTokens = mMyTokens.find( Element ) != mMyTokens.end( ); - if ( bInNamespaces ) + + // We have methods to _add_ individual tokens or whole namespaces to be + // processed by writerfilter (instead of oox), but we have no method to + // filter out a single token. Just hardwire the wrap token here till we + // need a more generic solution. + if ( bInNamespaces && Element != static_cast<sal_Int32>(NS_vml_wordprocessingDrawing | OOXML_wrap) ) xResult.set(OOXMLFactory::getInstance()->createFastChildContextFromStart(this, Element)); else if (mxContext.is()) { |