diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-23 13:35:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-24 08:47:57 +0200 |
| commit | 151752f89465ff980f9a377361eb90e4180943d3 (patch) | |
| tree | 6a0356e234ecc2c76ac6f92014f3b3749ad96afe /svx | |
| parent | 02329af0cbd25f5901be2ec938984968080d17f5 (diff) | |
remove CellOverlayType
since only the CELL_OVERLAY_TRANSPARENT value was in use
Change-Id: Ia7a0dfbf09b08e2dfed62d51af42e1409b05f275
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/overlay/overlayobjectcell.cxx | 27 | ||||
| -rw-r--r-- | svx/source/table/tablecontroller.cxx | 5 |
2 files changed, 8 insertions, 24 deletions
diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index 4596fa9e30dd..934fc1dd4de8 100644 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx @@ -34,9 +34,8 @@ namespace sdr { namespace overlay { - OverlayObjectCell::OverlayObjectCell( CellOverlayType eType, const Color& rColor, const RangeVector& rRects ) + OverlayObjectCell::OverlayObjectCell( const Color& rColor, const RangeVector& rRects ) : OverlayObject( rColor ), - mePaintType( eType ), maRectangles( rRects ) { // no AA for selection overlays @@ -70,25 +69,13 @@ namespace sdr } - if(mePaintType == CELL_OVERLAY_TRANSPARENT) - { - // embed in 50% transparent paint - const drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparence( - new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D( - aRetval, - 0.5)); + // embed in 50% transparent paint + const drawinglayer::primitive2d::Primitive2DReference aUnifiedTransparence( + new drawinglayer::primitive2d::UnifiedTransparencePrimitive2D( + aRetval, + 0.5)); - aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence }; - } - else // CELL_OVERLAY_INVERT - { - // embed in invert primitive - const drawinglayer::primitive2d::Primitive2DReference aInvert( - new drawinglayer::primitive2d::InvertPrimitive2D( - aRetval)); - - aRetval = drawinglayer::primitive2d::Primitive2DContainer { aInvert }; - } + aRetval = drawinglayer::primitive2d::Primitive2DContainer { aUnifiedTransparence }; } return aRetval; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index ae8b8482ce9c..f5899a615bc5 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2141,10 +2141,7 @@ void SvxTableController::updateSelectionOverlay() rtl::Reference < sdr::overlay::OverlayManager > xOverlayManager = pPaintWindow->GetOverlayManager(); if( xOverlayManager.is() ) { - // sdr::overlay::CellOverlayType eType = sdr::overlay::CELL_OVERLAY_INVERT; - sdr::overlay::CellOverlayType eType = sdr::overlay::CELL_OVERLAY_TRANSPARENT; - - sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( eType, aHighlight, aRanges ); + sdr::overlay::OverlayObjectCell* pOverlay = new sdr::overlay::OverlayObjectCell( aHighlight, aRanges ); xOverlayManager->add(*pOverlay); mpSelectionOverlay = new sdr::overlay::OverlayObjectList; |