summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorAndre Fischer <af@apache.org>2012-07-13 08:27:09 +0000
committerXisco Fauli <anistenis@gmail.com>2013-04-02 07:21:56 +0200
commit74700570730f7259a78c031973cbecd98ef777ff (patch)
tree581c81404cd5a29ee1309f17c5e179e959f39310 /filter
parente72558346dda04be6a0878d90e3155616c0a1e7d (diff)
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
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/escherex.cxx6
1 files changed, 5 insertions, 1 deletions
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, ' ' ) );