From 628275acb1b9652e65b8c5c013549dce5ad6f5bf Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 23 Mar 2023 11:24:30 +0900 Subject: tdf#90407 Change the auto-fit alg. to match better with OOXML MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The auto-fit algorithm has been tweaked to be more in-line with the expectations of OOXML. This means a couple of changes to what properties are scaled by the algorithm have been made: - most properties that influence the X axis position or size (for example indent) are not scaled down or changed by scaling. - properties that influence y axis position and size are scaled by a separate parameter (like in the OOXML). This is used in the auto-fit algorithm in a different way. - if line spacing is proportional, it is now scaled with the spacing parameter. Fixed line spacing doesn't get scaled. - the main scaling X,Y parameter only scales the fonts. - trying hard to scale the fonts to the nearest pt (point) value With this change the scaling is much more stable than it was before - for example it doesn't matter what the unscaled font size is, when it is scaled down to the text box size, it (should) always look the same (for example scaling from 32pt -> 10pt or 64pt -> 10pt or even 999pt -> 10pt). The algorithm is also rewritten to be better at finding a fit and is also better at find a good fit, but it can take more iterations by doing so (there are ways to improve it however). Previous algorithm used a linear search to converge to the best fit in less iterations, but the issue with that was that it could in some cases miss a solution (especially since change to floating point scaling parameter). The new algorithm now uses a binary search - always trying the middle of the search space. OOXML export and import was also changed to take advantage of the font scaling and spacing scaling parameters. The additional scaling at export that was needed to have consistent OOXML support was removed. Change-Id: I8f3bb8d43a01931f18bd7ffdf8e0ba40caa73d8b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149207 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- oox/source/drawingml/diagram/diagram.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'oox/source/drawingml/diagram') diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx index efba958fa0e4..7927b7aa6945 100644 --- a/oox/source/drawingml/diagram/diagram.cxx +++ b/oox/source/drawingml/diagram/diagram.cxx @@ -186,13 +186,13 @@ void Diagram::syncDiagramFontHeights() { // Find out the minimum scale within this group. const ShapePairs& rShapePairs = rNameAndPairs.second; - sal_Int16 nMinScale = 100; + double nMinScale = 100.0; for (const auto& rShapePair : rShapePairs) { uno::Reference xPropertySet(rShapePair.second, uno::UNO_QUERY); if (xPropertySet.is()) { - sal_Int16 nTextFitToSizeScale = 0; + double nTextFitToSizeScale = 0.0; xPropertySet->getPropertyValue("TextFitToSizeScale") >>= nTextFitToSizeScale; if (nTextFitToSizeScale > 0 && nTextFitToSizeScale < nMinScale) { @@ -202,7 +202,7 @@ void Diagram::syncDiagramFontHeights() } // Set that minimum scale for all members of the group. - if (nMinScale < 100) + if (nMinScale < 100.0) { for (const auto& rShapePair : rShapePairs) { -- cgit