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 /toolkit/source/awt/vclxwindows.cxx | |
| 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 'toolkit/source/awt/vclxwindows.cxx')
| -rw-r--r-- | toolkit/source/awt/vclxwindows.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index a9f5e3d891b6..fc8286ceb628 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -693,7 +693,7 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s { case BASEPROPERTY_IMAGE_SCALE_MODE: { - sal_Int16 nScaleMode( ImageScaleMode::Anisotropic ); + sal_Int16 nScaleMode( ImageScaleMode::ANISOTROPIC ); if ( pImageControl && ( Value >>= nScaleMode ) ) { pImageControl->SetScaleMode( nScaleMode ); @@ -707,7 +707,7 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s sal_Bool bScaleImage = sal_False; if ( pImageControl && ( Value >>= bScaleImage ) ) { - pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::Anisotropic : ImageScaleMode::None ); + pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::ANISOTROPIC : ImageScaleMode::NONE ); } } break; @@ -729,11 +729,11 @@ void VCLXImageControl::setProperty( const OUString& PropertyName, const ::com::s switch ( nPropType ) { case BASEPROPERTY_IMAGE_SCALE_MODE: - aProp <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::Anisotropic ); + aProp <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::ANISOTROPIC ); break; case BASEPROPERTY_SCALEIMAGE: - aProp <<= ( pImageControl && pImageControl->GetScaleMode() != ImageScaleMode::None ) ? sal_True : sal_False; + aProp <<= ( pImageControl && pImageControl->GetScaleMode() != ImageScaleMode::NONE ) ? sal_True : sal_False; break; default: |