Skip to content

C
core
Kaydet (Commit) d49c0f3b authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

expose the SvXMLEnumMapEntry arrays in getAnimationsEnumMap 

preparatory change to making SvXMLEnumMapEntry a template class for the
"UNO scoped enum" change.

But I think its an improvement by itself, there is no need to initialise
these arrays on-demand, the compiler will do that at link time.

Change-Id: Ie582fbe628cc9d21a4f31229c85195aa09139516
Reviewed-on: https://gerrit.libreoffice.org/34737Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9ca8a63f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 36 deletions
xmloff/inc/animations.hxx
Dosyayı görüntüle @ d49c0f3b
......@@ -26,24 +26,22 @@ struct SvXMLEnumMapEntry;
namespace xmloff
{
const sal_uInt16 Animations_EnumMap_Fill = 0;
const sal_uInt16 Animations_EnumMap_FillDefault = 1;
const sal_uInt16 Animations_EnumMap_Restart = 2;
const sal_uInt16 Animations_EnumMap_RestartDefault = 3;
const sal_uInt16 Animations_EnumMap_Endsync = 4;
const sal_uInt16 Animations_EnumMap_CalcMode = 5;
const sal_uInt16 Animations_EnumMap_AdditiveMode = 6;
const sal_uInt16 Animations_EnumMap_TransformType = 7;
const sal_uInt16 Animations_EnumMap_TransitionType = 8;
const sal_uInt16 Animations_EnumMap_TransitionSubType = 9;
const sal_uInt16 Animations_EnumMap_EventTrigger = 10;
const sal_uInt16 Animations_EnumMap_EffectPresetClass = 11;
const sal_uInt16 Animations_EnumMap_EffectNodeType = 12;
const sal_uInt16 Animations_EnumMap_SubItem = 13;
const sal_uInt16 Animations_EnumMap_IterateType = 14;
const sal_uInt16 Animations_EnumMap_Command = 15;
extern const SvXMLEnumMapEntry* getAnimationsEnumMap( sal_uInt16 nMap );
extern const SvXMLEnumMapEntry aAnimations_EnumMap_Fill[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_FillDefault[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_Restart[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_RestartDefault[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_Endsync[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_CalcMode[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_AdditiveMode[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransformType[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionType[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_TransitionSubType[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_EventTrigger[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_EffectPresetClass[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_EffectNodeType[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_SubItem[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_IterateType[];
extern const SvXMLEnumMapEntry aAnimations_EnumMap_Command[];
struct ImplAttributeNameConversion
{
......
xmloff/source/draw/animationimport.cxx
Dosyayı görüntüle @ d49c0f3b
......@@ -541,7 +541,7 @@ Any AnimationsImportHelperImpl::convertTiming( const OUString& rValue )
}
sal_uInt16 nEnum;
if( SvXMLUnitConverter::convertEnum( nEnum, aEventTrigger, getAnimationsEnumMap(Animations_EnumMap_EventTrigger) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, aEventTrigger, aAnimations_EnumMap_EventTrigger ) )
{
aEvent.Trigger = (sal_Int16)nEnum;
}
......@@ -778,25 +778,25 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
break;
case ANA_Fill:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Fill) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_Fill ) )
mxNode->setFill( (sal_Int16)nEnum );
}
break;
case ANA_FillDefault:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_FillDefault) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_FillDefault ) )
mxNode->setFillDefault( (sal_Int16)nEnum );
}
break;
case ANA_Restart:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Restart) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_Restart ) )
mxNode->setRestart( (sal_Int16)nEnum );
}
break;
case ANA_RestartDefault:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_RestartDefault) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_RestartDefault ) )
mxNode->setRestartDefault( (sal_Int16)nEnum );
}
break;
......@@ -831,13 +831,13 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
break;
case ANA_EndSync:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Endsync) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_Endsync ) )
mxNode->setEndSync( makeAny( (sal_Int16)nEnum ) );
}
break;
case ANA_Node_Type:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_EffectNodeType) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_EffectNodeType ) )
aUserData.push_back( NamedValue( GetXMLToken( XML_NODE_TYPE ), makeAny( (sal_Int16)nEnum ) ) );
}
break;
......@@ -853,7 +853,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
break;
case ANA_Preset_Class:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_EffectPresetClass) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_EffectPresetClass ) )
aUserData.push_back( NamedValue( GetXMLToken( XML_PRESET_CLASS ), makeAny( (sal_Int16)nEnum ) ) );
}
break;
......@@ -917,7 +917,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
case ANA_SubItem:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_SubItem) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_SubItem ) )
{
if( xAnimate.is() )
{
......@@ -1009,7 +1009,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
{
if( xAnimate.is() )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_CalcMode) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_CalcMode ) )
xAnimate->setCalcMode( (sal_Int16)nEnum );
}
}
......@@ -1026,7 +1026,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
{
if( xAnimate.is() )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_AdditiveMode) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_AdditiveMode ) )
xAnimate->setAdditive( (sal_Int16)nEnum );
}
}
......@@ -1068,7 +1068,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
Reference< XAnimateTransform > xTransform( mxNode, UNO_QUERY );
if( xTransform.is() )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_TransformType) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_TransformType ) )
{
xTransform->setTransformType( (sal_Int16)nEnum );
switch( nEnum )
......@@ -1090,7 +1090,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
{
if( xTransitionFilter.is() )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_TransitionType) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_TransitionType ) )
xTransitionFilter->setTransition( (sal_Int16)nEnum );
}
}
......@@ -1100,7 +1100,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
{
if( xTransitionFilter.is() )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_TransitionSubType) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_TransitionSubType ) )
xTransitionFilter->setSubtype( (sal_Int16)nEnum );
}
}
......@@ -1133,7 +1133,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
case ANA_IterateType:
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_IterateType) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_IterateType ) )
{
if( xIter.is() )
xIter->setIterateType( (sal_Int16)nEnum );
......@@ -1176,7 +1176,7 @@ void AnimationNodeContext::init_node( const css::uno::Reference< css::xml::sax:
{
if( xCommand.is() && nNodeType == AnimationNodeType::COMMAND )
{
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, getAnimationsEnumMap(Animations_EnumMap_Command) ) )
if( SvXMLUnitConverter::convertEnum( nEnum, rValue, aAnimations_EnumMap_Command ) )
{
xCommand->setCommand( (sal_Int16)nEnum );
}
......
xmloff/source/draw/sdpropls.cxx
Dosyayı görüntüle @ d49c0f3b
......@@ -1130,10 +1130,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
pHdl = new XMLDateTimeFormatHdl( mpExport );
break;
case XML_SD_TYPE_TRANSITION_TYPE:
pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionType) , ::cppu::UnoType<sal_Int16>::get());
pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionType, ::cppu::UnoType<sal_Int16>::get());
break;
case XML_SD_TYPE_TRANSTIION_SUBTYPE:
pHdl = new XMLEnumPropertyHdl( xmloff::getAnimationsEnumMap(xmloff::Animations_EnumMap_TransitionSubType) , ::cppu::UnoType<sal_Int16>::get());
pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionSubType, ::cppu::UnoType<sal_Int16>::get());
break;
case XML_SD_TYPE_TRANSTIION_DIRECTION:
pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FORWARD), GetXMLToken(XML_REVERSE) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment