incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1361125 - /incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx
Date Fri, 13 Jul 2012 09:27:09 GMT
Author: af
Date: Fri Jul 13 09:27:09 2012
New Revision: 1361125

URL: http://svn.apache.org/viewvc?rev=1361125&view=rev
Log:
#i119495# Fixed export of arrow styles to PPT.

          Reported by: Du Jing
          Patch by: Jianyuan Li
          Review by: Andre Fischer

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

Modified: incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx?rev=1361125&r1=1361124&r2=1361125&view=diff
==============================================================================
--- incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx (original)
+++ incubator/ooo/trunk/main/filter/source/msfilter/escherex.cxx Fri Jul 13 09:27:09 2012
@@ -754,6 +754,7 @@ sal_Bool EscherPropertyContainer::GetLin
 				sal_Int16		nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
 
 				SvxUnogetApiNameForItem( nWhich, aArrowStartName, aApiName );
+				sal_Bool bIsMapped = sal_True;
 				if ( aApiName.getLength() )
 				{
 
@@ -788,8 +789,11 @@ sal_Bool EscherPropertyContainer::GetLin
 						reLineEnd = ESCHER_LineArrowDiamondEnd;
 					else if ( aApiName.equalsAscii( "Arrow" ) )
 						reLineEnd = ESCHER_LineArrowEnd;
+					else
+						bIsMapped = sal_False;
+
 				}
-				else if ( aArrowStartName.GetTokenCount( ' ' ) == 2 )
+				if ( !bIsMapped && aArrowStartName.GetTokenCount( ' ' ) == 2 )
 				{
 					sal_Bool b = sal_True;
 					String aArrowName( aArrowStartName.GetToken( 0, ' ' ) );



Mime
View raw message