include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx | 8 +++----- include/drawinglayer/primitive2d/borderlineprimitive2d.hxx | 6 +----- 2 files changed, 4 insertions(+), 10 deletions(-)
New commits: commit d91caef0eeadb8bbb91713fcae08b619d1acd197 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Feb 3 18:05:43 2020 +0100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Feb 4 08:36:42 2020 +0100 use "pragma once" in borderlineprimitive2d.hxx Change-Id: I3582f36b0435de343d1e8574bf2bb0e0bd40e16b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87938 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <[email protected]> diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index 2c10eb96572d..3699310ef787 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX -#define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX +#pragma once #include <drawinglayer/drawinglayerdllapi.h> @@ -144,7 +143,4 @@ namespace drawinglayer } // end of namespace primitive2d } // end of namespace drawinglayer - -#endif //INCLUDED_DRAWINGLAYER_PRIMITIVE2D_BORDERLINEPRIMITIVE2D_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 9cd7d4f2bd10833c591e60721f8c7dff1f5caec3 Author: Tomaž Vajngerl <[email protected]> AuthorDate: Mon Feb 3 18:03:27 2020 +0100 Commit: Tomaž Vajngerl <[email protected]> CommitDate: Tue Feb 4 08:36:23 2020 +0100 clean-up namespaces in backgroundcolorprimitive2d.hxx Change-Id: I7ef644edf90ced417cf9583175ef777fa921dc94 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87937 Reviewed-by: Tomaž Vajngerl <[email protected]> Tested-by: Tomaž Vajngerl <[email protected]> diff --git a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx index 127353581212..cdd7b8db3671 100644 --- a/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx @@ -26,9 +26,7 @@ // BackgroundColorPrimitive2D class -namespace drawinglayer -{ -namespace primitive2d +namespace drawinglayer::primitive2d { /** BackgroundColorPrimitive2D class @@ -80,7 +78,7 @@ public: get2DDecomposition(Primitive2DDecompositionVisitor& rVisitor, const geometry::ViewInformation2D& rViewInformation) const override; }; -} // end of namespace primitive2d -} // end of namespace drawinglayer + +} // end of namespace drawinglayer::primitive2d /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
