[Libreoffice-commits] .: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Mon Nov 19 03:43:34 PST 2012


 vcl/unx/generic/app/saldisp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fe71e7bd0c7630b6452e418df14d780dd87ba946
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 19 12:39:56 2012 +0100

    SalColormap: -Werror=conversion-null
    
    That is actually XID, not a pointer.
    
    Change-Id: I9fa807fc4f33c07b2b4ebbb5e1b7163eb53411c3

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index b010359..3310e6d 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -2687,7 +2687,7 @@ SalColormap::SalColormap( sal_uInt16 nDepth )
 SalColormap::~SalColormap()
 {
 #ifdef DBG_UTIL
-    m_hColormap      = NULL;
+    m_hColormap      = None;
     m_pDisplay       = NULL;
 #endif
 }


More information about the Libreoffice-commits mailing list