mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#60922 ignore DOCX import of w:position w:val="0"

Browse Source 
Change-Id: I10e9c0f1078e36710335a9a48f7f02292c764795
This commit is contained in:
Miklos Vajna
2013-03-25 10:12:20 +01:00
parent 25810de17f
commit cadb3433b3
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlimport/data/fdo60922.docx Normal file
View File

Binary file not shown.

8
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
View File

@@ -121,6 +121,7 @@ public:
void testFdo59638(); void testFdo59638();
void testFdo61343(); void testFdo61343();
void testToolsLineNumbering(); void testToolsLineNumbering();
void testFdo60922();
CPPUNIT_TEST_SUITE(Test); CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT) #if !defined(MACOSX) && !defined(WNT)
@@ -193,6 +194,7 @@ void Test::run()
{"fdo59638.docx", &Test::testFdo59638}, {"fdo59638.docx", &Test::testFdo59638},
{"fdo61343.docx", &Test::testFdo61343}, {"fdo61343.docx", &Test::testFdo61343},
{"tools-line-numbering.docx", &Test::testToolsLineNumbering}, {"tools-line-numbering.docx", &Test::testToolsLineNumbering},
{"fdo60922.docx", &Test::testFdo60922},
}; };
header(); header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1280,6 +1282,12 @@ void Test::testToolsLineNumbering()
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue); CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue);
} }
void Test::testFdo60922()
{
// This was 0, not 100, due to wrong import of w:position w:val="0"
CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(getRun(getParagraph(1), 1), "CharEscapementHeight"));
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();

4
writerfilter/source/dmapper/DomainMapper.cxx
View File

@@ -2154,7 +2154,9 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext, SprmType
case NS_sprm::LN_CHpsInc: case NS_sprm::LN_CHpsInc:
break; // sprmCHpsInc break; // sprmCHpsInc
case NS_sprm::LN_CHpsPos: case NS_sprm::LN_CHpsPos:
m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue )); // The spec says 0 is the same as the lack of the value, so don't parse that.
if (nIntValue)
m_pImpl->deferCharacterProperty( nSprmId, uno::makeAny( nIntValue ));
break; // sprmCHpsPos break; // sprmCHpsPos
case NS_sprm::LN_CHpsPosAdj: case NS_sprm::LN_CHpsPosAdj:
break; // sprmCHpsPosAdj break; // sprmCHpsPosAdj