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

Caolán McNamara caolanm at redhat.com
Wed Feb 25 12:35:28 PST 2015


 vcl/unx/gtk/window/gtksalframe.cxx |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit b5b19508dafc2702eb3713fb6b07edb5e05d6601
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 25 20:34:28 2015 +0000

    WaE: -Werror=unused-variable
    
    and assert is bollox as well
    
    Change-Id: I966aa4efe1191f1a7957d3117d9c3ccabe041178

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 997b948..05d5e46 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1965,10 +1965,7 @@ void GtkSalFrame::AllocateFrame()
             aFrameSize.setX( 1 );
         if( aFrameSize.getY() == 0 )
             aFrameSize.setY( 1 );
-        sal_Int32 nStride(basebmp::getBitmapDeviceStrideForWidth(basebmp::FORMAT_TWENTYFOUR_BIT_TC_MASK, aFrameSize.getX()));
         int cairo_stride = cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, aFrameSize.getX());
-        assert(cairo_stride >= basebmp::getBitmapDeviceStrideForWidth(basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX,
-            aFrameSize.getX()));
         m_aFrame = basebmp::createBitmapDevice(aFrameSize, true,
                                                basebmp::FORMAT_THIRTYTWO_BIT_TC_MASK_BGRX, cairo_stride);
         m_aFrame->setDamageTracker(


More information about the Libreoffice-commits mailing list