[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                          |    7 +++++++
 patches/dev300/sw-section-import-fix-m58.diff |   15 +++++++++++++++
 patches/dev300/sw-section-import-fix.diff     |    5 +++--
 3 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 5b0f6131d1f19dbe65688b7e7d8d7e8644968e7a
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Sep 30 17:19:16 2009 -0400

    Adjusted for dev300-m60.
    
    * patches/dev300/apply:
    * patches/dev300/sw-section-import-fix-m58.diff:
    * patches/dev300/sw-section-import-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c0752ca..9874236 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2879,7 +2879,14 @@ setup_native-package-glib2.diff
 
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
+
+[ Fixes >= dev300-m60 ]
 sw-section-import-fix.diff, n#364533, freuter
+
+[ Fixes < dev300-m60 ]
+sw-section-import-fix-m58.diff, n#364533, freuter
+
+[ Fixes ]
 sw-allow-negative-spacing.diff, n#364534, freuter
 
 # FIXME: 2009-08-13: Does not apply, huh? --tml
diff --git a/patches/dev300/sw-section-import-fix-m58.diff b/patches/dev300/sw-section-import-fix-m58.diff
new file mode 100644
index 0000000..37b2160
--- /dev/null
+++ b/patches/dev300/sw-section-import-fix-m58.diff
@@ -0,0 +1,15 @@
+--- 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,8 +2728,10 @@
+             else if (!nInTable)
+             {
+                 // Always insert a txtnode for a column break, e.g. ##
+-                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.Insert(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
+             }
+             break;
+         case 0x7:
diff --git a/patches/dev300/sw-section-import-fix.diff b/patches/dev300/sw-section-import-fix.diff
index 37b2160..0048668 100644
--- a/patches/dev300/sw-section-import-fix.diff
+++ b/patches/dev300/sw-section-import-fix.diff
@@ -1,11 +1,12 @@
 --- 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,8 +2728,10 @@
+@@ -2768,9 +2728,10 @@
              else if (!nInTable)
              {
                  // Always insert a txtnode for a column break, e.g. ##
 -                AppendTxtNode(*pPaM->GetPoint());
--                rDoc.Insert(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
+-                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());