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

oox smartart: handle <dgm:prSet ... custT="1"/>

Browse source 
Which defines that a data node has text properties as direct formatting,
so autoscale should not happen.

We decide autofit at a shape level, smartart defines custom text props
at a data node level. So take the shape, go to its first presentation
node, get its data node and see if it has custom text props. If not,
continue to scale text down till it fits.

smartart-autofit-sync.pptx is extended to contain a 3rd shape: the first
two have their autofit scaling synchronized, while the 3rd has a fixed
font size of 10pt.

Change-Id: I6caacdaab9a36072b9ad5021bd217c955b09b790
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102689
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Miklos Vajna 2020-09-14 16:58:38 +02:00
parent 4d85d2d482
commit 89b385c233
3 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
oox/source/drawingml/diagram/diagramlayoutatoms.cxx
View file

@ -478,6 +478,54 @@ void ApplyConstraintToLayout(const Constraint& rConstraint, LayoutPropertyMap& r
= rConstraint.mfValue * fUnitFactor;
}
}
/// Does the first data node of this shape have customized text properties?
bool HasCustomText(const ShapePtr& rShape, LayoutNode& rLayoutNode)
{
const PresPointShapeMap& rPresPointShapeMap
= rLayoutNode.getDiagram().getLayout()->getPresPointShapeMap();
const DiagramData::StringMap& rPresOfNameMap
= rLayoutNode.getDiagram().getData()->getPresOfNameMap();
const DiagramData::PointNameMap& rPointNameMap
= rLayoutNode.getDiagram().getData()->getPointNameMap();
// Get the first presentation node of the shape.
const dgm::Point* pPresNode = nullptr;
for (const auto& rPair : rPresPointShapeMap)
{
if (rPair.second == rShape)
{
pPresNode = rPair.first;
break;
}
}
// Get the first data node of the presentation node.
dgm::Point* pDataNode = nullptr;
if (pPresNode)
{
auto itPresToData = rPresOfNameMap.find(pPresNode->msModelId);
if (itPresToData != rPresOfNameMap.end())
{
for (const auto& rPair : itPresToData->second)
{
const DiagramData::SourceIdAndDepth& rItem = rPair.second;
auto it = rPointNameMap.find(rItem.msSourceId);
if (it != rPointNameMap.end())
{
pDataNode = it->second;
break;
}
}
}
}
// If we have a data node, see if its text is customized or not.
if (pDataNode)
{
return pDataNode->mbCustomText;
}
return false;
}
}
void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>& rConstraints,
@ -1452,7 +1500,13 @@ void AlgAtom::layoutShape(const ShapePtr& rShape, const std::vector<Constraint>&
if (!aRun->getTextCharacterProperties().moHeight.has())
aRun->getTextCharacterProperties().moHeight = fFontSize * 100;
}
pTextBody->getTextProperties().maPropertyMap.setProperty(PROP_TextFitToSize, drawing::TextFitToSizeType_AUTOFIT);
if (!HasCustomText(rShape, getLayoutNode()))
{
// No customized text properties: enable autofit.
pTextBody->getTextProperties().maPropertyMap.setProperty(
PROP_TextFitToSize, drawing::TextFitToSizeType_AUTOFIT);
}
// ECMA-376-1:2016 21.4.7.5 ST_AutoTextRotation (Auto Text Rotation)
const sal_Int32 nautoTxRot = maMap.count(XML_autoTxRot) ? maMap.find(XML_autoTxRot)->second : XML_upr;

BIN
sd/qa/unit/data/pptx/smartart-autofit-sync.pptx
View file

Binary file not shown.

11
sd/qa/unit/import-tests-smartart.cxx
View file

@ -1591,6 +1591,17 @@ void SdImportTestSmartArt::testAutofitSync()
// requested that their scaling matches.
CPPUNIT_ASSERT_EQUAL(nSecondScale, nFirstScale);
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 0 (drawing::TextFitToSizeType_NONE)
// - Actual : 3 (TextFitToSizeType_AUTOFIT)
// i.e. the 3rd shape had font size as direct formatting, but its automatic text scale was not
// disabled.
uno::Reference<beans::XPropertySet> xThirdInner(getChildShape(getChildShape(xMiddle, 4), 0),
uno::UNO_QUERY);
drawing::TextFitToSizeType eType{};
CPPUNIT_ASSERT(xThirdInner->getPropertyValue("TextFitToSize") >>= eType);
CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, eType);
xDocShRef->DoClose();
}