diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-28 09:57:01 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-28 10:00:49 +0100 |
commit | c7662eea858d4c1edc7f7600fa102cedc386417f (patch) | |
tree | 8d730cab26ebdc27587d9807be16e19ae0e28790 | |
parent | 8466894125b3bd5888fee85c33e1eec5d88206fe (diff) |
oox: whitespace fixes in WpsContext
Change-Id: Idcd4409a02a5b0dc5f7b67d2a482bf4fe30f579c
-rw-r--r-- | oox/source/shape/WpsContext.cxx | 108 | ||||
-rw-r--r-- | oox/source/shape/WpsContext.hxx | 8 |
2 files changed, 62 insertions, 54 deletions
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index c5d233eedcb6..44fc1e6715b2 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -14,11 +14,14 @@ using namespace com::sun::star; -namespace oox { namespace shape { +namespace oox +{ +namespace shape +{ WpsContext::WpsContext(ContextHandler2Helper& rParent, uno::Reference<drawing::XShape> xShape) : ContextHandler2(rParent), - mxShape(xShape) + mxShape(xShape) { mpShape.reset(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape")); mpShape->setWps(true); @@ -37,64 +40,65 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken { switch (getBaseToken(nElementToken)) { - case XML_wsp: - break; - case XML_cNvCnPr: - break; - case XML_cNvSpPr: - break; - case XML_spPr: - return new oox::drawingml::ShapePropertiesContext(*this, *mpShape); - break; - case XML_style: - return new oox::drawingml::ShapeStyleContext(*this, *mpShape); - break; - case XML_bodyPr: - if (mxShape.is()) + case XML_wsp: + break; + case XML_cNvCnPr: + break; + case XML_cNvSpPr: + break; + case XML_spPr: + return new oox::drawingml::ShapePropertiesContext(*this, *mpShape); + break; + case XML_style: + return new oox::drawingml::ShapeStyleContext(*this, *mpShape); + break; + case XML_bodyPr: + if (mxShape.is()) + { + OptValue<OUString> oVert = rAttribs.getString(XML_vert); + if (oVert.has() && oVert.get() == "vert270") { - OptValue<OUString> oVert = rAttribs.getString(XML_vert); - if (oVert.has() && oVert.get() == "vert270") + // No support for this in core, work around by char rotation, as we do so for table cells already. + uno::Reference<text::XText> xText(mxShape, uno::UNO_QUERY); + uno::Reference<text::XTextCursor> xTextCursor = xText->createTextCursor(); + xTextCursor->gotoStart(false); + xTextCursor->gotoEnd(true); + uno::Reference<beans::XPropertyState> xPropertyState(xTextCursor, uno::UNO_QUERY); + beans::PropertyState aState = xPropertyState->getPropertyState("CharRotation"); + if (aState == beans::PropertyState_DEFAULT_VALUE) { - // No support for this in core, work around by char rotation, as we do so for table cells already. - uno::Reference<text::XText> xText(mxShape, uno::UNO_QUERY); - uno::Reference<text::XTextCursor> xTextCursor = xText->createTextCursor(); - xTextCursor->gotoStart(false); - xTextCursor->gotoEnd(true); - uno::Reference<beans::XPropertyState> xPropertyState(xTextCursor, uno::UNO_QUERY); - beans::PropertyState aState = xPropertyState->getPropertyState("CharRotation"); - if (aState == beans::PropertyState_DEFAULT_VALUE) - { - uno::Reference<beans::XPropertySet> xPropertySet(xTextCursor, uno::UNO_QUERY); - xPropertySet->setPropertyValue("CharRotation", uno::makeAny(sal_Int16(900))); - } + uno::Reference<beans::XPropertySet> xPropertySet(xTextCursor, uno::UNO_QUERY); + xPropertySet->setPropertyValue("CharRotation", uno::makeAny(sal_Int16(900))); } + } - // Handle inset attributes for Writer textframes. - sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns }; - boost::optional<sal_Int32> oInsets[4]; - for (size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i) - { - OptValue<OUString> oValue = rAttribs.getString(aInsets[i]); - if (oValue.has()) - oInsets[i] = oox::drawingml::GetCoordinate(oValue.get()); - } - OUString aProps[] = { OUString("LeftBorderDistance"), OUString("TopBorderDistance"), OUString("RightBorderDistance"), OUString("BottomBorderDistance") }; - uno::Reference<beans::XPropertySet> xPropertySet(mxShape, uno::UNO_QUERY); - for (size_t i = 0; i < SAL_N_ELEMENTS(aProps); ++i) - if (oInsets[i]) - xPropertySet->setPropertyValue(aProps[i], uno::makeAny(*oInsets[i])); + // Handle inset attributes for Writer textframes. + sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns }; + boost::optional<sal_Int32> oInsets[4]; + for (size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i) + { + OptValue<OUString> oValue = rAttribs.getString(aInsets[i]); + if (oValue.has()) + oInsets[i] = oox::drawingml::GetCoordinate(oValue.get()); } - break; - case XML_txbx: - mpShape->setServiceName("com.sun.star.text.TextFrame"); - break; - default: - SAL_WARN("oox", "WpsContext::createFastChildContext: unhandled element:" << getBaseToken(nElementToken)); - break; + OUString aProps[] = { OUString("LeftBorderDistance"), OUString("TopBorderDistance"), OUString("RightBorderDistance"), OUString("BottomBorderDistance") }; + uno::Reference<beans::XPropertySet> xPropertySet(mxShape, uno::UNO_QUERY); + for (size_t i = 0; i < SAL_N_ELEMENTS(aProps); ++i) + if (oInsets[i]) + xPropertySet->setPropertyValue(aProps[i], uno::makeAny(*oInsets[i])); + } + break; + case XML_txbx: + mpShape->setServiceName("com.sun.star.text.TextFrame"); + break; + default: + SAL_WARN("oox", "WpsContext::createFastChildContext: unhandled element:" << getBaseToken(nElementToken)); + break; } return 0; } -} } +} +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index b7f97f89faf5..aafc77a32a5e 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -13,7 +13,10 @@ #include "oox/core/contexthandler2.hxx" #include "oox/drawingml/shape.hxx" -namespace oox { namespace shape { +namespace oox +{ +namespace shape +{ /// Wps is the drawingML equivalent of v:shape. class WpsContext : public oox::core::ContextHandler2 @@ -32,7 +35,8 @@ protected: }; -} } +} +} #endif |