ooo-build r14316 - in branches/ooo-build-3-0: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Wed Oct 15 18:17:11 2008
New Revision: 14316
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14316&view=rev

Log:
2008-10-15  Petr Mladek  <pmladek suse cz>

	* patches/src680/sw-field-patch-fix-competing-protection.diff:
	Workaround for the competing protection problem from n#400884;
	ported Florian's fix from ooo-build-2-4-1 branch



Added:
   branches/ooo-build-3-0/patches/dev300/sw-field-patch-fix-competing-protection.diff
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/patches/dev300/apply

Modified: branches/ooo-build-3-0/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0/patches/dev300/apply	Wed Oct 15 18:17:11 2008
@@ -2414,6 +2414,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
 
 [ RadioButtons ]
 # Add a GroupName property to RadioButtons so that RadioButtons don't need to

Added: branches/ooo-build-3-0/patches/dev300/sw-field-patch-fix-competing-protection.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0/patches/dev300/sw-field-patch-fix-competing-protection.diff	Wed Oct 15 18:17:11 2008
@@ -0,0 +1,16 @@
+--- sw/source/filter/ww8/ww8par.cxx.old	2008-10-15 16:33:07.000000000 +0200
++++ sw/source/filter/ww8/ww8par.cxx	2008-10-15 17:55:41.000000000 +0200
+@@ -3503,7 +3503,12 @@ void wwSectionManager::InsertSegments()
+ 
+         bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() &&  bThisAndPreviousAreCompatible): 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)
+         {