mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pptx: fix custom shape equations import

Browse Source 
- guide names can be reused and in that case current one used
   in following equations is the last one
This commit is contained in:
Radek Doulik
2011-12-12 15:00:25 +01:00
parent f2f31cbd24
commit cc65d9fe56
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
oox/source/drawingml/customshapeproperties.cxx
View File

@@ -84,14 +84,16 @@ sal_Int32 CustomShapeProperties::SetCustomShapeGuideValue( std::vector< CustomSh
// if the return value is < 0 then the guide value could not be found
sal_Int32 CustomShapeProperties::GetCustomShapeGuideValue( const std::vector< CustomShapeGuide >& rGuideList, const rtl::OUString& rFormulaName )
{
sal_Int32 nIndex = 0;
for( ; nIndex < static_cast< sal_Int32 >( rGuideList.size() ); nIndex++ )
// traverse the list from the end, because guide names can be reused
// and current is the last one
// see a1 guide in gear6 custom shape preset as example
sal_Int32 nIndex = static_cast< sal_Int32 >( rGuideList.size() ) - 1;
for( ; nIndex >= 0; nIndex-- )
{
if ( rGuideList[ nIndex ].maName == rFormulaName )
break;
}
if ( nIndex == static_cast< sal_Int32 >( rGuideList.size() ) )
nIndex = -1;
return nIndex;
}