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

fdo#77267 RTF import: pard should reset current paragraph style

Change-Id: I8d78ce262a4e57161325231a78e48750909b1bad
üst c1e563f6
{\rtf1\ansi\ansicpg1250\uc1 \deff0\deflang1045\deflangfe1045
{\stylesheet
{
\li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \snext0 Normal;}
{\s4\qc \li0\ri0\sl360\slmult1
\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0 \b\fs52\lang1045\langfe1045\cgrid\langnp1045\langfenp1045 \sbasedon0 \snext0 heading 4;}
}
\pard\plain \s4\qc \li0\ri0\sl360\slmult1\keepn\nowidctlpar\faauto\outlinelevel3\rin0\lin0\itap0
\pard \qc
l
\par
}
......@@ -1648,6 +1648,12 @@ DECLARE_RTFIMPORT_TEST(testFdo74599, "fdo74599.rtf")
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(-1), getProperty<sal_Int32>(xPropertySet, "CharColor"));
}
DECLARE_RTFIMPORT_TEST(testFdo77267, "fdo77267.rtf")
{
// Paragraph was aligned to left, should be center.
CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast<style::ParagraphAdjust>(getProperty<sal_Int16>(getParagraph(1), "ParaAdjust")));
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -2536,6 +2536,9 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms.set(NS_ooxml::LN_inTbl, RTFValue::Pointer_t(new RTFValue(1)));
}
m_aStates.top().resetFrame();
// Reset currently selected paragraph style as well.
m_aStates.top().nCurrentStyleIndex = -1;
break;
case RTF_SECTD:
{
......
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