diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-23 15:16:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-31 09:34:46 +0100 |
commit | 84b396a235671ea77f1a9fa0d131cb56d7662737 (patch) | |
tree | 13d9de3d2b31424e785780864e084bd2d9315ff1 /sw/source/core/draw | |
parent | c81d766dd4ff7d8b580b7fdc79db6e68c5f14204 (diff) |
new loplugin:namespaceindentation
check indentation of braces in namespace decls,
and the comments that often appear with them.
This is my penance for messing up the indentation with
clang-tidy-modernize-namespaces.
As such I have limited it to new-style namespaces for now,
and the check is off by default.
Change-Id: I4db7f10a81c79bc0eece8f8e3ee564da8bc7f168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/draw')
-rw-r--r-- | sw/source/core/draw/dcontact.cxx | 8 | ||||
-rw-r--r-- | sw/source/core/draw/dflyobj.cxx | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index 581d9c3f7dc8..1b78c24aa0dc 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -1989,7 +1989,7 @@ void SwDrawContact::GetAnchoredObjs(std::vector<SwAnchoredObject*>& o_rAnchoredO // not possible since we have no OutputDevice, but define the geometry itself. namespace sdr::contact - { +{ namespace { class VOCOfDrawVirtObj : public ViewObjectContactOfSdrObj @@ -2037,10 +2037,10 @@ namespace sdr::contact }; } - } // end of namespace sdr +} // end of namespace sdr::contact namespace sdr::contact - { +{ /// recursively collect primitive data from given VOC with given offset static void impAddPrimitivesFromGroup(const ViewObjectContact& rVOC, const basegfx::B2DHomMatrix& rOffsetMatrix, const DisplayInfo& rDisplayInfo, drawinglayer::primitive2d::Primitive2DContainer& rxTarget) { @@ -2145,7 +2145,7 @@ namespace sdr::contact return *(new VOCOfDrawVirtObj(rObjectContact, *this)); } - } // end of namespace sdr +} // end of namespace sdr::contact /// implementation of class <SwDrawVirtObj> std::unique_ptr<sdr::contact::ViewContact> SwDrawVirtObj::CreateObjectSpecificViewContact() diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx index 2ff59ec47287..282fc1a91119 100644 --- a/sw/source/core/draw/dflyobj.cxx +++ b/sw/source/core/draw/dflyobj.cxx @@ -72,7 +72,7 @@ static bool bInResize = false; namespace sdr::contact - { +{ namespace { /** @@ -108,7 +108,7 @@ namespace sdr::contact return drawinglayer::primitive2d::Primitive2DContainer(); } - } // end of namespace sdr +} // end of namespace sdr::contact std::unique_ptr<sdr::properties::BaseProperties> SwFlyDrawObj::CreateObjectSpecificProperties() { @@ -146,7 +146,7 @@ sal_uInt16 SwFlyDrawObj::GetObjIdentifier() const // TODO: Need own primitive to get the FlyFrame paint working namespace drawinglayer::primitive2d - { +{ namespace { class SwVirtFlyDrawObjPrimitive : public BufferedDecompositionPrimitive2D @@ -185,10 +185,10 @@ namespace drawinglayer::primitive2d }; } - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d namespace drawinglayer::primitive2d - { +{ void SwVirtFlyDrawObjPrimitive::create2DDecomposition(Primitive2DContainer& rContainer, const geometry::ViewInformation2D& /*rViewInformation*/) const { if(!getOuterRange().isEmpty()) @@ -240,7 +240,7 @@ namespace drawinglayer::primitive2d // provide unique ID ImplPrimitive2DIDBlock(SwVirtFlyDrawObjPrimitive, PRIMITIVE2D_ID_SWVIRTFLYDRAWOBJPRIMITIVE2D) - } // end of namespace drawinglayer +} // end of namespace drawinglayer::primitive2d // AW: own sdr::contact::ViewContact (VC) sdr::contact::ViewObjectContact (VOC) needed // since offset is defined different from SdrVirtObj's sdr::contact::ViewContactOfVirtObj. @@ -248,7 +248,7 @@ namespace drawinglayer::primitive2d // not possible since we have no OutputDevice, but define the geometry itself. namespace sdr::contact - { +{ namespace { class VCOfSwVirtFlyDrawObj : public ViewContactOfVirtObj @@ -275,10 +275,10 @@ namespace sdr::contact }; } - } // end of namespace sdr +} // end of namespace sdr::contact namespace sdr::contact - { +{ drawinglayer::primitive2d::Primitive2DContainer VCOfSwVirtFlyDrawObj::createViewIndependentPrimitive2DSequence() const { drawinglayer::primitive2d::Primitive2DContainer xRetval; @@ -304,7 +304,7 @@ namespace sdr::contact return xRetval; } - } // end of namespace sdr +} // end of namespace sdr::contact basegfx::B2DRange SwVirtFlyDrawObj::getOuterBound() const { |