[Libreoffice-commits] core.git: 2 commits - vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx |    7 ++++++-
 vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx |   10 +++++++---
 vcl/unx/generic/gdi/gdiimpl.cxx                 |   10 ----------
 vcl/unx/generic/gdi/gdiimpl.hxx                 |    3 ---
 4 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit bb9594a3b6d9c71fb2d817291ca7e02470cccd11
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 11 11:04:11 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 12 12:33:09 2023 +0000

    drop X11SalGraphicsImpl middleman now
    
    Change-Id: Ifccf6016403503a5abe34d0c1796ee43d14143de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145336
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx 
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
index f4a7a496168f..87605a067395 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -23,7 +23,7 @@
 #include <basegfx/curve/b2dcubicbezier.hxx>
 
 X11CairoSalGraphicsImpl::X11CairoSalGraphicsImpl(X11SalGraphics& rParent, 
CairoCommon& rCairoCommon)
-    : X11SalGraphicsImpl(rParent)
+    : mrParent(rParent)
     , mrCairoCommon(rCairoCommon)
 {
 }
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx 
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index c6580c9e3633..2599f0157a03 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -24,9 +24,10 @@
 
 #include <headless/CairoCommon.hxx>
 
-class X11CairoSalGraphicsImpl : public X11SalGraphicsImpl
+class X11CairoSalGraphicsImpl : public SalGraphicsImpl, public X11GraphicsImpl
 {
 private:
+    X11SalGraphics& mrParent;
     CairoCommon& mrCairoCommon;
 
 public:
commit 622e8cd9e5c96d0fe0bb02e07d95efa93c156c44
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Jan 11 11:00:43 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Thu Jan 12 12:32:55 2023 +0000

    reuse CairoCommon GetGraphicsWidth from X11CairoSalGraphicsImpl
    
    Change-Id: I925f67469b2821b85b86260be22bc111cd97d452
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145333
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx 
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
index 7d572ee997f6..f4a7a496168f 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.cxx
@@ -28,6 +28,11 @@ 
X11CairoSalGraphicsImpl::X11CairoSalGraphicsImpl(X11SalGraphics& rParent, CairoC
 {
 }
 
+tools::Long X11CairoSalGraphicsImpl::GetGraphicsWidth() const
+{
+    return mrCairoCommon.m_pSurface ? mrCairoCommon.m_aFrameSize.getX() : 0;
+}
+
 void X11CairoSalGraphicsImpl::drawRect(tools::Long nX, tools::Long nY, 
tools::Long nWidth,
                                        tools::Long nHeight)
 {
diff --git a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx 
b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
index 8a1fe37e16bf..c6580c9e3633 100644
--- a/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
+++ b/vcl/unx/generic/gdi/X11CairoSalGraphicsImpl.hxx
@@ -34,10 +34,13 @@ public:
 
     void Init() override;
 
-    virtual OUString getRenderBackendName() const override { return "gen"; }
+    OUString getRenderBackendName() const override { return "gen"; }
 
     // get the depth of the device
-    virtual sal_uInt16 GetBitCount() const override { return 
mrParent.GetVisual().GetDepth(); }
+    sal_uInt16 GetBitCount() const override { return 
mrParent.GetVisual().GetDepth(); }
+
+    // get the width of the device
+    tools::Long GetGraphicsWidth() const override;
 
     void ResetClipRegion() override { mrCairoCommon.m_aClipRegion.SetNull(); }
 
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 46ada75327f0..857c0a283fff 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -59,14 +59,4 @@ X11SalGraphicsImpl::~X11SalGraphicsImpl()
 {
 }
 
-tools::Long X11SalGraphicsImpl::GetGraphicsWidth() const
-{
-    if( mrParent.m_pFrame )
-        return mrParent.m_pFrame->maGeometry.width();
-    else if( mrParent.m_pVDev )
-        return static_cast< X11SalVirtualDevice* 
>(mrParent.m_pVDev)->GetWidth();
-    else
-        return 0;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index a455b1b0ef4a..a33bc0c84210 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -49,9 +49,6 @@ public:
     explicit X11SalGraphicsImpl(X11SalGraphics& rParent);
 
     virtual ~X11SalGraphicsImpl() override;
-
-    // get the width of the device
-    virtual tools::Long GetGraphicsWidth() const override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */