diff options
m--------- | dictionaries | 0 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 6 | ||||
m--------- | helpcontent2 | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/dictionaries b/dictionaries -Subproject 66a5a2e03573ab1862db1965f7b9c5419db3dec +Subproject 36776c334cf3bae5bdd5929fad8e11a8bdf830a diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 6449ba8a543c..89727c3a98ce 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -731,6 +731,7 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, sal_Int16 nWhich = bLineStart ? XATTR_LINESTART : XATTR_LINEEND; OUString aApiName = SvxUnogetApiNameForItem(nWhich, aArrowStartName); + sal_Bool bIsMapped = sal_True; if ( !aApiName.isEmpty() ) { @@ -765,8 +766,11 @@ sal_Bool EscherPropertyContainer::GetLineArrow( const sal_Bool bLineStart, reLineEnd = ESCHER_LineArrowDiamondEnd; else if ( aApiName == "Arrow" ) 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; OUString aArrowName( aArrowStartName.getToken( 0, ' ' ) ); diff --git a/helpcontent2 b/helpcontent2 -Subproject 037b55c72ae7831f19ffb8429fba81038314c16 +Subproject 341ef992d8fdc702e97274779cf3aa92133c547 |