diff options
| author | Balazs Varga <balazs.varga991@gmail.com> | 2019-11-21 14:56:43 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-12-09 13:40:39 +0100 |
| commit | 8c39a4ea777c0afa1dbea9a3399436d22c2e6e70 (patch) | |
| tree | a365c12b2a9394b614c91ea361f68e78773cdd16 /chart2 | |
| parent | 7a0d7921dd1151427385e1b07398fffe1550c772 (diff) | |
tdf#115630 tdf#88922 Chart: fix custom legend position and size
Do not need to set the "AnchorPosition" value, when we move
the legend object. It is enough to set only the "Expansion" as
custom, so we keep the previously set "AnchorPosition" value
and we can use the lcl_calculatePositionAndRemainingSpace function
to calculate the remaining space of the inner chart area.
Change-Id: I7b577bc6acf2de9b6755329b92603ea5ba631d57
Reviewed-on: https://gerrit.libreoffice.org/83399
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 739ed2c29f49ea5e83bcd1352b2644c2e2d09f7b)
Reviewed-on: https://gerrit.libreoffice.org/83890
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit 1903d0275b09d88eec6e57303a8a7d34246cb230)
Reviewed-on: https://gerrit.libreoffice.org/84241
Reviewed-by: Balazs Varga <balazs.varga991@gmail.com>
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/main/PositionAndSizeHelper.cxx | 1 | ||||
| -rw-r--r-- | chart2/source/view/main/VLegend.cxx | 36 |
2 files changed, 18 insertions, 19 deletions
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 8f8b7109b8a5..177a605f820f 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -68,7 +68,6 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType } else if(eObjectType==OBJECTTYPE_LEGEND) { - xObjectProp->setPropertyValue( "AnchorPosition", uno::Any(LegendPosition_CUSTOM)); xObjectProp->setPropertyValue( "Expansion", uno::Any(css::chart::ChartLegendExpansion_CUSTOM)); chart2::RelativePosition aRelativePosition; chart2::RelativeSize aRelativeSize; diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index bbb0707f7a0f..315cb98b41ce 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -701,29 +701,29 @@ awt::Point lcl_calculatePositionAndRemainingSpace( switch( ePos ) { case LegendPosition_LINE_START: - { - sal_Int32 nExtent = aLegendSize.Width; - rRemainingSpace.Width -= ( nExtent + nXDistance ); - rRemainingSpace.X += ( nExtent + nXDistance ); - } + { + sal_Int32 nExtent = aLegendSize.Width; + rRemainingSpace.Width -= ( nExtent + nXDistance ); + rRemainingSpace.X += ( nExtent + nXDistance ); + } break; case LegendPosition_LINE_END: - { - rRemainingSpace.Width -= ( aLegendSize.Width + nXDistance ); - } - break; + { + rRemainingSpace.Width -= ( aLegendSize.Width + nXDistance ); + } + break; case LegendPosition_PAGE_START: - { - sal_Int32 nExtent = aLegendSize.Height; - rRemainingSpace.Height -= ( nExtent + nYDistance ); - rRemainingSpace.Y += ( nExtent + nYDistance ); - } + { + sal_Int32 nExtent = aLegendSize.Height; + rRemainingSpace.Height -= ( nExtent + nYDistance ); + rRemainingSpace.Y += ( nExtent + nYDistance ); + } break; case LegendPosition_PAGE_END: - { - rRemainingSpace.Height -= ( aLegendSize.Height + nYDistance ); - } - break; + { + rRemainingSpace.Height -= ( aLegendSize.Height + nYDistance ); + } + break; default: // nothing |