Kaydet (Commit) 74700570 authored tarafından Andre Fischer's avatar Andre Fischer Kaydeden (comit) Xisco Fauli

Fix #i119495# Fixed export of arrow styles to PPT.

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

Conflicts:
	filter/source/msfilter/escherex.cxx

Change-Id: Ic45b36a3193b3771d16fa36b9baa8f0661656e1b
üst e7255834
dictionaries @ 36776c33
Subproject commit 66a5a2e03573ab1862db1965f7b9c5419db3decd Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4
...@@ -731,6 +731,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, ...@@ -731,6 +731,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND; sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND;
OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName); OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName);
sal_Bool bIsMapped = sal_True;
if ( !aApiName.isEmpty() ) if ( !aApiName.isEmpty() )
{ {
...@@ -765,8 +766,11 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, ...@@ -765,8 +766,11 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart,
reLineEnd = ESCHER_LineArrowDiamondEnd; reLineEnd = ESCHER_LineArrowDiamondEnd;
else if ( aApiName == "Arrow" ) else if ( aApiName == "Arrow" )
reLineEnd = ESCHER_LineArrowEnd; reLineEnd = ESCHER_LineArrowEnd;
else
bIsMapped = sal_False;
} }
else if ( comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 ) if ( !bIsMapped && comphelper::string::getTokenCount(aArrowStartName, ' ') == 2 )
{ {
sal_Bool b = sal_True; sal_Bool b = sal_True;
OUString aArrowName( aArrowStartName.getToken( 0, ' ' ) ); OUString aArrowName( aArrowStartName.getToken( 0, ' ' ) );
......
helpcontent2 @ 341ef992
Subproject commit 037b55c72ae7831f19ffb8429fba81038314c163 Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment