diff options
| -rw-r--r-- | include/svx/sdr/overlay/overlayselection.hxx | 8 | ||||
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 12 | ||||
| -rw-r--r-- | svx/source/sdr/overlay/overlayselection.cxx | 14 | ||||
| -rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index ed4d75a51637..4380e71e6848 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -29,11 +29,11 @@ namespace sdr namespace overlay { // overlay type definition - enum OverlayType + enum class OverlayType { - OVERLAY_INVERT, - OVERLAY_SOLID, - OVERLAY_TRANSPARENT + Invert, + Solid, + Transparent }; class SVX_DLLPUBLIC OverlaySelection : public OverlayObject diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index dba986a8249a..94d38beb07cb 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -6034,7 +6034,7 @@ void ScGridWindow::UpdateCursorOverlay() } sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, + sdr::overlay::OverlayType::Solid, aCursorColor, aRanges, false); @@ -6110,7 +6110,7 @@ void ScGridWindow::UpdateSelectionOverlay() const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor()); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_TRANSPARENT, + sdr::overlay::OverlayType::Transparent, aHighlight, aRanges, true); @@ -6207,7 +6207,7 @@ void ScGridWindow::UpdateAutoFillOverlay() aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, + sdr::overlay::OverlayType::Solid, aHandleColor, aRanges, false); @@ -6334,7 +6334,7 @@ void ScGridWindow::UpdateDragRectOverlay() } sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, + sdr::overlay::OverlayType::Invert, Color(COL_BLACK), aRanges, false); @@ -6380,7 +6380,7 @@ void ScGridWindow::UpdateHeaderOverlay() aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, + sdr::overlay::OverlayType::Invert, Color(COL_BLACK), aRanges, false); @@ -6447,7 +6447,7 @@ void ScGridWindow::UpdateShrinkOverlay() aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, + sdr::overlay::OverlayType::Invert, Color(COL_BLACK), aRanges, false); diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index ace91aae19bd..b6b91fdc8ba3 100644 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx @@ -58,18 +58,18 @@ namespace sdr return aRetval; } - // check if wanted type OVERLAY_TRANSPARENT or OVERLAY_SOLID + // check if wanted type OverlayType::Transparent or OverlayType::Solid // is possible. If not, fallback to invert mode (classic mode) OverlayType impCheckPossibleOverlayType(OverlayType aOverlayType) { - if(OVERLAY_INVERT != aOverlayType) + if(OverlayType::Invert != aOverlayType) { const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer; if(!aSvtOptionsDrawinglayer.IsTransparentSelection()) { // not possible when switched off by user - return OVERLAY_INVERT; + return OverlayType::Invert; } else if (const OutputDevice* pOut = Application::GetDefaultDevice()) { @@ -77,13 +77,13 @@ namespace sdr if(pOut->GetSettings().GetStyleSettings().GetHighContrastMode()) { // not possible when in high contrast mode - return OVERLAY_INVERT; + return OverlayType::Invert; } if(!pOut->SupportsOperation(OutDevSupport_TransparentRect)) { // not possible when no fast transparence paint is supported on the system - return OVERLAY_INVERT; + return OverlayType::Invert; } } } @@ -99,7 +99,7 @@ namespace sdr if(nCount) { // create range primitives - const bool bInvert(OVERLAY_INVERT == maLastOverlayType); + const bool bInvert(OverlayType::Invert == maLastOverlayType); basegfx::BColor aRGBColor(getBaseColor().getBColor()); aRetval.resize(nCount); @@ -126,7 +126,7 @@ namespace sdr aRetval)); aRetval = drawinglayer::primitive2d::Primitive2DContainer { aInvert }; } - else if(OVERLAY_TRANSPARENT == maLastOverlayType) + else if(OverlayType::Transparent == maLastOverlayType) { // embed all rectangles in transparent paint const double fTransparence(mnLastTransparence / 100.0); diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index ca68ace23e7c..3cb202167514 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -348,7 +348,7 @@ void SwSelPaintRects::Show(std::vector<OString>* pSelectionRectangles) // create correct selection m_pCursorOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_TRANSPARENT, + sdr::overlay::OverlayType::Transparent, aHighlight, aNewRanges, true); |