[ooo-build-commit] patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                                      |    3 
 patches/dev300/sw-collapse-empty-table-par-like-html.diff |   48 ++++++--------
 patches/dev300/sw-section-import-fix.diff                 |   14 ++--
 3 files changed, 31 insertions(+), 34 deletions(-)

New commits:
commit 3118df085bca7485a4dbd237910754c17c1c0c70
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Mon Oct 12 15:53:46 2009 +0200

    Updated patches
    
    * patches/dev300/apply:
    * patches/dev300/sw-collapse-empty-table-par-like-html.diff:
        Fixed a non-applying chunk
    * patches/dev300/sw-section-import-fix.diff:
        Updated the patch

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1f2dd0d..4eee4f1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2789,8 +2789,7 @@ setup_native-package-glib2.diff
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
 
-# FIXME: 2009-10-01: This one applies, but doesn't build on dev300-m60.
-# sw-section-import-fix.diff, n#364533, freuter
+sw-section-import-fix.diff, n#364533, freuter
 
 sw-allow-negative-spacing.diff, n#364534, freuter
 
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 8644ba4..f7010d3 100644
--- a/patches/dev300/sw-collapse-empty-table-par-like-html.diff
+++ b/patches/dev300/sw-collapse-empty-table-par-like-html.diff
@@ -338,31 +338,29 @@ index 2426ced..f9cd78e 100644
  
      //
      // COMPATIBILITY FLAGS END
-# 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/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
+index 2426ced..f9cd78e 100644
+--- sw/source/filter/ww8/ww8par2.cxx
++++ sw/source/filter/ww8/ww8par2.cxx
+@@ -3623,18 +3623,6 @@
+     if (nInTable && pTableDesc)
+     {
+         pTableDesc->TableCellEnd();
+-
+-        if (bReadTable 
+-            && pWFlyPara == NULL 
+-            && mpTableEndPaM.get() != NULL 
+-            && (! SwPaM::Overlap(*pPaM, *mpTableEndPaM))
+-            && SwPaM::LessThan(*mpTableEndPaM, *pPaM)
+-            && mpTableEndPaM->GetPoint()->nNode.GetNode().IsTxtNode()
+-            && !lcl_PamContainsFly(*mpTableEndPaM)
+-            )
+-        {
+-            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
diff --git a/patches/dev300/sw-section-import-fix.diff b/patches/dev300/sw-section-import-fix.diff
index 0048668..65d4d3f 100644
--- a/patches/dev300/sw-section-import-fix.diff
+++ b/patches/dev300/sw-section-import-fix.diff
@@ -1,16 +1,16 @@
---- sw_save/source/filter/ww8/ww8par.cxx	2007-11-26 18:30:58.000000000 +0100
-+++ sw/source/filter/ww8/ww8par.cxx	2008-02-26 03:55:14.000000000 +0100
-@@ -2768,9 +2728,10 @@
+--- sw/source/filter/ww8/ww8par.cxx
++++ sw/source/filter/ww8/ww8par.cxx
+@@ -2808,9 +2808,10 @@
              else if (!nInTable)
              {
                  // Always insert a txtnode for a column break, e.g. ##
 -                AppendTxtNode(*pPaM->GetPoint());
 -                rDoc.InsertPoolItem(*pPaM,
 -                    SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
-+		SwCntntNode *pCntNd=pPaM->GetCntntNode();
-+		if (pCntNd!=NULL && pCntNd->Len()>0) // if par is empty not break is needed                
-+		    AppendTxtNode(*pPaM->GetPoint());
-+		rDoc.Insert(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
++                SwCntntNode *pCntNd=pPaM->GetCntntNode();
++                if (pCntNd!=NULL && pCntNd->Len()>0) // if par is empty not break is needed                
++                    AppendTxtNode(*pPaM->GetPoint());
++                rDoc.InsertPoolItem(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
              }
              break;
          case 0x7: