Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1382686 -
 /incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
Date: Mon, 10 Sep 2012 08:16:37 -0000
To: ooo-commits@incubator.apache.org
From: lijiany@apache.org
Message-Id: <20120910081638.1315C23888E4@eris.apache.org>

Author: lijiany
Date: Mon Sep 10 08:16:37 2012
New Revision: 1382686

URL: http://svn.apache.org/viewvc?rev=1382686&view=rev
Log:
#119628# Arrow shape changed is save doc file by AOO
Reported by: Yan Ji
Review by: sunying
Patch by: Jianyuan Li

Modified:
    incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx

Modified: incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1382686&r1=1382685&r2=1382686&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/msdffimp.cxx Mon Sep 10 08:16:37 2012
@@ -798,7 +798,10 @@ static basegfx::B2DPolygon GetLineArrow(
 	String& rsArrowName, sal_Bool bScaleArrow )
 {
 	basegfx::B2DPolygon aRetval;
-	double		fLineWidth = nLineWidth < 70 ? 70.0 : nLineWidth;
+	// 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		fLenghtMul, fWidthMul;
 	sal_Int32	nLineNumber;
 	switch( eLineLenght )
@@ -816,12 +819,6 @@ static basegfx::B2DPolygon GetLineArrow(
 		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;
 	switch ( eLineEnd )
 	{