diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 18:45:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-07-19 21:07:36 +0200 |
| commit | 1c4c096f7316f4541d57983ad3dee3827748d2f8 (patch) | |
| tree | 045e6dbba96704ad038c9c3e41970bc00c286d0a /oox/source/shape | |
| parent | e06cb5853f735e523f740dec82954c54cbe47f48 (diff) | |
compact namespace: oox
Change-Id: I9ea016adcec334437da45296ee325453347836ae
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99002
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox/source/shape')
| -rw-r--r-- | oox/source/shape/LockedCanvasContext.hxx | 5 | ||||
| -rw-r--r-- | oox/source/shape/WpgContext.hxx | 5 | ||||
| -rw-r--r-- | oox/source/shape/WpsContext.hxx | 16 |
3 files changed, 4 insertions, 22 deletions
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx index 68c8e27fad35..bf6766f36b79 100644 --- a/oox/source/shape/LockedCanvasContext.hxx +++ b/oox/source/shape/LockedCanvasContext.hxx @@ -13,9 +13,7 @@ #include <oox/core/fragmenthandler2.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace oox -{ -namespace shape +namespace oox::shape { /// Locked canvas is kind of a container for drawingml shapes: it can even contain group shapes. class LockedCanvasContext final : public oox::core::FragmentHandler2 @@ -33,7 +31,6 @@ private: oox::drawingml::ShapePtr mpShape; }; } -} #endif diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx index 1b85cd4ec885..c4b511a923d3 100644 --- a/oox/source/shape/WpgContext.hxx +++ b/oox/source/shape/WpgContext.hxx @@ -13,9 +13,7 @@ #include <oox/core/fragmenthandler2.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace oox -{ -namespace shape +namespace oox::shape { /// Wpg is the drawingML equivalent of v:group. class WpgContext final : public oox::core::FragmentHandler2 @@ -33,7 +31,6 @@ private: oox::drawingml::ShapePtr mpShape; }; } -} #endif diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx index c5a6565a58fc..1cb6106324da 100644 --- a/oox/source/shape/WpsContext.hxx +++ b/oox/source/shape/WpsContext.hxx @@ -14,23 +14,12 @@ #include <oox/drawingml/shapecontext.hxx> #include <oox/drawingml/drawingmltypes.hxx> -namespace com -{ -namespace sun -{ -namespace star -{ -namespace drawing +namespace com::sun::star::drawing { class XShape; } -} -} -} -namespace oox -{ -namespace shape +namespace oox::shape { /// Wps is the drawingML equivalent of v:shape. class WpsContext final : public oox::drawingml::ShapeContext @@ -49,7 +38,6 @@ private: css::uno::Reference<css::drawing::XShape> mxShape; }; } -} #endif |