diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-06 12:09:45 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-09-06 19:37:11 +0200 |
commit | 33439c566e4c9cc2637c49ac729b86a57410fa48 (patch) | |
tree | 60434e63bd5f51f5c70f3d84c3e6e7eff7bd3cb2 /oox/source | |
parent | 0e757616f5188a4675933e44b983deecc0b44898 (diff) |
bnc#779642 VML import: import result of sdt fields
We can't have e.g. placeholder fields on drawinglayer rectangles, but at
least the result of the field is now imported.
Change-Id: I135f205c4231645f11f824495993c4dbea4135ed
(cherry picked from commit 3847de4b724f4f435bb68bceef9a5e187c3f363c)
Diffstat (limited to 'oox/source')
-rw-r--r-- | oox/source/vml/vmltextboxcontext.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index c28e97d92294..e176db441abc 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -218,14 +218,19 @@ ContextHandlerRef TextBoxContext::onCreateContext( sal_Int32 nElement, const Att if (nElement == OOX_TOKEN(doc, p)) return this; break; case OOX_TOKEN(doc, p): + case OOX_TOKEN(doc, sdtContent): if (nElement == OOX_TOKEN(doc, r)) return new TextPortionContext( *this, mrTextBox, maParagraph, TextFontModel(), nElement, rAttribs ); else return this; break; case OOX_TOKEN(doc, pPr): + case OOX_TOKEN(doc, sdt): return this; break; + default: + SAL_INFO("oox", "unhandled 0x" << std::hex << getCurrentElement()); + break; } return 0; } |