summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorJennifer Liebel <jliebel94@gmail.com>2014-11-10 14:57:14 +0000
committerTobias Madl <tobias.madl.dev@gmail.com>2014-12-09 12:34:54 +0000
commit9824b78dd4ac44fe61d194854a4bc0e98015b4b2 (patch)
tree1f6ef6221f76c492a386e2bedb7b59fbe1978557 /svx
parent484129d08cc48595fe735f77bc3a30b5b8c3475a (diff)
changed timers to idle
Change-Id: I5846940cc45781f4a0264047107dbb568604d543
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/_contdlg.cxx18
-rw-r--r--svx/source/dialog/contimp.hxx4
-rw-r--r--svx/source/sidebar/PanelLayout.cxx10
3 files changed, 16 insertions, 16 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 9b471b4b5aba..6362690901ae 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -264,11 +264,11 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow *
Resize();
- aUpdateTimer.SetTimeout( 100 );
- aUpdateTimer.SetTimeoutHdl( LINK( this, SvxSuperContourDlg, UpdateHdl ) );
+ aUpdateIdle.SetPriority( VCL_IDLE_PRIORITY_LOW );
+ aUpdateIdle.SetIdleHdl( LINK( this, SvxSuperContourDlg, UpdateHdl ) );
- aCreateTimer.SetTimeout( 50 );
- aCreateTimer.SetTimeoutHdl( LINK( this, SvxSuperContourDlg, CreateHdl ) );
+ aCreateIdle.SetPriority( VCL_IDLE_PRIORITY_RESIZE );
+ aCreateIdle.SetIdleHdl( LINK( this, SvxSuperContourDlg, CreateHdl ) );
}
SvxSuperContourDlg::~SvxSuperContourDlg()
@@ -386,7 +386,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, bool _bGraphicL
else
aUpdatePolyPoly = tools::PolyPolygon();
- aUpdateTimer.Start();
+ aUpdateIdle.Start();
}
bool SvxSuperContourDlg::IsUndoPossible() const
@@ -480,7 +480,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
}
else if (nId == mnAutoContourId)
{
- aCreateTimer.Start();
+ aCreateIdle.Start();
}
else if (nId == mnPipetteId)
{
@@ -543,7 +543,7 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
{
- aUpdateTimer.Stop();
+ aUpdateIdle.Stop();
if ( pUpdateEditingObject != pCheckObj )
{
@@ -569,7 +569,7 @@ IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl)
IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl)
{
- aCreateTimer.Stop();
+ aCreateIdle.Stop();
const Rectangle aWorkRect = m_pContourWnd->LogicToPixel( m_pContourWnd->GetWorkRect(), MapMode( MAP_100TH_MM ) );
const Graphic& rGraphic = m_pContourWnd->GetGraphic();
@@ -696,7 +696,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
pWnd->SetGraphic( aGraphic, bNewContour );
if( bNewContour )
- aCreateTimer.Start();
+ aCreateIdle.Start();
}
}
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 407dd2fd4df1..2e999e855e8f 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -35,8 +35,8 @@ class SvxSuperContourDlg : public SvxContourDlg
Graphic aRedoGraphic;
Graphic aUpdateGraphic;
tools::PolyPolygon aUpdatePolyPoly;
- Timer aUpdateTimer;
- Timer aCreateTimer;
+ Idle aUpdateIdle;
+ Idle aCreateIdle;
Size aLastSize;
void* pUpdateEditingObject;
void* pCheckObj;
diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx
index 08256d180236..6630d7ae55ba 100644
--- a/svx/source/sidebar/PanelLayout.cxx
+++ b/svx/source/sidebar/PanelLayout.cxx
@@ -20,14 +20,14 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin
{
SetStyle(GetStyle() | WB_DIALOGCONTROL);
m_pUIBuilder = new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame);
- m_aPanelLayoutTimer.SetTimeout(50);
- m_aPanelLayoutTimer.SetTimeoutHdl( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) );
+ m_aPanelLayoutIdle.SetPriority(VCL_IDLE_PRIORITY_RESIZE);
+ m_aPanelLayoutIdle.SetIdleHdl( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) );
}
PanelLayout::~PanelLayout()
{
m_bInClose = true;
- m_aPanelLayoutTimer.Stop();
+ m_aPanelLayoutIdle.Stop();
}
Size PanelLayout::GetOptimalSize() const
@@ -40,7 +40,7 @@ Size PanelLayout::GetOptimalSize() const
bool PanelLayout::hasPanelPendingLayout() const
{
- return m_aPanelLayoutTimer.IsActive();
+ return m_aPanelLayoutIdle.IsActive();
}
void PanelLayout::queue_resize(StateChangedType /*eReason*/)
@@ -51,7 +51,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/)
return;
if (!isLayoutEnabled(this))
return;
- m_aPanelLayoutTimer.Start();
+ m_aPanelLayoutIdle.Start();
}
IMPL_LINK( PanelLayout, ImplHandlePanelLayoutTimerHdl, void*, EMPTYARG )