Kaydet (Commit) 04f57134 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#102334 Some hidden text not imported as hidden correctly

began to be a problem since..

commit 705a8c22
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Tue Sep 23 20:35:50 2014 +0100

    WW8PLCFMan::AdjustEnds deeply flawed concept wrt change tracking

but underlying problem is...

commit b3cee382
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Mon Jun 27 14:52:41 2011 +0100

    Related: #i76955# make this 4+ times faster

Change-Id: I1cd42a0f51599efab9352c960a5f496626af7ac0
üst 56239a62
This diff was suppressed by a .gitattributes entry.
......@@ -615,6 +615,12 @@ DECLARE_WW8IMPORT_TEST(testTdf59896, "tdf59896.doc")
CPPUNIT_ASSERT_EQUAL(awt::FontWeight::BOLD, getProperty<float>(getRun(getParagraph(1), 1), "CharWeight"));
}
DECLARE_WW8IMPORT_TEST(testTdf102334, "tdf102334.doc")
{
// This was false, i.e. the first run wasn't hidden, when it should have been
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(getRun(getParagraph(7), 1), "CharHidden"));
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -240,8 +240,10 @@ namespace
{
return (pExtendCandidate &&
!pExtendCandidate->bConsumedByField &&
//potentially more, but lets keep it simple
(isPARATR_LIST(rAttr.Which()) || (isCHRATR(rAttr.Which()) && rAttr.Which() != RES_CHRATR_FONT && rAttr.Which() != RES_CHRATR_FONTSIZE)) &&
//if we bring character attributes into the fold we need to both
//a) consider RES_CHRATR_FONTSIZE and RES_CHRATR_FONT wrt Word's CJK/CTL variants
//b) consider crossing table cell boundaries (tdf#102334)
isPARATR_LIST(rAttr.Which()) &&
*(pExtendCandidate->pAttr) == rAttr);
}
}
......
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