summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 12:40:55 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-08 14:51:19 +0200
commit80d44afd085c5f35e9f4698679885087318fc65d (patch)
treeb156e09b72cffc7879eff5d6c300bb8411b5f790 /drawinglayer
parentc94d7b8a9aafc51ce33e74c6102c9b54a07a6b16 (diff)
compact namespace in dbaccess..dtrans
Change-Id: Ie4b619dd19cc4d12d240759abea9c3ffdedd5c7e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93718 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/inc/emfplushelper.hxx2
-rw-r--r--drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx4
-rw-r--r--drawinglayer/inc/processor3d/defaultprocessor3d.hxx12
-rw-r--r--drawinglayer/inc/texture/texture3d.hxx4
-rw-r--r--drawinglayer/inc/wmfemfhelper.hxx2
-rw-r--r--drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx8
-rw-r--r--drawinglayer/source/processor2d/getdigitlanguage.hxx4
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx8
8 files changed, 22 insertions, 22 deletions
diff --git a/drawinglayer/inc/emfplushelper.hxx b/drawinglayer/inc/emfplushelper.hxx
index 929a0dc46e09..22b9acb60538 100644
--- a/drawinglayer/inc/emfplushelper.hxx
+++ b/drawinglayer/inc/emfplushelper.hxx
@@ -25,7 +25,7 @@
namespace emfplushelper { struct EmfPlusHelperData; }
namespace wmfemfhelper { class TargetHolders; }
-namespace drawinglayer { namespace geometry { class ViewInformation2D; }}
+namespace drawinglayer::geometry { class ViewInformation2D; }
class SvMemoryStream;
namespace emfplushelper
diff --git a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
index c2057db81f11..9a4d62cbc24f 100644
--- a/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
+++ b/drawinglayer/inc/primitive3d/sdrdecompositiontools3d.hxx
@@ -34,13 +34,13 @@ namespace basegfx {
class B2DVector;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrLineAttribute;
class SdrFillAttribute;
class Sdr3DObjectAttribute;
class FillGradientAttribute;
class SdrShadowAttribute;
-}}
+}
namespace drawinglayer
diff --git a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
index 2a8b179a1ba7..f23a826a669e 100644
--- a/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
+++ b/drawinglayer/inc/processor3d/defaultprocessor3d.hxx
@@ -31,13 +31,13 @@ namespace basegfx {
class B3DPolyPolygon;
}
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class SdrSceneAttribute;
class SdrLightingAttribute;
class MaterialAttribute3D;
-}}
+}
-namespace drawinglayer { namespace primitive3d {
+namespace drawinglayer::primitive3d {
class PolygonHairlinePrimitive3D;
class PolyPolygonMaterialPrimitive3D;
class GradientTexturePrimitive3D;
@@ -45,11 +45,11 @@ namespace drawinglayer { namespace primitive3d {
class BitmapTexturePrimitive3D;
class TransformPrimitive3D;
class ModifiedColorPrimitive3D;
-}}
+}
-namespace drawinglayer { namespace texture {
+namespace drawinglayer::texture {
class GeoTexSvx;
-}}
+}
namespace drawinglayer
diff --git a/drawinglayer/inc/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx
index b5ac6e514f04..47ef9ff450a1 100644
--- a/drawinglayer/inc/texture/texture3d.hxx
+++ b/drawinglayer/inc/texture/texture3d.hxx
@@ -24,9 +24,9 @@
#include <texture/texture.hxx>
#include <vcl/bitmapex.hxx>
-namespace drawinglayer { namespace primitive3d {
+namespace drawinglayer::primitive3d {
class HatchTexturePrimitive3D;
-}}
+}
namespace drawinglayer
{
diff --git a/drawinglayer/inc/wmfemfhelper.hxx b/drawinglayer/inc/wmfemfhelper.hxx
index ae8b8f16fb1f..214d2a5d785c 100644
--- a/drawinglayer/inc/wmfemfhelper.hxx
+++ b/drawinglayer/inc/wmfemfhelper.hxx
@@ -28,7 +28,7 @@
#include <memory>
// predefines
-namespace drawinglayer { namespace geometry { class ViewInformation2D; }}
+namespace drawinglayer::geometry { class ViewInformation2D; }
class GDIMetaFile;
namespace wmfemfhelper { class PropertyHolder; }
diff --git a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
index 2d355dd78dad..ba18f9ba3096 100644
--- a/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
+++ b/drawinglayer/source/drawinglayeruno/xprimitive2drenderer.hxx
@@ -26,12 +26,12 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-namespace com { namespace sun { namespace star {
+namespace com::sun::star {
namespace lang { class XMultiServiceFactory; }
namespace uno { class XInterface; }
-} } }
+}
-namespace drawinglayer { namespace unorenderer {
+namespace drawinglayer::unorenderer {
css::uno::Sequence<OUString>
XPrimitive2DRenderer_getSupportedServiceNames();
@@ -42,7 +42,7 @@ css::uno::Reference<css::uno::XInterface>
XPrimitive2DRenderer_createInstance(
css::uno::Reference<css::lang::XMultiServiceFactory> const &);
-} }
+}
#endif
diff --git a/drawinglayer/source/processor2d/getdigitlanguage.hxx b/drawinglayer/source/processor2d/getdigitlanguage.hxx
index 9ee4b5aaa5d4..c634321b36f9 100644
--- a/drawinglayer/source/processor2d/getdigitlanguage.hxx
+++ b/drawinglayer/source/processor2d/getdigitlanguage.hxx
@@ -14,12 +14,12 @@
#include <i18nlangtag/lang.h>
-namespace drawinglayer { namespace detail {
+namespace drawinglayer::detail {
/// Get digit language derived from SvtCTLOptions
LanguageType getDigitLanguage();
-} }
+}
#endif
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index ebb3046478e7..2bfa8d0f0a77 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -40,14 +40,14 @@ class Gradient;
class SvtGraphicFill;
class SvtGraphicStroke;
-namespace drawinglayer { namespace attribute {
+namespace drawinglayer::attribute {
class FillGradientAttribute;
class LineAttribute;
class StrokeAttribute;
class LineStartEndAttribute;
-}}
+}
-namespace drawinglayer { namespace primitive2d {
+namespace drawinglayer::primitive2d {
class GraphicPrimitive2D;
class ControlPrimitive2D;
class TextHierarchyFieldPrimitive2D;
@@ -67,7 +67,7 @@ namespace drawinglayer { namespace primitive2d {
class UnifiedTransparencePrimitive2D;
class TransparencePrimitive2D;
class StructureTagPrimitive2D;
-}}
+}
namespace basegfx {
class BColor;