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

What's a "mape"?

Browse Source 
Change-Id: I4f7895683d5e42fd9c901759615025958939eb76
This commit is contained in:
Tor Lillqvist
2015-10-28 16:33:01 +02:00
parent d24b2a352a
commit 1ef5ab5e60
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/inc/TransitionPreset.hxx
View File

@@ -68,7 +68,7 @@ private:
static bool importTransitionsFile( TransitionPresetList& rList, static bool importTransitionsFile( TransitionPresetList& rList,
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
UStringMap& rTransitionNameMape, UStringMap& rTransitionNameMap,
const OUString& aFilename ); const OUString& aFilename );
}; };

12
sd/source/core/TransitionPreset.cxx
View File

@@ -89,7 +89,7 @@ TransitionPreset::TransitionPreset( const ::com::sun::star::uno::Reference< ::co
bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList, bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
Reference< XMultiServiceFactory >& xServiceFactory, Reference< XMultiServiceFactory >& xServiceFactory,
UStringMap& rTransitionNameMape, UStringMap& rTransitionNameMap,
const OUString& aURL ) const OUString& aURL )
{ {
// import transition presets // import transition presets
@@ -112,8 +112,8 @@ bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
OUString aPresetId( pPreset->getPresetId() ); OUString aPresetId( pPreset->getPresetId() );
if( !aPresetId.isEmpty() ) if( !aPresetId.isEmpty() )
{ {
UStringMap::const_iterator aIter( rTransitionNameMape.find( aPresetId ) ); UStringMap::const_iterator aIter( rTransitionNameMap.find( aPresetId ) );
if( aIter != rTransitionNameMape.end() ) if( aIter != rTransitionNameMap.end() )
pPreset->maUIName = (*aIter).second; pPreset->maUIName = (*aIter).second;
// add it // add it
@@ -154,9 +154,9 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
Reference< XMultiServiceFactory > xConfigProvider = Reference< XMultiServiceFactory > xConfigProvider =
configuration::theDefaultProvider::get( xContext ); configuration::theDefaultProvider::get( xContext );
UStringMap aTransitionNameMape; UStringMap aTransitionNameMap;
const OUString aTransitionPath("/org.openoffice.Office.UI.Effects/UserInterface/Transitions" ); const OUString aTransitionPath("/org.openoffice.Office.UI.Effects/UserInterface/Transitions" );
implImportLabels( xConfigProvider, aTransitionPath, aTransitionNameMape ); implImportLabels( xConfigProvider, aTransitionPath, aTransitionNameMap );
// read path to transition effects files from config // read path to transition effects files from config
Any propValue = uno::makeAny( Any propValue = uno::makeAny(
@@ -178,7 +178,7 @@ bool TransitionPreset::importTransitionPresetList( TransitionPresetList& rList )
bRet |= importTransitionsFile( rList, bRet |= importTransitionsFile( rList,
xServiceFactory, xServiceFactory,
aTransitionNameMape, aTransitionNameMap,
aURL ); aURL );
} }