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
3f695473
Kaydet (Commit)
3f695473
authored
Haz 04, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: tdf#46440 SIGSEGV on toolkit bootstrap without running instance
Change-Id: I9a78a75b3d72586b1702ed6fa63bb0b62ce6cd72
üst
407c6c87
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletion
+22
-1
vclxtoolkit.cxx
toolkit/source/awt/vclxtoolkit.cxx
+20
-0
svapp.cxx
vcl/source/app/svapp.cxx
+2
-1
No files found.
toolkit/source/awt/vclxtoolkit.cxx
Dosyayı görüntüle @
3f695473
...
@@ -44,6 +44,7 @@
...
@@ -44,6 +44,7 @@
#include <com/sun/star/awt/XToolkitExperimental.hpp>
#include <com/sun/star/awt/XToolkitExperimental.hpp>
#include <com/sun/star/awt/XMessageBoxFactory.hpp>
#include <com/sun/star/awt/XMessageBoxFactory.hpp>
#include <cppuhelper/bootstrap.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/supportsservice.hxx>
...
@@ -595,6 +596,25 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
...
@@ -595,6 +596,25 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs )
{
{
osl_setThreadName
(
"VCLXToolkit VCL main thread"
);
osl_setThreadName
(
"VCLXToolkit VCL main thread"
);
css
::
uno
::
Reference
<
css
::
lang
::
XMultiServiceFactory
>
xServiceManager
;
try
{
xServiceManager
=
::
comphelper
::
getProcessServiceFactory
();
}
catch
(
const
css
::
uno
::
DeploymentException
&
)
{
}
if
(
!
xServiceManager
.
is
())
{
css
::
uno
::
Reference
<
css
::
uno
::
XComponentContext
>
xContext
=
::
cppu
::
defaultBootstrap_InitialComponentContext
();
xServiceManager
=
css
::
uno
::
Reference
<
css
::
lang
::
XMultiServiceFactory
>
(
xContext
->
getServiceManager
(),
css
::
uno
::
UNO_QUERY_THROW
);
// set global process service factory used by unotools config helpers
::
comphelper
::
setProcessServiceFactory
(
xServiceManager
);
}
VCLXToolkit
*
pTk
=
static_cast
<
VCLXToolkit
*>
(
pArgs
);
VCLXToolkit
*
pTk
=
static_cast
<
VCLXToolkit
*>
(
pArgs
);
bInitedByVCLToolkit
=
InitVCL
();
bInitedByVCLToolkit
=
InitVCL
();
if
(
bInitedByVCLToolkit
)
if
(
bInitedByVCLToolkit
)
...
...
vcl/source/app/svapp.cxx
Dosyayı görüntüle @
3f695473
...
@@ -418,7 +418,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
...
@@ -418,7 +418,8 @@ void Application::AcquireSolarMutex( sal_uLong nCount )
bool
Application
::
IsInMain
()
bool
Application
::
IsInMain
()
{
{
return
ImplGetSVData
()
->
maAppData
.
mbInAppMain
;
ImplSVData
*
pSVData
=
ImplGetSVData
();
return
pSVData
?
pSVData
->
maAppData
.
mbInAppMain
:
false
;
}
}
bool
Application
::
IsInExecute
()
bool
Application
::
IsInExecute
()
...
...
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