diff options
| -rw-r--r-- | include/postwin.h | 1 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 5 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/filter/wmf/winmtf.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 2 |
5 files changed, 5 insertions, 9 deletions
diff --git a/include/postwin.h b/include/postwin.h index 555478dece0f..febe581b4590 100644 --- a/include/postwin.h +++ b/include/postwin.h @@ -28,7 +28,6 @@ #undef GradientStyle_RECT // so it doesn't conflict with enum values -#undef TRANSPARENT #undef OPAQUE #define WIN32_TRANSPARENT 1 diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 80ec0c79e007..68a16093ab79 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -231,9 +231,6 @@ template<class T> class VclPtr; #define AUTOSCROLL_VERT ((sal_uInt16)0x0001) #define AUTOSCROLL_HORZ ((sal_uInt16)0x0002) -#ifdef TRANSPARENT -#undef TRANSPARENT -#endif // Flags for StateChanged() enum class StateChangedType : sal_uInt16 { @@ -248,7 +245,7 @@ enum class StateChangedType : sal_uInt16 STYLE = 9, ZOOM = 10, BORDER = 11, - TRANSPARENT = 12, + Transparent = 12, CONTROLFONT = 13, CONTROLFOREGROUND = 14, CONTROLBACKGROUND = 15, diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx index 9b068935121b..d6423eac5ac6 100644 --- a/vcl/source/filter/wmf/winmtf.cxx +++ b/vcl/source/filter/wmf/winmtf.cxx @@ -919,7 +919,7 @@ void WinMtfOutput::UpdateLineStyle() void WinMtfOutput::UpdateFillStyle() { if ( !mbFillStyleSelected ) // SJ: #i57205# taking care of bkcolor if no brush is selected - maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == BkMode::TRANSPARENT ); + maFillStyle = WinMtfFillStyle( maBkColor, mnBkMode == BkMode::Transparent ); if (!( maLatestFillStyle == maFillStyle ) ) { maLatestFillStyle = maFillStyle; @@ -1410,7 +1410,7 @@ void WinMtfOutput::DrawText( Point& rPosition, OUString& rText, long* pDXArry, b aTmp.SetColor( maTextColor ); aTmp.SetFillColor( maBkColor ); - if( mnBkMode == BkMode::TRANSPARENT ) + if( mnBkMode == BkMode::Transparent ) aTmp.SetTransparent( true ); else aTmp.SetTransparent( false ); diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index cc930c4ddad7..d50fb3788e18 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -41,7 +41,7 @@ enum class BkMode { NONE = 0, - TRANSPARENT = 1, + Transparent = 1, OPAQUE = 2, LAST = 2 }; diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index ac348f2ec1ad..5c30ba0a1434 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -2025,7 +2025,7 @@ void Window::StateChanged(StateChangedType eType) //stuff that doesn't invalidate the layout case StateChangedType::CONTROLFOREGROUND: case StateChangedType::CONTROLBACKGROUND: - case StateChangedType::TRANSPARENT: + case StateChangedType::Transparent: case StateChangedType::UPDATEMODE: case StateChangedType::READONLY: case StateChangedType::ENABLE: |