diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2012-08-08 16:46:19 +0400 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-08-13 12:15:18 +0200 |
| commit | 1500bc8970dc61f96697a186d6bb0d1aacc2ce67 (patch) | |
| tree | 1f26078e5256f0c8a0b75aabc2ad8da3b11d82d4 | |
| parent | 05218c101df486302bf4cfe8be23ad840daa3f73 (diff) | |
fdo#50654: update virtual device width on modifying WB_EXTRAFIELD flag
Writer sets this flag dynamically via Ruler::SetStyle depending on
the text direction, the flag is set by default and gets unset for the
vertical ruler, because the initial text direction is horizontal,
see SwView::StateTabWin.
Ruler::SetStyle calls Ruler::ImplInitExtraField, which modifies mnVirOff,
however mnVirWidth depends on mnVirOff, but gets updated only in Resize.
This patch copies the code from Resize to ImplInitExtraField, we cannot
just call Resize from ImplInitExtraField due to possible infinite recursion.
Change-Id: Ic7bb897059295aebe86c11977c37419017b55787
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | svtools/source/control/ruler.cxx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 00fc75935108..de371f725cc1 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1359,6 +1359,8 @@ void Ruler::ImplFormat() void Ruler::ImplInitExtraField( sal_Bool bUpdate ) { + Size aWinSize = GetOutputSizePixel(); + // Extra-Field beruecksichtigen if ( mnWinStyle & WB_EXTRAFIELD ) { @@ -1368,7 +1370,6 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) maExtraRect.Bottom() = RULER_OFF+mnVirHeight-1; if(mpData->bTextRTL) { - Size aWinSize = GetOutputSizePixel(); if(mnWinStyle & WB_HORZ) maExtraRect.Move(aWinSize.Width() - maExtraRect.GetWidth() - maExtraRect.Left(), 0); else @@ -1385,6 +1386,19 @@ void Ruler::ImplInitExtraField( sal_Bool bUpdate ) mnVirOff = 0; } + // mnVirWidth depends on mnVirOff + if ( (mnVirWidth > RULER_MIN_SIZE) || + ((aWinSize.Width() > RULER_MIN_SIZE) && (aWinSize.Height() > RULER_MIN_SIZE)) ) + { + if ( mnWinStyle & WB_HORZ ) + mnVirWidth = aWinSize.Width()-mnVirOff; + else + mnVirWidth = aWinSize.Height()-mnVirOff; + + if ( mnVirWidth < RULER_MIN_SIZE ) + mnVirWidth = 0; + } + if ( bUpdate ) { mbCalc = sal_True; |