CWS-TOOLING: integrate CWS writerfilter07

2 files changed, 83 insertions, 1 deletions

diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 1f62d5f66d..77d98ab890 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1265,10 +1265,72 @@ const SwTable* SwDoc::TextToTable( const std::vector< std::vector<SwNodeRange> >
     return pNdTbl;
 }
 
+SwNodeRange * SwNodes::ExpandRangeForTableBox(const SwNodeRange & rRange)
+{
+    SwNodeRange * pResult = NULL;
+    bool bChanged = false;
+    
+    SwNodeIndex aNewStart = rRange.aStart;
+    SwNodeIndex aNewEnd = rRange.aEnd;
+    
+    SwNodeIndex aEndIndex = rRange.aEnd;
+    SwNodeIndex aIndex = rRange.aStart;
+    
+    while (aIndex < aEndIndex)
+    {
+        SwNode& rNode = aIndex.GetNode();
+        
+        if (rNode.IsStartNode())
+        {
+            // advance aIndex to the end node of this start node
+            SwNode * pEndNode = rNode.EndOfSectionNode();
+            aIndex = *pEndNode;
+            
+            if (aIndex > aNewEnd)
+            {
+                aNewEnd = aIndex;
+                bChanged = true;
+            }
+        }
+        else if (rNode.IsEndNode())
+        {
+            SwNode * pStartNode = rNode.StartOfSectionNode();
+            SwNodeIndex aStartIndex = *pStartNode;
+            
+            if (aStartIndex < aNewStart)
+            {
+                aNewStart = aStartIndex;
+                bChanged = true;
+            }
+        }
+        
+        if (aIndex < aEndIndex)
+            ++aIndex;	
+    }
+    
+    SwNode * pNode = &aIndex.GetNode();
+    while (pNode->IsEndNode())
+    {
+        SwNode * pStartNode = pNode->StartOfSectionNode();
+        SwNodeIndex aStartIndex(*pStartNode);
+        aNewStart = aStartIndex;        
+        aNewEnd = aIndex;
+        bChanged = true;
+        
+        ++aIndex;
+        pNode = &aIndex.GetNode();
+    }
+    
+    if (bChanged)
+        pResult = new SwNodeRange(aNewStart, aNewEnd);
+    
+    return pResult;
+}
+
 /*-- 18.05.2006 08:23:28---------------------------------------------------
 
   -----------------------------------------------------------------------*/
-SwTableNode* SwNodes::TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes,
+SwTableNode* SwNodes::TextToTable( const SwNodes::TableRanges_t & rTableNodes,
                                     SwTableFmt* pTblFmt,
                                     SwTableLineFmt* pLineFmt,
                                     SwTableBoxFmt* pBoxFmt,
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 133ad4d278..089cba42ad 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1885,6 +1885,26 @@ void SwXText::Impl::ConvertCell(
     {
         throw lang::IllegalArgumentException();
     }
+    
+    SwNodeRange aTmpRange(aStartCellPam.Start()->nNode, 
+                          aEndCellPam.End()->nNode);
+    SwNodeRange * pCorrectedRange = 
+        m_pDoc->GetNodes().ExpandRangeForTableBox(aTmpRange);
+    
+    if (pCorrectedRange != NULL)
+    {
+        SwPaM aNewStartPaM(pCorrectedRange->aStart, 0);
+        aStartCellPam = aNewStartPaM;
+        
+        xub_StrLen nEndLen = 0;                
+        SwTxtNode * pTxtNode = pCorrectedRange->aEnd.GetNode().GetTxtNode();
+        if (pTxtNode != NULL)
+            nEndLen = pTxtNode->Len();
+        
+        SwPaM aNewEndPaM(pCorrectedRange->aEnd, nEndLen);
+        aEndCellPam = aNewEndPaM;
+    }
+    
     /** check the nodes between start and end
         it is allowed to have pairs of StartNode/EndNodes
      */