[Libreoffice-commits] core.git: sc/inc

Stephan Bergmann sbergman at redhat.com
Tue Oct 28 03:33:00 PDT 2014


 sc/inc/fillinfo.hxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 27dcfc03c1f9f08111102e54191ecd8aacd6b09f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Oct 28 11:28:45 2014 +0100

    Revert "cid#738785 Uninitialized pointer field"
    
    This reverts commit 8e156ef6d8a236a49303b12a66ac6cae1ccd567c,
    those members apparently need to be initialized to null.

diff --git a/sc/inc/fillinfo.hxx b/sc/inc/fillinfo.hxx
index 2af32c1..1db76d9 100644
--- a/sc/inc/fillinfo.hxx
+++ b/sc/inc/fillinfo.hxx
@@ -115,9 +115,9 @@ struct CellInfo : boost::noncopyable
 
     ScShadowPart                eHShadowPart : 4;           // shadow effective for drawing
     ScShadowPart                eVShadowPart : 4;
-    sal_uInt8                   nClipMark;
-    sal_uInt16                  nWidth;
-    sal_uInt8                   nRotateDir;
+    sal_uInt8                        nClipMark;
+    sal_uInt16                      nWidth;
+    sal_uInt8                        nRotateDir;
 
     bool                        bMarked : 1;
     bool                        bEmptyCellText : 1;
@@ -132,6 +132,11 @@ struct CellInfo : boost::noncopyable
     bool                        bHideGrid : 1;              // output-internal
     bool                        bEditEngine : 1;            // output-internal
 
+    CellInfo():
+        pColorScale(NULL),
+        pDataBar(NULL),
+        pIconSet(NULL) {}
+
     ~CellInfo()
     {
         delete pColorScale;


More information about the Libreoffice-commits mailing list