[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Cédric Bosdonnat]

 patches/dev300/apply                |    1 +
 patches/dev300/floating-tables.diff |   27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

New commits:
commit 5632ec2fe3e7432654084db3c0917bd40d00591d
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Aug 24 11:01:42 2010 +0200

    n#617593: Fix for WW8 floating tables
    
    * patches/dev300/apply:
    * patches/dev300/floating-tables.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4822b5f..ccf5c7c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3042,6 +3042,7 @@ field-patch-uno-fix.diff, cbosdo
 field-patch-lock.diff, n#601355, cbosdo
 dummy-fields.diff, n#628098, cbosdo
 empty-fields.diff, n#623944, cbosdo
+floating-tables.diff n#617593, cbosdo
 
 sw-import-html-controls.diff, n#485609, freuter
 svx-hacky-htmlselect-control-import.diff, n#523191, noelpwer
diff --git a/patches/dev300/floating-tables.diff b/patches/dev300/floating-tables.diff
new file mode 100644
index 0000000..31bcad9
--- /dev/null
+++ b/patches/dev300/floating-tables.diff
@@ -0,0 +1,27 @@
+WW8: Fix floating table import
+
+From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
+
+
+---
+
+ sw/source/filter/ww8/ww8par6.cxx |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+
+diff --git sw/source/filter/ww8/ww8par6.cxx sw/source/filter/ww8/ww8par6.cxx
+index c16177e..3d4779a 100644
+--- sw/source/filter/ww8/ww8par6.cxx
++++ sw/source/filter/ww8/ww8par6.cxx
+@@ -2216,7 +2216,10 @@ WW8FlySet::WW8FlySet(SwWW8ImplReader& rReader, const WW8FlyPara* pFW,
+         Put(SvxULSpaceItem(pFS->nUpMgn, pFS->nLoMgn, RES_UL_SPACE));
+ 
+     //we no longer need to hack around the header/footer problems
+-    Put(SwFmtSurround(pFS->eSurround));
++    SwFmtSurround aSurround(pFS->eSurround);
++    if ( pFS->eSurround == SURROUND_IDEAL )
++        aSurround.SetAnchorOnly( TRUE );
++    Put( aSurround );
+ 
+     short aSizeArray[5]={0};
+     rReader.SetFlyBordersShadow(*this,(const WW8_BRC*)pFW->brc,&aSizeArray[0]);