[Libreoffice-commits] core.git: 2 commits - lotuswordpro/source sfx2/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppagelayout.cxx |    8 ++++----
 sfx2/source/control/unoctitm.cxx             |    7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 9fe0c6636f38163936ff65aee2da863a503a4fc7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 28 10:52:22 2017 +0000

    fix leak
    
    Change-Id: I20e665a2b0bfadd44976b1659d85b1828e10311f

diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx
index bdb99af..4b67421 100644
--- a/lotuswordpro/source/filter/lwppagelayout.cxx
+++ b/lotuswordpro/source/filter/lwppagelayout.cxx
@@ -872,7 +872,7 @@ void LwpHeaderLayout::ParseWaterMark(XFHeaderStyle * pHeaderStyle)
 
 void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
 {
-    XFHeader* pHeader = new XFHeader();
+    std::unique_ptr<XFHeader> xHeader(new XFHeader());
     rtl::Reference<LwpObject> pStory = m_Content.obj();
     if(pStory.is())
     {
@@ -887,12 +887,12 @@ void LwpHeaderLayout::RegisterStyle(XFMasterPage* mp1)
         //register child layout style for framelayout,
         RegisterChildStyle();
         //End
-        pChangeMgr->SetHeadFootChange(pHeader);
-        pStory->DoXFConvert(pHeader);
+        pChangeMgr->SetHeadFootChange(xHeader.get());
+        pStory->DoXFConvert(xHeader.get());
 
         pChangeMgr->SetHeadFootFribMap(false);
     }
-    mp1->SetHeader(pHeader);
+    mp1->SetHeader(xHeader.release());
 }
 
 LwpFooterLayout::LwpFooterLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm )
commit dc1c69a4efe9368a1f4fae4bc11325485bcc0772
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Feb 28 10:42:17 2017 +0000

    might as well move append 'usage' into the msConfigPath from the start
    
    Change-Id: Ic3e141d91607f8e34ff4a74cd1ae3276e42934e7

diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 6e99463..b343c77 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -496,7 +496,10 @@ public:
     {
         mbIsCollecting = bIsCollecting;
         if (mbIsCollecting)
+        {
             msConfigPath = SvtPathOptions().GetConfigPath();
+            msConfigPath += "usage/";
+        }
     }
 };
 
@@ -515,9 +518,7 @@ void UsageInfo::save()
     if (!mbIsCollecting)
         return;
 
-    OUString path(msConfigPath);
-    path += "usage/";
-    osl::Directory::createPath(path);
+    osl::Directory::createPath(msConfigPath);
 
     //get system time information.
     TimeValue systemTime;