diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-23 18:20:18 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-27 16:58:09 +0100 |
| commit | 949f97ba480f96c7892602f3208467ac925fab15 (patch) | |
| tree | 61fd513dea511cb92c6395717ca65a7317744108 /oox | |
| parent | 62aec37627c30c56b4ec7c04bc194cabff6a3e14 (diff) | |
Resolves: #i121162# ImageScaleMode constants should be in UPPERCASE
(cherry picked from commit 734b532fb77d2d5be7eb7becb6720dbd7b3d8978)
Conflicts:
offapi/com/sun/star/awt/ImageScaleMode.idl
oox/source/ole/axcontrol.cxx
reportdesign/source/filter/xml/xmlHelper.cxx
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
Change-Id: Ib5fa7b82edddb809129a4e5619a20ca7a7b2e38a
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 2f777b414908..35a0ea5dcd21 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -508,12 +508,12 @@ void ControlConverter::convertAxPicture( PropertyMap& rPropMap, const StreamData convertPicture( rPropMap, rPicData ); // picture scale mode - sal_Int16 nScaleMode = ImageScaleMode::None; + sal_Int16 nScaleMode = ImageScaleMode::NONE; switch( nPicSizeMode ) { - case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::None; break; - case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::Anisotropic; break; - case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::Isotropic; break; + case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::NONE; break; + case AX_PICSIZE_STRETCH: nScaleMode = ImageScaleMode::ANISOTROPIC; break; + case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::ISOTROPIC; break; default: OSL_FAIL( "ControlConverter::convertAxPicture - unknown picture size mode" ); } rPropMap.setProperty( PROP_ScaleMode, nScaleMode ); |