diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-03-24 22:36:05 +0530 |
|---|---|---|
| committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-03-24 22:37:10 +0530 |
| commit | 83a0659e4fe4dfcc5b61e8dba30304238ee32aaa (patch) | |
| tree | 5f97b073a516e65ce6ee1a2ec275c57a1b5fd5fc | |
| parent | b9308968af3fb3b812ee4494533e07fb66c1755d (diff) | |
sw lok: Avoid double declaration of variable
Fallback from f20bb20f8e1147d8ea1b93ee6dc216722461d456 when fixing merge
conflicts
Change-Id: I04a9c5dac43e4aeb3196decc703ad8e14f7b9944
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |