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
8db7c0de
Kaydet (Commit)
8db7c0de
authored
Mar 11, 2016
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
No need for a complicated arg to SetReady
Change-Id: Iacb900ab7de0f01a78441019d2455abacc974617
üst
34eb5546
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
10 deletions
+5
-10
officeipcthread.cxx
desktop/source/app/officeipcthread.cxx
+4
-7
officeipcthread.hxx
desktop/source/app/officeipcthread.hxx
+1
-3
No files found.
desktop/source/app/officeipcthread.cxx
Dosyayı görüntüle @
8db7c0de
...
@@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
...
@@ -638,7 +638,7 @@ void OfficeIPCThread::DisableOfficeIPCThread(bool join)
// release mutex to avoid deadlocks
// release mutex to avoid deadlocks
aMutex
.
clear
();
aMutex
.
clear
();
OfficeIPCThread
::
SetReady
(
pOfficeIPCThread
);
pOfficeIPCThread
->
cReady
.
set
(
);
// exit gracefully and join
// exit gracefully and join
if
(
join
)
if
(
join
)
...
@@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread()
...
@@ -664,14 +664,11 @@ OfficeIPCThread::~OfficeIPCThread()
pGlobalOfficeIPCThread
.
clear
();
pGlobalOfficeIPCThread
.
clear
();
}
}
void
OfficeIPCThread
::
SetReady
(
void
OfficeIPCThread
::
SetReady
()
rtl
::
Reference
<
OfficeIPCThread
>
const
&
pThread
)
{
{
rtl
::
Reference
<
OfficeIPCThread
>
const
&
t
(
if
(
pGlobalOfficeIPCThread
.
is
())
pThread
.
is
()
?
pThread
:
pGlobalOfficeIPCThread
);
if
(
t
.
is
())
{
{
t
->
cReady
.
set
();
pGlobalOfficeIPCThread
->
cReady
.
set
();
}
}
}
}
...
...
desktop/source/app/officeipcthread.hxx
Dosyayı görüntüle @
8db7c0de
...
@@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread
...
@@ -117,9 +117,7 @@ class OfficeIPCThread : public salhelper::Thread
static
Status
EnableOfficeIPCThread
();
static
Status
EnableOfficeIPCThread
();
static
void
DisableOfficeIPCThread
(
bool
join
=
true
);
static
void
DisableOfficeIPCThread
(
bool
join
=
true
);
// start dispatching events...
// start dispatching events...
static
void
SetReady
(
static
void
SetReady
();
rtl
::
Reference
<
OfficeIPCThread
>
const
&
pThread
=
rtl
::
Reference
<
OfficeIPCThread
>
());
static
void
WaitForReady
();
static
void
WaitForReady
();
static
bool
IsEnabled
();
static
bool
IsEnabled
();
...
...
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