diff options
Diffstat (limited to 'sc/source/ui/view/gridwin.cxx')
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 54 |
1 files changed, 26 insertions, 28 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0d020fc6a5de..efae750942b3 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -5361,8 +5361,8 @@ void ScGridWindow::UpdateCopySourceOverlay() if (!pViewData->ShowPasteSource()) return; - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); - if (!pOverlayManager) + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); + if (!xOverlayManager.is()) return; ScTransferObj* pTransObj = ScTransferObj::GetOwnClipboard( pViewData->GetActiveWin() ); if (!pTransObj) @@ -5400,7 +5400,7 @@ void ScGridWindow::UpdateCopySourceOverlay() Rectangle aLogic = PixelToLogic(aRect, aDrawMode); ::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom()); ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight, this); - pOverlayManager->add(*pDashedBorder); + xOverlayManager->add(*pDashedBorder); mpOOSelectionBorder->append(*pDashedBorder); } @@ -5495,9 +5495,9 @@ void ScGridWindow::UpdateCursorOverlay() if ( !aPixelRects.empty() ) { // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { Color aCursorColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); if (pViewData->GetActivePart() != eWhich) @@ -5520,7 +5520,7 @@ void ScGridWindow::UpdateCursorOverlay() aRanges, false); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOOCursors = new ::sdr::overlay::OverlayObjectList; mpOOCursors->append(*pOverlay); } @@ -5549,9 +5549,9 @@ void ScGridWindow::UpdateSelectionOverlay() if ( aPixelRects.size() && pViewData->IsActive() ) { // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); @@ -5590,7 +5590,7 @@ void ScGridWindow::UpdateSelectionOverlay() aRanges, true); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOOSelection = new ::sdr::overlay::OverlayObjectList; mpOOSelection->append(*pOverlay); } @@ -5647,9 +5647,9 @@ void ScGridWindow::UpdateAutoFillOverlay() mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6))); // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { Color aHandleColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); if (pViewData->GetActivePart() != eWhich) @@ -5668,7 +5668,7 @@ void ScGridWindow::UpdateAutoFillOverlay() aRanges, false); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOOAutoFill = new ::sdr::overlay::OverlayObjectList; mpOOAutoFill->append(*pOverlay); } @@ -5777,9 +5777,9 @@ void ScGridWindow::UpdateDragRectOverlay() } // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); @@ -5798,7 +5798,7 @@ void ScGridWindow::UpdateDragRectOverlay() aRanges, false); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOODragRect = new ::sdr::overlay::OverlayObjectList; mpOODragRect->append(*pOverlay); } @@ -5826,9 +5826,9 @@ void ScGridWindow::UpdateHeaderOverlay() if ( !aInvertRect.IsEmpty() ) { // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { // Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); std::vector< basegfx::B2DRange > aRanges; @@ -5844,7 +5844,7 @@ void ScGridWindow::UpdateHeaderOverlay() aRanges, false); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOOHeader = new ::sdr::overlay::OverlayObjectList; mpOOHeader->append(*pOverlay); } @@ -5896,9 +5896,9 @@ void ScGridWindow::UpdateShrinkOverlay() if ( !aPixRect.IsEmpty() ) { // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) + if (xOverlayManager.is()) { std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); @@ -5913,7 +5913,7 @@ void ScGridWindow::UpdateShrinkOverlay() aRanges, false); - pOverlayManager->add(*pOverlay); + xOverlayManager->add(*pOverlay); mpOOShrink = new ::sdr::overlay::OverlayObjectList; mpOOShrink->append(*pOverlay); } @@ -5924,7 +5924,7 @@ void ScGridWindow::UpdateShrinkOverlay() } // #i70788# central method to get the OverlayManager safely -::sdr::overlay::OverlayManager* ScGridWindow::getOverlayManager() +rtl::Reference<sdr::overlay::OverlayManager> ScGridWindow::getOverlayManager() { SdrPageView* pPV = pViewData->GetView()->GetScDrawView()->GetSdrPageView(); @@ -5938,18 +5938,16 @@ void ScGridWindow::UpdateShrinkOverlay() } } - return 0L; + return rtl::Reference<sdr::overlay::OverlayManager>(); } void ScGridWindow::flushOverlayManager() { // #i70788# get the OverlayManager safely - ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); + rtl::Reference<sdr::overlay::OverlayManager> xOverlayManager = getOverlayManager(); - if(pOverlayManager) - { - pOverlayManager->flush(); - } + if (xOverlayManager.is()) + xOverlayManager->flush(); } // --------------------------------------------------------------------------- |