ooo-build r11701 - in trunk: . patches/src680

[freuter svn gnome org]

Author: freuter
Date: Mon Feb 25 18:19:21 2008
New Revision: 11701
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11701&view=rev

Log:
some WW compatibility fixes: n#364533 and n#364534


Added:
   trunk/patches/src680/sw-allow-negative-spacing.diff
   trunk/patches/src680/sw-section-import-fix.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Feb 25 18:19:21 2008
@@ -2246,4 +2246,7 @@
 
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo
+sw-section-import-fix.diff, n#364533, freuter
+sw-allow-negative-spacing.diff, n#364534, freuter
+
 sd-slideshow-slideshowview-transformation-fix.diff

Added: trunk/patches/src680/sw-allow-negative-spacing.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sw-allow-negative-spacing.diff	Mon Feb 25 18:19:21 2008
@@ -0,0 +1,16 @@
+--- sw_save/source/core/text/txtfrm.cxx	2007-11-26 18:30:32.000000000 +0100
++++ sw/source/core/text/txtfrm.cxx	2008-02-26 05:27:17.000000000 +0100
+@@ -2401,10 +2401,13 @@
+             nTmp *= rSpace.GetPropLineSpace();
+             nTmp /= 100;
+             nTmp -= nRet;
++	    nRet = nTmp;
++/*
+             if ( nTmp > 0 )
+                 nRet = nTmp;
+             else
+                 nRet = 0;
++*/
+ 		}
+ 			break;
+ 		case SVX_INTER_LINE_SPACE_FIX:

Added: trunk/patches/src680/sw-section-import-fix.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sw-section-import-fix.diff	Mon Feb 25 18:19:21 2008
@@ -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: