Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
eef25e0e
Kaydet (Commit)
eef25e0e
authored
Kas 20, 2014
tarafından
Tobias Madl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
changed timers to idles
Change-Id: Iaceef008e7df91f3a9ad54fdaec25f2170100ee0
üst
50fdcff5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
57 additions
and
59 deletions
+57
-59
formula.cxx
formula/source/ui/dlg/formula.cxx
+9
-9
funcutl.cxx
formula/source/ui/dlg/funcutl.cxx
+12
-14
funcutl.hxx
include/formula/funcutl.hxx
+1
-1
imivctl.hxx
svtools/source/contnr/imivctl.hxx
+4
-4
imivctl1.cxx
svtools/source/contnr/imivctl1.cxx
+6
-6
imapdlg.cxx
svx/source/dialog/imapdlg.cxx
+4
-4
imapimp.hxx
svx/source/dialog/imapimp.hxx
+1
-1
dockmgr.cxx
vcl/source/window/dockmgr.cxx
+13
-13
dockwin.cxx
vcl/source/window/dockwin.cxx
+7
-7
No files found.
formula/source/ui/dlg/formula.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -183,7 +183,7 @@ namespace formula
bool
bStructUpdate
;
MultiLineEdit
*
pMEdit
;
bool
bUserMatrixFlag
;
Timer
aTimer
;
Idle
aIdle
;
const
OUString
aTitle1
;
const
OUString
aTitle2
;
...
...
@@ -353,11 +353,11 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent
FormulaDlg_Impl
::~
FormulaDlg_Impl
()
{
if
(
a
Timer
.
IsActive
())
if
(
a
Idle
.
IsActive
())
{
a
Timer
.
SetTimeout
Hdl
(
Link
());
a
Timer
.
Stop
();
}
// if(a
Timer
.IsActive())
a
Idle
.
SetIdle
Hdl
(
Link
());
a
Idle
.
Stop
();
}
// if(a
Idle
.IsActive())
bIsShutDown
=
true
;
// Set it in order to PreNotify not to save GetFocus.
m_pTabCtrl
->
RemovePage
(
TP_FUNCTION
);
...
...
@@ -412,7 +412,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt )
FormEditData
*
pData
=
m_pHelper
->
getFormEditData
();
if
(
pData
&&
!
a
Timer
.
IsActive
())
// won't be destroyed via Close
if
(
pData
&&
!
a
Idle
.
IsActive
())
// won't be destroyed via Close
{
pData
->
SetUniqueId
(
aActivWinId
);
}
...
...
@@ -1773,9 +1773,9 @@ OUString FormulaDlg::GetMeText() const
void
FormulaDlg
::
Update
()
{
m_pImpl
->
Update
();
m_pImpl
->
a
Timer
.
SetTimeout
(
200
);
m_pImpl
->
a
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
FormulaDlg
,
UpdateFocusHdl
));
m_pImpl
->
a
Timer
.
Start
();
m_pImpl
->
a
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOWER
);
m_pImpl
->
a
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
FormulaDlg
,
UpdateFocusHdl
));
m_pImpl
->
a
Idle
.
Start
();
}
void
FormulaDlg
::
DoEnter
(
bool
_bOk
)
...
...
formula/source/ui/dlg/funcutl.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -455,15 +455,13 @@ void EditBox::UpdateOldSel()
// class RefEdit
#define SC_ENABLE_TIME 100
RefEdit
::
RefEdit
(
vcl
::
Window
*
_pParent
,
vcl
::
Window
*
pShrinkModeLabel
,
WinBits
nStyle
)
:
Edit
(
_pParent
,
nStyle
)
,
pAnyRefDlg
(
NULL
)
,
pLabelWidget
(
pShrinkModeLabel
)
{
a
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Timer
.
SetTimeout
(
SC_ENABLE_TIME
);
a
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOW
);
}
RefEdit
::
RefEdit
(
vcl
::
Window
*
_pParent
,
IControlReferenceHandler
*
pParent
,
...
...
@@ -472,8 +470,8 @@ RefEdit::RefEdit( vcl::Window* _pParent,IControlReferenceHandler* pParent,
,
pAnyRefDlg
(
pParent
)
,
pLabelWidget
(
pShrinkModeLabel
)
{
a
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Timer
.
SetTimeout
(
SC_ENABLE_TIME
);
a
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOW
);
}
extern
"C"
SAL_DLLPUBLIC_EXPORT
vcl
::
Window
*
SAL_CALL
makeRefEdit
(
vcl
::
Window
*
pParent
,
VclBuilder
::
stringmap
&
)
...
...
@@ -483,8 +481,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeRefEdit(vcl::Window *p
RefEdit
::~
RefEdit
()
{
a
Timer
.
SetTimeout
Hdl
(
Link
()
);
a
Timer
.
Stop
();
a
Idle
.
SetIdle
Hdl
(
Link
()
);
a
Idle
.
Stop
();
}
void
RefEdit
::
SetRefString
(
const
OUString
&
rStr
)
...
...
@@ -509,12 +507,12 @@ void RefEdit::SetRefValid(bool bValid)
void
RefEdit
::
SetText
(
const
OUString
&
rStr
)
{
Edit
::
SetText
(
rStr
);
UpdateHdl
(
&
a
Timer
);
UpdateHdl
(
&
a
Idle
);
}
void
RefEdit
::
StartUpdateData
()
{
a
Timer
.
Start
();
a
Idle
.
Start
();
}
void
RefEdit
::
SetReferences
(
IControlReferenceHandler
*
pDlg
,
vcl
::
Window
*
pLabel
)
...
...
@@ -524,13 +522,13 @@ void RefEdit::SetReferences( IControlReferenceHandler* pDlg, vcl::Window* pLabel
if
(
pDlg
)
{
a
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Timer
.
SetTimeout
(
SC_ENABLE_TIME
);
a
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
RefEdit
,
UpdateHdl
)
);
a
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOW
);
}
else
{
a
Timer
.
SetTimeout
Hdl
(
Link
()
);
a
Timer
.
Stop
();
a
Idle
.
SetIdle
Hdl
(
Link
()
);
a
Idle
.
Stop
();
}
}
...
...
include/formula/funcutl.hxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -32,7 +32,7 @@ class IControlReferenceHandler;
class
FORMULA_DLLPUBLIC
RefEdit
:
public
Edit
{
private
:
Timer
aTimer
;
Idle
aIdle
;
IControlReferenceHandler
*
pAnyRefDlg
;
// parent dialog
vcl
::
Window
*
pLabelWidget
;
...
...
svtools/source/contnr/imivctl.hxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -166,8 +166,8 @@ class SvxIconChoiceCtrl_Impl
std
::
vector
<
Rectangle
*>
aSelectedRectList
;
Idle
aEditIdle
;
// for editing in place
Idle
aAutoArrangeIdle
;
Timer
aDocRectChangedTimer
;
Timer
aVisRectChangedTimer
;
Idle
aDocRectChangedIdle
;
Idle
aVisRectChangedIdle
;
Idle
aCallSelectHdlIdle
;
Size
aVirtOutputSize
;
Size
aImageSize
;
...
...
@@ -308,8 +308,8 @@ class SvxIconChoiceCtrl_Impl
{
return
(
ePositionMode
==
IcnViewPositionModeAutoAdjust
);
}
void
DocRectChanged
()
{
aDocRectChanged
Timer
.
Start
();
}
void
VisRectChanged
()
{
aVisRectChanged
Timer
.
Start
();
}
void
DocRectChanged
()
{
aDocRectChanged
Idle
.
Start
();
}
void
VisRectChanged
()
{
aVisRectChanged
Idle
.
Start
();
}
void
SetOrigin
(
const
Point
&
,
bool
bDoNotUpdateWallpaper
=
false
);
DECL_LINK
(
TextEditEndedHdl
,
void
*
);
...
...
svtools/source/contnr/imivctl1.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -142,10 +142,10 @@ SvxIconChoiceCtrl_Impl::SvxIconChoiceCtrl_Impl(
aCallSelectHdlIdle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOWEST
);
aCallSelectHdlIdle
.
SetIdleHdl
(
LINK
(
this
,
SvxIconChoiceCtrl_Impl
,
CallSelectHdlHdl
));
aDocRectChanged
Timer
.
SetTimeout
(
50
);
aDocRectChanged
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
SvxIconChoiceCtrl_Impl
,
DocRectChangedHdl
));
aVisRectChanged
Timer
.
SetTimeout
(
50
);
aVisRectChanged
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
SvxIconChoiceCtrl_Impl
,
VisRectChangedHdl
));
aDocRectChanged
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_MEDIUM
);
aDocRectChanged
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
SvxIconChoiceCtrl_Impl
,
DocRectChangedHdl
));
aVisRectChanged
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_MEDIUM
);
aVisRectChanged
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
SvxIconChoiceCtrl_Impl
,
VisRectChangedHdl
));
Clear
(
true
);
...
...
@@ -2895,14 +2895,14 @@ IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl)
IMPL_LINK_NOARG
(
SvxIconChoiceCtrl_Impl
,
VisRectChangedHdl
)
{
aVisRectChanged
Timer
.
Stop
();
aVisRectChanged
Idle
.
Stop
();
pView
->
VisibleRectChanged
();
return
0
;
}
IMPL_LINK_NOARG
(
SvxIconChoiceCtrl_Impl
,
DocRectChangedHdl
)
{
aDocRectChanged
Timer
.
Stop
();
aDocRectChanged
Idle
.
Stop
();
pView
->
DocumentRectChanged
();
return
0
;
}
...
...
svx/source/dialog/imapdlg.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -210,8 +210,8 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, vcl::Window
m_pCbbTarget
->
Disable
();
pOwnData
->
bExecState
=
false
;
pOwnData
->
a
Timer
.
SetTimeout
(
100
);
pOwnData
->
a
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
SvxIMapDlg
,
UpdateHdl
)
);
pOwnData
->
a
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOW
);
pOwnData
->
a
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
SvxIMapDlg
,
UpdateHdl
)
);
m_pTbxIMapDlg1
->
EnableItem
(
mnActiveId
,
false
);
m_pTbxIMapDlg1
->
EnableItem
(
mnMacroId
,
false
);
...
...
@@ -318,7 +318,7 @@ void SvxIMapDlg::UpdateLink( const Graphic& rGraphic, const ImageMap* pImageMap,
pOwnData
->
aUpdateTargetList
.
push_back
(
aTargetList
[
i
]
);
}
pOwnData
->
a
Timer
.
Start
();
pOwnData
->
a
Idle
.
Start
();
}
...
...
@@ -687,7 +687,7 @@ IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl)
IMPL_LINK_NOARG
(
SvxIMapDlg
,
UpdateHdl
)
{
pOwnData
->
a
Timer
.
Stop
();
pOwnData
->
a
Idle
.
Stop
();
if
(
pOwnData
->
pUpdateEditingObject
!=
pCheckObj
)
{
...
...
svx/source/dialog/imapimp.hxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -29,7 +29,7 @@ class IMapOwnData
{
public
:
Timer
aTimer
;
Idle
aIdle
;
Timer
aTbxTimer
;
Graphic
aUpdateGraphic
;
ImageMap
aUpdateImageMap
;
...
...
vcl/source/window/dockmgr.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -42,8 +42,8 @@ class ImplDockFloatWin2 : public FloatingWindow
private
:
ImplDockingWindowWrapper
*
mpDockWin
;
sal_uLong
mnLastTicks
;
Timer
maDockTimer
;
Timer
maEndDockTimer
;
Idle
maDockIdle
;
Idle
maEndDockIdle
;
Point
maDockPos
;
Rectangle
maDockRect
;
bool
mbInMove
;
...
...
@@ -91,10 +91,10 @@ ImplDockFloatWin2::ImplDockFloatWin2( vcl::Window* pParent, WinBits nWinBits,
SetBackground
(
GetSettings
().
GetStyleSettings
().
GetFaceColor
()
);
maDock
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
ImplDockFloatWin2
,
DockTimerHdl
)
);
maDock
Timer
.
SetTimeout
(
50
);
maEndDock
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
ImplDockFloatWin2
,
EndDockTimerHdl
)
);
maEndDock
Timer
.
SetTimeout
(
50
);
maDock
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
ImplDockFloatWin2
,
DockTimerHdl
)
);
maDock
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_MEDIUM
);
maEndDock
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
ImplDockFloatWin2
,
EndDockTimerHdl
)
);
maEndDock
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_MEDIUM
);
}
ImplDockFloatWin2
::~
ImplDockFloatWin2
()
...
...
@@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
{
DBG_ASSERT
(
mpDockWin
->
IsFloatingMode
(),
"docktimer called but not floating"
);
maDock
Timer
.
Stop
();
maDock
Idle
.
Stop
();
PointerState
aState
=
GetPointerState
();
if
(
aState
.
mnState
&
KEY_MOD1
)
...
...
@@ -115,7 +115,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
// i43499 CTRL disables docking now
mpDockWin
->
GetWindow
()
->
GetParent
()
->
ImplGetFrameWindow
()
->
HideTracking
();
if
(
aState
.
mnState
&
(
MOUSE_LEFT
|
MOUSE_MIDDLE
|
MOUSE_RIGHT
)
)
maDock
Timer
.
Start
();
maDock
Idle
.
Start
();
}
else
if
(
!
(
aState
.
mnState
&
(
MOUSE_LEFT
|
MOUSE_MIDDLE
|
MOUSE_RIGHT
)
)
)
{
...
...
@@ -125,7 +125,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockTimerHdl)
else
{
mpDockWin
->
GetWindow
()
->
GetParent
()
->
ImplGetFrameWindow
()
->
ShowTracking
(
maDockRect
,
SHOWTRACK_BIG
|
SHOWTRACK_WINDOW
);
maDock
Timer
.
Start
();
maDock
Idle
.
Start
();
}
return
0
;
...
...
@@ -135,7 +135,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl)
{
DBG_ASSERT
(
mpDockWin
->
IsFloatingMode
(),
"enddocktimer called but not floating"
);
maEndDock
Timer
.
Stop
();
maEndDock
Idle
.
Stop
();
PointerState
aState
=
GetPointerState
();
if
(
!
(
aState
.
mnState
&
(
MOUSE_LEFT
|
MOUSE_MIDDLE
|
MOUSE_RIGHT
)
)
)
{
...
...
@@ -144,7 +144,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, EndDockTimerHdl)
}
else
{
maEndDock
Timer
.
Start
();
maEndDock
Idle
.
Start
();
}
return
0
;
...
...
@@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ImplDockFloatWin2, DockingHdl)
maDockRect
.
SetPos
(
mpDockWin
->
GetWindow
()
->
GetParent
()
->
ImplGetFrameWindow
()
->
ScreenToOutputPixel
(
maDockRect
.
TopLeft
()
)
);
mpDockWin
->
GetWindow
()
->
GetParent
()
->
ImplGetFrameWindow
()
->
ShowTracking
(
maDockRect
,
SHOWTRACK_BIG
|
SHOWTRACK_WINDOW
);
maEndDock
Timer
.
Stop
();
maEndDock
Idle
.
Stop
();
DockTimerHdl
(
this
);
}
else
{
mpDockWin
->
GetWindow
()
->
GetParent
()
->
ImplGetFrameWindow
()
->
HideTracking
();
maDock
Timer
.
Stop
();
maDock
Idle
.
Stop
();
EndDockTimerHdl
(
this
);
}
}
...
...
vcl/source/window/dockwin.cxx
Dosyayı görüntüle @
eef25e0e
...
...
@@ -59,7 +59,7 @@ class ImplDockFloatWin : public FloatingWindow
private
:
DockingWindow
*
mpDockWin
;
sal_uLong
mnLastTicks
;
Timer
maDockTimer
;
Idle
maDockIdle
;
Point
maDockPos
;
Rectangle
maDockRect
;
bool
mbInMove
;
...
...
@@ -103,8 +103,8 @@ ImplDockFloatWin::ImplDockFloatWin( vcl::Window* pParent, WinBits nWinBits,
SetBackground
();
maDock
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
ImplDockFloatWin
,
DockTimerHdl
)
);
maDock
Timer
.
SetTimeout
(
50
);
maDock
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
ImplDockFloatWin
,
DockTimerHdl
)
);
maDock
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_MEDIUM
);
}
ImplDockFloatWin
::~
ImplDockFloatWin
()
...
...
@@ -117,7 +117,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
{
DBG_ASSERT
(
mpDockWin
->
IsFloatingMode
(),
"docktimer called but not floating"
);
maDock
Timer
.
Stop
();
maDock
Idle
.
Stop
();
PointerState
aState
=
GetPointerState
();
if
(
aState
.
mnState
&
KEY_MOD1
)
...
...
@@ -126,7 +126,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
mpDockWin
->
GetParent
()
->
ImplGetFrameWindow
()
->
HideTracking
();
mpDockWin
->
EndDocking
(
maDockRect
,
true
);
if
(
aState
.
mnState
&
(
MOUSE_LEFT
|
MOUSE_MIDDLE
|
MOUSE_RIGHT
)
)
maDock
Timer
.
Start
();
maDock
Idle
.
Start
();
}
else
if
(
!
(
aState
.
mnState
&
(
MOUSE_LEFT
|
MOUSE_MIDDLE
|
MOUSE_RIGHT
)
)
)
{
...
...
@@ -136,7 +136,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockTimerHdl)
else
{
mpDockWin
->
GetParent
()
->
ImplGetFrameWindow
()
->
ShowTracking
(
maDockRect
,
SHOWTRACK_BIG
|
SHOWTRACK_WINDOW
);
maDock
Timer
.
Start
();
maDock
Idle
.
Start
();
}
return
0
;
...
...
@@ -171,7 +171,7 @@ IMPL_LINK_NOARG(ImplDockFloatWin, DockingHdl)
else
{
mpDockWin
->
GetParent
()
->
ImplGetFrameWindow
()
->
HideTracking
();
maDock
Timer
.
Stop
();
maDock
Idle
.
Stop
();
mpDockWin
->
EndDocking
(
maDockRect
,
true
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment