[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Michael Stahl]

 vcl/source/filter/wmf/winmtf.cxx |    5 ++---
 vcl/source/filter/wmf/winmtf.hxx |    1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 08337202b175b8ccf4bd1336abad5d817b006213
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 5 13:16:50 2015 +0100

    compilerplugins: enhance "badstatics" plugin to find members
    
    Finds static variables of types that have bad non-static members.
    
    (cherry picked from commit 10afa00c8ce4f0de9191cd182409a3a5d8e55bb8)
    
    Omit the actual compiler plugin, just the fix for the release branch.
    
    Change-Id: I81ee940580c0f043feb543840ea4d3dd27734202
    Reviewed-on: https://gerrit.libreoffice.org/19829
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index 3f54ae8..513751d 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -944,12 +944,11 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
     if ( nRasterOp != mnRop )
     {
         mnRop = nRasterOp;
-        static WinMtfFillStyle aNopFillStyle;
         static WinMtfLineStyle aNopLineStyle;
 
         if ( mbNopMode && ( nRasterOp != R2_NOP ) )
         {   // changing modes from R2_NOP so set pen and brush
-            maFillStyle = aNopFillStyle;
+            maFillStyle = m_NopFillStyle;
             maLineStyle = aNopLineStyle;
             mbNopMode = false;
         }
@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
                 meRasterOp = ROP_OVERPAINT;
                 if( !mbNopMode )
                 {
-                    aNopFillStyle = maFillStyle;
+                    m_NopFillStyle = maFillStyle;
                     aNopLineStyle = maLineStyle;
                     maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true );
                     maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true );
diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx
index d50fb37..3b78821 100644
--- a/vcl/source/filter/wmf/winmtf.hxx
+++ b/vcl/source/filter/wmf/winmtf.hxx
@@ -545,6 +545,7 @@ class WinMtfOutput
     WinMtfLineStyle     maLineStyle;
     WinMtfFillStyle     maLatestFillStyle;
     WinMtfFillStyle     maFillStyle;
+    WinMtfFillStyle     m_NopFillStyle;
     vcl::Font           maLatestFont;
     vcl::Font           maFont;
     sal_uInt32          mnLatestTextAlign;