[Libreoffice-commits] core.git: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Jul 25 06:46:17 UTC 2018
sw/source/uibase/docvw/edtdd.cxx | 5 -
sw/source/uibase/docvw/edtwin.cxx | 99 +++++++++++++------------------------
sw/source/uibase/docvw/edtwin2.cxx | 3 -
sw/source/uibase/inc/edtwin.hxx | 14 ++---
4 files changed, 45 insertions(+), 76 deletions(-)
New commits:
commit 3426b8ea0ded6423e465bf1770433b39cc345ffd
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Tue Jul 24 10:41:27 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Jul 25 08:45:51 2018 +0200
loplugin:useuniqueptr in SwEditWin
Change-Id: I93dc00565c5ae99be774300bdde92e08546b3571
Reviewed-on: https://gerrit.libreoffice.org/57937
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sw/source/uibase/docvw/edtdd.cxx b/sw/source/uibase/docvw/edtdd.cxx
index ed773db4b658..9c5413a85aad 100644
--- a/sw/source/uibase/docvw/edtdd.cxx
+++ b/sw/source/uibase/docvw/edtdd.cxx
@@ -174,8 +174,7 @@ void SwEditWin::CleanupDropUserMarker()
{
if ( m_pUserMarker )
{
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
+ m_pUserMarker.reset();
m_pUserMarkerObj = nullptr;
}
}
@@ -464,7 +463,7 @@ sal_Int8 SwEditWin::AcceptDrop( const AcceptDropEvent& rEvt )
if(m_pUserMarkerObj)
{
- m_pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), *m_pUserMarkerObj );
+ m_pUserMarker.reset(new SdrDropMarkerOverlay( *rSh.GetDrawView(), *m_pUserMarkerObj ));
}
}
}
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index bbf7c8400dd6..bd468aa41d5c 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -352,8 +352,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
PointerStyle eStyle = PointerStyle::Fill;
if ( rSh.IsOverReadOnlyPos( rLPt ) )
{
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
+ m_pUserMarker.reset();
eStyle = PointerStyle::NotAllowed;
}
@@ -378,13 +377,12 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
if ( !m_pUserMarker )
{
- m_pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), aTmp );
+ m_pUserMarker.reset(new SdrDropMarkerOverlay( *rSh.GetDrawView(), aTmp ));
}
}
else
{
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
+ m_pUserMarker.reset();
}
rSh.SwCursorShell::SetVisibleCursor( rLPt );
@@ -410,13 +408,12 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16 nModifier )
if ( !m_pUserMarker )
{
- m_pUserMarker = new SdrDropMarkerOverlay( *rSh.GetDrawView(), aTmp );
+ m_pUserMarker.reset(new SdrDropMarkerOverlay( *rSh.GetDrawView(), aTmp ));
}
}
else
{
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
+ m_pUserMarker.reset();
}
SetPointer( eStyle );
@@ -644,10 +641,10 @@ IMPL_LINK_NOARG(SwEditWin, TimerHandler, Timer *, void)
}
if ( !bDone && !(g_bFrameDrag || m_bInsDraw) )
{
- if ( m_pRowColumnSelectionStart )
+ if ( m_xRowColumnSelectionStart )
{
Point aPos( aModPt );
- rSh.SelectTableRowCol( *m_pRowColumnSelectionStart, &aPos, m_bIsRowDrag );
+ rSh.SelectTableRowCol( *m_xRowColumnSelectionStart, &aPos, m_bIsRowDrag );
}
else
rSh.CallSetCursor( &aModPt, false );
@@ -691,8 +688,7 @@ void SwEditWin::LeaveArea(const Point &rPos)
JustifyAreaTimer();
if( !m_aTimer.IsActive() )
m_aTimer.Start();
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
inline void SwEditWin::EnterArea()
@@ -1379,8 +1375,7 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
// running on a document, no order is being taken
return;
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
m_aKeyInputFlushTimer.Stop();
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly() &&
@@ -2741,8 +2736,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
}
m_bWasShdwCursor = nullptr != m_pShadCursor;
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
const Point aDocPos( PixelToLogic( rMEvt.GetPosPixel() ) );
@@ -2904,7 +2898,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
rSh.SelectTableRowCol( aDocPos );
if( SwTab::SEL_HORI != nMouseTabCol && SwTab::SEL_HORI_RTL != nMouseTabCol)
{
- m_pRowColumnSelectionStart = new Point( aDocPos );
+ m_xRowColumnSelectionStart = aDocPos;
m_bIsRowDrag = SwTab::ROWSEL_HORI == nMouseTabCol||
SwTab::ROWSEL_HORI_RTL == nMouseTabCol ||
SwTab::COLSEL_VERT == nMouseTabCol;
@@ -3001,7 +2995,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
{
// #i121463# Set selected during drag
pHdl->SetSelected();
- m_pAnchorMarker = new SwAnchorMarker( pHdl );
+ m_pAnchorMarker.reset( new SwAnchorMarker( pHdl ) );
UpdatePointer( aDocPos, rMEvt.GetModifier() );
return;
}
@@ -3156,7 +3150,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
( pHdl->GetKind() == SdrHdlKind::Anchor ||
pHdl->GetKind() == SdrHdlKind::Anchor_TR ) )
{
- m_pAnchorMarker = new SwAnchorMarker( pHdl );
+ m_pAnchorMarker.reset( new SwAnchorMarker( pHdl ) );
UpdatePointer( aDocPos, rMEvt.GetModifier() );
return;
}
@@ -3701,8 +3695,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( m_pShadCursor && 0 != (rMEvt.GetModifier() + rMEvt.GetButtons() ) )
{
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
bool bIsDocReadOnly = m_rView.GetDocShell()->IsReadOnly();
@@ -3736,15 +3729,14 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( m_pShadCursor && !bInsWin )
{
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
- if( bInsWin && m_pRowColumnSelectionStart )
+ if( bInsWin && m_xRowColumnSelectionStart )
{
EnterArea();
Point aPos( aDocPt );
- if( rSh.SelectTableRowCol( *m_pRowColumnSelectionStart, &aPos, m_bIsRowDrag ))
+ if( rSh.SelectTableRowCol( *m_xRowColumnSelectionStart, &aPos, m_bIsRowDrag ))
return;
}
@@ -3895,8 +3887,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
}
else
{
- delete m_pAnchorMarker;
- m_pAnchorMarker = nullptr;
+ m_pAnchorMarker.reset();
}
}
if ( m_bInsDraw )
@@ -4173,8 +4164,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( rSh.GetShadowCursorPos( aDocPt, eMode, aRect, eOrient ))
{
if( !m_pShadCursor )
- m_pShadCursor = new SwShadowCursor( *this,
- SwViewOption::GetDirectCursorColor() );
+ m_pShadCursor.reset( new SwShadowCursor( *this,
+ SwViewOption::GetDirectCursorColor() ) );
if( text::HoriOrientation::RIGHT != eOrient && text::HoriOrientation::CENTER != eOrient )
eOrient = text::HoriOrientation::LEFT;
m_pShadCursor->SetPos( aRect.Pos(), aRect.Height(), static_cast< sal_uInt16 >(eOrient) );
@@ -4195,8 +4186,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
if( bDelShadCursor && m_pShadCursor )
{
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
m_bWasShdwCursor = false;
}
@@ -4221,12 +4211,10 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
m_bWasShdwCursor = false;
if( m_pShadCursor )
{
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
- if( m_pRowColumnSelectionStart )
- DELETEZ( m_pRowColumnSelectionStart );
+ m_xRowColumnSelectionStart.reset();
SdrHdlKind eOldSdrMoveHdl = g_eSdrMoveHdl;
g_eSdrMoveHdl = SdrHdlKind::User; // for MoveEvents - reset again
@@ -4308,7 +4296,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
}
Point aPnt( m_pAnchorMarker->GetLastPos() );
- DELETEZ( m_pAnchorMarker );
+ m_pAnchorMarker.reset();
if( aPnt.X() || aPnt.Y() )
rSh.FindAnchorPos( aPnt, true );
}
@@ -4878,12 +4866,12 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
{
static bool bIdle = false;
- DELETEZ(m_pApplyTempl);
+ m_pApplyTempl.reset();
SwWrtShell &rSh = m_rView.GetWrtShell();
if(rTempl.m_pFormatClipboard)
{
- m_pApplyTempl = new SwApplyTemplate( rTempl );
+ m_pApplyTempl.reset(new SwApplyTemplate( rTempl ));
m_pApplyTempl->nUndo = rSh.GetDoc()->GetIDocumentUndoRedo().GetUndoActionCount();
SetPointer( PointerStyle::Fill );//@todo #i20119# maybe better a new brush pointer here in future
rSh.NoEdit( false );
@@ -4892,7 +4880,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
}
else if(rTempl.nColor)
{
- m_pApplyTempl = new SwApplyTemplate( rTempl );
+ m_pApplyTempl.reset(new SwApplyTemplate( rTempl ));
m_pApplyTempl->nUndo = rSh.GetDoc()->GetIDocumentUndoRedo().GetUndoActionCount();
SetPointer( PointerStyle::Fill );
rSh.NoEdit( false );
@@ -4901,7 +4889,7 @@ void SwEditWin::SetApplyTemplate(const SwApplyTemplate &rTempl)
}
else if( rTempl.eType != SfxStyleFamily::None )
{
- m_pApplyTempl = new SwApplyTemplate( rTempl );
+ m_pApplyTempl.reset(new SwApplyTemplate( rTempl ));
m_pApplyTempl->nUndo = rSh.GetDoc()->GetIDocumentUndoRedo().GetUndoActionCount();
SetPointer( PointerStyle::Fill );
rSh.NoEdit( false );
@@ -4942,7 +4930,6 @@ SwEditWin::SwEditWin(vcl::Window *pParent, SwView &rMyView):
m_pUserMarker( nullptr ),
m_pUserMarkerObj( nullptr ),
m_pShadCursor( nullptr ),
- m_pRowColumnSelectionStart( nullptr ),
m_rView( rMyView ),
@@ -5012,29 +4999,21 @@ SwEditWin::~SwEditWin()
void SwEditWin::dispose()
{
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
-
- delete m_pRowColumnSelectionStart;
- m_pRowColumnSelectionStart = nullptr;
+ m_pShadCursor.reset();
if( m_pQuickHlpData->m_bIsDisplayed && m_rView.GetWrtShellPtr() )
m_pQuickHlpData->Stop( m_rView.GetWrtShell() );
g_bExecuteDrag = false;
- delete m_pApplyTempl;
- m_pApplyTempl = nullptr;
+ m_pApplyTempl.reset();
m_rView.SetDrawFuncPtr(nullptr);
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
+ m_pUserMarker.reset();
- delete m_pAnchorMarker;
- m_pAnchorMarker = nullptr;
+ m_pAnchorMarker.reset();
m_pFrameControlsManager->dispose();
- delete m_pFrameControlsManager;
- m_pFrameControlsManager = nullptr;
+ m_pFrameControlsManager.reset();
DragSourceHelper::dispose();
DropTargetHelper::dispose();
@@ -5237,11 +5216,7 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
case CommandEventId::Wheel:
case CommandEventId::StartAutoScroll:
case CommandEventId::AutoScroll:
- if( m_pShadCursor )
- {
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
- }
+ m_pShadCursor.reset();
bCallBase = !m_rView.HandleWheelCommands( rCEvt );
break;
@@ -5801,11 +5776,7 @@ void SwEditWin::SetChainMode( bool bOn )
if ( !m_bChainMode )
StopInsFrame();
- if ( m_pUserMarker )
- {
- delete m_pUserMarker;
- m_pUserMarker = nullptr;
- }
+ m_pUserMarker.reset();
m_bChainMode = bOn;
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index d89678c6d088..48b348cff00b 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -428,8 +428,7 @@ void SwEditWin::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle
if( rRect.IsInside( aRect ) )
{
// then cancel
- delete m_pShadCursor;
- m_pShadCursor = nullptr;
+ m_pShadCursor.reset();
}
else if( rRect.IsOver( aRect ))
{
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 13dc3de08f56..c2884540f352 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -85,13 +85,13 @@ class SwEditWin final : public vcl::Window,
// type/object where the mouse pointer is
SwCallMouseEvent m_aSaveCallEvent;
- SwApplyTemplate *m_pApplyTempl;
- SwAnchorMarker *m_pAnchorMarker; // for relocating the anchor
+ std::unique_ptr<SwApplyTemplate> m_pApplyTempl;
+ std::unique_ptr<SwAnchorMarker> m_pAnchorMarker; // for relocating the anchor
- SdrDropMarkerOverlay *m_pUserMarker;
+ std::unique_ptr<SdrDropMarkerOverlay> m_pUserMarker;
SdrObject *m_pUserMarkerObj;
- SwShadowCursor *m_pShadCursor;
- Point *m_pRowColumnSelectionStart; // save position where table row/column selection has been started
+ std::unique_ptr<SwShadowCursor> m_pShadCursor;
+ boost::optional<Point> m_xRowColumnSelectionStart; // save position where table row/column selection has been started
SwView &m_rView;
@@ -124,7 +124,7 @@ class SwEditWin final : public vcl::Window,
sal_uInt16 m_nKS_NUMDOWN_Count; // #i23725#
sal_uInt16 m_nKS_NUMINDENTINC_Count;
- SwFrameControlsManager *m_pFrameControlsManager;
+ std::unique_ptr<SwFrameControlsManager> m_pFrameControlsManager;
void LeaveArea(const Point &);
void JustifyAreaTimer();
@@ -224,7 +224,7 @@ public:
static bool IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCursor );
void SetApplyTemplate(const SwApplyTemplate &);
- SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; }
+ SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl.get(); }
void StartExecuteDrag();
void DragFinished();
More information about the Libreoffice-commits
mailing list