summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-12-09 13:54:37 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-12-09 14:01:57 +0100
commit826d133ccfdf20bb9e317715c726c4a562674b0b (patch)
tree4831d5be254e3486090e6ba0782b4b94caa25a3a /oox
parentf5b3a728cec51cedc985e60bdd25f8f5484b7e14 (diff)
drawingml import: handle w:b (found in docx groupshape textboxes)
Change-Id: I105d068a6b8d454fac963cd30f6f812cf2b96170
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shapecontext.cxx2
-rw-r--r--oox/source/drawingml/textcharacterpropertiescontext.cxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index 7966482fe756..cf844d3ca276 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -114,6 +114,8 @@ ContextHandlerRef ShapeContext::onCreateContext( sal_Int32 aElementToken, const
mpShapePtr->setTextBody( TextBodyPtr(new TextBody) );
return new TextBodyPropertiesContext( *this, rAttribs, mpShapePtr->getTextBody()->getTextProperties() );
break;
+ case XML_txbx:
+ break;
default:
SAL_WARN("oox", "ShapeContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken));
break;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 12362b9b036a..d873c441dbec 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -133,6 +133,7 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
case OOX_TOKEN( doc, rFonts ):
break;
case OOX_TOKEN( doc, b ):
+ mrTextCharacterProperties.moBold = rAttribs.getBool(OOX_TOKEN( doc, val ), true);
break;
case OOX_TOKEN( doc, bCs ):
break;