summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-10-17 09:11:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-10-17 15:19:39 +0100
commitc45fa7f54dff30a66ff37fea6d03225d738ca7d3 (patch)
tree86c0c77122ca3c41c4001f768eed9015a26ba6eb /sw
parent6d249bec487208e56a057ea8a25c34c5d3133a23 (diff)
coverity#1247648 Uninitialized pointer read
Change-Id: Id9faf897cedd976491520178aad8015398f7d018
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx12
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 96c04c604487..95c609e175b6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2350,26 +2350,24 @@ void RtfAttributeOutput::CharRotate(const SvxCharRotateItem& rRotate)
void RtfAttributeOutput::CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark)
{
- const sal_Char* pStr;
switch (rEmphasisMark.GetEmphasisMark())
{
case EMPHASISMARK_NONE:
- pStr = OOO_STRING_SVTOOLS_RTF_ACCNONE;
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCNONE);
break;
case EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE:
- pStr = OOO_STRING_SVTOOLS_RTF_ACCDOT;
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCDOT);
break;
case EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE:
- pStr = OOO_STRING_SVTOOLS_RTF_ACCCOMMA;
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCCOMMA);
break;
case EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE:
- pStr = OOO_STRING_SVTOOLS_RTF_ACCCIRCLE;
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCCIRCLE);
break;
case EMPHASISMARK_DOT|EMPHASISMARK_POS_BELOW:
- pStr = OOO_STRING_SVTOOLS_RTF_ACCUNDERDOT;
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ACCUNDERDOT);
break;
}
- m_aStyles.append(pStr);
}
void RtfAttributeOutput::CharTwoLines(const SvxTwoLinesItem& rTwoLines)