Kaydet (Commit) 22c1e08f authored tarafından Michael Stahl's avatar Michael Stahl

vcl: WinMtfOutput: replace the other mutable static with a member too

Change-Id: Ied1e1c12f2fe19734f27c005e60db07e674e3639
üst 10afa00c
...@@ -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 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 = m_NopFillStyle; maFillStyle = m_NopFillStyle;
maLineStyle = aNopLineStyle; maLineStyle = m_NopLineStyle;
mbNopMode = false; mbNopMode = false;
} }
switch( nRasterOp ) switch( nRasterOp )
...@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp ) ...@@ -968,7 +967,7 @@ sal_uInt32 WinMtfOutput::SetRasterOp( sal_uInt32 nRasterOp )
if( !mbNopMode ) if( !mbNopMode )
{ {
m_NopFillStyle = maFillStyle; m_NopFillStyle = maFillStyle;
aNopLineStyle = maLineStyle; m_NopLineStyle = 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 );
mbNopMode = true; mbNopMode = true;
......
...@@ -543,6 +543,7 @@ class WinMtfOutput ...@@ -543,6 +543,7 @@ class WinMtfOutput
WinMtfLineStyle maLatestLineStyle; WinMtfLineStyle maLatestLineStyle;
WinMtfLineStyle maLineStyle; WinMtfLineStyle maLineStyle;
WinMtfLineStyle m_NopLineStyle;
WinMtfFillStyle maLatestFillStyle; WinMtfFillStyle maLatestFillStyle;
WinMtfFillStyle maFillStyle; WinMtfFillStyle maFillStyle;
WinMtfFillStyle m_NopFillStyle; WinMtfFillStyle m_NopFillStyle;
......
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