[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - 2 commits - sc/source sfx2/source

[Caolán McNamara]

 sc/source/ui/unoobj/styleuno.cxx |   11 ++++++-----
 sfx2/source/control/unoctitm.cxx |   12 ++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

New commits:
commit 6a4308109a185834d1cbaed1c567ad67d8e2216a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 2 14:21:46 2016 +0000

    usageinfo causes one of our more frequent fedora 25 crashes
    
    https://retrace.fedoraproject.org/faf/problems/bthash/?bth=17ba9a57f40d5ca29778866a9f96c1c0dfc7593c&bth=2f1801e44e9cb0be2b013624521fb0959dc2c73a&bth=5e8a1e07503f53b13b3a6779084f8b0637aaf5a7&bth=8033013a2ce586bccc23245583fa86ef4a761dce&bth=975271167132418534cb07336601efb5b0c711f0&bth=de75c2ad7917bc889d6307b152f79d34e79ce74d
    
    Change-Id: Ie93afa476eca9fdbf7ea17ff0189fbaa493a5531
    (cherry picked from commit a064f1226b9864f0d0ef6d969f2ae53cc413eb51)

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index cb7590c..920f921 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -472,6 +472,9 @@ class UsageInfo {
     /// Command vs. how many times it was used
     UsageMap maUsage;
 
+    /// config path, get it long before atexit time
+    OUString msConfigPath;
+
 public:
     UsageInfo() : mbIsCollecting(false)
     {
@@ -489,7 +492,12 @@ public:
     void save();
 
     /// Modify the flag whether we are collecting.
-    void setCollecting(bool bIsCollecting) { mbIsCollecting = bIsCollecting; }
+    void setCollecting(bool bIsCollecting)
+    {
+        mbIsCollecting = bIsCollecting;
+        if (mbIsCollecting)
+            msConfigPath = SvtPathOptions().GetConfigPath();
+    }
 };
 
 void UsageInfo::increment(const OUString &rCommand)
@@ -507,7 +515,7 @@ void UsageInfo::save()
     if (!mbIsCollecting)
         return;
 
-    OUString path(SvtPathOptions().GetConfigPath());
+    OUString path(msConfigPath);
     path += "usage/";
     osl::Directory::createPath(path);
 
commit 4e5a74a2fa7dd7bc6c0c5847515af5c4c4586b6d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Dec 2 08:53:34 2016 +0000

    coverity#1396676 Uninitialized pointer field
    
    Change-Id: I7d7557485fe603f49ae176378ef41539ebe4970c
    (cherry picked from commit 211925e144849ad14469a1a6c6451f61fcf369cf)

diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index d123734..1a6e8e9 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -943,11 +943,12 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c
 
 //  Default-ctor wird fuer die Reflection gebraucht
 
-ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName) :
-    pPropSet( (eFam == SfxStyleFamily::Para) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() ),
-    pDocShell( pDocSh ),
-    eFamily( eFam ),
-    aStyleName( rName )
+ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName)
+    : pPropSet( (eFam == SfxStyleFamily::Para) ? lcl_GetCellStyleSet() : lcl_GetPageStyleSet() )
+    , pDocShell(pDocSh)
+    , eFamily(eFam)
+    , aStyleName(rName)
+    , pStyle_cached(nullptr)
 {
     //  pDocShell ist Null, wenn per ServiceProvider erzeugt