chart2/source/view/main/VLegend.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6220362e844ad0e50a38c1627ddd05a082882009
Author: Andras Timar <andras.ti...@collabora.com>
Date: Sat Apr 4 14:13:18 2015 +0200
tdf#90404 OOXML chart legend import improvement
In the bugdoc, the chart legend had 6 entries in PowerPoint, but
only 5 in Impress. I played a lot with padding and offset parameters
in layout algorithm without success. Finally I introduced this 1mm
tolerance, so the fixed legend frame can expand up to 1mm, if necessary.
Change-Id: Id1ad1df67aab41d942133cea8d16fccf0f215167
Reviewed-on: https://gerrit.libreoffice.org/15149
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/chart2/source/view/main/VLegend.cxx
b/chart2/source/view/main/VLegend.cxx
index a5a3b72..d293165 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -390,7 +390,7 @@ awt::Size lcl_placeLegendEntries(
nSumHeight += aRowHeights[nR];
sal_Int32 nRemainingSpace = rAvailableSpace.Height - nSumHeight;
- if( nRemainingSpace<0 )
+ if( nRemainingSpace < -100 ) // 1mm tolerance for OOXML interop
tdf#90404
{
//remove entries that are too big
for( sal_Int32 nR=nNumberOfRows; nR--; )
@@ -418,7 +418,7 @@ awt::Size lcl_placeLegendEntries(
}
nNumberOfRows = static_cast<sal_Int32>(aRowHeights.size());
}
- if( nRemainingSpace > 0 )
+ if( nRemainingSpace >= -100 ) // 1mm tolerance for OOXML interop
tdf#90404
{
sal_Int32 nNormalSpacingHeight =
2*nYPadding+(nNumberOfRows-1)*nYOffset;
if( nRemainingSpace < nNormalSpacingHeight )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
