diff options
author | Release Engineers <releng@openoffice.org> | 2009-08-07 11:36:10 +0000 |
---|---|---|
committer | Release Engineers <releng@openoffice.org> | 2009-08-07 11:36:10 +0000 |
commit | fb0c523db39601f0b75d235a5419fc7b2fdcad0b (patch) | |
tree | 6302148c586e1bb84d3e43db4cb7cf70869e1ca9 /sw | |
parent | 3f809805a20d3bda2fb017a2139e16ebcd9ca112 (diff) |
CWS-TOOLING: integrate CWS hb311fixes03_DEV300
2009-07-28 11:08:46 +0200 hbrinkm r274390 : #i103357# adapted patch and applied
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 8463145d1990..ec81c82bbebd 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); |