summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedricbosdo@openoffice.org>2010-11-29 13:51:01 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2010-11-29 13:53:55 +0100
commit92b5fb3b171f3cb228ffe3986f7a779974c0ef16 (patch)
tree5ccf392817caafad66639e8317d4105c198d2f0a
parentdaed77b4c7d5dee15114e7d6ad01ac9537097d2e (diff)
n#636367: Table alignment set to "From Left" when moving the right
When moving the right end of a table, the table alignment came to Manual but this caused size weirdness when switching from web to print layout. Using the "From left" option for the alignment keeps the size. * patches/dev300/apply: applying the patch * patches/dev300/sw-table-web-layout.diff: the actual patch
-rw-r--r--patches/dev300/apply1
-rw-r--r--patches/dev300/sw-table-web-layout.diff24
2 files changed, 25 insertions, 0 deletions
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 04152b011..422a9951b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3051,6 +3051,7 @@ fields-nested-set.diff, n#634478, cbosdo
fields-double-click.diff, n#639288, cbosdo
sw-ww8-colbreak-import.diff, n#652364, cbosdo
sw-font-color-gui-fix.diff, n#652204, cbosdo
+sw-table-web-layout.diff, n#636367, cbosdo
[ IxionUse ]
fields-table-formula.diff, n#631912, cbosdo
diff --git a/patches/dev300/sw-table-web-layout.diff b/patches/dev300/sw-table-web-layout.diff
new file mode 100644
index 000000000..b78dcdb8a
--- /dev/null
+++ b/patches/dev300/sw-table-web-layout.diff
@@ -0,0 +1,24 @@
+Fix table resize problem when switching to/from web layout
+
+From: Cédric Bosdonnat <cedricbosdo@openoffice.org>
+
+
+---
+
+ sw/source/core/table/swtable.cxx | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+
+diff --git sw/source/core/table/swtable.cxx sw/source/core/table/swtable.cxx
+index 4bc7e81..3e034b0 100644
+--- sw/source/core/table/swtable.cxx
++++ sw/source/core/table/swtable.cxx
+@@ -990,7 +990,7 @@ void SwTable::SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld,
+ else if(!bLeftDist && rNew.GetRight() + nShRight < rNew.GetRightMax())
+ aOri.SetHoriOrient( text::HoriOrientation::LEFT );
+ else
+- aOri.SetHoriOrient( text::HoriOrientation::NONE );
++ aOri.SetHoriOrient( text::HoriOrientation::LEFT_AND_WIDTH );
+ }
+ pFmt->SetFmtAttr( aOri );
+ }