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

[Caolán McNamara (via logerrit)]

 vcl/unx/generic/gdi/cairo_xlib_cairo.cxx |   15 +--------------
 vcl/unx/generic/gdi/cairo_xlib_cairo.hxx |    1 -
 2 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 465ec8b275f2685a31ee42ca1447a5d44d18a227
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jan 15 20:37:26 2023 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Jan 16 11:13:10 2023 +0000

    getFormat() is always DeviceFormat::DEFAULT
    
    Change-Id: I93139a6c2ce28f28f615b7399e37fcb06fac0997
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145543
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx 
b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
index 26d8876a8906..4ec335d10324 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.cxx
@@ -255,7 +255,7 @@ namespace cairo
 
         return VclPtr<VirtualDevice>::Create(aSystemGraphicsData,
                               Size(width, height),
-                              getFormat());
+                              DeviceFormat::DEFAULT);
     }
 
     /**
@@ -289,19 +289,6 @@ namespace cairo
             return 
static_cast<XRenderPictFormat*>(maSysData.pRenderFormat)->depth;
         return -1;
     }
-
-    /**
-     * Surface::getFormat:  Get the device format of the Canvas surface.
-     *
-     * @return color format
-     **/
-    DeviceFormat X11Surface::getFormat() const
-    {
-        if (!maSysData.pRenderFormat)
-            return DeviceFormat::DEFAULT;
-        assert 
(static_cast<XRenderPictFormat*>(maSysData.pRenderFormat)->depth != 1 && 
"unsupported");
-        return DeviceFormat::DEFAULT;
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx 
b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
index e8f6cd28ea18..4f0b33101d4a 100644
--- a/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
+++ b/vcl/unx/generic/gdi/cairo_xlib_cairo.hxx
@@ -88,7 +88,6 @@ namespace cairo {
         virtual void flush() const override;
 
         int getDepth() const;
-        DeviceFormat getFormat() const;
         const X11PixmapSharedPtr& getPixmap() const { return mpPixmap; }
     };
 }