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

[Caolán McNamara]

 sw/source/core/layout/paintfrm.cxx |   62 +++++++++++++++++++++++++------------
 vcl/source/app/dbggui.cxx          |    2 -
 2 files changed, 44 insertions(+), 20 deletions(-)

New commits:
commit 620156f516db5f20cd97bcf962934e51f28b4d40
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 18 16:03:13 2014 +0000

    gcc 4.8.3 lets us do it, but not everyone else
    
    Change-Id: I83cca6a1bd3a462a277e5f5338cafbcd037d4227

diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 1a86ce2..0dc99f5 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -239,44 +239,68 @@ Color aGlobalRetoucheColor;
 struct SwPaintProperties {
     // Only repaint the Fly content as well as the background of the Fly content if
     // a metafile is taken of the Fly.
-    bool                bSFlyMetafile = false;
-    OutputDevice       *pSFlyMetafileOut = 0;
-    SwViewShell        *pSGlobalShell = 0;
+    bool                bSFlyMetafile;
+    OutputDevice       *pSFlyMetafileOut;
+    SwViewShell        *pSGlobalShell;
 
     // Retouch for transparent Flys is done by the background of the Flys.
     // The Fly itself should certainly not be spared out. See PaintBackground and
     // lcl_SubtractFlys()
-    SwFlyFrm           *pSRetoucheFly = 0;
-    SwFlyFrm           *pSRetoucheFly2 = 0;
-    SwFlyFrm           *pSFlyOnlyDraw = 0;
+    SwFlyFrm           *pSRetoucheFly;
+    SwFlyFrm           *pSRetoucheFly2;
+    SwFlyFrm           *pSFlyOnlyDraw;
 
     // The borders will be collected in pSLines during the Paint and later
     // possibly merge them.
     // The help lines will be collected and merged in gProp.pSSubsLines. These will
     // be compared with pSLines before the work in order to avoid help lines
     // to hide borders.
-    BorderLines        *pBLines = 0;
-    SwLineRects        *pSLines = 0;
-    SwSubsRects        *pSSubsLines = 0;
+    BorderLines        *pBLines;
+    SwLineRects        *pSLines;
+    SwSubsRects        *pSSubsLines;
 
     // global variable for sub-lines of body, header, footer, section and footnote frames.
-    SwSubsRects        *pSSpecSubsLines = 0;
-    SfxProgress        *pSProgress = 0;
+    SwSubsRects        *pSSpecSubsLines;
+    SfxProgress        *pSProgress;
 
     // Sizes of a pixel and the corresponding halves. Will be reset when
     // entering SwRootFrm::Paint
-    long                nSPixelSzW = 0;
-    long                nSPixelSzH = 0;
-    long                nSHalfPixelSzW = 0;
-    long                nSHalfPixelSzH = 0;
-    long                nSMinDistPixelW = 0;
-    long                nSMinDistPixelH = 0;
+    long                nSPixelSzW;
+    long                nSPixelSzH;
+    long                nSHalfPixelSzW;
+    long                nSHalfPixelSzH;
+    long                nSMinDistPixelW;
+    long                nSMinDistPixelH;
 
     Color               aSGlobalRetoucheColor;
 
     // Current zoom factor
-    double              aSScaleX = 1;
-    double              aSScaleY = 1;
+    double              aSScaleX;
+    double              aSScaleY;
+
+    SwPaintProperties()
+      : bSFlyMetafile(false)
+      , pSFlyMetafileOut(0)
+      , pSGlobalShell(0)
+      , pSRetoucheFly(0)
+      , pSRetoucheFly2(0)
+      , pSFlyOnlyDraw(0)
+      , pBLines(0)
+      , pSLines(0)
+      , pSSubsLines(0)
+      , pSSpecSubsLines(0)
+      , pSProgress(0)
+      , nSPixelSzW(0)
+      , nSPixelSzH(0)
+      , nSHalfPixelSzW(0)
+      , nSHalfPixelSzH(0)
+      , nSMinDistPixelW(0)
+      , nSMinDistPixelH(0)
+      , aSScaleX(1)
+      , aSScaleY(1)
+    {
+    }
+
 };
 
 static SwPaintProperties gProp;
commit 0dd7a5a27c48db5fb9b89ed794da96deda516594
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 18 15:57:47 2014 +0000

    restore old explanation message via assert hack
    
    Change-Id: I897f71e5ae4d2368d5d3ced60d90fb1c833fa376

diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 1e2270f..a07b720 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -790,7 +790,7 @@ void DbgDialogTest( vcl::Window* pWindow )
 
 void ImplDbgTestSolarMutex()
 {
-    assert(ImplGetSVData()->mpDefInst->CheckYieldMutex());
+    assert(ImplGetSVData()->mpDefInst->CheckYieldMutex() && "SolarMutex not locked");
 }
 
 void DbgGUIInitSolarMutexCheck()