[Libreoffice-commits] core.git: filter/source

[Jianyuan Li]

 filter/source/msfilter/msdffimp.cxx |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 60790b3f0ccc1779bcff2ddcc278a9027aedabee
Author: Jianyuan Li <lijiany at apache.org>
Date:   Mon Sep 10 07:16:37 2012 +0000

    Related: #i119628# Arrow shape changed is save doc file by AOO
    
    Reported by: Yan Ji
    Review by: sunying
    Patch by: Jianyuan Li
    (cherry picked from commit 43ff744cb9411b13860c3c57f7a052a6ab56001e)
    
    Conflicts:
    	filter/source/msfilter/msdffimp.cxx
    
    Change-Id: I88ab49daa7b82b573eaf6a22eb4a2ce97b871027
    
    Signed-off-by: Xisco Fauli <anistenis at gmail.com>

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 23c95fe..a80bdfd 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -768,8 +768,11 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M
     OUString& rsArrowName, sal_Bool bScaleArrow )
 {
     basegfx::B2DPolyPolygon aRetPolyPoly;
+    // 70 100mm = 2pt = 40 twip. In MS, line width less than 2pt has the same size arrow as 2pt
+    //If the unit is twip. Make all use this unit especailly the critical value 70/40.
+    sal_Int32   nLineWidthCritical = bScaleArrow ? 40 : 70;
+    double      fLineWidth = nLineWidth < nLineWidthCritical ? nLineWidthCritical : nLineWidth;;
 
-    double      fLineWidth = nLineWidth < 70 ? 70.0 : nLineWidth;
     double      fLenghtMul, fWidthMul;
     sal_Int32   nLineNumber;
     switch( eLineLenght )
@@ -787,12 +790,6 @@ static basegfx::B2DPolyPolygon GetLineArrow( const sal_Int32 nLineWidth, const M
         case mso_lineWideArrow          : fWidthMul = 5.0; nLineNumber += 6; break;
     }
 
-    if ( bScaleArrow )  // #i33630 arrows imported from Word are too big
-    {
-        fWidthMul /= 1.75;
-        fLenghtMul/= 1.75;
-    }
-
     rbArrowCenter = sal_False;
     OUStringBuffer aArrowName;
     switch ( eLineEnd )