[ooo-build-commit] Branch 'ooo/master' - sw/source

[Jan Holesovsky]

 sw/source/filter/ww8/ww8par2.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9ab4cb11593e5b1dfcd917fb363e4324274899c8
Author: Release Engineers <releng at openoffice.org>
Date:   Fri Aug 7 11:36:10 2009 +0000

    CWS-TOOLING: integrate CWS hb311fixes03_DEV300
    2009-07-28 11:08:46 +0200 hbrinkm  r274390 : #i103357# adapted patch and applied

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 0a45f90..bc6165a 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2382,7 +2382,8 @@ void WW8TabDesc::CalcDefaults()
         }
     } */
 
-    if (nMinLeft && ((!bIsBiDi && text::HoriOrientation::LEFT == eOri) || (bIsBiDi && text::HoriOrientation::RIGHT == eOri)))
+    if ((nMinLeft && !bIsBiDi && text::HoriOrientation::LEFT == eOri) || 
+        (nMinLeft != -108 && bIsBiDi && text::HoriOrientation::RIGHT == eOri)) // Word sets the first nCenter value to -108 when no indent is used
         eOri = text::HoriOrientation::LEFT_AND_WIDTH; //  absolutely positioned
 
     nDefaultSwCols = nMinCols;  // da Zellen einfuegen billiger ist als Mergen
@@ -2553,7 +2554,12 @@ void WW8TabDesc::CreateSwTable()
             if (!bIsBiDi)
                 nLeft = GetMinLeft();
             else
-                nLeft = pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft;
+            {
+                if (nPreferredWidth)                   
+                    nLeft = pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft;
+                else
+                    nLeft = -GetMinLeft();
+            }
 
             aL.SetLeft(nLeft);