[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - 2 commits - solenv/bin sw/source

[Andras Timar]

 solenv/bin/modules/installer/windows/admin.pm |    2 ++
 sw/source/uibase/inc/redlndlg.hxx             |    7 +++++++
 sw/source/uibase/misc/redlndlg.cxx            |   16 ++++++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)

New commits:
commit ded9e51fda12d01e381a5353e6ee412ec89548ff
Author: Andras Timar <andras.timar at collabora.com>
Date:   Sun Sep 6 01:31:01 2015 -0700

    hack to fix an MSP creation error
    
    Change-Id: Ifa833d3adfce5dcc247a8c6e2f972c0638e5c05c

diff --git a/solenv/bin/modules/installer/windows/admin.pm b/solenv/bin/modules/installer/windows/admin.pm
index 6fb1858..9e2dcd1 100644
--- a/solenv/bin/modules/installer/windows/admin.pm
+++ b/solenv/bin/modules/installer/windows/admin.pm
@@ -296,6 +296,8 @@ sub create_directory_structure
     {
         if ( ! exists($fullpathhash{$dir}) ) { $fullpathhash{$dir} = $targetdir; }
     }
+    # FIXME why is this hack needed? ERROR: Did not find full directory path for dir: "ystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"
+    $fullpathhash{"SystemFolder_x86_VC.194841A2_D0F2_3B96_9F71_05BA91BEA0FA"} = $targetdir . $installer::globals::separator . "System";
 
     return \%fullpathhash;
 }
commit cd7938f8ec0140f8e1d32660ace27fb298a91b6b
Author: Andras Timar <andras.timar at collabora.com>
Date:   Wed Oct 28 12:39:56 2015 -0700

    tdf#91270 fix crash on exit (Windows)
    
    dynamic atexit destructor and const static variables reportedly
    cause crash, let's avoid this.
    
    Change-Id: I24234084f810854606dde9914bee1c98ebc2e3dd

diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index a093230..1490b6b 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -93,6 +93,13 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg
     // prevent update dialog data during longer operations (cf #102657#)
     bool                    bInhibitActivate;
 
+    Image                   aInserted;
+    Image                   aDeleted;
+    Image                   aFormated;
+    Image                   aTableChgd;
+    Image                   aFormatCollSet;
+    Image                   aAutoFormat;
+
     DECL_DLLPRIVATE_LINK( AcceptHdl,     void* );
     DECL_DLLPRIVATE_LINK( AcceptAllHdl,  void* );
     DECL_DLLPRIVATE_LINK( RejectHdl,     void* );
diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx
index 73acb6a..a435591 100644
--- a/sw/source/uibase/misc/redlndlg.cxx
+++ b/sw/source/uibase/misc/redlndlg.cxx
@@ -160,7 +160,14 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(vcl::Window *pParent, VclBuilderContainer
     bOnlyFormatedRedlines( false ),
     bHasReadonlySel ( false ),
     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);
     pTPView = aTabPagesCTRL->GetViewPage();
@@ -338,13 +345,6 @@ OUString SwRedlineAcceptDlg::GetRedlineText(const SwRangeRedline& rRedln, DateTi
 
 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))
     {
         case nsRedlineType_t::REDLINE_INSERT:  return aInserted;