[Libreoffice-commits] .: Branch 'ooo-build-3-2-1' - patches/dev300
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Nov 23 00:57:50 PST 2010
patches/dev300/apply | 1
patches/dev300/sw-ww8-colbreak-import.diff | 37 +++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
New commits:
commit bf3bc131dfc66e61e5ea532aff5a8fb57e179287
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Tue Nov 23 09:52:49 2010 +0100
n#652364: Fixed ww8 column break import
* patches/dev300/apply: applied the patch in the fixes
* patches/dev300/sw-ww8-colbreak-import.diff: the patch itself
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 09fe717..a08ecec 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3049,6 +3049,7 @@ floating-tables.diff n#617593, cbosdo
dummy-fields-ole-links.diff, n#628098, cbosdo
fields-nested-set.diff, n#634478, cbosdo
fields-double-click.diff, n#639288, cbosdo
+sw-ww8-colbreak-import.diff, n#652364, cbosdo
[ IxionUse ]
fields-table-formula.diff, n#631912, cbosdo
diff --git a/patches/dev300/sw-ww8-colbreak-import.diff b/patches/dev300/sw-ww8-colbreak-import.diff
new file mode 100644
index 0000000..6c1bc6f
--- /dev/null
+++ b/patches/dev300/sw-ww8-colbreak-import.diff
@@ -0,0 +1,37 @@
+diff --git sw/source/filter/ww8/ww8par.cxx sw/source/filter/ww8/ww8par.cxx
+index 83480ff..23abf02 100644
+--- sw/source/filter/ww8/ww8par.cxx
++++ sw/source/filter/ww8/ww8par.cxx
+@@ -3582,6 +3582,14 @@ void wwSectionManager::InsertSegments()
+ mySegIter aStart = maSegments.begin();
+ for (mySegIter aIter = aStart; aIter != aEnd; ++aIter)
+ {
++ // If the section is of type "New column" (0x01), then simply insert a column break
++ if ( aIter->maSep.bkc == 1 )
++ {
++ SwPaM start( aIter->maStart );
++ mrReader.rDoc.InsertPoolItem( start, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
++ continue;
++ }
++
+ mySegIter aNext = aIter+1;
+ mySegIter aPrev = (aIter == aStart) ? aIter : aIter-1;
+
+@@ -3593,11 +3601,12 @@ void wwSectionManager::InsertSegments()
+ bool bInsertSection = (aIter != aStart) ? (aIter->IsContinous() && bThisAndPreviousAreCompatible): false;
+ bool bInsertPageDesc = !bInsertSection;
+ 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 (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)
More information about the Libreoffice-commits
mailing list