diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-11-05 22:09:12 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-11-06 20:37:38 +0100 |
| commit | 22c1e08fda61e424a3bdb7305a9b9025c5e80d90 (patch) | |
| tree | 689d93e7b1e9adbb97d6189d4e422b7b29db4272 | |
| parent | 10afa00c8ce4f0de9191cd182409a3a5d8e55bb8 (diff) | |
vcl: WinMtfOutput: replace the other mutable static with a member too
Change-Id: Ied1e1c12f2fe19734f27c005e60db07e674e3639
| -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 93c6b1a444f6..a34beda5366d 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 WinMtfLineStyle aNopLineStyle; if ( mbNopMode && ( nRasterOp != R2_NOP ) ) { // changing modes from R2_NOP so set pen and brush maFillStyle = m_NopFillStyle; - maLineStyle = aNopLineStyle; + maLineStyle = m_NopLineStyle; mbNopMode = false; } switch( nRasterOp ) @@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) if( !mbNopMode ) { m_NopFillStyle = maFillStyle; - aNopLineStyle = maLineStyle; + m_NopLineStyle = maLineStyle; maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); mbNopMode = true; diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index bb1bbf2a4ccf..095dfbe1d28d 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -543,6 +543,7 @@ class WinMtfOutput WinMtfLineStyle maLatestLineStyle; WinMtfLineStyle maLineStyle; + WinMtfLineStyle m_NopLineStyle; WinMtfFillStyle maLatestFillStyle; WinMtfFillStyle maFillStyle; WinMtfFillStyle m_NopFillStyle; |