Kaydet (Commit) a2fea109 authored tarafından Miklos Vajna's avatar Miklos Vajna

RtfAttributeOutput::ParaHyphenZone: use \hyphpar

Previously SvxHyphenZoneItem was serialized to some custom RTF extension
that even our own RTF import ignores since LO 3.5.

Change-Id: Ia99d9750ad0b1a07105eeef2bee07e6fdbfe7876
üst a3ec386c
{\rtf1\hyphauto1
\pard\plain AAA\par
\pard\plain\hyphpar0 BBB\par
\pard\plain CCC\par
}
......@@ -872,6 +872,12 @@ DECLARE_RTFEXPORT_TEST(testHyphauto, "hyphauto.rtf")
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getParagraph(1), "ParaIsHyphenation"));
}
DECLARE_RTFEXPORT_TEST(testHyphpar, "hyphpar.rtf")
{
// Hyphenation was enabled for all 3 paragraphs, but it should be disabled for the 2nd one.
CPPUNIT_ASSERT_EQUAL(false, getProperty<bool>(getParagraph(2), "ParaIsHyphenation"));
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -2663,20 +2663,8 @@ void RtfAttributeOutput::ParaTabStop(const SvxTabStopItem& rTabStop)
void RtfAttributeOutput::ParaHyphenZone(const SvxHyphenZoneItem& rHyphenZone)
{
sal_Int32 nFlags = rHyphenZone.IsHyphen() ? 1 : 0;
if (rHyphenZone.IsPageEnd())
nFlags += 2;
m_aStyles.append('{');
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_IGNORE);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HYPHEN);
m_aStyles.append((sal_Int32)nFlags);
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HYPHLEAD);
m_aStyles.append((sal_Int32)rHyphenZone.GetMinLead());
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HYPHTRAIL);
m_aStyles.append((sal_Int32)rHyphenZone.GetMinTrail());
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HYPHMAX);
m_aStyles.append((sal_Int32)rHyphenZone.GetMaxHyphens());
m_aStyles.append('}');
m_aStyles.append(OOO_STRING_SVTOOLS_RTF_HYPHPAR);
m_aStyles.append(int(rHyphenZone.IsHyphen()));
}
void RtfAttributeOutput::ParaNumRule_Impl(const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment