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 /vcl/source/control | |
| 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 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/imgctrl.cxx | 10 | ||||
| -rw-r--r-- | vcl/source/control/throbber.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 40c5d2357777..cdc71fae8ffa 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -30,7 +30,7 @@ namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) - ,mnScaleMode( ImageScaleMode::Anisotropic ) + ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } @@ -38,7 +38,7 @@ ImageControl::ImageControl( Window* pParent, WinBits nStyle ) ImageControl::ImageControl( Window* pParent, const ResId& rResId ) :FixedImage( pParent, rResId ) - ,mnScaleMode( ImageScaleMode::Anisotropic ) + ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } @@ -117,13 +117,13 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi switch ( mnScaleMode ) { - case ImageScaleMode::None: + case ImageScaleMode::NONE: { rDev.DrawImage( lcl_centerWithin( aDrawRect, rBitmapSize ), *pImage, nStyle ); } break; - case ImageScaleMode::Isotropic: + case ImageScaleMode::ISOTROPIC: { const Size aPaintSize = lcl_calcPaintSize( aDrawRect, rBitmapSize ); rDev.DrawImage( @@ -133,7 +133,7 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi } break; - case ImageScaleMode::Anisotropic: + case ImageScaleMode::ANISOTROPIC: { rDev.DrawImage( aDrawRect.TopLeft(), diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 56ab52dbe3ea..457bb2ef0470 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -53,7 +53,7 @@ Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_im maWaitTimer.SetTimeout( mnStepTime ); maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) ); - SetScaleMode( ImageScaleMode::None ); + SetScaleMode( ImageScaleMode::NONE ); initImages(); } @@ -68,7 +68,7 @@ Throbber::Throbber( Window* i_parentWindow, const ResId& i_resId, const ImageSet maWaitTimer.SetTimeout( mnStepTime ); maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) ); - SetScaleMode( ImageScaleMode::None ); + SetScaleMode( ImageScaleMode::NONE ); initImages(); } |