strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

crashtesting: further failure to reload forum-de3-6592.docx

Browse source 
git show -w

Change-Id: I2963833726779d784bcdfa772e152e65dfde3af5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177674
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
This commit is contained in:
Caolán McNamara 2024-12-02 11:03:47 +00:00
parent adfbf35c0c
commit 6091e6b0ed
1 changed files with 49 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
oox/source/shape/WpsContext.cxx
View file

@ -730,60 +730,63 @@ oox::core::ContextHandlerRef WpsContext::onCreateContext(sal_Int32 nElementToken
// Apply character color of the shape to the shape's textbox.
uno::Reference<text::XText> xText(mxShape, uno::UNO_QUERY);
uno::Any xCharColor = xPropertySet->getPropertyValue(u"CharColor"_ustr);
Color aColor = COL_AUTO;
if ((xCharColor >>= aColor) && aColor != COL_AUTO)
if (xText)
{
// tdf#135923 Apply character color of the shape to the textrun
// when the character color of the textrun is default.
// tdf#153791 But only if the run has no background color (shd element in OOXML)
if (uno::Reference<container::XEnumerationAccess> paraEnumAccess{
xText, uno::UNO_QUERY })
uno::Any xCharColor = xPropertySet->getPropertyValue(u"CharColor"_ustr);
Color aColor = COL_AUTO;
if ((xCharColor >>= aColor) && aColor != COL_AUTO)
{
uno::Reference<container::XEnumeration> paraEnum(
paraEnumAccess->createEnumeration());
while (paraEnum->hasMoreElements())
// tdf#135923 Apply character color of the shape to the textrun
// when the character color of the textrun is default.
// tdf#153791 But only if the run has no background color (shd element in OOXML)
if (uno::Reference<container::XEnumerationAccess> paraEnumAccess{
xText, uno::UNO_QUERY })
{
uno::Reference<text::XTextRange> xParagraph(paraEnum->nextElement(),
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> runEnumAccess(
xParagraph, uno::UNO_QUERY);
if (!runEnumAccess.is())
continue;
if (uno::Reference<beans::XPropertySet> xParaPropSet{ xParagraph,
uno::UNO_QUERY })
if ((xParaPropSet->getPropertyValue(u"ParaBackColor"_ustr)
>>= aColor)
&& aColor != COL_AUTO)
continue;
uno::Reference<container::XEnumeration> paraEnum(
paraEnumAccess->createEnumeration());
uno::Reference<container::XEnumeration> runEnum
= runEnumAccess->createEnumeration();
while (runEnum->hasMoreElements())
while (paraEnum->hasMoreElements())
{
uno::Reference<text::XTextRange> xRun(runEnum->nextElement(),
uno::UNO_QUERY);
const uno::Reference<beans::XPropertyState> xRunState(
xRun, uno::UNO_QUERY);
if (!xRunState
|| xRunState->getPropertyState(u"CharColor"_ustr)
== beans::PropertyState_DEFAULT_VALUE)
{
uno::Reference<beans::XPropertySet> xRunPropSet(xRun,
uno::UNO_QUERY);
if (!xRunPropSet)
continue;
if ((xRunPropSet->getPropertyValue(u"CharBackColor"_ustr)
uno::Reference<text::XTextRange> xParagraph(paraEnum->nextElement(),
uno::UNO_QUERY);
uno::Reference<container::XEnumerationAccess> runEnumAccess(
xParagraph, uno::UNO_QUERY);
if (!runEnumAccess.is())
continue;
if (uno::Reference<beans::XPropertySet> xParaPropSet{
xParagraph, uno::UNO_QUERY })
if ((xParaPropSet->getPropertyValue(u"ParaBackColor"_ustr)
>>= aColor)
&& aColor != COL_AUTO)
continue;
if (!(xRunPropSet->getPropertyValue(u"CharColor"_ustr)
>>= aColor)
|| aColor == COL_AUTO)
xRunPropSet->setPropertyValue(u"CharColor"_ustr,
xCharColor);
uno::Reference<container::XEnumeration> runEnum
= runEnumAccess->createEnumeration();
while (runEnum->hasMoreElements())
{
uno::Reference<text::XTextRange> xRun(runEnum->nextElement(),
uno::UNO_QUERY);
const uno::Reference<beans::XPropertyState> xRunState(
xRun, uno::UNO_QUERY);
if (!xRunState
|| xRunState->getPropertyState(u"CharColor"_ustr)
== beans::PropertyState_DEFAULT_VALUE)
{
uno::Reference<beans::XPropertySet> xRunPropSet(
xRun, uno::UNO_QUERY);
if (!xRunPropSet)
continue;
if ((xRunPropSet->getPropertyValue(u"CharBackColor"_ustr)
>>= aColor)
&& aColor != COL_AUTO)
continue;
if (!(xRunPropSet->getPropertyValue(u"CharColor"_ustr)
>>= aColor)
|| aColor == COL_AUTO)
xRunPropSet->setPropertyValue(u"CharColor"_ustr,
xCharColor);
}
}
}
}