mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove bitmapprimitive2d.{cxx,hxx} from clang-format blacklist

Browse Source 
Change-Id: I9d9d7cd8bba489c71a5c1ac0b23755d572696e10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87904
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2020-02-02 21:58:04 +01:00
committed by Tomaž Vajngerl
parent 19181dab1c
commit a334f77792
3 changed files with 35 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
View File

@@ -20,18 +20,15 @@
#include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
using namespace com::sun::star;
namespace drawinglayer::primitive2d
{
BitmapPrimitive2D::BitmapPrimitive2D(
const BitmapEx& rBitmapEx,
BitmapPrimitive2D::BitmapPrimitive2D(const BitmapEx& rBitmapEx,
const basegfx::B2DHomMatrix& rTransform)
: BasePrimitive2D(),
maBitmapEx(rBitmapEx),
maTransform(rTransform)
: BasePrimitive2D()
, maBitmapEx(rBitmapEx)
, maTransform(rTransform)
{
}
@@ -48,17 +45,15 @@ namespace drawinglayer::primitive2d
return false;
}
basegfx::B2DRange BitmapPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
basegfx::B2DRange
BitmapPrimitive2D::getB2DRange(const geometry::ViewInformation2D& /*rViewInformation*/) const
{
basegfx::B2DRange aRetval(0.0, 0.0, 1.0, 1.0);
aRetval.transform(maTransform);
return aRetval;
}
sal_Int64 SAL_CALL BitmapPrimitive2D::estimateUsage()
{
return getBitmapEx().GetSizeBytes();
}
sal_Int64 SAL_CALL BitmapPrimitive2D::estimateUsage() { return getBitmapEx().GetSizeBytes(); }
// provide unique ID
ImplPrimitive2DIDBlock(BitmapPrimitive2D, PRIMITIVE2D_ID_BITMAPPRIMITIVE2D)

14
include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
View File

@@ -28,7 +28,6 @@
namespace drawinglayer::primitive2d
{
/** BitmapPrimitive2D class
This class is the central primitive for Bitmap-based primitives.
@@ -49,9 +48,7 @@ private:
public:
/// constructor
BitmapPrimitive2D(
const BitmapEx& rBitmapEx,
const basegfx::B2DHomMatrix& rTransform);
BitmapPrimitive2D(const BitmapEx& rBitmapEx, const basegfx::B2DHomMatrix& rTransform);
/// data read access
const BitmapEx& getBitmapEx() const { return maBitmapEx; }
@@ -61,13 +58,14 @@ public:
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
/// get range
virtual basegfx::B2DRange getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
/// provide unique ID
DeclPrimitive2DIDBlock()
virtual basegfx::B2DRange
getB2DRange(const geometry::ViewInformation2D& rViewInformation) const override;
// XAccounting
virtual sal_Int64 SAL_CALL estimateUsage() override;
/// provide unique ID
DeclPrimitive2DIDBlock()
};
} // end of namespace drawinglayer::primitive2d

2
solenv/clang-format/blacklist
View File

@@ -3751,7 +3751,6 @@ drawinglayer/source/geometry/viewinformation2d.cxx
drawinglayer/source/geometry/viewinformation3d.cxx
drawinglayer/source/primitive2d/animatedprimitive2d.cxx
drawinglayer/source/primitive2d/backgroundcolorprimitive2d.cxx
drawinglayer/source/primitive2d/bitmapprimitive2d.cxx
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx
drawinglayer/source/primitive2d/controlprimitive2d.cxx
drawinglayer/source/primitive2d/cropprimitive2d.cxx
@@ -6052,7 +6051,6 @@ include/drawinglayer/geometry/viewinformation2d.hxx
include/drawinglayer/geometry/viewinformation3d.hxx
include/drawinglayer/primitive2d/animatedprimitive2d.hxx
include/drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx
include/drawinglayer/primitive2d/bitmapprimitive2d.hxx
include/drawinglayer/primitive2d/borderlineprimitive2d.hxx
include/drawinglayer/primitive2d/controlprimitive2d.hxx
include/drawinglayer/primitive2d/cropprimitive2d.hxx