sc/source/ui/view/output2.cxx | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
New commits:
commit 37210da00a9190f7765fa9c1e4a08629d2f4c2c4
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Thu Jun 14 12:32:48 2018 +0200
tdf#105720: lok: sc: currency symbol is displayed in the preceding cell
Change-Id: I6175cfeab3d8bc3a757c8522aa9c7a7e49c4bf2b
Reviewed-on: https://gerrit.libreoffice.org/55790
Reviewed-by: Marco Cecchetti <mrcek...@gmail.com>
Tested-by: Marco Cecchetti <mrcek...@gmail.com>
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 035bd3730cc6..bf10567aa2eb 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -75,6 +75,7 @@
#include <com/sun/star/i18n/DirectionProperty.hpp>
#include <comphelper/string.hxx>
+#include <comphelper/lok.hxx>
#include <memory>
#include <vector>
@@ -566,13 +567,21 @@ void ScDrawStringsVars::RepeatToFill( long nColWidth )
if ( nRepeatPos == -1 || nRepeatPos > aString.getLength() )
return;
+ const bool bIsTiledRendering = comphelper::LibreOfficeKit::isActive();
+
long nCharWidth = pOutput->pFmtDevice->GetTextWidth(OUString(nRepeatChar));
- if ( nCharWidth < 1) return;
+
+ if ( nCharWidth < 1 || (bIsTiledRendering && nCharWidth <
TWIPS_PER_PIXEL)) return;
+
if (bPixelToLogic)
nColWidth =
pOutput->mpRefDevice->PixelToLogic(Size(nColWidth,0)).Width();
+
// Are there restrictions on the cell type we should filter out here ?
- long nSpaceToFill = ( nColWidth - aTextSize.Width() );
+ long nTextWidth = aTextSize.Width();
+ if ( bIsTiledRendering )
+ nTextWidth =
pOutput->mpRefDevice->PixelToLogic(Size(nTextWidth,0)).Width();
+ long nSpaceToFill = ( nColWidth - nTextWidth );
if ( nSpaceToFill <= nCharWidth )
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
