From c53dd7ea947e0233d98edd3e5d2f07c65ea61f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolnai=20Tam=C3=A1s?= Date: Mon, 3 Feb 2014 17:19:25 +0100 Subject: [PATCH] drawingML import: capitalization inside group shape There are two types of capitalization in DOCX: -uppercase: -smallcaps: Change-Id: I6a5d238bed68aa3fd3478a77cf1942f009480eb6 --- .../textcharacterpropertiescontext.cxx | 17 ++++++++++++++++- .../data/dml-groupshape-capitalization.docx | Bin 0 -> 17676 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 15 +++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlimport/data/dml-groupshape-capitalization.docx diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 36bb46536f0b..36bd255455df 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -63,7 +63,6 @@ TextCharacterPropertiesContext::TextCharacterPropertiesContext( mrTextCharacterProperties.moCaseMap = rAttribs.getToken( XML_cap ); /* TODO / unhandled so far: - XML_cap A_TOKEN( kern ) XML_altLang A_TOKEN( kumimoji ) @@ -155,6 +154,22 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl break; case OOX_TOKEN( doc, szCs ): break; + case OOX_TOKEN( doc, caps ): + { + if( rAttribs.getBool(OOX_TOKEN( doc, val ), true) ) + mrTextCharacterProperties.moCaseMap = XML_all; + else + mrTextCharacterProperties.moCaseMap = XML_none; + } + break; + case OOX_TOKEN( doc, smallCaps ): + { + if( rAttribs.getBool(OOX_TOKEN( doc, val ), true) ) + mrTextCharacterProperties.moCaseMap = XML_small; + else + mrTextCharacterProperties.moCaseMap = XML_none; + } + break; default: SAL_WARN("oox", "TextCharacterPropertiesContext::onCreateContext: unhandled element: " << getBaseToken(aElementToken)); break; diff --git a/sw/qa/extras/ooxmlimport/data/dml-groupshape-capitalization.docx b/sw/qa/extras/ooxmlimport/data/dml-groupshape-capitalization.docx new file mode 100644 index 0000000000000000000000000000000000000000..67fd21f64d14183ae382f2d7e5cebf9af1f3bef6 GIT binary patch literal 17676 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 `N)f*3z0NzrvTRrl%lpCF6MYZ9mVfacj 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 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index d432f80fa2b9..d1035eb1217a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -1773,6 +1774,20 @@ DECLARE_OOXMLIMPORT_TEST(testRelSizeRound, "rel-size-round.docx") CPPUNIT_ASSERT_EQUAL(sal_Int16(10), getProperty(getShape(1), "RelativeHeight")); } +DECLARE_OOXMLIMPORT_TEST(testDMLGroupShapeCapitalization, "dml-groupshape-capitalization.docx") +{ + // Capitalization inside a group shape was not imported + uno::Reference xGroup(getShape(1), uno::UNO_QUERY); + uno::Reference xText = uno::Reference(xGroup->getByIndex(1), uno::UNO_QUERY)->getText(); + // 2nd line is written with uppercase letters + CPPUNIT_ASSERT_EQUAL(style::CaseMap::UPPERCASE, getProperty(getRun(getParagraphOfText(2, xText), 1), "CharCaseMap")); + // 3rd line has no capitalization + CPPUNIT_ASSERT_EQUAL(style::CaseMap::NONE, getProperty(getRun(getParagraphOfText(3, xText), 1), "CharCaseMap")); + // 4th line has written with small capitals + CPPUNIT_ASSERT_EQUAL(style::CaseMap::SMALLCAPS, getProperty(getRun(getParagraphOfText(4, xText), 1), "CharCaseMap")); + // 5th line has no capitalization + CPPUNIT_ASSERT_EQUAL(style::CaseMap::NONE, getProperty(getRun(getParagraphOfText(5, xText), 1), "CharCaseMap")); +} #endif CPPUNIT_PLUGIN_IMPLEMENT();