From 3847de4b724f4f435bb68bceef9a5e187c3f363c Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 6 Sep 2013 12:09:45 +0200 Subject: 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 --- oox/source/vml/vmltextboxcontext.cxx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx index fbb701f67ca5..2720450698a2 100644 --- a/oox/source/vml/vmltextboxcontext.cxx +++ b/oox/source/vml/vmltextboxcontext.cxx @@ -226,14 +226,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; } -- cgit