summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorjp <jp@openoffice.org>2000-10-12 20:37:12 +0000
committerjp <jp@openoffice.org>2000-10-12 20:37:12 +0000
commitbaa8d52a2fdd4809b558141bb58474bd98019cbc (patch)
treeecfb3af0834279b56d611fc2c9726de9f78dedd3 /sw/source
parentc0805ac1e315696eb762857cbb8f608908852837 (diff)
Bug #79478#: delete UnoCrsr in DTOR
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/unocore/unoobj.cxx10
-rw-r--r--sw/source/core/unocore/unoport.cxx6
2 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 05d906c94b7c..a2ce48eb9f2a 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoobj.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2000-09-22 09:33:46 $
+ * last change: $Author: jp $ $Date: 2000-10-12 21:37:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -5083,6 +5083,8 @@ SwXParaFrameEnumeration::SwXParaFrameEnumeration(const SwUnoCrsr& rUnoCrsr,
SwXParaFrameEnumeration::~SwXParaFrameEnumeration()
{
aFrameArr.DeleteAndDestroy(0, aFrameArr.Count());
+ SwUnoCrsr* pUnoCrsr = GetCrsr();
+ delete pUnoCrsr;
}
/* -----------------------------03.04.00 10:15--------------------------------
Description: Search for a FLYCNT text attribute at the cursor point
@@ -5312,6 +5314,10 @@ SwXTextPortionEnumeration::~SwXTextPortionEnumeration()
delete pCurDepend;
aFrameArr.Remove(nFrame - 1);
}
+
+ if( aPortionArr.Count() )
+ aPortionArr.DeleteAndDestroy(0, aPortionArr.Count() );
+
SwUnoCrsr* pUnoCrsr = GetCrsr();
delete pUnoCrsr;
}
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 0642fdbd07b7..50f234ecf830 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: unoport.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: os $ $Date: 2000-09-21 12:52:59 $
+ * last change: $Author: jp $ $Date: 2000-10-12 21:37:12 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -192,6 +192,8 @@ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, uno::Reference< XT
-----------------------------------------------------------------------*/
SwXTextPortion::~SwXTextPortion()
{
+ SwUnoCrsr* pUnoCrsr = GetCrsr();
+ delete pUnoCrsr;
}
/*-- 11.12.98 09:56:56---------------------------------------------------