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

[Jan Holesovsky]

 sfx2/source/control/unoctitm.cxx |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 7ee52080ba07b42addfbb2d038fcff711d0fb64c
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Fri Jul 3 20:35:30 2015 +0200

    tdf#92528: Saving of usage info can happen very late in the tear down.
    
    Change-Id: Id545f3447472a8e6ee137a6630ee14b45a45d673
    Reviewed-on: https://gerrit.libreoffice.org/16746
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 1ab2b53..bba52c6 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -598,11 +598,14 @@ class UsageInfo {
 
     typedef std::map<OUString, int> UsageMap;
 
+    /// Are we collecting the info?  We cache the value because the call to save can happen very late.
+    bool mbIsCollecting;
+
     /// Command vs. how many times it was used
     UsageMap maUsage;
 
 public:
-    UsageInfo()
+    UsageInfo() : mbIsCollecting(false)
     {
     }
 
@@ -616,6 +619,9 @@ public:
 
     /// Save the usage data for the next session.
     void save();
+
+    /// Modify the flag whether we are collecting.
+    void setCollecting(bool bIsCollecting) { mbIsCollecting = bIsCollecting; }
 };
 
 void UsageInfo::increment(const OUString &rCommand)
@@ -630,7 +636,7 @@ void UsageInfo::increment(const OUString &rCommand)
 
 void UsageInfo::save()
 {
-    if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+    if (!mbIsCollecting)
         return;
 
     // TODO - do a real saving here, not only dump to the screen
@@ -647,7 +653,9 @@ class theUsageInfo : public rtl::Static<UsageInfo, theUsageInfo> {};
 /// Extracts information about the command + args, and stores that.
 void collectUsageInformation(const util::URL& rURL, const uno::Sequence<beans::PropertyValue>& rArgs)
 {
-    if (!officecfg::Office::Common::Misc::CollectUsageInformation::get())
+    bool bCollecting = officecfg::Office::Common::Misc::CollectUsageInformation::get();
+    theUsageInfo::get().setCollecting(bCollecting);
+    if (!bCollecting)
         return;
 
     OUStringBuffer aBuffer;