summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2023-01-11 10:43:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2023-01-12 12:32:40 +0000
commite28eee5b04391ab7b38e336747f3d2462f602785 (patch)
tree908fae00bf6e04586835f0850081294f423cf56d /vcl
parent9107b3789c2d01a219632e646ea04cf6776e703b (diff)
move X11SalGraphicsImpl::GetBitCount to X11CairoSalGraphicsImpl
Change-Id: I7ccd95539ee8e9368deb42f6c72f2ef0efe49d76 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145329 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx3
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx5
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx5
3 files changed, 4 insertions, 9 deletions
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index 0ef7e8cf5f8f..8a1fe37e16bf 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -36,6 +36,9 @@ public:
virtual OUString getRenderBackendName() const override { return "gen"; }
+ // get the depth of the device
+ virtual sal_uInt16 GetBitCount() const override { return mrParent.GetVisual().GetDepth(); }
+
void ResetClipRegion() override { mrCairoCommon.m_aClipRegion.SetNull(); }
void setClipRegion(const vcl::Region& i_rClip) override
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 9a08ece391fb..46ada75327f0 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -59,11 +59,6 @@ X11SalGraphicsImpl::~X11SalGraphicsImpl()
{
}
-sal_uInt16 X11SalGraphicsImpl::GetBitCount() const
-{
- return mrParent.GetVisual().GetDepth();
-}
-
tools::Long X11SalGraphicsImpl::GetGraphicsWidth() const
{
if( mrParent.m_pFrame )
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 3aea76788b63..a455b1b0ef4a 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -41,7 +41,7 @@ class Gradient;
class X11SalGraphicsImpl : public SalGraphicsImpl, public X11GraphicsImpl
{
-private:
+protected:
X11SalGraphics& mrParent;
public:
@@ -50,9 +50,6 @@ public:
virtual ~X11SalGraphicsImpl() 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;
};