diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-05 13:16:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-06 20:37:38 +0100 |
| commit | 10afa00c8ce4f0de9191cd182409a3a5d8e55bb8 (patch) | |
| tree | 792c791d250b7edb66ec31d498ce9cb44a2120e4 /vcl | |
| parent | 22fb58a6fa7764ec0045529c483693e1a81b488e (diff) | |
compilerplugins: enhance "badstatics" plugin to find members
Finds static variables of types that have bad non-static members.
Change-Id: I81ee940580c0f043feb543840ea4d3dd27734202
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.hxx | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index c9f87508dd59..93c6b1a444f6 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 01269700e0bc..bb1bbf2a4ccf 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; |