summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-04-26 21:09:52 -0400
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-04-26 21:11:01 -0400
commited89b3799f2b0131f2150b7762044afd4ffd8fd2 (patch)
treec6bb2ab56aedc84cf9b74ada2c4f7626f25f9508
parent861acd5b73956425da788c78fb1ed5c283a1f6a0 (diff)
Evil manual reference counter manipulations. Let's murder them.
Incidentally, this fixes the dbgutil error problem. The old code was passing a copy of the ScHeaderFooterContentObj object to the ScHeaderFooterTextData object, which was why the counter was incremented on copy (though they should still have used a wrapper instead of manual reference counting). My new code passes a reference, which removes the copying, but those pesky acquire() and release() calls were still there. This caused the ScHeaderFooterContentObj object to never get deleted, which in turn caused the dbgutil refcounting check of SvxUnoTextRangeBase object to fail. Change-Id: I4e1780b32b21098a121ec7a43bb3eb842a419584
-rw-r--r--sc/source/ui/unoobj/textuno.cxx3
1 files changed, 0 insertions, 3 deletions
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index fbae7fd448ce..b6fd42965e71 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -204,7 +204,6 @@ ScHeaderFooterTextData::ScHeaderFooterTextData(
pForwarder( NULL ),
bDataValid(false)
{
- rContentObj.acquire(); // must not go away
}
ScHeaderFooterTextData::~ScHeaderFooterTextData()
@@ -213,8 +212,6 @@ ScHeaderFooterTextData::~ScHeaderFooterTextData()
delete pForwarder;
delete pEditEngine;
-
- rContentObj.release();
}
SvxTextForwarder* ScHeaderFooterTextData::GetTextForwarder()