Kaydet (Commit) 2da25cb4 authored tarafından Mike Kaganski's avatar Mike Kaganski

tdf#120593: properly handle tab pos identical to right indent

... otherwise it's counted without taking into account current column,
as well as TabsRelativeToIndent mode.

Change-Id: I7442f63d9d5c51c5a4d82094b49b8028f2b42b41
Reviewed-on: https://gerrit.libreoffice.org/61768
Tested-by: Jenkins
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst e00ac11c
...@@ -2200,7 +2200,15 @@ void SvxRuler::ApplyTabs() ...@@ -2200,7 +2200,15 @@ void SvxRuler::ApplyTabs()
if( mxRulerImpl->lMaxRightLogic != -1 && if( mxRulerImpl->lMaxRightLogic != -1 &&
mpTabs[nCoreIdx + TAB_GAP].nPos + Ruler::GetNullOffset() == nMaxRight ) mpTabs[nCoreIdx + TAB_GAP].nPos + Ruler::GetNullOffset() == nMaxRight )
{ {
aTabStop.GetTabPos() = mxRulerImpl->lMaxRightLogic - lLogicNullOffset; // Set tab pos exactly at the right indent
long nTmpLeftIndentLogic
= lAppNullOffset + (bRTL ? GetRightFrameMargin() : GetLeftFrameMargin());
if (mxRulerImpl->bIsTabsRelativeToIndent && mxParaItem)
{
nTmpLeftIndentLogic += bRTL ? mxParaItem->GetRight() : mxParaItem->GetLeft();
}
aTabStop.GetTabPos()
= mxRulerImpl->lMaxRightLogic - lLogicNullOffset - nTmpLeftIndentLogic;
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment