Kaydet (Commit) 08337202 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Miklos Vajna

compilerplugins: enhance "badstatics" plugin to find members

Finds static variables of types that have bad non-static members.

(cherry picked from commit 10afa00c)

Omit the actual compiler plugin, just the fix for the release branch.

Change-Id: I81ee940580c0f043feb543840ea4d3dd27734202
Reviewed-on: https://gerrit.libreoffice.org/19829Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst f318e585
...@@ -944,12 +944,11 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) ...@@ -944,12 +944,11 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
if ( nRasterOp != mnRop ) if ( nRasterOp != mnRop )
{ {
mnRop = nRasterOp; mnRop = nRasterOp;
static WinMtfFillStyle aNopFillStyle;
static WinMtfLineStyle aNopLineStyle; static WinMtfLineStyle aNopLineStyle;
if ( mbNopMode && ( nRasterOp != R2_NOP ) ) if ( mbNopMode && ( nRasterOp != R2_NOP ) )
{ // changing modes from R2_NOP so set pen and brush { // changing modes from R2_NOP so set pen and brush
maFillStyle = aNopFillStyle; maFillStyle = m_NopFillStyle;
maLineStyle = aNopLineStyle; maLineStyle = aNopLineStyle;
mbNopMode = false; mbNopMode = false;
} }
...@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) ...@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
meRasterOp = ROP_OVERPAINT; meRasterOp = ROP_OVERPAINT;
if( !mbNopMode ) if( !mbNopMode )
{ {
aNopFillStyle = maFillStyle; m_NopFillStyle = maFillStyle;
aNopLineStyle = maLineStyle; aNopLineStyle = maLineStyle;
maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true );
maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true );
......
...@@ -545,6 +545,7 @@ class WinMtfOutput ...@@ -545,6 +545,7 @@ class WinMtfOutput
WinMtfLineStyle maLineStyle; WinMtfLineStyle maLineStyle;
WinMtfFillStyle maLatestFillStyle; WinMtfFillStyle maLatestFillStyle;
WinMtfFillStyle maFillStyle; WinMtfFillStyle maFillStyle;
WinMtfFillStyle m_NopFillStyle;
vcl::Font maLatestFont; vcl::Font maLatestFont;
vcl::Font maFont; vcl::Font maFont;
sal_uInt32 mnLatestTextAlign; sal_uInt32 mnLatestTextAlign;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment