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

5 files changed, 18 insertions, 18 deletions

diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 5f540442b541..57614e993422 100644
--- a/toolkit/source/awt/animatedimagespeer.cxx
+++ b/toolkit/source/awt/animatedimagespeer.cxx
@@ -366,7 +366,7 @@ namespace toolkit
 
             case BASEPROPERTY_IMAGE_SCALE_MODE:
             {
-                sal_Int16 nScaleMode( ImageScaleMode::Anisotropic );
+                sal_Int16 nScaleMode( ImageScaleMode::ANISOTROPIC );
                 ImageControl* pImageControl = dynamic_cast< ImageControl* >( GetWindow() );
                 if ( pImageControl && ( i_value >>= nScaleMode ) )
                 {
@@ -406,7 +406,7 @@ namespace toolkit
         case BASEPROPERTY_IMAGE_SCALE_MODE:
             {
                 ImageControl const* pImageControl = dynamic_cast< ImageControl* >( GetWindow() );
-                aReturn <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::Anisotropic );
+                aReturn <<= ( pImageControl ? pImageControl->GetScaleMode() : ImageScaleMode::ANISOTROPIC );
             }
             break;
 
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 21c5b6d3d4d4..757598719f98 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -978,14 +978,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 if  ( aServiceName.EqualsAscii( "simpleanimation" ) )
                 {
                     pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
-                    ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::Anisotropic );
+                    ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::ANISOTROPIC );
                         // (compatibility)
                     *ppNewComp = new ::toolkit::XSimpleAnimation;
                 }
                 else if ( aServiceName.EqualsAscii( "throbber" ) )
                 {
                     pNewWindow = new Throbber( pParent, nWinBits, Throbber::IMAGES_NONE );
-                    ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::Anisotropic );
+                    ((Throbber*)pNewWindow)->SetScaleMode( css::awt::ImageScaleMode::ANISOTROPIC );
                         // (compatibility)
                     *ppNewComp = new ::toolkit::XThrobber;
                 }
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:
diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx
index e2cd1d9359d9..26d03e6ef6f5 100644
--- a/toolkit/source/controls/animatedimages.cxx
+++ b/toolkit/source/controls/animatedimages.cxx
@@ -297,11 +297,11 @@ namespace toolkit
         {
         case BASEPROPERTY_IMAGE_SCALE_MODE:
         {
-            sal_Int16 nImageScaleMode( ImageScaleMode::Anisotropic );
+            sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC );
             OSL_VERIFY( i_value >>= nImageScaleMode );  // convertFastPropertyValue ensures that this has the proper type
-            if  (   ( nImageScaleMode != ImageScaleMode::None )
-                &&  ( nImageScaleMode != ImageScaleMode::Isotropic )
-                &&  ( nImageScaleMode != ImageScaleMode::Anisotropic )
+            if  (   ( nImageScaleMode != ImageScaleMode::NONE )
+                &&  ( nImageScaleMode != ImageScaleMode::ISOTROPIC )
+                &&  ( nImageScaleMode != ImageScaleMode::ANISOTROPIC )
                 )
                 throw IllegalArgumentException( OUString(), *this, 1 );
         }
@@ -329,7 +329,7 @@ namespace toolkit
             return makeAny( (sal_Bool)sal_True );
 
         case BASEPROPERTY_IMAGE_SCALE_MODE:
-            return makeAny( ImageScaleMode::None );
+            return makeAny( ImageScaleMode::NONE );
 
         default:
             return UnoControlModel::ImplGetDefaultValue( i_propertyId );
@@ -379,7 +379,7 @@ namespace toolkit
     //------------------------------------------------------------------------------------------------------------------
     ::sal_Int16 SAL_CALL AnimatedImagesControlModel::getScaleMode() throw (RuntimeException)
     {
-        sal_Int16 nImageScaleMode( ImageScaleMode::Anisotropic );
+        sal_Int16 nImageScaleMode( ImageScaleMode::ANISOTROPIC );
         OSL_VERIFY( getPropertyValue( GetPropertyName( BASEPROPERTY_IMAGE_SCALE_MODE ) ) >>= nImageScaleMode );
         return nImageScaleMode;
     }
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index f7967968f12e..19c50afff5c6 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -849,7 +849,7 @@ uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId )
         return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlImageControl ) );
 
     if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE )
-        return makeAny( awt::ImageScaleMode::Anisotropic );
+        return makeAny( awt::ImageScaleMode::ANISOTROPIC );
 
     return GraphicControlModel::ImplGetDefaultValue( nPropId );
 }
@@ -885,9 +885,9 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
             if ( !mbAdjustingImageScaleMode && ImplHasProperty( BASEPROPERTY_SCALEIMAGE ) )
             {
                 mbAdjustingImageScaleMode = true;
-                sal_Int16 nScaleMode( awt::ImageScaleMode::Anisotropic );
+                sal_Int16 nScaleMode( awt::ImageScaleMode::ANISOTROPIC );
                 OSL_VERIFY( _rValue >>= nScaleMode );
-                setDependentFastPropertyValue( BASEPROPERTY_SCALEIMAGE, uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::None ) ) );
+                setDependentFastPropertyValue( BASEPROPERTY_SCALEIMAGE, uno::makeAny( sal_Bool( nScaleMode != awt::ImageScaleMode::NONE ) ) );
                 mbAdjustingImageScaleMode = false;
             }
             break;
@@ -897,7 +897,7 @@ void SAL_CALL UnoControlImageControlModel::setFastPropertyValue_NoBroadcast( sal
                 mbAdjustingImageScaleMode = true;
                 sal_Bool bScale = sal_True;
                 OSL_VERIFY( _rValue >>= bScale );
-                setDependentFastPropertyValue( BASEPROPERTY_IMAGE_SCALE_MODE, uno::makeAny( bScale ? awt::ImageScaleMode::Anisotropic : awt::ImageScaleMode::None ) );
+                setDependentFastPropertyValue( BASEPROPERTY_IMAGE_SCALE_MODE, uno::makeAny( bScale ? awt::ImageScaleMode::ANISOTROPIC : awt::ImageScaleMode::NONE ) );
                 mbAdjustingImageScaleMode = false;
             }
             break;