compilerplugins/clang/mergeclasses.results | 2 compilerplugins/clang/unusedfields.only-used-in-constructor.results | 6 +- drawinglayer/inc/texture/texture3d.hxx | 10 +-- drawinglayer/source/processor3d/defaultprocessor3d.cxx | 4 - drawinglayer/source/texture/texture3d.cxx | 26 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-)
New commits: commit 2ea359044c6b3427696a5ca5df86e1a90019aa1a Author: Xisco Fauli <[email protected]> AuthorDate: Mon Jan 19 13:46:24 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Tue Jan 20 08:51:25 2026 +0100 drawinglayer: GeoTexSvxBitmapEx*-> GeoTexSvxBitmap* After commit 805ef97f521f1f65d833f9db23c56b225b4d78e1 Author: Noel Grandin <[email protected]> Date: Tue Aug 12 22:19:45 2025 +0200 BitmapEx->Bitmap in GeoTexSvx Change-Id: Ic393ff4de51be0eb8c5859605135695f8f92f472 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197587 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/compilerplugins/clang/mergeclasses.results b/compilerplugins/clang/mergeclasses.results index 553265f26d74..5ce71665a26b 100644 --- a/compilerplugins/clang/mergeclasses.results +++ b/compilerplugins/clang/mergeclasses.results @@ -517,7 +517,7 @@ merge detail::ScVbaHlinkContainerMember with ScVbaHyperlinks merge drawinglayer::primitive2d::ObjectAndViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::DiscreteBitmapPrimitive2D merge drawinglayer::primitive2d::ViewTransformationDependentPrimitive2D with drawinglayer::primitive2d::WallpaperBitmapPrimitive2D merge drawinglayer::processor3d::DefaultProcessor3D with drawinglayer::processor3d::ZBufferProcessor3D -merge drawinglayer::texture::GeoTexSvxBitmapEx with drawinglayer::texture::GeoTexSvxBitmapExTiled +merge drawinglayer::texture::GeoTexSvxBitmap with drawinglayer::texture::GeoTexSvxBitmapTiled merge fileaccess::Notifier with fileaccess::BaseContent maybe merge filter::config::BaseContainer with cppu::ImplInheritanceHelper, in modules filter and cppuhelper maybe merge formula::ExternalReferenceHelper with ScExternalRefManager, in modules formula and sc diff --git a/compilerplugins/clang/unusedfields.only-used-in-constructor.results b/compilerplugins/clang/unusedfields.only-used-in-constructor.results index 76bb0a076dbd..3c6de0fd2d32 100644 --- a/compilerplugins/clang/unusedfields.only-used-in-constructor.results +++ b/compilerplugins/clang/unusedfields.only-used-in-constructor.results @@ -187,11 +187,11 @@ dbaccess/source/core/inc/databasecontext.hxx:73 dbaccess/source/core/inc/SingleSelectQueryComposer.hxx:79 dbaccess::OSingleSelectQueryComposer m_aNeutralContext ::svxform::ONeutralParseContext drawinglayer/inc/texture/texture3d.hxx:55 - drawinglayer::texture::GeoTexSvxBitmapEx maBitmapEx BitmapEx + drawinglayer::texture::GeoTexSvxBitmap maBitmapEx BitmapEx drawinglayer/inc/texture/texture3d.hxx:56 - drawinglayer::texture::GeoTexSvxBitmapEx maBitmap Bitmap + drawinglayer::texture::GeoTexSvxBitmap maBitmap Bitmap drawinglayer/inc/texture/texture3d.hxx:58 - drawinglayer::texture::GeoTexSvxBitmapEx maTransparence Bitmap + drawinglayer::texture::GeoTexSvxBitmap maTransparence Bitmap drawinglayer/source/tools/emfphelperdata.hxx:197 emfplushelper::EmfPlusHelperData mnFrameRight sal_Int32 drawinglayer/source/tools/emfphelperdata.hxx:198 diff --git a/drawinglayer/inc/texture/texture3d.hxx b/drawinglayer/inc/texture/texture3d.hxx index cf076881a061..158f31da5b91 100644 --- a/drawinglayer/inc/texture/texture3d.hxx +++ b/drawinglayer/inc/texture/texture3d.hxx @@ -49,7 +49,7 @@ namespace drawinglayer::texture namespace drawinglayer::texture { - class GeoTexSvxBitmapEx : public GeoTexSvx + class GeoTexSvxBitmap : public GeoTexSvx { protected: Bitmap maBitmap; @@ -63,10 +63,10 @@ namespace drawinglayer::texture bool impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const; public: - GeoTexSvxBitmapEx( + GeoTexSvxBitmap( const Bitmap& rBitmap, const basegfx::B2DRange& rRange); - virtual ~GeoTexSvxBitmapEx() override; + virtual ~GeoTexSvxBitmap() override; virtual void modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const override; virtual void modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const override; @@ -76,7 +76,7 @@ namespace drawinglayer::texture namespace drawinglayer::texture { - class GeoTexSvxBitmapExTiled final : public GeoTexSvxBitmapEx + class GeoTexSvxBitmapTiled final : public GeoTexSvxBitmap { double mfOffsetX; double mfOffsetY; @@ -88,7 +88,7 @@ namespace drawinglayer::texture basegfx::B2DPoint impGetCorrected(const basegfx::B2DPoint& rUV) const; public: - GeoTexSvxBitmapExTiled( + GeoTexSvxBitmapTiled( const Bitmap& rBitmap, const basegfx::B2DRange& rRange, double fOffsetX, diff --git a/drawinglayer/source/processor3d/defaultprocessor3d.cxx b/drawinglayer/source/processor3d/defaultprocessor3d.cxx index 1e1212470a56..d96fc30946c4 100644 --- a/drawinglayer/source/processor3d/defaultprocessor3d.cxx +++ b/drawinglayer/source/processor3d/defaultprocessor3d.cxx @@ -245,7 +245,7 @@ namespace drawinglayer::processor3d if(rFillGraphicAttribute.getTiling()) { mpGeoTexSvx = - std::make_shared<texture::GeoTexSvxBitmapExTiled>( + std::make_shared<texture::GeoTexSvxBitmapTiled>( aBitmap, aGraphicRange, rFillGraphicAttribute.getOffsetX(), @@ -254,7 +254,7 @@ namespace drawinglayer::processor3d else { mpGeoTexSvx = - std::make_shared<texture::GeoTexSvxBitmapEx>( + std::make_shared<texture::GeoTexSvxBitmap>( aBitmap, aGraphicRange); } diff --git a/drawinglayer/source/texture/texture3d.cxx b/drawinglayer/source/texture/texture3d.cxx index ab7e1f02b8c9..7e965770ab9f 100644 --- a/drawinglayer/source/texture/texture3d.cxx +++ b/drawinglayer/source/texture/texture3d.cxx @@ -56,7 +56,7 @@ namespace drawinglayer::texture } - GeoTexSvxBitmapEx::GeoTexSvxBitmapEx( + GeoTexSvxBitmap::GeoTexSvxBitmap( const Bitmap& rBitmap, const basegfx::B2DRange& rRange) : maBitmap(rBitmap), @@ -67,7 +67,7 @@ namespace drawinglayer::texture { if (!maBitmap.IsEmpty()) mpReadBitmap = maBitmap; - SAL_WARN_IF(!mpReadBitmap, "drawinglayer", "GeoTexSvxBitmapEx: Got no read access to Bitmap"); + SAL_WARN_IF(!mpReadBitmap, "drawinglayer", "GeoTexSvxBitmap: Got no read access to Bitmap"); if (mpReadBitmap) { mfMulX = static_cast<double>(mpReadBitmap->Width()) / maSize.getX(); @@ -85,11 +85,11 @@ namespace drawinglayer::texture } } - GeoTexSvxBitmapEx::~GeoTexSvxBitmapEx() + GeoTexSvxBitmap::~GeoTexSvxBitmap() { } - bool GeoTexSvxBitmapEx::impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const + bool GeoTexSvxBitmap::impIsValid(const basegfx::B2DPoint& rUV, sal_Int32& rX, sal_Int32& rY) const { if(mpReadBitmap) { @@ -106,7 +106,7 @@ namespace drawinglayer::texture return false; } - void GeoTexSvxBitmapEx::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void GeoTexSvxBitmap::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const { sal_Int32 nX, nY; @@ -139,7 +139,7 @@ namespace drawinglayer::texture } } - void GeoTexSvxBitmapEx::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const + void GeoTexSvxBitmap::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const { sal_Int32 nX, nY; @@ -169,7 +169,7 @@ namespace drawinglayer::texture } - basegfx::B2DPoint GeoTexSvxBitmapExTiled::impGetCorrected(const basegfx::B2DPoint& rUV) const + basegfx::B2DPoint GeoTexSvxBitmapTiled::impGetCorrected(const basegfx::B2DPoint& rUV) const { double fX(rUV.getX() - maTopLeft.getX()); double fY(rUV.getY() - maTopLeft.getY()); @@ -209,12 +209,12 @@ namespace drawinglayer::texture return basegfx::B2DPoint(fX + maTopLeft.getX(), fY + maTopLeft.getY()); } - GeoTexSvxBitmapExTiled::GeoTexSvxBitmapExTiled( + GeoTexSvxBitmapTiled::GeoTexSvxBitmapTiled( const Bitmap& rBitmap, const basegfx::B2DRange& rRange, double fOffsetX, double fOffsetY) - : GeoTexSvxBitmapEx(rBitmap, rRange), + : GeoTexSvxBitmap(rBitmap, rRange), mfOffsetX(std::clamp(fOffsetX, 0.0, 1.0)), mfOffsetY(std::clamp(fOffsetY, 0.0, 1.0)), mbUseOffsetX(!basegfx::fTools::equalZero(mfOffsetX)), @@ -222,19 +222,19 @@ namespace drawinglayer::texture { } - void GeoTexSvxBitmapExTiled::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const + void GeoTexSvxBitmapTiled::modifyBColor(const basegfx::B2DPoint& rUV, basegfx::BColor& rBColor, double& rfOpacity) const { if(mpReadBitmap) { - GeoTexSvxBitmapEx::modifyBColor(impGetCorrected(rUV), rBColor, rfOpacity); + GeoTexSvxBitmap::modifyBColor(impGetCorrected(rUV), rBColor, rfOpacity); } } - void GeoTexSvxBitmapExTiled::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const + void GeoTexSvxBitmapTiled::modifyOpacity(const basegfx::B2DPoint& rUV, double& rfOpacity) const { if(mpReadBitmap) { - GeoTexSvxBitmapEx::modifyOpacity(impGetCorrected(rUV), rfOpacity); + GeoTexSvxBitmap::modifyOpacity(impGetCorrected(rUV), rfOpacity); } }
