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
b35820c0
Kaydet (Commit)
b35820c0
authored
Kas 21, 2014
tarafından
Tobias Madl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
changed timers to idles
Change-Id: Iac97f482df9fca8563e6931e4c710c1cc4e6503d
üst
eef25e0e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
32 deletions
+26
-32
drawdoc.hxx
sd/inc/drawdoc.hxx
+1
-1
drawdoc.cxx
sd/source/core/drawdoc.cxx
+1
-1
drawdoc4.cxx
sd/source/core/drawdoc4.cxx
+9
-9
SlsQueueProcessor.cxx
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
+9
-9
SlsQueueProcessor.hxx
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
+1
-1
modctrl.cxx
svx/source/stbctrls/modctrl.cxx
+5
-11
No files found.
sd/inc/drawdoc.hxx
Dosyayı görüntüle @
b35820c0
...
@@ -149,7 +149,7 @@ private:
...
@@ -149,7 +149,7 @@ private:
::
sd
::
Outliner
*
mpOutliner
;
///< local outliner for outline mode
::
sd
::
Outliner
*
mpOutliner
;
///< local outliner for outline mode
::
sd
::
Outliner
*
mpInternalOutliner
;
///< internal outliner for creation of text objects
::
sd
::
Outliner
*
mpInternalOutliner
;
///< internal outliner for creation of text objects
Timer
*
mpWorkStartupTimer
;
Timer
*
mpWorkStartupTimer
;
Timer
*
mpOnlineSpellingTimer
;
Idle
*
mpOnlineSpellingIdle
;
sd
::
ShapeList
*
mpOnlineSpellingList
;
sd
::
ShapeList
*
mpOnlineSpellingList
;
SvxSearchItem
*
mpOnlineSearchItem
;
SvxSearchItem
*
mpOnlineSearchItem
;
std
::
vector
<
sd
::
FrameView
*>
maFrameViewList
;
std
::
vector
<
sd
::
FrameView
*>
maFrameViewList
;
...
...
sd/source/core/drawdoc.cxx
Dosyayı görüntüle @
b35820c0
...
@@ -152,7 +152,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
...
@@ -152,7 +152,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
,
mpOutliner
(
NULL
)
,
mpOutliner
(
NULL
)
,
mpInternalOutliner
(
NULL
)
,
mpInternalOutliner
(
NULL
)
,
mpWorkStartupTimer
(
NULL
)
,
mpWorkStartupTimer
(
NULL
)
,
mpOnlineSpelling
Timer
(
NULL
)
,
mpOnlineSpelling
Idle
(
NULL
)
,
mpOnlineSpellingList
(
NULL
)
,
mpOnlineSpellingList
(
NULL
)
,
mpOnlineSearchItem
(
NULL
)
,
mpOnlineSearchItem
(
NULL
)
,
mpCustomShowList
(
NULL
)
,
mpCustomShowList
(
NULL
)
...
...
sd/source/core/drawdoc4.cxx
Dosyayı görüntüle @
b35820c0
...
@@ -725,13 +725,13 @@ sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
...
@@ -725,13 +725,13 @@ sal_uInt16 SdDrawDocument::GetMasterPageUserCount(SdrPage* pMaster) const
void
SdDrawDocument
::
StopOnlineSpelling
()
void
SdDrawDocument
::
StopOnlineSpelling
()
{
{
if
(
mpOnlineSpelling
Timer
&&
mpOnlineSpellingTimer
->
IsActive
())
if
(
mpOnlineSpelling
Idle
&&
mpOnlineSpellingIdle
->
IsActive
())
{
{
mpOnlineSpelling
Timer
->
Stop
();
mpOnlineSpelling
Idle
->
Stop
();
}
}
delete
mpOnlineSpelling
Timer
;
delete
mpOnlineSpelling
Idle
;
mpOnlineSpelling
Timer
=
NULL
;
mpOnlineSpelling
Idle
=
NULL
;
delete
mpOnlineSpellingList
;
delete
mpOnlineSpellingList
;
mpOnlineSpellingList
=
NULL
;
mpOnlineSpellingList
=
NULL
;
...
@@ -773,10 +773,10 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
...
@@ -773,10 +773,10 @@ void SdDrawDocument::StartOnlineSpelling(bool bForceSpelling)
}
}
mpOnlineSpellingList
->
seekShape
(
0
);
mpOnlineSpellingList
->
seekShape
(
0
);
mpOnlineSpelling
Timer
=
new
Timer
();
mpOnlineSpelling
Idle
=
new
Idle
();
mpOnlineSpelling
Timer
->
SetTimeout
Hdl
(
LINK
(
this
,
SdDrawDocument
,
OnlineSpellingHdl
)
);
mpOnlineSpelling
Idle
->
SetIdle
Hdl
(
LINK
(
this
,
SdDrawDocument
,
OnlineSpellingHdl
)
);
mpOnlineSpelling
Timer
->
SetTimeout
(
250
);
mpOnlineSpelling
Idle
->
SetPriority
(
VCL_IDLE_PRIORITY_LOWEST
);
mpOnlineSpelling
Timer
->
Start
();
mpOnlineSpelling
Idle
->
Start
();
}
}
}
}
...
@@ -861,7 +861,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
...
@@ -861,7 +861,7 @@ IMPL_LINK_NOARG(SdDrawDocument, OnlineSpellingHdl)
}
}
// Continue search
// Continue search
mpOnlineSpelling
Timer
->
Start
();
mpOnlineSpelling
Idle
->
Start
();
}
}
else
else
{
{
...
...
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx
Dosyayı görüntüle @
b35820c0
...
@@ -32,7 +32,7 @@ QueueProcessor::QueueProcessor (
...
@@ -32,7 +32,7 @@ QueueProcessor::QueueProcessor (
const
bool
bDoSuperSampling
,
const
bool
bDoSuperSampling
,
const
SharedCacheContext
&
rpCacheContext
)
const
SharedCacheContext
&
rpCacheContext
)
:
maMutex
(),
:
maMutex
(),
ma
Timer
(),
ma
Idle
(),
mnTimeBetweenHighPriorityRequests
(
10
/*ms*/
),
mnTimeBetweenHighPriorityRequests
(
10
/*ms*/
),
mnTimeBetweenLowPriorityRequests
(
100
/*ms*/
),
mnTimeBetweenLowPriorityRequests
(
100
/*ms*/
),
mnTimeBetweenRequestsWhenNotIdle
(
1000
/*ms*/
),
mnTimeBetweenRequestsWhenNotIdle
(
1000
/*ms*/
),
...
@@ -58,8 +58,8 @@ QueueProcessor::QueueProcessor (
...
@@ -58,8 +58,8 @@ QueueProcessor::QueueProcessor (
if
(
aTimeBetweenReqeusts
.
has
<
sal_Int32
>
())
if
(
aTimeBetweenReqeusts
.
has
<
sal_Int32
>
())
aTimeBetweenReqeusts
>>=
mnTimeBetweenRequestsWhenNotIdle
;
aTimeBetweenReqeusts
>>=
mnTimeBetweenRequestsWhenNotIdle
;
ma
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
QueueProcessor
,
ProcessRequestHdl
));
ma
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
QueueProcessor
,
ProcessRequestHdl
));
ma
Timer
.
SetTimeout
(
mnTimeBetweenHighPriorityRequests
);
ma
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_REPAINT
);
}
}
QueueProcessor
::~
QueueProcessor
(
void
)
QueueProcessor
::~
QueueProcessor
(
void
)
...
@@ -70,20 +70,20 @@ void QueueProcessor::Start (int nPriorityClass)
...
@@ -70,20 +70,20 @@ void QueueProcessor::Start (int nPriorityClass)
{
{
if
(
mbIsPaused
)
if
(
mbIsPaused
)
return
;
return
;
if
(
!
ma
Timer
.
IsActive
())
if
(
!
ma
Idle
.
IsActive
())
{
{
if
(
nPriorityClass
==
0
)
if
(
nPriorityClass
==
0
)
ma
Timer
.
SetTimeout
(
mnTimeBetweenHighPriorityRequests
);
ma
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_REPAINT
);
else
else
ma
Timer
.
SetTimeout
(
mnTimeBetweenLowPriorityRequests
);
ma
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOW
);
ma
Timer
.
Start
();
ma
Idle
.
Start
();
}
}
}
}
void
QueueProcessor
::
Stop
(
void
)
void
QueueProcessor
::
Stop
(
void
)
{
{
if
(
ma
Timer
.
IsActive
())
if
(
ma
Idle
.
IsActive
())
ma
Timer
.
Stop
();
ma
Idle
.
Stop
();
}
}
void
QueueProcessor
::
Pause
(
void
)
void
QueueProcessor
::
Pause
(
void
)
...
...
sd/source/ui/slidesorter/cache/SlsQueueProcessor.hxx
Dosyayı görüntüle @
b35820c0
...
@@ -92,7 +92,7 @@ private:
...
@@ -92,7 +92,7 @@ private:
*/
*/
::
osl
::
Mutex
maMutex
;
::
osl
::
Mutex
maMutex
;
Timer
maTimer
;
Idle
maIdle
;
DECL_LINK
(
ProcessRequestHdl
,
void
*
);
DECL_LINK
(
ProcessRequestHdl
,
void
*
);
sal_uInt32
mnTimeBetweenHighPriorityRequests
;
sal_uInt32
mnTimeBetweenHighPriorityRequests
;
sal_uInt32
mnTimeBetweenLowPriorityRequests
;
sal_uInt32
mnTimeBetweenLowPriorityRequests
;
...
...
svx/source/stbctrls/modctrl.cxx
Dosyayı görüntüle @
b35820c0
...
@@ -35,12 +35,6 @@ using ::com::sun::star::beans::PropertyValue;
...
@@ -35,12 +35,6 @@ using ::com::sun::star::beans::PropertyValue;
SFX_IMPL_STATUSBAR_CONTROL
(
SvxModifyControl
,
SfxBoolItem
);
SFX_IMPL_STATUSBAR_CONTROL
(
SvxModifyControl
,
SfxBoolItem
);
namespace
{
const
unsigned
_FEEDBACK_TIMEOUT
=
3000
;
}
struct
SvxModifyControl
::
ImplData
struct
SvxModifyControl
::
ImplData
{
{
enum
ModificationState
enum
ModificationState
...
@@ -51,7 +45,7 @@ struct SvxModifyControl::ImplData
...
@@ -51,7 +45,7 @@ struct SvxModifyControl::ImplData
MODIFICATION_STATE_SIZE
MODIFICATION_STATE_SIZE
};
};
Timer
maTimer
;
Idle
maIdle
;
Image
maImages
[
MODIFICATION_STATE_SIZE
];
Image
maImages
[
MODIFICATION_STATE_SIZE
];
ModificationState
mnModState
;
ModificationState
mnModState
;
...
@@ -63,7 +57,7 @@ struct SvxModifyControl::ImplData
...
@@ -63,7 +57,7 @@ struct SvxModifyControl::ImplData
maImages
[
MODIFICATION_STATE_YES
]
=
Image
(
SVX_RES
(
RID_SVXBMP_DOC_MODIFIED_YES
));
maImages
[
MODIFICATION_STATE_YES
]
=
Image
(
SVX_RES
(
RID_SVXBMP_DOC_MODIFIED_YES
));
maImages
[
MODIFICATION_STATE_FEEDBACK
]
=
Image
(
SVX_RES
(
RID_SVXBMP_DOC_MODIFIED_FEEDBACK
));
maImages
[
MODIFICATION_STATE_FEEDBACK
]
=
Image
(
SVX_RES
(
RID_SVXBMP_DOC_MODIFIED_FEEDBACK
));
ma
Timer
.
SetTimeout
(
_FEEDBACK_TIMEOU
T
);
ma
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOWES
T
);
}
}
};
};
...
@@ -82,7 +76,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status
...
@@ -82,7 +76,7 @@ SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, Status
}
}
}
}
//#endif
//#endif
mpImpl
->
ma
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
SvxModifyControl
,
OnTimer
)
);
mpImpl
->
ma
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
SvxModifyControl
,
OnTimer
)
);
}
}
...
@@ -95,7 +89,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
...
@@ -95,7 +89,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
DBG_ASSERT
(
pState
->
ISA
(
SfxBoolItem
),
"invalid item type"
);
DBG_ASSERT
(
pState
->
ISA
(
SfxBoolItem
),
"invalid item type"
);
const
SfxBoolItem
*
pItem
=
static_cast
<
const
SfxBoolItem
*>
(
pState
);
const
SfxBoolItem
*
pItem
=
static_cast
<
const
SfxBoolItem
*>
(
pState
);
mpImpl
->
ma
Timer
.
Stop
();
mpImpl
->
ma
Idle
.
Stop
();
bool
modified
=
pItem
->
GetValue
();
bool
modified
=
pItem
->
GetValue
();
bool
start
=
(
!
modified
&&
mpImpl
->
mnModState
==
ImplData
::
MODIFICATION_STATE_YES
);
// should timer be started and feedback image displayed ?
bool
start
=
(
!
modified
&&
mpImpl
->
mnModState
==
ImplData
::
MODIFICATION_STATE_YES
);
// should timer be started and feedback image displayed ?
...
@@ -108,7 +102,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
...
@@ -108,7 +102,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
GetStatusBar
().
SetQuickHelpText
(
GetId
(),
SVX_RESSTR
(
nResId
));
GetStatusBar
().
SetQuickHelpText
(
GetId
(),
SVX_RESSTR
(
nResId
));
if
(
start
)
if
(
start
)
mpImpl
->
ma
Timer
.
Start
();
mpImpl
->
ma
Idle
.
Start
();
}
}
...
...
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