summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2012-06-26 12:36:31 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-04-10 20:17:30 +0100
commit858c6610f3476bb47bb7b4e621a7ac48a9e34a75 (patch)
tree8eb898f314aa3c3099b6b2359a2bf8c52e1651dd /sfx2
parenta6f169433ada74a81b2e3421ea9c68a36c821fbb (diff)
Resolves: #i120077# Memory leak fixed in ScXMLFontAutoStylePool_Impl
also checked and fixed memory leaks caused by not deleting SfxStyleSheetIterator instances. Found by: Chao Huang Patch by: Chao Huang Review by: alg (cherry picked from commit aee8221b3fbe64d8e88aa3a1b630214807cd86f0) Conflicts: sc/source/core/data/stlsheet.cxx sc/source/filter/xml/xmlfonte.cxx sfx2/source/doc/objcont.cxx svl/source/items/style.cxx sw/source/core/unocore/unostyle.cxx Resolves: #120077# ALG: Reverted r1354011, adapted all usages of SfxStyleSheetIterator and CreateIterator to use boost::shared_ptr (cherry picked from commit ec1819f218b94bed1556653e1b2b816a65da61ef) Conflicts: sc/source/core/data/stlsheet.cxx sc/source/filter/xml/xmlfonte.cxx sfx2/source/doc/objcont.cxx svl/inc/svl/style.hxx svl/source/items/style.cxx sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unostyle.cxx 26937d4d65562b14de0aea59a7b01cc4334f73c1 Change-Id: If99bf3ee399292ec269d68b36ee78ed63f033215
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/doc/objcont.cxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index a03879c4ddbe..7f3a31e5213a 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -600,8 +600,6 @@ sal_Bool SfxObjectShell::Remove
return bRet;
}
-//--------------------------------------------------------------------
-
void SfxObjectShell::LoadStyles
(
SfxObjectShell &rSource /* the document template from which