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
9ea0390f
Kaydet (Commit)
9ea0390f
authored
Eyl 09, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert Link<> to typed
Change-Id: Iaca21344f6a38f508f79e6d5983e515162a6dca3
üst
71d8cfc1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
svapp.hxx
include/vcl/svapp.hxx
+1
-1
bootstrapfixture.cxx
test/source/bootstrapfixture.cxx
+2
-3
vclbootstrapprotector.cxx
test/source/vclbootstrapprotector.cxx
+3
-3
svdata.hxx
vcl/inc/svdata.hxx
+1
-1
svapp.cxx
vcl/source/app/svapp.cxx
+1
-1
No files found.
include/vcl/svapp.hxx
Dosyayı görüntüle @
9ea0390f
...
@@ -1483,7 +1483,7 @@ public:
...
@@ -1483,7 +1483,7 @@ public:
///@}
///@}
// For vclbootstrapprotector:
// For vclbootstrapprotector:
static
void
setDeInitHook
(
Link
<>
const
&
hook
);
static
void
setDeInitHook
(
Link
<
LinkParamNone
*
,
void
>
const
&
hook
);
private
:
private
:
...
...
test/source/bootstrapfixture.cxx
Dosyayı görüntüle @
9ea0390f
...
@@ -85,12 +85,11 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
...
@@ -85,12 +85,11 @@ void test_init_impl(bool bAssertOnDialog, bool bNeedUCB,
}
}
struct
InitHook
{
struct
InitHook
{
DECL_STATIC_LINK
(
InitHook
,
deinitHook
,
void
*
);
DECL_STATIC_LINK
_TYPED
(
InitHook
,
deinitHook
,
LinkParamNone
*
,
void
);
};
};
IMPL_STATIC_LINK_NOARG
(
InitHook
,
deinitHook
)
{
IMPL_STATIC_LINK_NOARG
_TYPED
(
InitHook
,
deinitHook
,
LinkParamNone
*
,
void
)
{
// nothing to do for now
// nothing to do for now
return
0
;
}
}
// this is called from pyuno
// this is called from pyuno
...
...
test/source/vclbootstrapprotector.cxx
Dosyayı görüntüle @
9ea0390f
...
@@ -56,14 +56,15 @@ private:
...
@@ -56,14 +56,15 @@ private:
SAL_OVERRIDE
SAL_OVERRIDE
{
return
functor
();
}
{
return
functor
();
}
DECL_STATIC_LINK
(
Protector
,
deinitHook
,
void
*
);
DECL_STATIC_LINK
_TYPED
(
Protector
,
deinitHook
,
LinkParamNone
*
,
void
);
};
};
// HACK so that defaultBootstrap_InitialComponentContext (in
// HACK so that defaultBootstrap_InitialComponentContext (in
// unobootstrapprotector) is called before InitVCL (above), but component
// unobootstrapprotector) is called before InitVCL (above), but component
// context is disposed (redundantly again in unobootstrapprotector) from within
// context is disposed (redundantly again in unobootstrapprotector) from within
// DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx):
// DeInitVCL (cf. Desktop::DeInit, desktop/source/app/app.cxx):
IMPL_STATIC_LINK_NOARG
(
Protector
,
deinitHook
)
{
IMPL_STATIC_LINK_NOARG_TYPED
(
Protector
,
deinitHook
,
LinkParamNone
*
,
void
)
{
css
::
uno
::
Reference
<
css
::
uno
::
XComponentContext
>
context
;
css
::
uno
::
Reference
<
css
::
uno
::
XComponentContext
>
context
;
try
{
try
{
context
=
comphelper
::
getProcessComponentContext
();
context
=
comphelper
::
getProcessComponentContext
();
...
@@ -82,7 +83,6 @@ IMPL_STATIC_LINK_NOARG(Protector, deinitHook) {
...
@@ -82,7 +83,6 @@ IMPL_STATIC_LINK_NOARG(Protector, deinitHook) {
context
,
css
::
uno
::
UNO_QUERY_THROW
)
->
dispose
();
context
,
css
::
uno
::
UNO_QUERY_THROW
)
->
dispose
();
comphelper
::
setProcessServiceFactory
(
0
);
comphelper
::
setProcessServiceFactory
(
0
);
}
}
return
0
;
}
}
}
}
...
...
vcl/inc/svdata.hxx
Dosyayı görüntüle @
9ea0390f
...
@@ -344,7 +344,7 @@ struct ImplSVData
...
@@ -344,7 +344,7 @@ struct ImplSVData
std
::
list
<
vcl
::
DeleteOnDeinitBase
*
>*
mpDeinitDeleteList
;
std
::
list
<
vcl
::
DeleteOnDeinitBase
*
>*
mpDeinitDeleteList
;
std
::
unordered_map
<
int
,
OUString
>*
mpPaperNames
;
std
::
unordered_map
<
int
,
OUString
>*
mpPaperNames
;
Link
<>
maDeInitHook
;
Link
<
LinkParamNone
*
,
void
>
maDeInitHook
;
};
};
void
ImplDeInitSVData
();
void
ImplDeInitSVData
();
...
...
vcl/source/app/svapp.cxx
Dosyayı görüntüle @
9ea0390f
...
@@ -1600,7 +1600,7 @@ Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM
...
@@ -1600,7 +1600,7 @@ Application::createFolderPicker( const Reference< uno::XComponentContext >& xSM
return
pSVData
->
mpDefInst
->
createFolderPicker
(
xSM
);
return
pSVData
->
mpDefInst
->
createFolderPicker
(
xSM
);
}
}
void
Application
::
setDeInitHook
(
Link
<>
const
&
hook
)
{
void
Application
::
setDeInitHook
(
Link
<
LinkParamNone
*
,
void
>
const
&
hook
)
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
ImplSVData
*
pSVData
=
ImplGetSVData
();
assert
(
!
pSVData
->
maDeInitHook
.
IsSet
());
assert
(
!
pSVData
->
maDeInitHook
.
IsSet
());
pSVData
->
maDeInitHook
=
hook
;
pSVData
->
maDeInitHook
=
hook
;
...
...
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