Kaydet (Commit) 9f3e3923 authored tarafından Jennifer Liebel's avatar Jennifer Liebel Kaydeden (comit) Tobias Madl

changed timers to idle

Change-Id: I5846940cc45781f4a0264047107dbb568604d543
üst d1684e16
......@@ -85,7 +85,7 @@ namespace dbaui
OTableWindowMap m_aTableMap;
::std::vector<OTableConnection*> m_vTableConnection;
Timer m_aDragScrollTimer;
Idle m_aDragScrollIdle;
Rectangle m_aDragRect;
Rectangle m_aSizingRect;
Point m_aDragOffset;
......
......@@ -169,7 +169,7 @@ OJoinTableView::OJoinTableView( vcl::Window* pParent, OJoinDesignView* pView )
InitColors();
m_aDragScrollTimer.SetTimeoutHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
m_aDragScrollIdle.SetIdleHdl(LINK(this, OJoinTableView, OnDragScrollTimer));
}
OJoinTableView::~OJoinTableView()
......@@ -716,8 +716,8 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
{
if( m_pDragWin )
{
if (m_aDragScrollTimer.IsActive())
m_aDragScrollTimer.Stop();
if (m_aDragScrollIdle.IsActive())
m_aDragScrollIdle.Stop();
// adjust position of child after moving
// windows are not allowed to leave display range
......@@ -776,8 +776,8 @@ void OJoinTableView::Tracking( const TrackingEvent& rTEvt )
}
else if (rTEvt.IsTrackingCanceled())
{
if (m_aDragScrollTimer.IsActive())
m_aDragScrollTimer.Stop();
if (m_aDragScrollIdle.IsActive())
m_aDragScrollIdle.Stop();
EndTracking();
}
else
......@@ -989,8 +989,8 @@ bool OJoinTableView::ScrollWhileDragging()
OSL_ENSURE(m_pDragWin != NULL, "OJoinTableView::ScrollWhileDragging must not be called when a window is being dragged !");
// kill the timer
if (m_aDragScrollTimer.IsActive())
m_aDragScrollTimer.Stop();
if (m_aDragScrollIdle.IsActive())
m_aDragScrollIdle.Stop();
Point aDragWinPos = m_ptPrevDraggingPos - m_aDragOffset;
Size aDragWinSize = m_pDragWin->GetSizePixel();
......@@ -1048,8 +1048,8 @@ bool OJoinTableView::ScrollWhileDragging()
// resetting timer, if still necessary
if (bNeedScrollTimer)
{
m_aDragScrollTimer.SetTimeout(100);
m_aDragScrollTimer.Start();
m_aDragScrollIdle.SetPriority(VCL_IDLE_PRIORITY_LOW);
m_aDragScrollIdle.Start();
}
// redraw DraggingRect
......
......@@ -243,7 +243,7 @@ ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
ToolBarManager::~ToolBarManager()
{
assert(!m_aAsyncUpdateControllersTimer.IsActive());
assert(!m_aAsyncUpdateControllersIdle.IsActive());
OSL_ASSERT( m_pToolBar == 0 );
OSL_ASSERT( !m_bAddedToTaskPaneList );
}
......@@ -631,7 +631,7 @@ void SAL_CALL ToolBarManager::dispose() throw( RuntimeException, std::exception
// stop timer to prevent timer events after dispose
// do it last because other calls could restart timer in StateChanged()
m_aAsyncUpdateControllersTimer.Stop();
m_aAsyncUpdateControllersIdle.Stop();
m_bDisposed = true;
}
......
......@@ -332,7 +332,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack )
IMPL_LINK_NOARG(ScDocument, TrackTimeHdl)
{
if ( ScDdeLink::IsInUpdate() ) // do not nest
{s
{
aTrackIdle.Start(); // try again later
}
else if (pShell) // execute
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment