sd/inc/TransitionPreset.hxx | 2 +-
sd/source/core/TransitionPreset.cxx | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 1ef5ab5e60292375808879a318eb18fce0ab510f
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Oct 28 16:33:01 2015 +0200
What's a "mape"?
Change-Id: I4f7895683d5e42fd9c901759615025958939eb76
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7c4054d..65fcbee 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -68,7 +68,7 @@ private:
static bool importTransitionsFile( TransitionPresetList& rList,
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- UStringMap& rTransitionNameMape,
+ UStringMap& rTransitionNameMap,
const OUString& aFilename );
};
diff --git a/sd/source/core/TransitionPreset.cxx
b/sd/source/core/TransitionPreset.cxx
index e19e664..212b15a 100644
--- a/sd/source/core/TransitionPreset.cxx
+++ b/sd/source/core/TransitionPreset.cxx
@@ -89,7 +89,7 @@ TransitionPreset::TransitionPreset( const
::com::sun::star::uno::Reference< ::co
bool TransitionPreset::importTransitionsFile( TransitionPresetList& rList,
Reference< XMultiServiceFactory
>& xServiceFactory,
- UStringMap& rTransitionNameMape,
+ UStringMap& rTransitionNameMap,
const OUString& aURL )
{
// import transition presets
@@ -112,8 +112,8 @@ bool TransitionPreset::importTransitionsFile(
TransitionPresetList& rList,
OUString aPresetId( pPreset->getPresetId() );
if( !aPresetId.isEmpty() )
{
- UStringMap::const_iterator aIter(
rTransitionNameMape.find( aPresetId ) );
- if( aIter != rTransitionNameMape.end() )
+ UStringMap::const_iterator aIter( rTransitionNameMap.find(
aPresetId ) );
+ if( aIter != rTransitionNameMap.end() )
pPreset->maUIName = (*aIter).second;
// add it
@@ -154,9 +154,9 @@ bool TransitionPreset::importTransitionPresetList(
TransitionPresetList& rList )
Reference< XMultiServiceFactory > xConfigProvider =
configuration::theDefaultProvider::get( xContext );
- UStringMap aTransitionNameMape;
+ UStringMap aTransitionNameMap;
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
Any propValue = uno::makeAny(
@@ -178,7 +178,7 @@ bool TransitionPreset::importTransitionPresetList(
TransitionPresetList& rList )
bRet |= importTransitionsFile( rList,
xServiceFactory,
- aTransitionNameMape,
+ aTransitionNameMap,
aURL );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
