[Libreoffice-commits] core.git: oox/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Dec 24 01:06:18 PST 2013
oox/source/shape/WpgContext.cxx | 54 +++++++++++++++++++++-------------------
oox/source/shape/WpgContext.hxx | 8 ++++-
2 files changed, 35 insertions(+), 27 deletions(-)
New commits:
commit 8a6d84fc1a926147884a9cbf234f86c6fb6f8583
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Dec 24 10:05:02 2013 +0100
oox: whitespace fixes in WpgContext
Change-Id: I4b4a3f9c4ec2c49c178d2e6a175b3dc307295e97
diff --git a/oox/source/shape/WpgContext.cxx b/oox/source/shape/WpgContext.cxx
index c8ca505..39bb470 100644
--- a/oox/source/shape/WpgContext.cxx
+++ b/oox/source/shape/WpgContext.cxx
@@ -13,10 +13,13 @@
using namespace com::sun::star;
-namespace oox { namespace shape {
+namespace oox
+{
+namespace shape
+{
WpgContext::WpgContext(ContextHandler2Helper& rParent)
-: ContextHandler2(rParent)
+ : ContextHandler2(rParent)
{
mpShape.reset(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
}
@@ -34,32 +37,33 @@ oox::core::ContextHandlerRef WpgContext::onCreateContext(sal_Int32 nElementToken
{
switch (getBaseToken(nElementToken))
{
- case XML_wgp:
- break;
- case XML_cNvGrpSpPr:
- break;
- case XML_grpSpPr:
- return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
- break;
- case XML_wsp:
- {
- oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape"));
- return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
- }
- break;
- case XML_grpSp:
- {
- oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
- return new oox::drawingml::ShapeGroupContext(*this, mpShape, pShape);
- }
- break;
- default:
- SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken));
- break;
+ case XML_wgp:
+ break;
+ case XML_cNvGrpSpPr:
+ break;
+ case XML_grpSpPr:
+ return new oox::drawingml::ShapePropertiesContext(*this, *mpShape);
+ break;
+ case XML_wsp:
+ {
+ oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.CustomShape"));
+ return new oox::drawingml::ShapeContext(*this, mpShape, pShape);
+ }
+ break;
+ case XML_grpSp:
+ {
+ oox::drawingml::ShapePtr pShape(new oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
+ return new oox::drawingml::ShapeGroupContext(*this, mpShape, pShape);
+ }
+ break;
+ default:
+ SAL_WARN("oox", "WpgContext::createFastChildContext: unhandled element: " << getBaseToken(nElementToken));
+ break;
}
return 0;
}
-} }
+}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index 3a60986..444efe4 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -13,7 +13,10 @@
#include "oox/core/contexthandler2.hxx"
#include "oox/drawingml/shape.hxx"
-namespace oox { namespace shape {
+namespace oox
+{
+namespace shape
+{
/// Wpg is the drawingML equivalent of v:group.
class WpgContext : public oox::core::ContextHandler2
@@ -31,7 +34,8 @@ protected:
};
-} }
+}
+}
#endif
More information about the Libreoffice-commits
mailing list