[Libreoffice-commits] core.git: sw/source

[Oliver-Rainer Wittmann]

 sw/source/core/edit/eddel.cxx |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit e47b7f967bcdd8b1e830d07b2ad941b1302686f7
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Thu Jun 27 09:56:32 2013 +0000

    Related: #i121925# fixed by reverting change for issue #i119652#
    
    (cherry picked from commit be6ce149c164d8ac06f12a4a1cc04a9299f5fd07)
    
    Conflicts:
    	sw/source/core/edit/eddel.cxx
    
    Change-Id: I13ff642a7d983a1a1ffe4e3e0b412ec190d900bb

diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2d7adb6..05ea03a 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 for selections
-    if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
+    // only on a selection
+    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,6 +71,9 @@ 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() )
             {