[Libreoffice-commits] libvisio.git: src/lib

Hidemune info at tanaka-cs.co.jp
Tue Nov 18 02:59:27 PST 2014


 src/lib/VSDContentCollector.cpp |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3684ef0bc0eeb05477a30f4d3bfba01d957b0292
Author: Hidemune <info at tanaka-cs.co.jp>
Date:   Tue Nov 18 09:25:35 2014 +0900

    display too small arrow to the appropriate size
    
    : Visio implementation-dependent problem
    
    Change-Id: I15131cafd82429b18874fa69a149deb8bee00e0c
    Reviewed-on: https://gerrit.libreoffice.org/12523
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/src/lib/VSDContentCollector.cpp b/src/lib/VSDContentCollector.cpp
index 9de0d30..a3cd0f1 100644
--- a/src/lib/VSDContentCollector.cpp
+++ b/src/lib/VSDContentCollector.cpp
@@ -2277,13 +2277,15 @@ void libvisio::VSDContentCollector::_lineProperties(const VSDLineStyle &style, l
   {
     styleProps.insert("draw:marker-start-viewbox", _linePropertiesMarkerViewbox(style.startMarker));
     styleProps.insert("draw:marker-start-path", _linePropertiesMarkerPath(style.startMarker));
-    styleProps.insert("draw:marker-start-width", m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width));
+    double w =  m_scale*_linePropertiesMarkerScale(style.startMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+    styleProps.insert("draw:marker-start-width", std::max(w, 0.05));
   }
   if (style.endMarker > 0)
   {
     styleProps.insert("draw:marker-end-viewbox", _linePropertiesMarkerViewbox(style.endMarker));
     styleProps.insert("draw:marker-end-path", _linePropertiesMarkerPath(style.endMarker));
-    styleProps.insert("draw:marker-end-width", m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width));
+    double w =  m_scale*_linePropertiesMarkerScale(style.endMarker)*(0.1/(style.width*style.width+1)+2.54*style.width);
+    styleProps.insert("draw:marker-end-width", std::max(w, 0.05));
   }
 
   int dots1 = 0;


More information about the Libreoffice-commits mailing list