[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/sw-collapse-empty-table-par-like-html.diff |   48 +++++++-------
 1 file changed, 25 insertions(+), 23 deletions(-)

New commits:
commit 221fad5c299496a3f38286787f6e34801ad32b81
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Sep 7 16:22:07 2009 +0300

    Comment out part of sw-collapse-empty-table-par-like-html.diff
    
    The diff to SwWW8ImplReader::TabCellEnd() in
    sw/source/filter/ww8/ww8par2.cxx does not aply any more. Whether the
    corresponding snippet should still be removed from the upstream code,
    or the additional code now in upstream means that this hunk is now
    unneeded, I don't know. Commented it out.

diff --git a/patches/dev300/sw-collapse-empty-table-par-like-html.diff b/patches/dev300/sw-collapse-empty-table-par-like-html.diff
index 51c82b8..8644ba4 100644
--- a/patches/dev300/sw-collapse-empty-table-par-like-html.diff
+++ b/patches/dev300/sw-collapse-empty-table-par-like-html.diff
@@ -338,29 +338,31 @@ index 2426ced..f9cd78e 100644
  
      //
      // COMPATIBILITY FLAGS END
-diff --git sw/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
-index 0a45f90..36e4d27 100644
---- sw/source/filter/ww8/ww8par2.cxx
-+++ sw/source/filter/ww8/ww8par2.cxx
-@@ -3578,18 +3578,6 @@ void SwWW8ImplReader::TabCellEnd()
-     if (nInTable && pTableDesc)
-     {
-         pTableDesc->TableCellEnd();
--
--        if (bReadTable 
--            && pWFlyPara == NULL 
--            && mpTableEndPaM.get() != NULL 
--            && (! SwPaM::Overlap(*pPaM, *mpTableEndPaM))
--            && SwPaM::LessThan(*mpTableEndPaM, *pPaM))
--        {
--            if (mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode())
--            {
--                rDoc.DelFullPara(*mpTableEndPaM);
--            }
--        }    
-     }
-     
-     bFirstPara = true;    // We have come to the end of a cell so FirstPara flag
+# FIXME: 2009-09-07: The below does not apply to dev300-m57. 
+# Whether the corresponding snippet should still be removed
+# from the upstream code, or the additional code now in upstream
+# means that this hunk is now unneeded, I don't know. --tml
+# --- sw/source/filter/ww8/ww8par2.cxx
+# +++ sw/source/filter/ww8/ww8par2.cxx
+# @@ -3578,18 +3578,6 @@ void SwWW8ImplReader::TabCellEnd()
+#      if (nInTable && pTableDesc)
+#      {
+#          pTableDesc->TableCellEnd();
+# -
+# -        if (bReadTable 
+# -            && pWFlyPara == NULL 
+# -            && mpTableEndPaM.get() != NULL 
+# -            && (! SwPaM::Overlap(*pPaM, *mpTableEndPaM))
+# -            && SwPaM::LessThan(*mpTableEndPaM, *pPaM))
+# -        {
+# -            if (mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode())
+# -            {
+# -                rDoc.DelFullPara(*mpTableEndPaM);
+# -            }
+# -        }    
+#      }
+#      
+#      bFirstPara = true;    // We have come to the end of a cell so FirstPara flag
 diff --git sw/source/ui/uno/SwXDocumentSettings.cxx sw/source/ui/uno/SwXDocumentSettings.cxx
 index a65d367..039cfb4 100644
 --- sw/source/ui/uno/SwXDocumentSettings.cxx