[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Pranav Kant]

 sw/source/uibase/uiview/view2.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 83a0659e4fe4dfcc5b61e8dba30304238ee32aaa
Author: Pranav Kant <pranavk at collabora.co.uk>
Date:   Fri Mar 24 22:36:05 2017 +0530

    sw lok: Avoid double declaration of variable
    
    Fallback from f20bb20f8e1147d8ea1b93ee6dc216722461d456 when fixing merge
    conflicts
    
    Change-Id: I04a9c5dac43e4aeb3196decc703ad8e14f7b9944

diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index a9744b0b48b6..1cdfea949cc3 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -666,7 +666,6 @@ void SwView::Execute(SfxRequest &rReq)
             SwDoc *pDoc = m_pWrtShell->GetDoc();
             SwPaM *pCursor = m_pWrtShell->GetCursor();
             const SwRedlineTable& rRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
-            SwRedlineTable::size_type nRedline = SwRedlineTable::npos;
             sal_uInt16 nRedline = USHRT_MAX;
             if (pArgs && pArgs->GetItemState(nSlot, false, &pItem) == SfxItemState::SET)
             {