ooo-build r13332 - in branches/ooo-build-2-4-1: . patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jul 21 20:23:00 2008
New Revision: 13332
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13332&view=rev

Log:
fix a typo in win32 installer + backport a little tiny safe fix

Added:
   branches/ooo-build-2-4-1/patches/src680/sw-source-filter-ww8-continous-section-break-fix.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply
   branches/ooo-build-2-4-1/patches/src680/win32-installer-register-moox-types.diff

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Mon Jul 21 20:23:00 2008
@@ -52,7 +52,7 @@
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, DIS26300
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, CairoFonts, DIS26300
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, TransparentPrinting, PptExport, LinkWarningDlg, CairoFonts, DIS26300
-SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, TransparentPrinting, PptExport, LinkWarningDlg, CairoFonts, DIS26300
+SUSE      : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, TransparentPrinting, PptExport, LinkWarningDlg, CairoFonts, DIS26300, UnstableLibwpd
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, CalcSolver, BerkeleyDB43, Split, PostgreSQL
@@ -2446,6 +2446,7 @@
 # don't do dns lookup on startup
 lockfile-dont-do-dns-lookup.diff, n#389257, jholesov
 
+sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, fridrich
 
 [ DIS26300 ]
 # better conformance to DIS26300 (ODF)

Added: branches/ooo-build-2-4-1/patches/src680/sw-source-filter-ww8-continous-section-break-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/sw-source-filter-ww8-continous-section-break-fix.diff	Mon Jul 21 20:23:00 2008
@@ -0,0 +1,30 @@
+--- sw/source//filter/ww8/ww8par.cxx	2008-07-04 22:05:07.000000000 +0200
++++ sw/source//filter/ww8/ww8par.cxx	2008-07-04 22:01:31.000000000 +0200
+@@ -3435,8 +3435,14 @@
+     for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
+     {
+         mySegIter aNext = aIter+1;
++        mySegIter aPrev = (aIter == aStart) ? aIter : aIter-1;
+ 
+-        bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false;
++        // If two following sections are different in following properties, Word will interprete a continuous
++        // section break between them as if it was a section break next page.
++        bool bThisAndPreviousAreCompatible = ((aIter->GetPageWidth() == aPrev->GetPageWidth()) &&
++            (aIter->GetPageHeight() == aPrev->GetPageHeight()) && (aIter->IsLandScape() == aPrev->IsLandScape()));
++
++        bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): false;
+         bool bInsertPageDesc = !bInsertSection;
+         bool bProtected = SectionIsProtected(*aIter);
+ 
+@@ -3452,7 +3458,10 @@
+             */
+ 
+             bool bIgnoreCols = false;
+-            if ((aNext != aEnd && aNext->IsContinous() || bProtected))
++            bool bThisAndNextAreCompatible = (aNext != aEnd) ? ((aIter->GetPageWidth() == aNext->GetPageWidth()) &&
++                (aIter->GetPageHeight() == aNext->GetPageHeight()) && (aIter->IsLandScape() == aNext->IsLandScape())) : true;
++
++            if ((aNext != aEnd && aNext->IsContinous() && bThisAndNextAreCompatible || bProtected))
+             {
+                 bIgnoreCols = true;
+                 if ((aIter->NoCols() > 1) || bProtected)

Modified: branches/ooo-build-2-4-1/patches/src680/win32-installer-register-moox-types.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/win32-installer-register-moox-types.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/win32-installer-register-moox-types.diff	Mon Jul 21 20:23:00 2008
@@ -83,7 +83,7 @@
 +std::wstring RegistrationContextInformation::GetMOOXPowerPointDocumentDisplayName() const
 +{	
 +	std::wstring str;
-+	str = TEXT("Microsoft Excel 2007 Presentation");
++	str = TEXT("Microsoft PowerPoint 2007 Presentation");
 +	return str;
 +}
 +