diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-25 15:00:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-02 10:26:57 +0200 |
| commit | 029ee0a0cb935283f0f0a997674944f1ea87c9f0 (patch) | |
| tree | 31e9e753ab4b0027fe598ffd869e5c9996b413d3 /sw | |
| parent | 88d46b9198a42956c521080f2aa7f3acf73cde06 (diff) | |
n#793998 SwTxtCursor::GetCharRect: respect TabOverMargin compat mode
Change-Id: I47280399bd9e0757365db8f4f1930efd0a340424
(cherry picked from commit 5e992f88d9f78a062bd78ea8907fa247f1f49b5f)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/itrcrsr.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx index 3127ae863634..3fe4ce6d82dd 100644 --- a/sw/source/core/text/itrcrsr.cxx +++ b/sw/source/core/text/itrcrsr.cxx @@ -1209,7 +1209,9 @@ sal_Bool SwTxtCursor::GetCharRect( SwRect* pOrig, const xub_StrLen nOfst, pCMS->p2Lines->aPortion.Pos().Y() += aCharPos.Y(); } - if( pOrig->Left() > nTmpRight ) + const bool bTabOverMargin = GetTxtFrm()->GetTxtNode()->getIDocumentSettingAccess()->get(IDocumentSettingAccess::TAB_OVER_MARGIN); + // Make sure the cursor respects the right margin, unless in compat mode, where the tab size has priority over the margin size. + if( pOrig->Left() > nTmpRight && !bTabOverMargin) pOrig->Pos().X() = nTmpRight; if( nMax ) |