[Libreoffice-commits] core.git: Branch 'feature/drawinglayercore' - 2 commits - drawinglayer/source

[Tomaž Vajngerl (via logerrit)]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx |   27 ++-----------
 1 file changed, 6 insertions(+), 21 deletions(-)

New commits:
commit 572129f56d8680e6b6b963471b0d95a6093c48a5
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue May 5 22:58:01 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 5 22:58:01 2020 +0200

    simplify namespaces vclmetafileprocessor2d.hxx
    
    Change-Id: I3fd36b3d58aa35d68b3582baf87bf020ec894a63

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index 028af772015b..9da28d0be698 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -24,14 +24,7 @@
 #include "vclprocessor2d.hxx"
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-
-
-// vcl::PDFExtOutDevData support
-
-#include <vcl/pdfextoutdevdata.hxx>
-
-
-// predefines
+#include <vcl/pdfextoutdevdata.hxx> // vcl::PDFExtOutDevData support
 
 class GDIMetaFile;
 namespace tools { class Rectangle; }
@@ -39,14 +32,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;
@@ -72,11 +65,8 @@ namespace basegfx {
     class BColor;
 }
 
-
-namespace drawinglayer
+namespace drawinglayer::processor2d
 {
-    namespace processor2d
-    {
         /** VclMetafileProcessor2D class
 
             This processor derived from VclProcessor2D is the base class for rendering
@@ -194,7 +184,6 @@ namespace drawinglayer
                 OutputDevice& rOutDev);
             virtual ~VclMetafileProcessor2D() override;
         };
-    } // end of namespace processor2d
-} // end of namespace drawinglayer
+} // end of namespace processor2d::drawinglayer
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit d15fe16131c9d6e67ddabb978e6de57c30b15415
Author:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
AuthorDate: Tue May 5 22:34:12 2020 +0200
Commit:     Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
CommitDate: Tue May 5 22:34:12 2020 +0200

    use pragma once in vclmetafileprocessor2d.hxx
    
    Change-Id: I4112e33c92d189a2dab15e4a17b9cb06afd99048

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
index ebb3046478e7..028af772015b 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX
-#define INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX
+#pragma once
 
 #include <stack>
 
@@ -198,7 +197,4 @@ namespace drawinglayer
     } // end of namespace processor2d
 } // end of namespace drawinglayer
 
-
-#endif // INCLUDED_DRAWINGLAYER_SOURCE_PROCESSOR2D_VCLMETAFILEPROCESSOR2D_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */