sw/source/core/text/itrcrsr.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 7f743c373b028106f5923f53399aae55a51e3e06
Author: Miklos Vajna <vmik...@suse.cz>
Date: Mon Feb 25 15:00:08 2013 +0100
n#793998 SwTxtCursor::GetCharRect: respect TabOverMargin compat mode
Change-Id: I47280399bd9e0757365db8f4f1930efd0a340424
(cherry picked from commit 5e992f88d9f78a062bd78ea8907fa247f1f49b5f)
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 5d0a154..c3a2497 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1218,7 +1218,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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
