summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2011-07-01 18:04:07 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2011-07-01 18:04:07 +0200
commit3ee782f1a0d655f2e6b353ee47c44a08b90f4880 (patch)
treeea0abb90a48f35d9b8d556d719dfa90a2ffb11c6
parent5ae58540fe2c0b6f3aa7bed36136b0424a8efcfb (diff)
use the destination buffer for levelnumbers
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx7
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx3
2 files changed, 2 insertions, 8 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 0468da81a3da..b07850a4b162 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -586,15 +586,13 @@ void RTFDocumentImpl::text(OUString& rString)
bool bRet = true;
switch (m_aStates.top().nDestinationState)
{
- case DESTINATION_LEVELTEXT:
- m_aStates.top().aLevelText.append(rString);
- break;
case DESTINATION_FONTENTRY:
case DESTINATION_STYLEENTRY:
case DESTINATION_REVISIONENTRY:
// drop the ; at the end if it's there
if (rString.endsWithAsciiL(";", 1))
rString = rString.copy(0, rString.getLength() - 1);
+ case DESTINATION_LEVELTEXT:
case DESTINATION_SHAPEPROPERTYNAME:
case DESTINATION_SHAPEPROPERTYVALUE:
case DESTINATION_BOOKMARKEND:
@@ -2254,7 +2252,7 @@ int RTFDocumentImpl::popState()
}
else if (m_aStates.top().nDestinationState == DESTINATION_LEVELTEXT)
{
- OUString aStr = m_aStates.top().aLevelText.makeStringAndClear();
+ OUString aStr = m_aDestinationText.makeStringAndClear();
// The first character is the length of the string (the rest should be ignored).
sal_Int32 nLength(aStr.toChar());
@@ -2516,7 +2514,6 @@ RTFParserState::RTFParserState()
nCharsToSkip(0),
nListLevelNum(0),
aListLevelEntries(),
- aLevelText(),
aLevelNumbers(),
nPictureScaleX(0),
nPictureScaleY(0),
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 61403c580db3..ff66164074f9 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -185,9 +185,6 @@ namespace writerfilter {
/// List level entries, which will form a list entry later.
RTFSprms_t aListLevelEntries;
- /// Text from leveltext destination.
- rtl::OUStringBuffer aLevelText;
-
/// List of character positions in leveltext to replace.
std::vector<sal_Int32> aLevelNumbers;