Kaydet (Commit) cd7938f8 authored tarafından Andras Timar's avatar Andras Timar

tdf#91270 fix crash on exit (Windows)

dynamic atexit destructor and const static variables reportedly
cause crash, let's avoid this.

Change-Id: I24234084f810854606dde9914bee1c98ebc2e3dd
üst 5fb93f26
...@@ -93,6 +93,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg ...@@ -93,6 +93,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
// prevent update dialog data during longer operations (cf #102657#) // prevent update dialog data during longer operations (cf #102657#)
bool bInhibitActivate; bool bInhibitActivate;
Image aInserted;
Image aDeleted;
Image aFormated;
Image aTableChgd;
Image aFormatCollSet;
Image aAutoFormat;
DECL_DLLPRIVATE_LINK( AcceptHdl, void* ); DECL_DLLPRIVATE_LINK( AcceptHdl, void* );
DECL_DLLPRIVATE_LINK( AcceptAllHdl, void* ); DECL_DLLPRIVATE_LINK( AcceptAllHdl, void* );
DECL_DLLPRIVATE_LINK( RejectHdl, void* ); DECL_DLLPRIVATE_LINK( RejectHdl, void* );
......
...@@ -160,7 +160,14 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer ...@@ -160,7 +160,14 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
bOnlyFormatedRedlines( false ), bOnlyFormatedRedlines( false ),
bHasReadonlySel ( false ), bHasReadonlySel ( false ),
bRedlnAutoFormat (bAutoFormat), bRedlnAutoFormat (bAutoFormat),
bInhibitActivate( false ) bInhibitActivate( false ),
aInserted (SW_RES(IMG_REDLINE_INSERTED)),
aDeleted (SW_RES(IMG_REDLINE_DELETED)),
aFormated (SW_RES(IMG_REDLINE_FORMATED)),
aTableChgd (SW_RES(IMG_REDLINE_TABLECHG)),
aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)),
aAutoFormat (SW_RES(IMG_REDLINE_AUTOFMT))
{ {
aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL);
pTPView = aTabPagesCTRL->GetViewPage(); pTPView = aTabPagesCTRL->GetViewPage();
...@@ -338,13 +345,6 @@ OUString SwRedlineAcceptDlg::GetRedlineText(const SwRangeRedline& rRedln, DateTi ...@@ -338,13 +345,6 @@ OUString SwRedlineAcceptDlg::GetRedlineText(const SwRangeRedline& rRedln, DateTi
Image SwRedlineAcceptDlg::GetActionImage(const SwRangeRedline& rRedln, sal_uInt16 nStack) Image SwRedlineAcceptDlg::GetActionImage(const SwRangeRedline& rRedln, sal_uInt16 nStack)
{ {
const static Image aInserted(SW_RES(IMG_REDLINE_INSERTED));
const static Image aDeleted(SW_RES(IMG_REDLINE_DELETED));
const static Image aFormated(SW_RES(IMG_REDLINE_FORMATED));
const static Image aTableChgd(SW_RES(IMG_REDLINE_TABLECHG));
const static Image aFormatCollSet(SW_RES(IMG_REDLINE_FMTCOLLSET));
const static Image aAutoFormat(SW_RES(IMG_REDLINE_AUTOFMT));
switch (rRedln.GetType(nStack)) switch (rRedln.GetType(nStack))
{ {
case nsRedlineType_t::REDLINE_INSERT: return aInserted; case nsRedlineType_t::REDLINE_INSERT: return aInserted;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment