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
55b68ad0
Kaydet (Commit)
55b68ad0
authored
Ara 10, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Instantiate ImplSVData on demand
Change-Id: I661949a8635a2ed1a1efda77ced48a0fa9f6722e
üst
4de09a9e
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
29 deletions
+10
-29
svapp.hxx
include/vcl/svapp.hxx
+0
-1
svdata.hxx
vcl/inc/svdata.hxx
+3
-4
svapp.cxx
vcl/source/app/svapp.cxx
+0
-3
svdata.cxx
vcl/source/app/svdata.cxx
+7
-13
svmain.cxx
vcl/source/app/svmain.cxx
+0
-3
lazydelete.cxx
vcl/source/helper/lazydelete.cxx
+0
-5
No files found.
include/vcl/svapp.hxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -241,7 +241,6 @@ public:
@attention The initialization of the application itself is done in Init()
@see InitSalData is implemented by platform specific code.
ImplInitSVData initializes the global instance data
*/
Application
();
...
...
vcl/inc/svdata.hxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -300,6 +300,8 @@ struct BlendFrameCache
struct
ImplSVData
{
ImplSVData
();
SalData
*
mpSalData
;
SalInstance
*
mpDefInst
;
// Default SalInstance
Application
*
mpApp
;
// pApp
...
...
@@ -339,9 +341,7 @@ struct ImplSVData
Link
maDeInitHook
;
};
void
ImplInitSVData
();
void
ImplDeInitSVData
();
void
ImplDestroySVData
();
VCL_PLUGIN_PUBLIC
vcl
::
Window
*
ImplGetDefaultWindow
();
VCL_PLUGIN_PUBLIC
ResMgr
*
ImplGetResMgr
();
VCL_PLUGIN_PUBLIC
ResId
VclResId
(
sal_Int32
nId
);
// throws std::bad_alloc if no res mgr
...
...
@@ -357,8 +357,7 @@ void ImplFreeEventHookData();
bool
ImplCallPreNotify
(
NotifyEvent
&
rEvt
);
extern
VCL_PLUGIN_PUBLIC
ImplSVData
*
pImplSVData
;
inline
ImplSVData
*
ImplGetSVData
()
{
return
pImplSVData
;
}
VCL_PLUGIN_PUBLIC
ImplSVData
*
ImplGetSVData
();
VCL_PLUGIN_PUBLIC
void
ImplHideSplash
();
bool
ImplInitAccessBridge
();
...
...
vcl/source/app/svapp.cxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -194,8 +194,6 @@ Application::Application()
OUString
aVar
(
"LIBO_VERSION"
),
aValue
(
LIBO_VERSION_DOTTED
);
osl_setEnvironment
(
aVar
.
pData
,
aValue
.
pData
);
if
(
!
ImplGetSVData
()
)
ImplInitSVData
();
ImplGetSVData
()
->
mpApp
=
this
;
InitSalData
();
}
...
...
@@ -205,7 +203,6 @@ Application::~Application()
ImplDeInitSVData
();
DeInitSalData
();
ImplGetSVData
()
->
mpApp
=
NULL
;
ImplDestroySVData
();
}
int
Application
::
Main
()
...
...
vcl/source/app/svdata.cxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -64,8 +64,9 @@ namespace
public
rtl
::
Static
<
ImplSVData
,
private_aImplSVData
>
{};
}
// static SV-Data
ImplSVData
*
pImplSVData
=
NULL
;
ImplSVData
*
ImplGetSVData
()
{
return
&
private_aImplSVData
::
get
();
}
SalSystem
*
ImplGetSalSystem
()
{
...
...
@@ -75,14 +76,12 @@ SalSystem* ImplGetSalSystem()
return
pSVData
->
mpSalSystem
;
}
void
ImplInit
SVData
()
ImplSVData
::
Impl
SVData
()
{
pImplSVData
=
&
private_aImplSVData
::
get
();
// init global instance data
memset
(
pImplSVData
,
0
,
sizeof
(
ImplSVData
)
);
pImplSVData
->
maHelpData
.
mbAutoHelpId
=
true
;
pImplSVData
->
maNWFData
.
maMenuBarHighlightTextColor
=
Color
(
COL_TRANSPARENT
);
memset
(
this
,
0
,
sizeof
(
ImplSVData
)
);
maHelpData
.
mbAutoHelpId
=
true
;
maNWFData
.
maMenuBarHighlightTextColor
=
Color
(
COL_TRANSPARENT
);
}
void
ImplDeInitSVData
()
...
...
@@ -104,11 +103,6 @@ void ImplDeInitSVData()
delete
pSVData
->
mpPaperNames
,
pSVData
->
mpPaperNames
=
NULL
;
}
void
ImplDestroySVData
()
{
pImplSVData
=
NULL
;
}
vcl
::
Window
*
ImplGetDefaultWindow
()
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
...
...
vcl/source/app/svmain.cxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -240,9 +240,6 @@ bool InitVCL()
EmbeddedFontsHelper
::
clearTemporaryFontFiles
();
if
(
!
ImplGetSVData
()
)
ImplInitSVData
();
if
(
!
ImplGetSVData
()
->
mpApp
)
{
pOwnSvApp
=
new
Application
();
...
...
vcl/source/helper/lazydelete.cxx
Dosyayı görüntüle @
55b68ad0
...
...
@@ -80,11 +80,6 @@ DeleteOnDeinitBase::~DeleteOnDeinitBase()
void
DeleteOnDeinitBase
::
addDeinitContainer
(
DeleteOnDeinitBase
*
i_pContainer
)
{
ImplSVData
*
pSVData
=
ImplGetSVData
();
if
(
!
pSVData
)
{
ImplInitSVData
();
pSVData
=
ImplGetSVData
();
}
DBG_ASSERT
(
!
pSVData
->
mbDeInit
,
"DeleteOnDeinit added after DeiInitVCL !"
);
if
(
pSVData
->
mbDeInit
)
...
...
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