[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - chart2/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 14 14:12:14 UTC 2018


 chart2/source/view/main/ShapeFactory.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 236d015936572445ed7632a69f019e2c52c84630
Author:     Balazs Varga <balazs.varga991 at gmail.com>
AuthorDate: Tue Sep 4 16:27:17 2018 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Fri Sep 14 16:11:39 2018 +0200

    tdf#108028 OOXML: Fix line breaking of chart title
    
    With adding the "TextMaximumFrameWidth" property to the chart title's
    textbox property, it breaks chart titles longer then the chart width,
    as in OOXML reference implementation. LibreOffice previously distorted
    the text and squeezed the chart. This patch will fix it.
    
    Change-Id: Ic086d25b49e9c5cf9c6f2c79f141592749adc7d8
    Reviewed-on: https://gerrit.libreoffice.org/59991
    Tested-by: Jenkins
    Tested-by: László Németh <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 063e92004b65411dbee7fc12ab00c78aa9c69a86)
    Reviewed-on: https://gerrit.libreoffice.org/60305
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 738a52a3cabb..159c2b893e0a 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -2401,6 +2401,7 @@ uno::Reference< drawing::XShape >
             aValueMap.insert( { "TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_CENTER) } ); //drawing::TextVerticalAdjust
             aValueMap.insert( { "TextAutoGrowHeight", uno::Any(true) } ); // sal_Bool
             aValueMap.insert( { "TextAutoGrowWidth", uno::Any(true) } ); // sal_Bool
+            aValueMap.insert( { "TextMaximumFrameWidth", uno::Any(rSize.Width) } ); // sal_Int32
 
             //set name/classified ObjectID (CID)
             if( !aName.isEmpty() )


More information about the Libreoffice-commits mailing list