diff options
| author | Armin Le Grand <alg@apache.org> | 2012-07-30 16:36:56 +0000 |
|---|---|---|
| committer | Armin Le Grand <alg@apache.org> | 2012-07-30 16:36:56 +0000 |
| commit | 5c6d55316b6cefab558bdf9ae84646933fd5e914 (patch) | |
| tree | 42c8412264612e740fc60a3bce01a605428c0ae8 /xmloff | |
| parent | 76741df0b60b9157710f8e66720275749dbf98bd (diff) | |
#116001# Reverted revision 1366087
Notes
ignore: reverted
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/pch/precompiled_xmloff.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 15 | ||||
| -rw-r--r-- | xmloff/source/draw/sdpropls.hxx | 1 |
3 files changed, 16 insertions, 1 deletions
diff --git a/xmloff/inc/pch/precompiled_xmloff.hxx b/xmloff/inc/pch/precompiled_xmloff.hxx index bc52eb37ffca..e8baac07b071 100644 --- a/xmloff/inc/pch/precompiled_xmloff.hxx +++ b/xmloff/inc/pch/precompiled_xmloff.hxx @@ -180,6 +180,7 @@ #include "com/sun/star/drawing/ShadeMode.hpp" #include "com/sun/star/drawing/TextAnimationDirection.hpp" #include "com/sun/star/drawing/TextAnimationKind.hpp" +#include "com/sun/star/drawing/TextFitToSizeType.hpp" #include "com/sun/star/drawing/TextHorizontalAdjust.hpp" #include "com/sun/star/drawing/TextVerticalAdjust.hpp" #include "com/sun/star/drawing/TextureKind.hpp" diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 746484d99938..79863c575b5b 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -51,6 +51,7 @@ #include <com/sun/star/drawing/TextAnimationDirection.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/drawing/TextFitToSizeType.hpp> #include <com/sun/star/drawing/MeasureTextHorzPos.hpp> #include <com/sun/star/drawing/MeasureTextVertPos.hpp> #include <xmloff/controlpropertyhdl.hxx> @@ -141,7 +142,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "TextVerticalAdjust", XML_NAMESPACE_DRAW, XML_TEXTAREA_VERTICAL_ALIGN, XML_SD_TYPE_VERTICAL_ALIGN, 0 ), GMAP( "TextAutoGrowHeight", XML_NAMESPACE_DRAW, XML_AUTO_GROW_HEIGHT, XML_TYPE_BOOL, 0 ), GMAP( "TextAutoGrowWidth", XML_NAMESPACE_DRAW, XML_AUTO_GROW_WIDTH, XML_TYPE_BOOL, 0 ), - GMAP( "TextFitToSize", XML_NAMESPACE_DRAW, XML_FIT_TO_SIZE, XML_TYPE_BOOL, 0 ), + GMAP( "TextFitToSize", XML_NAMESPACE_DRAW, XML_FIT_TO_SIZE, XML_SD_TYPE_FITTOSIZE, 0 ), GMAP( "TextContourFrame", XML_NAMESPACE_DRAW, XML_FIT_TO_CONTOUR, XML_TYPE_BOOL, 0 ), GMAP( "TextMaximumFrameHeight", XML_NAMESPACE_FO, XML_MAX_HEIGHT, XML_TYPE_MEASURE, 0 ), GMAP( "TextMaximumFrameWidth", XML_NAMESPACE_FO, XML_MAX_WIDTH, XML_TYPE_MEASURE, 0 ), @@ -626,6 +627,15 @@ SvXMLEnumMapEntry __READONLY_DATA pXML_VerticalAlign_Enum[] = { XML_TOKEN_INVALID, 0 } }; +SvXMLEnumMapEntry __READONLY_DATA pXML_FitToSize_Enum[] = +{ + { XML_FALSE, drawing::TextFitToSizeType_NONE }, + { XML_TRUE, drawing::TextFitToSizeType_PROPORTIONAL }, + { XML_TRUE, drawing::TextFitToSizeType_ALLLINES }, + { XML_TRUE, drawing::TextFitToSizeType_RESIZEATTR }, + { XML_TOKEN_INVALID, 0 } +}; + SvXMLEnumMapEntry __READONLY_DATA pXML_MeasureUnit_Enum[] = { { XML_AUTOMATIC, 0 }, @@ -1049,6 +1059,9 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy case XML_SD_TYPE_VERTICAL_ALIGN: pHdl = new XMLEnumPropertyHdl( pXML_VerticalAlign_Enum, ::getCppuType((const com::sun::star::drawing::TextVerticalAdjust*)0) ); break; + case XML_SD_TYPE_FITTOSIZE: + pHdl = new XMLEnumPropertyHdl( pXML_FitToSize_Enum, ::getCppuType((const com::sun::star::drawing::TextFitToSizeType*)0) ); + break; case XML_SD_TYPE_MEASURE_UNIT: pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::getCppuType((const sal_Int32*)0) ); break; diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx index c4fcca1c339a..b5befc3d1161 100644 --- a/xmloff/source/draw/sdpropls.hxx +++ b/xmloff/source/draw/sdpropls.hxx @@ -75,6 +75,7 @@ extern const XMLPropertyMapEntry aXMLSDPresPageProps_onlyHeadersFooter[]; #define XML_TYPE_TEXT_ANIMATION_STEPS (XML_SD_TYPES_START + 24 ) #define XML_SD_TYPE_TEXT_ALIGN (XML_SD_TYPES_START + 25 ) #define XML_SD_TYPE_VERTICAL_ALIGN (XML_SD_TYPES_START + 26 ) +#define XML_SD_TYPE_FITTOSIZE (XML_SD_TYPES_START + 27 ) #define XML_SD_TYPE_MEASURE_HALIGN (XML_SD_TYPES_START + 28 ) #define XML_SD_TYPE_MEASURE_VALIGN (XML_SD_TYPES_START + 29 ) #define XML_SD_TYPE_MEASURE_UNIT (XML_SD_TYPES_START + 30 ) |