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

extract common code

Browse Source 
Change-Id: I9327f232f1edb9ef052eb7868ac60774f3b6e4cf
This commit is contained in:
Markus Mohrhard
2014-06-22 03:37:24 +02:00
parent a1d2c88124
commit 086d93f130
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
chart2/source/controller/dialogs/DialogModel.cxx
View File

@@ -468,6 +468,19 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
return aResult;
}
namespace {
void addMissingRoles(DialogModel::tRolesWithRanges& rResult, const uno::Sequence<OUString>& rRoles)
{
for(sal_Int32 i = 0, n = rRoles.getLength(); i < n; ++i)
{
if(rResult.find(rRoles[i]) == rResult.end())
rResult.insert(DialogModel::tRolesWithRanges::value_type(rRoles[i], OUString()));
}
}
}
DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
const Reference< XDataSeries > & xSeries,
const OUString & aRoleOfSequenceForLabel,
@@ -484,21 +497,11 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
{
// add missing mandatory roles
Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles());
OUString aEmptyString;
sal_Int32 nI = 0;
for( nI=0; nI < aRoles.getLength(); ++nI )
{
if( aResult.find( aRoles[nI] ) == aResult.end() )
aResult.insert( DialogModel::tRolesWithRanges::value_type( aRoles[nI], aEmptyString ));
}
addMissingRoles(aResult, aRoles);
// add missing optional roles
aRoles = xChartType->getSupportedOptionalRoles();
for( nI=0; nI < aRoles.getLength(); ++nI )
{
if( aResult.find( aRoles[nI] ) == aResult.end() )
aResult.insert( DialogModel::tRolesWithRanges::value_type( aRoles[nI], aEmptyString ));
}
addMissingRoles(aResult, aRoles);
}
}
catch( const uno::Exception & ex )