[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/kspread/excel
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2010-07-07 19:21:05
Message-ID: 20100707192105.10B61AC8E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1147269 by mkruisselbrink:

fix some minor memory leaks

 M  +6 -4      import/excelimport.cc  
 M  +1 -0      sidewinder/excel.cpp  


--- trunk/koffice/filters/kspread/excel/import/excelimport.cc #1147268:1147269
@@ -284,11 +284,13 @@
     // we are done!
     delete d->workbook;
     delete d->styles;
+    delete d->mainStyles;
     delete d->storeout;
     d->inputFile.clear();
     d->outputFile.clear();
     d->workbook = 0;
     d->styles = 0;
+    d->mainStyles = 0;
     d->cellStyles.clear();
     d->rowStyles.clear();
     d->colStyles.clear();
@@ -636,8 +638,8 @@
     QString masterStyleName("Default");
     QString pageLayoutStyleName("Mpm");
 
-    KoGenStyle *pageLayoutStyle = new KoGenStyle(KoGenStyle::PageLayoutStyle);
-    pageLayoutStyle->addProperty("style:writing-mode", "lr-tb");
+    KoGenStyle pageLayoutStyle(KoGenStyle::PageLayoutStyle);
+    pageLayoutStyle.addProperty("style:writing-mode", "lr-tb");
 
     QBuffer buf;
     buf.open(QIODevice::WriteOnly);
@@ -665,8 +667,8 @@
     buf.close();
     buf.setData("", 0);
 
-    pageLayoutStyle->addProperty("1header-footer-style", pageLyt, \
                KoGenStyle::StyleChildElement);
-    pageLayoutStyleName = mainStyles->insert(*pageLayoutStyle, pageLayoutStyleName, \
KoGenStyles::DontAddNumberToName); +    \
pageLayoutStyle.addProperty("1header-footer-style", pageLyt, \
KoGenStyle::StyleChildElement); +    pageLayoutStyleName = \
mainStyles->insert(pageLayoutStyle, pageLayoutStyleName, \
KoGenStyles::DontAddNumberToName);  
     for (unsigned i = 0; i < workbook->sheetCount(); i++) {
         Sheet* sheet = workbook->sheet(i);
--- trunk/koffice/filters/kspread/excel/sidewinder/excel.cpp #1147268:1147269
@@ -3150,6 +3150,7 @@
     }
 
     free(buffer);
+    free(continuePositions);
 
     delete stream;
 


[prev in list] [next in list] [prev in thread] [next in thread]