diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-06-27 15:27:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-06-27 15:38:33 +0200 |
| commit | fd2bd50bb4fbe139cd1ed9332c0d2eeaebc7dabe (patch) | |
| tree | da0d8c435601850df984386c73d8898fa74c4785 /sw | |
| parent | 97e6ff086e2601c066c32fca8412e939843dae3f (diff) | |
Revert "Related: #i121925# fixed by reverting change for issue #i119652#"
This reverts commit e47b7f967bcdd8b1e830d07b2ad941b1302686f7.
The original commit this reverts was never merged anyway and this adds
some line that were context in the AOO commit.
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/edit/eddel.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx index 05ea03a0ab58..2d7adb6e816b 100644 --- a/sw/source/core/edit/eddel.cxx +++ b/sw/source/core/edit/eddel.cxx @@ -35,17 +35,17 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo ) { - // only on a selection - if ( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark()) + // only for selections + if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark()) return; // Is the selection in a table? Then delete only the content of the selected boxes. // Here, there are two cases: // 1. Point and Mark are in one box, delete selection as usual // 2. Point and Mare are in different boxes, search all selected boxes and delete content - if( rPam.GetNode()->FindTableNode() && - rPam.GetNode()->StartOfSectionNode() != rPam.GetNode(sal_False)->StartOfSectionNode() ) + rPam.GetNode()->StartOfSectionNode() != + rPam.GetNode(sal_False)->StartOfSectionNode() ) { // group the Undo in the table if( pUndo && !*pUndo ) @@ -71,9 +71,6 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo ) aDelPam.Move( fnMoveBackward, fnGoCntnt ); } // skip protected boxes - //For i117395, in some situation, the node would be hidden or invisible, which makes the frame of it unavailable - //So verify it before use it. - SwCntntFrm* pFrm = NULL; if( !pNd->IsCntntNode() || !pNd->IsInProtectSect() ) { |