diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 09:43:20 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-02 20:08:13 +0000 |
| commit | 24e7d0390f08c79cfb7b9f71c7cd674594fe2b7f (patch) | |
| tree | d4e32c69714741426f532da377fe6f15808f9520 /sc/source/ui | |
| parent | a2bdb9ab23e3f229f669d6c4f7c0ce9853a97ed1 (diff) | |
coverity#1187655 Logically dead code
Change-Id: I3f490ca9d93849b021bf5804079fd215f077ad49
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 4df2b5fb4dc9..91d08cce4f51 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -591,24 +591,17 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, } ScRange aMarkRange; - bool bSimple = false; ScMarkData aMultiMark = rMark; aMultiMark.SetMarking(false); // fuer MarkToMulti ScDocument* pUndoDoc = NULL; - bool bMulti = !bSimple && aMultiMark.IsMultiMarked(); - if (!bSimple) - { - aMultiMark.MarkToMulti(); - aMultiMark.GetMultiMarkArea( aMarkRange ); - } + bool bMulti = aMultiMark.IsMultiMarked(); + aMultiMark.MarkToMulti(); + aMultiMark.GetMultiMarkArea( aMarkRange ); ScRange aExtendedRange(aMarkRange); - if (!bSimple) - { - if ( pDoc->ExtendMerge( aExtendedRange, true ) ) - bMulti = false; - } + if ( pDoc->ExtendMerge( aExtendedRange, true ) ) + bMulti = false; // keine Objekte auf geschuetzten Tabellen bool bObjects = false; @@ -666,14 +659,7 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, } //! HideAllCursors(); // falls Zusammenfassung aufgehoben wird - if (bSimple) - pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), - aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), - aMultiMark, nFlags ); - else - { - pDoc->DeleteSelection( nFlags, aMultiMark ); - } + pDoc->DeleteSelection( nFlags, aMultiMark ); // add undo action after drawing undo is complete (objects and note captions) if( bRecord ) |