diff options
| author | Tomaž Vajngerl <quikee@gmail.com> | 2013-08-26 18:08:19 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2013-08-29 18:40:00 +0200 |
| commit | 8c8b165f54399aa5a4f1c26f29101d4482eb9339 (patch) | |
| tree | af1aa7ff55d51c03d057df4ee067711c4126dda6 /svx | |
| parent | c968afcdf5994f21c8dd3a48f3602caa8c803fd9 (diff) | |
fdo#38144 more stable ruler actions on tables
Change-Id: I38b16153df1d801b81a753449e202d962ce5f38e
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/svxruler.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index dde45de18319..46829b374d1e 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -1220,11 +1220,15 @@ long SvxRuler::GetLeftFrameMargin() const // #126721# for some unknown reason the current column is set to 0xffff DBG_ASSERT(!pColumnItem || pColumnItem->GetActColumn() < pColumnItem->Count(), "issue #126721# - invalid current column!"); - long nLeft = - pColumnItem && pColumnItem->Count() && pColumnItem->GetActColumn() < pColumnItem->Count() ? - (*pColumnItem)[pColumnItem->GetActColumn()].nStart : 0; - if(pParaBorderItem && (!pColumnItem || pColumnItem->IsTable())) - nLeft += pParaBorderItem->GetLeft(); + long nLeft = 0; + if (pColumnItem && + pColumnItem->Count() && + pColumnItem->GetActColumn() < pColumnItem->Count()) + { + nLeft = (*pColumnItem)[pColumnItem->GetActColumn()].nStart; + } + //if(pParaBorderItem && (!pColumnItem || pColumnItem->IsTable())) + // nLeft += pParaBorderItem->GetLeft(); return nLeft; } @@ -1252,10 +1256,7 @@ long SvxRuler::GetRightFrameMargin() const { if(!IsActLastColumn( sal_True )) { - long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd; - if(pColumnItem->IsTable() && pParaBorderItem) - nRet -= pParaBorderItem->GetRight(); - return nRet; + return (*pColumnItem)[GetActRightColumn( sal_True )].nEnd; } } |