vcl/inc/unx/salgdi.h | 2 vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx | 7 --- vcl/unx/generic/gdi/gdiimpl.cxx | 56 ------------------------ vcl/unx/generic/gdi/gdiimpl.hxx | 7 --- vcl/unx/generic/gdi/salgdi.cxx | 7 --- 5 files changed, 1 insertion(+), 78 deletions(-)
New commits: commit 9107b3789c2d01a219632e646ea04cf6776e703b Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 11 10:41:19 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jan 12 11:50:08 2023 +0000 X11SalGraphicsImpl::GetGraphicsHeight is newly unused Change-Id: Iab08e42aa7c734072faab5b5b48eb77f646b0eef Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145328 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 677185809c2a..9a08ece391fb 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -59,16 +59,6 @@ X11SalGraphicsImpl::~X11SalGraphicsImpl() { } -tools::Long X11SalGraphicsImpl::GetGraphicsHeight() const -{ - if( mrParent.m_pFrame ) - return mrParent.m_pFrame->maGeometry.height(); - else if( mrParent.m_pVDev ) - return static_cast< X11SalVirtualDevice* >(mrParent.m_pVDev)->GetHeight(); - else - return 0; -} - sal_uInt16 X11SalGraphicsImpl::GetBitCount() const { return mrParent.GetVisual().GetDepth(); diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 4173bab6e84d..3aea76788b63 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -44,8 +44,6 @@ class X11SalGraphicsImpl : public SalGraphicsImpl, public X11GraphicsImpl private: X11SalGraphics& mrParent; - tools::Long GetGraphicsHeight() const; - public: explicit X11SalGraphicsImpl(X11SalGraphics& rParent); commit c3712f26582e5b89eb73866686d4ee857531ea4f Author: Caolán McNamara <[email protected]> AuthorDate: Wed Jan 11 10:40:19 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Thu Jan 12 11:49:58 2023 +0000 mpClipRegion is newly unused Change-Id: I52d1848faf7821385bb0d87f9bb512e51365c4f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145327 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index ebe0a3c4147b..ec2fe34628c2 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -154,8 +154,6 @@ private: SalX11Screen m_nXScreen; - Region mpClipRegion; - bool bWindow_ : 1; // is Window bool bVirDev_ : 1; // is VirDev diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx index ce6b01a97fe0..0ef7e8cf5f8f 100644 --- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx +++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx @@ -36,16 +36,11 @@ public: virtual OUString getRenderBackendName() const override { return "gen"; } - void ResetClipRegion() override - { - mrCairoCommon.m_aClipRegion.SetNull(); - X11SalGraphicsImpl::ResetClipRegion(); - } + void ResetClipRegion() override { mrCairoCommon.m_aClipRegion.SetNull(); } void setClipRegion(const vcl::Region& i_rClip) override { mrCairoCommon.m_aClipRegion = i_rClip; - X11SalGraphicsImpl::setClipRegion(i_rClip); } void SetLineColor() override { mrCairoCommon.m_oLineColor = std::nullopt; } diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 625fc9d77909..677185809c2a 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -59,52 +59,6 @@ X11SalGraphicsImpl::~X11SalGraphicsImpl() { } -void X11SalGraphicsImpl::ResetClipRegion() -{ - if( !mrParent.mpClipRegion ) - return; - - XDestroyRegion( mrParent.mpClipRegion ); - mrParent.mpClipRegion = nullptr; -} - -void X11SalGraphicsImpl::setClipRegion( const vcl::Region& i_rClip ) -{ - if( mrParent.mpClipRegion ) - XDestroyRegion( mrParent.mpClipRegion ); - mrParent.mpClipRegion = XCreateRegion(); - - RectangleVector aRectangles; - i_rClip.GetRegionRectangles(aRectangles); - - for (auto const& rectangle : aRectangles) - { - const tools::Long nW(rectangle.GetWidth()); - - if(nW) - { - const tools::Long nH(rectangle.GetHeight()); - - if(nH) - { - XRectangle aRect; - - aRect.x = static_cast<short>(rectangle.Left()); - aRect.y = static_cast<short>(rectangle.Top()); - aRect.width = static_cast<unsigned short>(nW); - aRect.height = static_cast<unsigned short>(nH); - XUnionRectWithRegion(&aRect, mrParent.mpClipRegion, mrParent.mpClipRegion); - } - } - } - - if( XEmptyRegion( mrParent.mpClipRegion ) ) - { - XDestroyRegion( mrParent.mpClipRegion ); - mrParent.mpClipRegion= nullptr; - } -} - tools::Long X11SalGraphicsImpl::GetGraphicsHeight() const { if( mrParent.m_pFrame ) diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index 5af5491c3bc0..4173bab6e84d 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -52,16 +52,11 @@ public: virtual ~X11SalGraphicsImpl() override; - virtual void setClipRegion( const vcl::Region& ) override; - // // get the depth of the device virtual sal_uInt16 GetBitCount() const override; // get the width of the device virtual tools::Long GetGraphicsWidth() const override; - - // set the clip region to empty - virtual void ResetClipRegion() override; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 087bfc8eb6e2..f2dada01c3a0 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -83,7 +83,6 @@ X11SalGraphics::X11SalGraphics(): m_pFrame(nullptr), m_pVDev(nullptr), m_nXScreen( 0 ), - mpClipRegion(nullptr), bWindow_(false), bVirDev_(false) { @@ -110,12 +109,6 @@ X11SalGraphics::~X11SalGraphics() COVERITY_NOEXCEPT_FALSE void X11SalGraphics::freeResources() { - if( mpClipRegion ) - { - XDestroyRegion( mpClipRegion ); - mpClipRegion = nullptr; - } - mxImpl->freeResources(); if( m_pDeleteColormap )
