summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-05-10 11:50:39 +0200
committerAndras Timar <atimar@suse.com>2012-05-14 13:55:11 +0200
commit45884d2a1378b46ab20abe92c2498bfed09cf58e (patch)
treebdf04150d102ac2c473d4129635d121492552ce3
parent4dc7a53b066c0241fc55b41b41d57a690ca512b1 (diff)
fdo#49692 fix RTF export of empty paragraph numbering rules
When there is a numbering rule, the fallback text is constructed so that whitespace separates the numbering and the paragraph text. When the numbering is empty, we don't need that separator. Change-Id: I17a11ddd73addc8c95a0c2b54402e6dd2705d094 Signed-off-by: Andras Timar <atimar@suse.com>
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index e66d5be76d46..4beb0df127df 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -2511,10 +2511,9 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
else
sTxt = pTxtNd->GetNumString();
- m_aStyles.append(' ');
-
if (sTxt.Len())
{
+ m_aStyles.append(' ');
m_aStyles.append(m_rExport.OutString(sTxt, m_rExport.eDefaultEncoding));
}
@@ -2522,7 +2521,8 @@ void RtfAttributeOutput::ParaNumRule_Impl( const SwTxtNode* pTxtNd, sal_Int32 nL
{
if( OUTLINE_RULE != pRule->GetRuleType() )
{
- m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB);
+ if (sTxt.Len())
+ m_aStyles.append(OOO_STRING_SVTOOLS_RTF_TAB);
m_aStyles.append('}');
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_ILVL);
if( nLvl > 8 ) // RTF knows only 9 levels