summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@novell.com>2011-07-26 18:47:19 +0100
committerNoel Power <noel.power@novell.com>2011-07-26 18:47:19 +0100
commit797ff3c3e4d1c5a8f604619625d782583d9477de (patch)
treeac6b2ce07f317719a61ea3f887c60c8b188e04ba
parent64842a9788227a5a18241ddfb5f0f679f09a007c (diff)
Revert "fix for bnc#693477 ensure table alignment is preserved"
This reverts commit 95351a519bec2833f5d936c20e3916a4e283b0f6. <sigh> after testing on another machine I think this is indeed font related, there is I think a genuine issue with the tablewidth and column width getting truncated with the 'FULL' setting but... it appears this isn't the fix for this bug.
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 578a3a609d..357711a4ba 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2290,8 +2290,7 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
aSize.SetHeightSizeType(ATT_MIN_SIZE);
aSize.SetHeight(MINLAY);
pFlyFmt->SetFmtAttr(aSize);
- SwFmtHoriOrient aHori = pTblFmt->GetHoriOrient();
- pTblFmt->SetFmtAttr(SwFmtHoriOrient(0, aHori.GetHoriOrient() ) );
+ pTblFmt->SetFmtAttr(SwFmtHoriOrient(0,text::HoriOrientation::FULL));
nRetWidth = aSize.GetWidth();
}
}