ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Fix preset_maping -> preset_mapping

Browse Source 
It passed "make check" on Linux

Change-Id: I37c9af2a0687e292475d43a37b85e222c187f711
Reviewed-on: https://gerrit.libreoffice.org/60690
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Andrea Gelmini
2018-09-26 16:52:16 +02:00
committed by Stephan Bergmann
parent 7e248d3558
commit d321b7dd08
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/oox/ppt/pptfilterhelpers.hxx
+2 -2
View File
@@ -69,13 +69,13 @@ namespace oox { namespace ppt {
static const convert_subtype* getList();
};
struct OOX_DLLPUBLIC preset_maping
struct OOX_DLLPUBLIC preset_mapping
{
sal_Int32 mnPresetClass;
sal_Int32 mnPresetId;
const sal_Char* mpStrPresetId;
static const preset_maping* getList();
static const preset_mapping* getList();
};
OOX_DLLPUBLIC OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_Int32 nPresetSubType );
oox/source/ppt/commontimenodecontext.cxx
+3 -3
View File
@@ -79,10 +79,10 @@ const convert_subtype* convert_subtype::getList()
return aList;
}
const preset_maping* preset_maping::getList()
const preset_mapping* preset_mapping::getList()
{
static const preset_maping aList[] =
static const preset_mapping aList[] =
{
{ css::presentation::EffectPresetClass::ENTRANCE, 1 ,"ooo-entrance-appear" },
{ css::presentation::EffectPresetClass::ENTRANCE, 2 ,"ooo-entrance-fly-in" },
@@ -528,7 +528,7 @@ OUString getConvertedSubType( sal_Int16 nPresetClass, sal_Int32 nPresetId, sal_I
if( attribs.hasAttribute( XML_presetID ) )
{
sal_Int32 nPresetId = attribs.getInteger( XML_presetID, 0 );
const preset_maping* p = preset_maping::getList();
const preset_mapping* p = preset_mapping::getList();
while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
p++;
sd/source/filter/eppt/pptexanimations.cxx
+1 -1
View File
@@ -924,7 +924,7 @@ sal_uInt32 AnimationExporter::GetPresetID( const OUString& rPreset, sal_uInt32 n
}
else
{
const oox::ppt::preset_maping* p = oox::ppt::preset_maping::getList();
const oox::ppt::preset_mapping* p = oox::ppt::preset_mapping::getList();
while( p->mpStrPresetId && ((p->mnPresetClass != static_cast<sal_Int32>(nAPIPresetClass)) || !rPreset.equalsAscii( p->mpStrPresetId )) )
p++;
sd/source/filter/ppt/pptinanimations.cxx
+1 -1
View File
@@ -735,7 +735,7 @@ void AnimationImporter::fillNode( Reference< XAnimationNode > const & xNode, con
aUserData.realloc(nSize+1);
aUserData[nSize].Name = "preset-id";
const oox::ppt::preset_maping* p = oox::ppt::preset_maping::getList();
const oox::ppt::preset_mapping* p = oox::ppt::preset_mapping::getList();
while( p->mpStrPresetId && ((p->mnPresetClass != nEffectPresetClass) || (p->mnPresetId != nPresetId )) )
p++;