|
 |
f0633d |
From 2bbcd06df60f4e7ab76e908a1173eeb343b22868 Mon Sep 17 00:00:00 2001
|
|
|
f0633d |
From: Andrzej Hunt <andrzej.hunt@collabora.com>
|
|
|
f0633d |
Date: Wed, 1 Jan 2014 17:07:56 +0000
|
|
|
f0633d |
Subject: [PATCH 093/109] EMF+: mapping can rotate the width vector, so use
|
|
|
f0633d |
resulting length.
|
|
|
f0633d |
MIME-Version: 1.0
|
|
|
f0633d |
Content-Type: text/plain; charset=UTF-8
|
|
|
f0633d |
Content-Transfer-Encoding: 8bit
|
|
|
f0633d |
|
|
|
f0633d |
Otherwise (i.e. with non-vertical lines) the width will be incorrect,
|
|
|
f0633d |
and can result in lines disappearing as the resulting X component
|
|
|
f0633d |
can be tiny/approaching zero.
|
|
|
f0633d |
|
|
|
f0633d |
Change-Id: Icf3b7c10c627594600b517b8ff445f8df87c56f8
|
|
|
f0633d |
(cherry picked from commit 83f2b3c590120a60b5e94fb1a15054ebe0745dbb)
|
|
|
f0633d |
Reviewed-on: https://gerrit.libreoffice.org/7249
|
|
|
f0633d |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
Tested-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
f0633d |
---
|
|
|
f0633d |
cppcanvas/source/mtfrenderer/emfplus.cxx | 2 +-
|
|
|
f0633d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
f0633d |
|
|
|
f0633d |
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
index 5eefdf6..7614bbb 100644
|
|
|
f0633d |
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
|
|
|
f0633d |
@@ -789,7 +789,7 @@ namespace cppcanvas
|
|
|
f0633d |
SAL_INFO ("cppcanvas.emf", "TODO: pen with zero width - using minimal which might not be correct\n");
|
|
|
f0633d |
}
|
|
|
f0633d |
#endif
|
|
|
f0633d |
- rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getX());
|
|
|
f0633d |
+ rStrokeAttributes.StrokeWidth = fabs((rState.mapModeTransform * rR.MapSize (width == 0.0 ? 0.05 : width, 0)).getLength());
|
|
|
f0633d |
}
|
|
|
f0633d |
|
|
|
f0633d |
void SetStrokeAttributes(rendering::StrokeAttributes& rStrokeAttributes)
|
|
|
f0633d |
--
|
|
|
f0633d |
1.8.4.2
|
|
|
f0633d |
|