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

[Kohei Yoshida]

 sc/source/filter/xml/editattributemap.cxx |    8 ++++----
 sc/source/filter/xml/xmlcelli.cxx         |    3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 61867bd74995c0fc35d607427958013998839506
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Feb 11 23:49:47 2013 -0500

    Fix the memory leak. ScEditCell clones the EditTextObject in its ctor.
    
    Change-Id: I8f0f29a504a363ac4359dd4e6ec962976746fecd

diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 701e784..3510514 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1050,7 +1050,8 @@ void ScXMLTableRowCellContext::PutTextCell( const ScAddress& rCurrentPos,
                         mpEditEngine->QuickInsertField(SvxFieldItem(*it->mpData, EE_FEATURE_FIELD), it->maSelection);
                 }
 
-                pNewCell = new ScEditCell(mpEditEngine->CreateTextObject(), pDoc, pDoc->GetEditPool());
+                boost::scoped_ptr<EditTextObject> pTextObj(mpEditEngine->CreateTextObject());
+                pNewCell = new ScEditCell(pTextObj.get(), pDoc, pDoc->GetEditPool());
             }
         }
         else if ( nCurrentCol > 0 && pOUText && !pOUText->isEmpty() )
commit 664e65f9c291589d9a0cd639fec06bc0575ba6da
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Mon Feb 11 23:23:09 2013 -0500

    Forgot to name it consistently...
    
    Change-Id: I331dcd6678c5f781b5535b72d38fd7544ad9b431

diff --git a/sc/source/filter/xml/editattributemap.cxx b/sc/source/filter/xml/editattributemap.cxx
index 174f508..22b4016 100644
--- a/sc/source/filter/xml/editattributemap.cxx
+++ b/sc/source/filter/xml/editattributemap.cxx
@@ -20,7 +20,7 @@ struct {
     sal_uInt16 mnItemID;
     sal_uInt8 mnFlag;
 
-} Entries[] = {
+} aEntries[] = {
 
     { "color", "CharColor", EE_CHAR_COLOR, 0 },
     { "font-charset", "CharFontCharSet", EE_CHAR_FONTINFO, MID_FONT_CHAR_SET },
@@ -76,13 +76,13 @@ ScXMLEditAttributeMap::Entry::Entry(sal_uInt16 nItemID, sal_uInt8 nFlag) :
 
 ScXMLEditAttributeMap::ScXMLEditAttributeMap()
 {
-    size_t n = sizeof(Entries) / sizeof(Entries[0]);
+    size_t n = sizeof(aEntries) / sizeof(aEntries[0]);
     for (size_t i = 0; i < n; ++i)
     {
         maEntries.insert(
             EntriesType::value_type(
-                OUString::createFromAscii(Entries[i].mpAPIName),
-                Entry(Entries[i].mnItemID, Entries[i].mnFlag)));
+                OUString::createFromAscii(aEntries[i].mpAPIName),
+                Entry(aEntries[i].mnItemID, aEntries[i].mnFlag)));
     }
 }