ooo-build r14679 - in trunk: . patches/dev300 patches/lwp

[tml svn gnome org]

Author: tml
Date: Tue Dec  2 10:57:12 2008
New Revision: 14679
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14679&view=rev

Log:
2008-12-02  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/cws-ooo11lotusfilter-lwp-filter.diff
	* patches/dev300/cws-ooo11lotusfilter-lwp-filter-m35.diff:
	Differentiate for m35 vs. m36 and later.



Added:
   trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter-m35.diff   (props changed)
      - copied unchanged from r14677, /trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec  2 10:57:12 2008
@@ -1403,7 +1403,14 @@
 lwp-filter-component.diff, i#11215, noelpwer
 # Integrate cws ooo11lotusfilter for WordPro filter
 cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
+
+[ Lwp < dev300-m36 }
+cws-ooo11lotusfilter-lwp-filter-m35.diff, Fong
+
+[ Lwp >= dev300-m36 }
 cws-ooo11lotusfilter-lwp-filter.diff, Fong
+
+[ Lwp ]
 cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
 # avoid warning: control reaches end of non-void function
 warning-return-values-lotuswordpro.diff, pmladek

Modified: trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff
==============================================================================
--- trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff	(original)
+++ trunk/patches/lwp/cws-ooo11lotusfilter-lwp-filter.diff	Tue Dec  2 10:57:12 2008
@@ -39456,11 +39456,11 @@
 +		// Immer auf 1/100 mm, bis Mtf-Loesung gefunden
 +		// Annahme (keine Skalierung, keine Org-Verschiebung)
 +		DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleX() == Fraction( 1, 1 ),
-+			"X-Skalierung im Mtf" )
++			"X-Skalierung im Mtf" );
 +			DBG_ASSERT( pMtf->GetPrefMapMode().GetScaleY() == Fraction( 1, 1 ),
-+			"Y-Skalierung im Mtf" )
++			"Y-Skalierung im Mtf" );
 +			DBG_ASSERT( pMtf->GetPrefMapMode().GetOrigin() == Point(),
-+			"Origin-Verschiebung im Mtf" )
++			"Origin-Verschiebung im Mtf" );
 +			MapUnit nMU = pMtf->GetPrefMapMode().GetMapUnit();
 +		if( MAP_100TH_MM != nMU )
 +		{