diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-05-05 13:21:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-05-05 15:51:10 +0200 |
| commit | c724eebbaee76c9c91ba332173903aa4f4bd754a (patch) | |
| tree | fce4460b0335030578d9cfb87861f82aba15a385 /vcl | |
| parent | cbaca2c1cea2a4a75e21b2b13d79f50858d7d186 (diff) | |
vcl: rename conflicting defintion of TRANSPARENT remove it from postwin.h
Change-Id: I3b4e25c27593e3a61612a96baa2a4378542d151c
Diffstat (limited to 'vcl')
| -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 |
3 files changed, 4 insertions, 4 deletions
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: |