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

[freuter svn gnome org]

Author: freuter
Date: Thu Jun 19 16:57:58 2008
New Revision: 12929
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12929&view=rev

Log:
Workaround for the competing protection problem from n#400884.

Added:
   branches/ooo-build-2-4-1/patches/src680/sw-field-patch-fix-competing-protection.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

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	Thu Jun 19 16:57:58 2008
@@ -2380,6 +2380,7 @@
 svtools-field-patch.diff, flr, n#248354
 sw-field-patch.diff, flr, n#248354
 xmloff-field-patch.diff, flr, n#248354
+sw-field-patch-fix-competing-protection.diff, flr, n#400884
 
 [ NovellOnly ]
 #only enable enhanced field work in Novell OOo by default

Added: branches/ooo-build-2-4-1/patches/src680/sw-field-patch-fix-competing-protection.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/sw-field-patch-fix-competing-protection.diff	Thu Jun 19 16:57:58 2008
@@ -0,0 +1,16 @@
+--- sw/source/filter/ww8/ww8par.cxx.save	2008-06-21 01:35:56.000000000 +0200
++++ sw/source/filter/ww8/ww8par.cxx	2008-06-21 01:36:04.000000000 +0200
+@@ -3602,7 +3602,12 @@
+ 
+         bool bInsertSection = aIter != aStart ? aIter->IsContinous() : false;
+         bool bInsertPageDesc = !bInsertSection;
+-        bool bProtected = !bUseEnhFields && SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++        bool bProtected = SectionIsProtected(*aIter); // do we really  need this ?? I guess I have a different logic in editshell which disales this...
++	if (bUseEnhFields && mrReader.pWDop->fProtEnabled && aIter->IsNotProtected()) {
++	    // here we have the special case that the whole document is protected, with the execption of this section.
++	    // I want to address this when I do the section rework, so for the moment we disable the overall protection then...
++	    mrReader.rDoc.set(IDocumentSettingAccess::PROTECT_FORM, false );
++	}
+ 
+         if (bInsertPageDesc)
+         {