[Libreoffice-commits] .: sw/source

[Noel Power]

 sw/source/filter/ww8/ww8par6.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 9ca076f6236a24e8909fdd471ea7acea88bfc01b
Author: Noel Power <noel.power at novell.com>
Date:   Mon Aug 15 11:23:31 2011 +0100

    bnc#693477 improve column/table width when table width > pagewidth

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 11fd617..8b6bf66 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2291,7 +2291,14 @@ SwTwips SwWW8ImplReader::MoveOutsideFly(SwFrmFmt *pFlyFmt,
                                 aSize.SetHeightSizeType(ATT_MIN_SIZE);
                                 aSize.SetHeight(MINLAY);
                                 pFlyFmt->SetFmtAttr(aSize);
-                                pTblFmt->SetFmtAttr(SwFmtHoriOrient(0,text::HoriOrientation::FULL));
+                                SwFmtHoriOrient aHori = pTblFmt->GetHoriOrient();
+                                // passing the table orientaion of
+                                // LEFT_AND_WIDTH to the frame seems to
+                                // work better than FULL, especially if the
+                                // table width exceeds the page width, however
+                                // I am not brave enough to set it in all
+                                // instances
+                                pTblFmt->SetFmtAttr( SwFmtHoriOrient(0, ( aHori.GetHoriOrient() == text::HoriOrientation::LEFT_AND_WIDTH ) ? ::text::HoriOrientation::LEFT_AND_WIDTH : text::HoriOrientation::FULL ) );
                                 nRetWidth = aSize.GetWidth();
                             }
                         }