diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-09 13:54:37 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-09 14:01:57 +0100 |
| commit | 826d133ccfdf20bb9e317715c726c4a562674b0b (patch) | |
| tree | 4831d5be254e3486090e6ba0782b4b94caa25a3a | |
| parent | f5b3a728cec51cedc985e60bdd25f8f5484b7e14 (diff) | |
drawingml import: handle w:b (found in docx groupshape textboxes)
Change-Id: I105d068a6b8d454fac963cd30f6f812cf2b96170
| -rw-r--r-- | oox/source/drawingml/shapecontext.cxx | 2 | ||||
| -rw-r--r-- | oox/source/drawingml/textcharacterpropertiescontext.cxx | 1 | ||||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2 |
3 files changed, 5 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; diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index cc93d5b4aa05..5da974f35081 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -11,6 +11,7 @@ #if !defined(WNT) #include <com/sun/star/awt/XBitmap.hpp> +#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp> #include <com/sun/star/drawing/XControlShape.hpp> @@ -1614,6 +1615,7 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx") uno::Reference<text::XTextRange> xParagraph = getParagraphOfText(1, xText, "[Year]"); CPPUNIT_ASSERT_EQUAL(48.f, getProperty<float>(getRun(xParagraph, 1), "CharHeight")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0xffffff), getProperty<sal_Int32>(getRun(xParagraph, 1), "CharColor")); + CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(getRun(xParagraph, 1), "CharWeight")); CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xGroup->getByIndex(1), "TextVerticalAdjust")); } |