diff options
Diffstat (limited to 'xmloff/source/draw/sdpropls.cxx')
| -rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 191 |
1 files changed, 92 insertions, 99 deletions
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 79967afc9dd5..b32204d11e52 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -23,14 +23,9 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/presentation/AnimationSpeed.hpp> #include <com/sun/star/presentation/FadeEffect.hpp> -#include <com/sun/star/drawing/ConnectorType.hpp> -#include <com/sun/star/drawing/RectanglePoint.hpp> -#include <com/sun/star/drawing/CircleKind.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/text/WritingMode.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/NamedBoolPropertyHdl.hxx> @@ -366,60 +361,60 @@ const XMLPropertyMapEntry aXMLTableShapeAttributes[] = // implementation of factory for own graphic properties -static SvXMLEnumMapEntry const aXML_LineStyle_EnumMap[] = +static SvXMLEnumMapEntry<drawing::LineStyle> const aXML_LineStyle_EnumMap[] = { { XML_NONE, drawing::LineStyle_NONE }, { XML_SOLID, drawing::LineStyle_SOLID }, { XML_DASH, drawing::LineStyle_DASH }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::LineStyle)0 } }; -static SvXMLEnumMapEntry const aXML_LineJoint_EnumMap[] = +static SvXMLEnumMapEntry<drawing::LineJoint> const aXML_LineJoint_EnumMap[] = { { XML_NONE, drawing::LineJoint_NONE }, { XML_MITER, drawing::LineJoint_MITER }, { XML_ROUND, drawing::LineJoint_ROUND }, { XML_BEVEL, drawing::LineJoint_BEVEL }, { XML_MIDDLE, drawing::LineJoint_MIDDLE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::LineJoint)0 } }; -static SvXMLEnumMapEntry const aXML_LineCap_EnumMap[] = +static SvXMLEnumMapEntry<drawing::LineCap> const aXML_LineCap_EnumMap[] = { { XML_BUTT, drawing::LineCap_BUTT }, { XML_ROUND, drawing::LineCap_ROUND }, // use XML_GRADIENTSTYLE_SQUARE as XML_SQUARE, is defined as "square" already { XML_GRADIENTSTYLE_SQUARE, drawing::LineCap_SQUARE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::LineCap)0 } }; -SvXMLEnumMapEntry const aXML_FillStyle_EnumMap[] = +SvXMLEnumMapEntry<drawing::FillStyle> const aXML_FillStyle_EnumMap[] = { { XML_NONE, drawing::FillStyle_NONE }, { XML_SOLID, drawing::FillStyle_SOLID }, { XML_BITMAP, drawing::FillStyle_BITMAP }, { XML_GRADIENT, drawing::FillStyle_GRADIENT }, { XML_HATCH, drawing::FillStyle_HATCH }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::FillStyle)0 } }; -static SvXMLEnumMapEntry const aXML_PresChange_EnumMap[] = +static SvXMLEnumMapEntry<sal_Int32> const aXML_PresChange_EnumMap[] = { { XML_MANUAL, 0 }, { XML_AUTOMATIC, 1 }, { XML_SEMI_AUTOMATIC, 2 }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, 0 } }; -static SvXMLEnumMapEntry const aXML_TransSpeed_EnumMap[] = +static SvXMLEnumMapEntry<presentation::AnimationSpeed> const aXML_TransSpeed_EnumMap[] = { { XML_FAST, presentation::AnimationSpeed_FAST }, { XML_MEDIUM, presentation::AnimationSpeed_MEDIUM }, { XML_SLOW, presentation::AnimationSpeed_SLOW }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (presentation::AnimationSpeed)0 } }; -static SvXMLEnumMapEntry const aXML_FadeEffect_EnumMap[] = +static SvXMLEnumMapEntry<presentation::FadeEffect> const aXML_FadeEffect_EnumMap[] = { { XML_NONE, presentation::FadeEffect_NONE }, { XML_FADE_FROM_LEFT, presentation::FadeEffect_FADE_FROM_LEFT }, @@ -478,68 +473,68 @@ static SvXMLEnumMapEntry const aXML_FadeEffect_EnumMap[] = { XML_UNCOVER_TO_LOWERLEFT, presentation::FadeEffect_UNCOVER_TO_LOWERLEFT }, { XML_VERTICAL_CHECKERBOARD,presentation::FadeEffect_VERTICAL_CHECKERBOARD }, { XML_HORIZONTAL_CHECKERBOARD,presentation::FadeEffect_HORIZONTAL_CHECKERBOARD }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (presentation::FadeEffect)0 } }; -SvXMLEnumMapEntry const aXML_ConnectionKind_EnumMap[] = +SvXMLEnumMapEntry<drawing::ConnectorType> const aXML_ConnectionKind_EnumMap[] = { { XML_STANDARD, drawing::ConnectorType_STANDARD }, { XML_CURVE, drawing::ConnectorType_CURVE }, { XML_LINE, drawing::ConnectorType_LINE }, { XML_LINES, drawing::ConnectorType_LINES }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::ConnectorType)0 } }; -SvXMLEnumMapEntry const aXML_BitmapMode_EnumMap[] = +SvXMLEnumMapEntry<drawing::BitmapMode> const aXML_BitmapMode_EnumMap[] = { { XML_REPEAT, drawing::BitmapMode_REPEAT }, { XML_STRETCH, drawing::BitmapMode_STRETCH }, { XML_BACKGROUND_NO_REPEAT, drawing::BitmapMode_NO_REPEAT }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::BitmapMode)0 } }; // 3D EnumMaps -static SvXMLEnumMapEntry const aXML_NormalsKind_EnumMap[] = +static SvXMLEnumMapEntry<drawing::NormalsKind> const aXML_NormalsKind_EnumMap[] = { { XML_OBJECT, drawing::NormalsKind_SPECIFIC }, { XML_FLAT, drawing::NormalsKind_FLAT }, { XML_SPHERE, drawing::NormalsKind_SPHERE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::NormalsKind)0 } }; -static SvXMLEnumMapEntry const aXML_TexGenerationX_EnumMap[] = +static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationX_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextureProjectionMode)0 } }; -static SvXMLEnumMapEntry const aXML_TexGenerationY_EnumMap[] = +static SvXMLEnumMapEntry<drawing::TextureProjectionMode> const aXML_TexGenerationY_EnumMap[] = { { XML_OBJECT, drawing::TextureProjectionMode_OBJECTSPECIFIC }, { XML_PARALLEL, drawing::TextureProjectionMode_PARALLEL }, { XML_SPHERE, drawing::TextureProjectionMode_SPHERE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextureProjectionMode)0 } }; -static SvXMLEnumMapEntry const aXML_TexKind_EnumMap[] = +static SvXMLEnumMapEntry<drawing::TextureKind> const aXML_TexKind_EnumMap[] = { { XML_LUMINANCE, drawing::TextureKind_LUMINANCE }, { XML_COLOR, drawing::TextureKind_COLOR }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextureKind)0 } }; -static SvXMLEnumMapEntry const aXML_TexMode_EnumMap[] = +static SvXMLEnumMapEntry<drawing::TextureMode> const aXML_TexMode_EnumMap[] = { { XML_REPLACE, drawing::TextureMode_REPLACE }, { XML_MODULATE, drawing::TextureMode_MODULATE }, { XML_BLEND, drawing::TextureMode_BLEND }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextureMode)0 } }; -SvXMLEnumMapEntry const aXML_RefPoint_EnumMap[] = +SvXMLEnumMapEntry<drawing::RectanglePoint> const aXML_RefPoint_EnumMap[] = { { XML_TOP_LEFT, drawing::RectanglePoint_LEFT_TOP }, { XML_TOP, drawing::RectanglePoint_MIDDLE_TOP }, @@ -550,91 +545,91 @@ SvXMLEnumMapEntry const aXML_RefPoint_EnumMap[] = { XML_BOTTOM_LEFT, drawing::RectanglePoint_LEFT_BOTTOM }, { XML_BOTTOM, drawing::RectanglePoint_MIDDLE_BOTTOM }, { XML_BOTTOM_RIGHT, drawing::RectanglePoint_RIGHT_BOTTOM }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::RectanglePoint)0 } }; -SvXMLEnumMapEntry const aXML_CircleKind_EnumMap[] = +SvXMLEnumMapEntry<drawing::CircleKind> const aXML_CircleKind_EnumMap[] = { { XML_FULL, drawing::CircleKind_FULL }, { XML_SECTION, drawing::CircleKind_SECTION }, { XML_CUT, drawing::CircleKind_CUT }, { XML_ARC, drawing::CircleKind_ARC }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::CircleKind)0 } }; -static SvXMLEnumMapEntry const aXML_WritingMode_EnumMap[] = +static SvXMLEnumMapEntry<text::WritingMode> const aXML_WritingMode_EnumMap[] = { { XML_TB_RL, text::WritingMode_TB_RL }, { XML_LR_TB, text::WritingMode_LR_TB }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (text::WritingMode)0 } }; -static SvXMLEnumMapEntry const pXML_TextAnimation_Enum[] = +static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Enum[] = { { XML_NONE, drawing::TextAnimationKind_NONE }, { XML_BLINKING, drawing::TextAnimationKind_BLINK }, // will be filtered { XML_SCROLL, drawing::TextAnimationKind_SCROLL }, { XML_ALTERNATE, drawing::TextAnimationKind_ALTERNATE }, { XML_SLIDE, drawing::TextAnimationKind_SLIDE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextAnimationKind)0 } }; -static SvXMLEnumMapEntry const pXML_TextAnimation_Blinking_Enum[] = +static SvXMLEnumMapEntry<drawing::TextAnimationKind> const pXML_TextAnimation_Blinking_Enum[] = { { XML_FALSE, drawing::TextAnimationKind_NONE }, { XML_TRUE, drawing::TextAnimationKind_BLINK }, { XML_FALSE, drawing::TextAnimationKind_SCROLL }, { XML_FALSE, drawing::TextAnimationKind_ALTERNATE }, { XML_FALSE, drawing::TextAnimationKind_SLIDE }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextAnimationKind)0 } }; -static SvXMLEnumMapEntry const pXML_TextAnimationDirection_Enum[] = +static SvXMLEnumMapEntry<drawing::TextAnimationDirection> const pXML_TextAnimationDirection_Enum[] = { { XML_LEFT, drawing::TextAnimationDirection_LEFT }, { XML_RIGHT, drawing::TextAnimationDirection_RIGHT }, // will be filtered { XML_UP, drawing::TextAnimationDirection_UP }, { XML_DOWN, drawing::TextAnimationDirection_DOWN }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextAnimationDirection)0 } }; -static SvXMLEnumMapEntry const pXML_TextAlign_Enum[] = +static SvXMLEnumMapEntry<drawing::TextHorizontalAdjust> const pXML_TextAlign_Enum[] = { { XML_LEFT, drawing::TextHorizontalAdjust_LEFT }, { XML_CENTER, drawing::TextHorizontalAdjust_CENTER }, { XML_RIGHT, drawing::TextHorizontalAdjust_RIGHT }, { XML_JUSTIFY, drawing::TextHorizontalAdjust_BLOCK }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextHorizontalAdjust)0 } }; -static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] = +static SvXMLEnumMapEntry<drawing::TextVerticalAdjust> const pXML_VerticalAlign_Enum[] = { { XML_TOP, drawing::TextVerticalAdjust_TOP }, { XML_MIDDLE, drawing::TextVerticalAdjust_CENTER }, { XML_BOTTOM, drawing::TextVerticalAdjust_BOTTOM }, { XML_JUSTIFY, drawing::TextVerticalAdjust_BLOCK }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextVerticalAdjust)0 } }; -static SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] = +static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum_Odf12[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, { XML_TRUE, drawing::TextFitToSizeType_ALLLINES }, { XML_TRUE, drawing::TextFitToSizeType_AUTOFIT }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 } }; -static SvXMLEnumMapEntry const pXML_FitToSize_Enum[] = +static SvXMLEnumMapEntry<drawing::TextFitToSizeType> const pXML_FitToSize_Enum[] = { { XML_FALSE, drawing::TextFitToSizeType_NONE }, { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, { XML_ALL, drawing::TextFitToSizeType_ALLLINES }, { XML_SHRINK_TO_FIT,drawing::TextFitToSizeType_AUTOFIT }, - { XML_TOKEN_INVALID, 0 } + { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 } }; -static SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_MeasureUnit_Enum[] = { { XML_AUTOMATIC, 0 }, { XML_UNIT_MM, 1 }, @@ -649,26 +644,26 @@ static SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Measure_HAlign_Enum[] = +static SvXMLEnumMapEntry<drawing::MeasureTextHorzPos> const pXML_Measure_HAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextHorzPos_AUTO }, { XML_LEFT_OUTSIDE, drawing::MeasureTextHorzPos_LEFTOUTSIDE }, { XML_INSIDE, drawing::MeasureTextHorzPos_INSIDE }, { XML_RIGHT_OUTSIDE, drawing::MeasureTextHorzPos_RIGHTOUTSIDE}, - { XML_TOKEN_INVALID,0 } + { XML_TOKEN_INVALID, (drawing::MeasureTextHorzPos)0 } }; -static SvXMLEnumMapEntry const pXML_Measure_VAlign_Enum[] = +static SvXMLEnumMapEntry<drawing::MeasureTextVertPos> const pXML_Measure_VAlign_Enum[] = { { XML_AUTOMATIC, drawing::MeasureTextVertPos_AUTO }, { XML_ABOVE, drawing::MeasureTextVertPos_EAST }, { XML_BELOW, drawing::MeasureTextVertPos_WEST }, { XML_CENTER, drawing::MeasureTextVertPos_CENTERED }, - { XML_TOKEN_INVALID,0 } + { XML_TOKEN_INVALID, (drawing::MeasureTextVertPos)0 } }; // #FontWork# -static SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Style_Enum[] = { { XML_ROTATE, 0 }, //XFormTextStyle::Rotate, { XML_UPRIGHT, 1 }, //XFormTextStyle::Upright, @@ -678,7 +673,7 @@ static SvXMLEnumMapEntry const pXML_Fontwork_Style_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Adjust_Enum[] = { { XML_LEFT, 0 }, //XFormTextAdjust::Left, { XML_RIGHT, 1 }, //XFormTextAdjust::Right, @@ -687,7 +682,7 @@ static SvXMLEnumMapEntry const pXML_Fontwork_Adjust_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Shadow_Enum[] = { { XML_NORMAL, 0 }, //XFormTextShadow::Normal, { XML_SLANT, 1 }, //XFormTextShadow::Slant, @@ -695,7 +690,7 @@ static SvXMLEnumMapEntry const pXML_Fontwork_Shadow_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Fontwork_Form_Enum[] = { { XML_NONE, 0 }, //XFTFORM_NONE, { XML_TOPCIRCLE, 1 }, //XFTFORM_TOPCIRC, @@ -713,7 +708,7 @@ static SvXMLEnumMapEntry const pXML_Fontwork_Form_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Esc_Dir_Enum[] = { { XML_HORIZONTAL, 0 }, //SdrCaptionEscDir::Horizontal, { XML_VERTICAL, 1 }, //SdrCaptionEscDir::Vertical, @@ -721,7 +716,7 @@ static SvXMLEnumMapEntry const pXML_Caption_Esc_Dir_Enum[] = { XML_TOKEN_INVALID,0 } }; -static SvXMLEnumMapEntry const pXML_Caption_Type_Enum[] = +static SvXMLEnumMapEntry<sal_Int32> const pXML_Caption_Type_Enum[] = { { XML_STRAIGHT_LINE, 0 }, //SdrCaptionType::Type1, { XML_ANGLED_LINE, 1 }, //SdrCaptionType::Type2, @@ -871,27 +866,27 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy { case XML_SD_TYPE_STROKE : { - pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap, cppu::UnoType<drawing::LineStyle>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_LineStyle_EnumMap); break; } case XML_SD_TYPE_LINEJOIN : { - pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap, cppu::UnoType<drawing::LineJoint>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_LineJoint_EnumMap); break; } case XML_SD_TYPE_LINECAP : { - pHdl = new XMLEnumPropertyHdl( aXML_LineCap_EnumMap, ::cppu::UnoType<drawing::LineCap>::get() ); + pHdl = new XMLEnumPropertyHdl( aXML_LineCap_EnumMap ); break; } case XML_SD_TYPE_FILLSTYLE : { - pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap, cppu::UnoType<drawing::FillStyle>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_FillStyle_EnumMap ); break; } case XML_SD_TYPE_PRESPAGE_TYPE : { - pHdl = new XMLEnumPropertyHdl( aXML_PresChange_EnumMap, ::cppu::UnoType<sal_Int32>::get() ); + pHdl = new XMLEnumPropertyHdl( aXML_PresChange_EnumMap ); break; } case XML_SD_TYPE_SHADOW : @@ -906,12 +901,12 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_PRESPAGE_STYLE : { - pHdl = new XMLEnumPropertyHdl( aXML_FadeEffect_EnumMap, ::cppu::UnoType<presentation::FadeEffect>::get() ); + pHdl = new XMLEnumPropertyHdl( aXML_FadeEffect_EnumMap ); break; } case XML_SD_TYPE_PRESPAGE_SPEED : { - pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap, cppu::UnoType<presentation::AnimationSpeed>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_TransSpeed_EnumMap ); break; } case XML_SD_TYPE_PRESPAGE_DURATION : @@ -931,7 +926,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_WRITINGMODE : { - pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap, cppu::UnoType<text::WritingMode>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_WritingMode_EnumMap ); break; } case XML_SD_TYPE_PRESPAGE_VISIBILITY : @@ -958,7 +953,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy case XML_SD_TYPE_NORMALS_KIND: { - pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap, cppu::UnoType<drawing::NormalsKind>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_NormalsKind_EnumMap ); break; } case XML_SD_TYPE_NORMALS_DIRECTION: @@ -968,22 +963,22 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_TEX_GENERATION_MODE_X: { - pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationX_EnumMap ); break; } case XML_SD_TYPE_TEX_GENERATION_MODE_Y: { - pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap, cppu::UnoType<drawing::TextureProjectionMode>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_TexGenerationY_EnumMap ); break; } case XML_SD_TYPE_TEX_KIND: { - pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap, cppu::UnoType<drawing::TextureKind>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_TexKind_EnumMap ); break; } case XML_SD_TYPE_TEX_MODE: { - pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap, cppu::UnoType<drawing::TextureMode>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_TexMode_EnumMap ); break; } case XML_SD_TYPE_NUMBULLET: @@ -998,7 +993,7 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_MODE: { - pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap, cppu::UnoType<drawing::BitmapMode>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_BitmapMode_EnumMap ); break; } case XML_SD_TYPE_BITMAPREPOFFSETX: @@ -1019,50 +1014,48 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy } case XML_SD_TYPE_BITMAP_REFPOINT: { - pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap, cppu::UnoType<css::drawing::RectanglePoint>::get()); + pHdl = new XMLEnumPropertyHdl( aXML_RefPoint_EnumMap); break; } case XML_TYPE_TEXT_ANIMATION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Enum); break; case XML_TYPE_TEXT_ANIMATION_BLINKING: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum, cppu::UnoType<css::drawing::TextAnimationKind>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimation_Blinking_Enum); break; case XML_TYPE_TEXT_ANIMATION_DIRECTION: - pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum, cppu::UnoType<css::drawing::TextAnimationDirection>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAnimationDirection_Enum); break; case XML_TYPE_TEXT_ANIMATION_STEPS: pHdl = new XMLTextAnimationStepPropertyHdl; break; case XML_SD_TYPE_TEXT_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum, cppu::UnoType<css::drawing::TextHorizontalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_TextAlign_Enum); break; case XML_SD_TYPE_VERTICAL_ALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, cppu::UnoType<css::drawing::TextVerticalAdjust>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum); break; case XML_SD_TYPE_FITTOSIZE: { if (mpExport && (mpExport->getDefaultVersion() <= SvtSaveOptions::ODFVER_012)) { - pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12, - cppu::UnoType<css::drawing::TextFitToSizeType>::get()); + pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12); } else { - pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum, - cppu::UnoType<css::drawing::TextFitToSizeType>::get()); + pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum); } } break; case XML_SD_TYPE_MEASURE_UNIT: - pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() ); + pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum ); break; case XML_SD_TYPE_MEASURE_HALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum, cppu::UnoType<css::drawing::MeasureTextHorzPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_HAlign_Enum); break; case XML_SD_TYPE_MEASURE_VALIGN: - pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum, cppu::UnoType<css::drawing::MeasureTextVertPos>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Measure_VAlign_Enum); break; case XML_SD_TYPE_MEASURE_PLACING: { @@ -1078,16 +1071,16 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy // #FontWork# case XML_SD_TYPE_FONTWORK_STYLE : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Style_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Style_Enum ); break; case XML_SD_TYPE_FONTWORK_ADJUST : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Adjust_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Adjust_Enum ); break; case XML_SD_TYPE_FONTWORK_SHADOW : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Shadow_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Shadow_Enum ); break; case XML_SD_TYPE_FONTWORK_FORM : - pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Form_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Fontwork_Form_Enum ); break; case XML_SD_TYPE_CONTROL_BORDER: @@ -1118,10 +1111,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLPercentOrMeasurePropertyHandler; break; case XML_SD_TYPE_CAPTION_ESC_DIR: - pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Caption_Esc_Dir_Enum ); break; case XML_SD_TYPE_CAPTION_TYPE: - pHdl = new XMLEnumPropertyHdl( pXML_Caption_Type_Enum , ::cppu::UnoType<sal_Int32>::get()); + pHdl = new XMLEnumPropertyHdl( pXML_Caption_Type_Enum ); break; case XML_SD_TYPE_DATETIMEUPDATE: pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FIXED), GetXMLToken(XML_VARIABLE) ); @@ -1130,10 +1123,10 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy pHdl = new XMLDateTimeFormatHdl( mpExport ); break; case XML_SD_TYPE_TRANSITION_TYPE: - pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionType, ::cppu::UnoType<sal_Int16>::get()); + pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionType ); break; case XML_SD_TYPE_TRANSTIION_SUBTYPE: - pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionSubType, ::cppu::UnoType<sal_Int16>::get()); + pHdl = new XMLEnumPropertyHdl( xmloff::aAnimations_EnumMap_TransitionSubType ); break; case XML_SD_TYPE_TRANSTIION_DIRECTION: pHdl = new XMLNamedBoolPropertyHdl( GetXMLToken(XML_FORWARD), GetXMLToken(XML_REVERSE) ); |