diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-08-28 08:23:39 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-08-29 18:40:01 +0200 |
| commit | 99bbef59aea5a9b5d3a606ec67870161b4896689 (patch) | |
| tree | 833d95071399a362627b097acea15e571f6d1e6d /svx/source/dialog | |
| parent | 14451e36c8a88c1b3809527771bcdf576233e5c8 (diff) | |
fdo#67033 fix default tab drawing on ruler
Change-Id: I471920e26a8e336cde795360945b5a843fe8f9c8
Diffstat (limited to 'svx/source/dialog')
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 3e1e943c8818..6918ebae6927 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1003,15 +1003,19 @@ void SvxRuler::UpdateTabs() // fill the rest with default Tabs if(bRTL) { + sal_Int32 aFirst = pTabs[nTabCount].nPos; for(j = 0; j < nDefTabBuf; ++j) { pTabs[nTabCount + TAB_GAP].nPos = - pTabs[nTabCount].nPos - nDefTabDist; + aFirst - ConvertHPosPixel(j * lDefTabDist); if(j == 0 ) + { pTabs[nTabCount + TAB_GAP].nPos -= ((pTabs[nTabCount + TAB_GAP].nPos - lRightPixMargin) % nDefTabDist ); + } + if(pTabs[nTabCount+TAB_GAP].nPos <= lParaIndentPix) break; pTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT; @@ -1020,6 +1024,7 @@ void SvxRuler::UpdateTabs() } else { + sal_Int32 aFirst = 0; for(j = 0; j < nDefTabBuf; ++j) { if( j == 0 ) @@ -1029,27 +1034,26 @@ void SvxRuler::UpdateTabs() { pTabs[nTabCount + TAB_GAP].nPos = (pTabs[nTabCount].nPos + nDefTabDist); + pTabs[nTabCount + TAB_GAP].nPos -= ((pTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix) % nDefTabDist ); + aFirst = pTabs[nTabCount + TAB_GAP].nPos; } else { if( pTabs[nTabCount].nPos < 0 ) - { - pTabs[nTabCount + TAB_GAP].nPos = ( pTabs[nTabCount].nPos / nDefTabDist ) * nDefTabDist; - } + aFirst = ( pTabs[nTabCount].nPos / nDefTabDist ) * nDefTabDist; else - { - pTabs[nTabCount + TAB_GAP].nPos = ( pTabs[nTabCount].nPos / nDefTabDist + 1 ) * nDefTabDist; - } + aFirst = ( pTabs[nTabCount].nPos / nDefTabDist + 1 ) * nDefTabDist; + pTabs[nTabCount + TAB_GAP].nPos = aFirst; } - } else { //simply add the default distance to the last position - pTabs[nTabCount + TAB_GAP].nPos = pTabs[nTabCount].nPos + nDefTabDist; + + pTabs[nTabCount + TAB_GAP].nPos = aFirst + ConvertHPosPixel(j * lDefTabDist); } if(pTabs[nTabCount + TAB_GAP].nPos >= lRightIndent) |