summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorTobias Madl <tobias.madl.dev@gmail.com>2014-11-18 15:11:29 +0000
committerTobias Madl <tobias.madl.dev@gmail.com>2014-12-09 12:35:00 +0000
commitec5851361bcf636c57691988b669d76313762a8c (patch)
treedf3181e9488048e27ca082297693226b56c381bd /sd
parent2a5500567544ef4e70528c0da0cf927d407dbf78 (diff)
changed timers to idles
Change-Id: I1595a9711e3d5c564f1c9028cbb756f2b0ca45f1
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/View.hxx4
-rw-r--r--sd/source/ui/view/sdview.cxx12
-rw-r--r--sd/source/ui/view/sdview3.cxx8
3 files changed, 12 insertions, 12 deletions
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 962f75d9a9ba..e9630c7a2b21 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -276,8 +276,8 @@ protected:
Point maDropPos;
::std::vector<OUString> maDropFileVector;
sal_Int8 mnAction;
- Timer maDropErrorTimer;
- Timer maDropInsertFileTimer;
+ Idle maDropErrorIdle;
+ Idle maDropInsertFileIdle;
sal_uInt16 mnLockRedrawSmph;
boost::ptr_vector<SdViewRedrawRec> maLockedRedraws;
bool mbIsDropAllowed;
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index 1eb87b55839a..bf3ec430b186 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -138,10 +138,10 @@ View::View(SdDrawDocument& rDrawDoc, OutputDevice* pOutDev,
SetMeasureLayer(SD_RESSTR(STR_LAYER_MEASURELINES));
// Timer for delayed drop (has to be for MAC)
- maDropErrorTimer.SetTimeoutHdl( LINK(this, View, DropErrorHdl) );
- maDropErrorTimer.SetTimeout(50);
- maDropInsertFileTimer.SetTimeoutHdl( LINK(this, View, DropInsertFileHdl) );
- maDropInsertFileTimer.SetTimeout(50);
+ maDropErrorIdle.SetIdleHdl( LINK(this, View, DropErrorHdl) );
+ maDropErrorIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM);
+ maDropInsertFileIdle.SetIdleHdl( LINK(this, View, DropInsertFileHdl) );
+ maDropInsertFileIdle.SetPriority(VCL_IDLE_PRIORITY_MEDIUM);
}
void View::ImplClearDrawDropMarker()
@@ -160,8 +160,8 @@ View::~View()
// release content of selection clipboard, if we own the content
UpdateSelectionClipboard( true );
- maDropErrorTimer.Stop();
- maDropInsertFileTimer.Stop();
+ maDropErrorIdle.Stop();
+ maDropInsertFileIdle.Stop();
ImplClearDrawDropMarker();
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 2cc0b56becbf..e029afabfcac 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -580,7 +580,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
}
else
{
- maDropErrorTimer.Start();
+ maDropErrorIdle.Start();
bReturn = false;
}
}
@@ -617,7 +617,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
}
else
{
- maDropErrorTimer.Start();
+ maDropErrorIdle.Start();
bReturn = false;
}
}
@@ -1448,7 +1448,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
for( sal_uLong i = 0, nCount = aDropFileList.Count(); i < nCount; i++ )
maDropFileVector.push_back( aDropFileList.GetFile( i ) );
- maDropInsertFileTimer.Start();
+ maDropInsertFileIdle.Start();
}
bReturn = true;
@@ -1462,7 +1462,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
{
maDropFileVector.clear();
maDropFileVector.push_back( aDropFile );
- maDropInsertFileTimer.Start();
+ maDropInsertFileIdle.Start();
}
bReturn = true;