diff options
| author | Rodolfo Ribeiro Gomes <rodolforg@gmail.com> | 2013-11-18 01:30:49 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-20 05:32:03 -0600 |
| commit | 912d6d171603cdc68c600ab713e22eeca2c1f58a (patch) | |
| tree | 8c1860d64650ee374ccf12b8c12fef5bf75121fb /svtools | |
| parent | c3702eb165ce0f0841ef1a166ae361e9616c77fb (diff) | |
fdo#65355 Ruler Comment control doesn't disappears
ImplDraw() should not be directly called because it avoids
overriden Paint() method.
Change-Id: I0f0f6b4af231c1ea50a23fb96f3c9018b5ce2d31
Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/6707
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/control/ruler.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 5a0b32ff2413..f6808a22df1e 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -1868,7 +1868,7 @@ void Ruler::ImplDrag( const Point& rPos ) Drag(); // and redraw - ImplDraw(); + Paint(Rectangle()); // reset the data as before cancel *mpDragData = aTempData; @@ -1889,7 +1889,7 @@ void Ruler::ImplDrag( const Point& rPos ) // redraw if ( mbFormat ) - ImplDraw(); + Paint(Rectangle()); } mnDragScroll = 0; @@ -1921,7 +1921,7 @@ void Ruler::ImplEndDrag() mnStartDragPos = 0; // redraw - ImplDraw(); + Paint(Rectangle()); } IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) @@ -1932,7 +1932,7 @@ IMPL_LINK_NOARG(Ruler, ImplUpdateHdl) if ( mnUpdateFlags & RULER_UPDATE_DRAW ) { mnUpdateFlags = 0; - ImplDraw(); + Paint(Rectangle()); } else if ( mnUpdateFlags & RULER_UPDATE_LINES ) { @@ -1954,7 +1954,7 @@ void Ruler::MouseButtonDown( const MouseEvent& rMEvt ) // update ruler if ( mbFormat ) { - ImplDraw(); + Paint(Rectangle()); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2062,7 +2062,7 @@ void Ruler::MouseMove( const MouseEvent& rMEvt ) if ( mbFormat ) { - ImplDraw(); + Paint(Rectangle()); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } mpPreviousHitTest.swap(mpCurrentHitTest); @@ -2189,7 +2189,7 @@ void Ruler::StateChanged( StateChangedType nType ) else if ( nType == STATE_CHANGE_UPDATEMODE ) { if ( IsReallyVisible() && IsUpdateMode() ) - ImplDraw(); + Paint(Rectangle()); } else if ( (nType == STATE_CHANGE_ZOOM) || (nType == STATE_CHANGE_CONTROLFONT) ) @@ -2291,7 +2291,7 @@ sal_Bool Ruler::StartDocDrag( const MouseEvent& rMEvt, RulerType eDragType ) // update ruler if ( mbFormat ) { - ImplDraw(); + Paint(Rectangle()); mnUpdateFlags &= ~RULER_UPDATE_DRAW; } @@ -2350,15 +2350,15 @@ void Ruler::CancelDrag() } } -RulerType Ruler::GetType( const Point& rPos, sal_uInt16* pAryPos ) const +RulerType Ruler::GetType( const Point& rPos, sal_uInt16* pAryPos ) { RulerSelection aHitTest; // update ruler if ( IsReallyVisible() && mbFormat ) { - ((Ruler*)this)->ImplDraw(); - ((Ruler*)this)->mnUpdateFlags &= ~RULER_UPDATE_DRAW; + Paint(Rectangle()); + mnUpdateFlags &= ~RULER_UPDATE_DRAW; } ImplHitTest( rPos, &aHitTest ); @@ -2790,7 +2790,7 @@ RulerUnitData Ruler::GetCurrentRulerUnit() const void Ruler::DrawTicks() { mbFormat = sal_True; - ImplDraw(); + Paint(Rectangle()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |