Kaydet (Commit) 0f88c2a7 authored tarafından Matteo Casalin's avatar Matteo Casalin

Use auto and constify

Change-Id: Ib871b2c8bb5696bc7c31413548362410f0d35187
üst 3a9a754d
...@@ -1028,7 +1028,7 @@ bool SwFEShell::IsObjSelectable( const Point& rPt ) ...@@ -1028,7 +1028,7 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
{ {
SdrObject* pObj; SdrObject* pObj;
SdrPageView* pPV; SdrPageView* pPV;
sal_uInt16 nOld = pDView->GetHitTolerancePixel(); const auto nOld = pDView->GetHitTolerancePixel();
pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 ); pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
bRet = pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKMARKABLE ); bRet = pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKMARKABLE );
...@@ -1045,7 +1045,7 @@ SdrObject* SwFEShell::GetObjAt( const Point& rPt ) ...@@ -1045,7 +1045,7 @@ SdrObject* SwFEShell::GetObjAt( const Point& rPt )
if( pDView ) if( pDView )
{ {
SdrPageView* pPV; SdrPageView* pPV;
sal_uInt16 nOld = pDView->GetHitTolerancePixel(); const auto nOld = pDView->GetHitTolerancePixel();
pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 ); pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
pDView->PickObj( rPt, pDView->getHitTolLog(), pRet, pPV, SdrSearchOptions::PICKMARKABLE ); pDView->PickObj( rPt, pDView->getHitTolLog(), pRet, pPV, SdrSearchOptions::PICKMARKABLE );
...@@ -1065,7 +1065,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt) ...@@ -1065,7 +1065,7 @@ bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
{ {
SdrObject* pObj; SdrObject* pObj;
SdrPageView* pPV; SdrPageView* pPV;
sal_uInt16 nOld(pDrawView->GetHitTolerancePixel()); const auto nOld(pDrawView->GetHitTolerancePixel());
pDrawView->SetHitTolerancePixel(pDrawView->GetMarkHdlSizePixel()/2); pDrawView->SetHitTolerancePixel(pDrawView->GetMarkHdlSizePixel()/2);
bRet = pDrawView->PickObj(rPt, pDrawView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKMARKABLE); bRet = pDrawView->PickObj(rPt, pDrawView->getHitTolLog(), pObj, pPV, SdrSearchOptions::PICKMARKABLE);
...@@ -2513,7 +2513,7 @@ SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource, ...@@ -2513,7 +2513,7 @@ SwChainRet SwFEShell::Chainable( SwRect &rRect, const SwFrmFmt &rSource,
SdrObject* pObj; SdrObject* pObj;
SdrPageView* pPView; SdrPageView* pPView;
SwDrawView *pDView = const_cast<SwDrawView*>(Imp()->GetDrawView()); SwDrawView *pDView = const_cast<SwDrawView*>(Imp()->GetDrawView());
const sal_uInt16 nOld = pDView->GetHitTolerancePixel(); const auto nOld = pDView->GetHitTolerancePixel();
pDView->SetHitTolerancePixel( 0 ); pDView->SetHitTolerancePixel( 0 );
if( pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SdrSearchOptions::PICKMARKABLE ) && if( pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SdrSearchOptions::PICKMARKABLE ) &&
pObj->ISA(SwVirtFlyDrawObj) ) pObj->ISA(SwVirtFlyDrawObj) )
...@@ -2546,7 +2546,7 @@ SwChainRet SwFEShell::Chain( SwFrmFmt &rSource, const Point &rPt ) ...@@ -2546,7 +2546,7 @@ SwChainRet SwFEShell::Chain( SwFrmFmt &rSource, const Point &rPt )
SdrObject* pObj; SdrObject* pObj;
SdrPageView* pPView; SdrPageView* pPView;
SwDrawView *pDView = (SwDrawView*)Imp()->GetDrawView(); SwDrawView *pDView = (SwDrawView*)Imp()->GetDrawView();
const sal_uInt16 nOld = pDView->GetHitTolerancePixel(); const auto nOld = pDView->GetHitTolerancePixel();
pDView->SetHitTolerancePixel( 0 ); pDView->SetHitTolerancePixel( 0 );
pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SdrSearchOptions::PICKMARKABLE ); pDView->PickObj( rPt, pDView->getHitTolLog(), pObj, pPView, SdrSearchOptions::PICKMARKABLE );
pDView->SetHitTolerancePixel( nOld ); pDView->SetHitTolerancePixel( nOld );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment