diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-07-27 22:56:08 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-07-27 22:56:08 +0000 |
| commit | 582db5d7ed1bb4308383528a8ce479faf1345732 (patch) | |
| tree | e492b482b4fc312cbc0504d8811284d1ee2eb38e | |
| parent | eb597e8b1e40560415ed04a21452402b402b3745 (diff) | |
CWS-TOOLING: integrate CWS sw311bf01
2009-07-21 17:05:41 +0200 od r274207 : #i103685# method <SwTxtFormatter::NewTabPortion(..)>
- adjust condition to apply automatic tab stop at left margin correctly
in case that tab stops are not relative to indent
| -rw-r--r-- | sw/source/core/text/txttab.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sw/source/core/text/txttab.cxx b/sw/source/core/text/txttab.cxx index 5a3ebd0e30..b299cae970 100644 --- a/sw/source/core/text/txttab.cxx +++ b/sw/source/core/text/txttab.cxx @@ -254,8 +254,14 @@ SwTabPortion *SwTxtFormatter::NewTabPortion( SwTxtFormatInfo &rInf, bool bAuto ) // <-- ( ( bRTL && nCurrentAbsPos > nTabLeft - nForced ) || ( !bRTL && nCurrentAbsPos < nTabLeft + nForced ) ) && - nNextPos > nForced ) - // <-- + // --> OD 2009-07-21 #i103685# + // adjust condition: + // - back to pre OOo 3.0 condition, if tab stops are relative to indent + // - further checks needed, if tab stops are not relative to indent + ( nNextPos > 0 && + ( bTabsRelativeToIndent || + ( !pTabStop || nNextPos > nForced ) ) ) ) + // <-- { eAdj = SVX_TAB_ADJUST_DEFAULT; cFill = 0; |