basctl/source/dlged/dlged.cxx | 11 ----------- basctl/source/inc/dlged.hxx | 2 -- 2 files changed, 13 deletions(-)
New commits: commit 371c549b4921f7ac7bb336a1308b4fb14b9324ae Author: Tobias Madl <tobias.madl....@gmail.com> Date: Fri Nov 21 21:16:47 2014 +0000 timers: Timer never started, remove it completely. Change-Id: I119529498f4bea014e5e0d3d81c39203080ff1c4 Reviewed-on: https://gerrit.libreoffice.org/13030 Reviewed-by: Jan Holesovsky <ke...@collabora.com> Tested-by: Jan Holesovsky <ke...@collabora.com> diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b6d525c..74c46e9 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -219,9 +219,6 @@ DlgEditor::DlgEditor ( m_ClipboardDataFlavorsResource[1].HumanPresentableName = "Dialog 8.0" ; m_ClipboardDataFlavorsResource[1].DataType = ::getCppuType( (const Sequence< sal_Int8 >*) 0 ); - aPaintTimer.SetTimeout( 1 ); - aPaintTimer.SetTimeoutHdl( LINK( this, DlgEditor, PaintTimeout ) ); - aMarkTimer.SetTimeout( 100 ); aMarkTimer.SetTimeoutHdl( LINK( this, DlgEditor, MarkTimeout ) ); @@ -249,7 +246,6 @@ DlgEditor::DlgEditor ( DlgEditor::~DlgEditor() { - aPaintTimer.Stop(); aMarkTimer.Stop(); ::comphelper::disposeComponent( m_xControlContainer ); @@ -478,12 +474,7 @@ bool DlgEditor::KeyInput( const KeyEvent& rKEvt ) void DlgEditor::Paint( const Rectangle& rRect ) { aPaintRect = rRect; - PaintTimeout( &aPaintTimer ); -} - -IMPL_LINK_NOARG(DlgEditor, PaintTimeout) -{ mnPaintGuard++; Size aMacSize; @@ -580,8 +571,6 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout) } mnPaintGuard--; - - return 0; } diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 981bc08..5204262 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -100,7 +100,6 @@ public: }; private: - DECL_LINK(PaintTimeout, void *); DECL_LINK(MarkTimeout, void *); void Print( Printer* pPrinter, const OUString& rTitle ); @@ -128,7 +127,6 @@ private: bool bGridVisible; bool bGridSnap; bool bCreateOK; - Timer aPaintTimer; Rectangle aPaintRect; bool bDialogModelChanged; Timer aMarkTimer; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits