Author: arielch Date: Sun Dec 23 19:20:18 2012 New Revision: 1425511 URL: http://svn.apache.org/viewvc?rev=1425511&view=rev Log: i121162 - ImageScaleMode constants should be in UPPERCASE
Modified: openoffice/trunk/main/offapi/com/sun/star/awt/ImageScaleMode.idl openoffice/trunk/main/oox/source/ole/axcontrol.cxx openoffice/trunk/main/reportdesign/source/core/api/ImageControl.cxx openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx openoffice/trunk/main/svx/source/form/formcontrolfactory.cxx openoffice/trunk/main/toolkit/source/awt/animatedimagespeer.cxx openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx openoffice/trunk/main/toolkit/source/controls/animatedimages.cxx openoffice/trunk/main/toolkit/source/controls/unocontrols.cxx openoffice/trunk/main/vcl/source/control/imgctrl.cxx openoffice/trunk/main/vcl/source/control/throbber.cxx openoffice/trunk/main/vcl/workben/svpclient.cxx openoffice/trunk/main/wizards/com/sun/star/wizards/document/DatabaseControl.java openoffice/trunk/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java openoffice/trunk/main/xmloff/source/forms/formenums.cxx Modified: openoffice/trunk/main/offapi/com/sun/star/awt/ImageScaleMode.idl URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/ImageScaleMode.idl?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/offapi/com/sun/star/awt/ImageScaleMode.idl (original) +++ openoffice/trunk/main/offapi/com/sun/star/awt/ImageScaleMode.idl Sun Dec 23 19:20:18 2012 @@ -1,5 +1,5 @@ /************************************************************** - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,53 +7,43 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * *************************************************************/ - - #ifndef __com_sun_star_awt_ImageScaleMode_idl__ #define __com_sun_star_awt_ImageScaleMode_idl__ -//============================================================================= - module com { module sun { module star { module awt { -//============================================================================= - /** defines modes how an image displayed in a given area should be scaled to fit this area */ constants ImageScaleMode { /** specifies that no scaling should happen at all */ - const short None = 0; + const short NONE = 0; /** specifies that the image should be scaled up or down to the size of the surrounding area isotropicly, i.e. by keeping its aspect ratio. */ - const short Isotropic = 1; + const short ISOTROPIC = 1; - /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropicly. + /** specifies that the image should be scaled up or down to the size of the surrounding area anisotropically. <p>The image will finally cover all of the surrounding area, but its dimensions might be distorted.</p> */ - const short Anisotropic = 2; + const short ANISOTROPIC = 2; }; -//============================================================================= - }; }; }; }; -//============================================================================= - #endif Modified: openoffice/trunk/main/oox/source/ole/axcontrol.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ole/axcontrol.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/oox/source/ole/axcontrol.cxx (original) +++ openoffice/trunk/main/oox/source/ole/axcontrol.cxx Sun Dec 23 19:20:18 2012 @@ -454,12 +454,12 @@ void ControlConverter::convertAxPicture( 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::ISOTROPIC; break; + case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::ANISOTROPIC; break; default: OSL_ENSURE( false, "ControlConverter::convertAxPicture - unknown picture size mode" ); } rPropMap.setProperty( PROP_ScaleMode, nScaleMode ); Modified: openoffice/trunk/main/reportdesign/source/core/api/ImageControl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/core/api/ImageControl.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/reportdesign/source/core/api/ImageControl.cxx (original) +++ openoffice/trunk/main/reportdesign/source/core/api/ImageControl.cxx Sun Dec 23 19:20:18 2012 @@ -125,7 +125,7 @@ OImageControl::OImageControl(uno::Refere :ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) -,m_nScaleMode(awt::ImageScaleMode::None) +,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(sal_True) { DBG_CTOR( rpt_OImageControl,NULL); @@ -138,7 +138,7 @@ OImageControl::OImageControl(uno::Refere :ImageControlBase(m_aMutex) ,ImageControlPropertySet(_xContext,static_cast< Implements >(IMPLEMENTS_PROPERTY_SET),lcl_getImageOptionals()) ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext) -,m_nScaleMode(awt::ImageScaleMode::None) +,m_nScaleMode(awt::ImageScaleMode::NONE) ,m_bPreserveIRI(sal_True) { DBG_CTOR( rpt_OImageControl,NULL); @@ -477,7 +477,7 @@ void SAL_CALL OImageControl::setSize( co // ----------------------------------------------------------------------------- void SAL_CALL OImageControl::setScaleMode( ::sal_Int16 _scalemode ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - if ( _scalemode < awt::ImageScaleMode::None ||_scalemode > awt::ImageScaleMode::Anisotropic ) + if ( _scalemode < awt::ImageScaleMode::NONE ||_scalemode > awt::ImageScaleMode::ANISOTROPIC ) throw lang::IllegalArgumentException(); set(PROPERTY_SCALEMODE,_scalemode,m_nScaleMode); } Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx (original) +++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlHelper.cxx Sun Dec 23 19:20:18 2012 @@ -401,9 +401,9 @@ const SvXMLEnumMapEntry* OXMLHelper::Get { static SvXMLEnumMapEntry s_aXML_EnumMap[] = { - // { XML_NONE, awt::ImageScaleMode::None }, // default - { XML_ISOTROPIC, awt::ImageScaleMode::Isotropic }, - { XML_ANISOTROPIC, awt::ImageScaleMode::Anisotropic }, + // { XML_NONE, awt::ImageScaleMode::NONE }, // default + { XML_ISOTROPIC, awt::ImageScaleMode::ISOTROPIC }, + { XML_ANISOTROPIC, awt::ImageScaleMode::ANISOTROPIC }, { XML_TOKEN_INVALID, 0 } }; return s_aXML_EnumMap; Modified: openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx (original) +++ openoffice/trunk/main/reportdesign/source/filter/xml/xmlImage.cxx Sun Dec 23 19:20:18 2012 @@ -86,10 +86,10 @@ OXMLImage::OXMLImage( ORptFilter& rImpor break; case XML_TOK_SCALE: { - sal_uInt16 nRet = awt::ImageScaleMode::None; + sal_uInt16 nRet = awt::ImageScaleMode::NONE; if ( s_sTRUE == sValue ) { - nRet = awt::ImageScaleMode::Anisotropic; + nRet = awt::ImageScaleMode::ANISOTROPIC; } else { Modified: openoffice/trunk/main/svx/source/form/formcontrolfactory.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/form/formcontrolfactory.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/svx/source/form/formcontrolfactory.cxx (original) +++ openoffice/trunk/main/svx/source/form/formcontrolfactory.cxx Sun Dec 23 19:20:18 2012 @@ -464,7 +464,7 @@ namespace svxform { const ::rtl::OUString sScaleModeProperty( RTL_CONSTASCII_USTRINGPARAM( "ScaleMode" ) ); if ( xPSI->hasPropertyByName( sScaleModeProperty ) ) - _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) ); + _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::ISOTROPIC ) ); } break; } Modified: openoffice/trunk/main/toolkit/source/awt/animatedimagespeer.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/animatedimagespeer.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/toolkit/source/awt/animatedimagespeer.cxx (original) +++ openoffice/trunk/main/toolkit/source/awt/animatedimagespeer.cxx Sun Dec 23 19:20:18 2012 @@ -365,7 +365,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 ) ) { @@ -405,7 +405,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; Modified: openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx (original) +++ openoffice/trunk/main/toolkit/source/awt/vclxwindows.cxx Sun Dec 23 19:20:18 2012 @@ -700,7 +700,7 @@ void VCLXImageControl::setProperty( cons { case BASEPROPERTY_IMAGE_SCALE_MODE: { - sal_Int16 nScaleMode( ImageScaleMode::Anisotropic ); + sal_Int16 nScaleMode( ImageScaleMode::ANISOTROPIC ); if ( pImageControl && ( Value >>= nScaleMode ) ) { pImageControl->SetScaleMode( nScaleMode ); @@ -714,7 +714,7 @@ void VCLXImageControl::setProperty( cons sal_Bool bScaleImage = sal_False; if ( pImageControl && ( Value >>= bScaleImage ) ) { - pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::Anisotropic : ImageScaleMode::None ); + pImageControl->SetScaleMode( bScaleImage ? ImageScaleMode::ANISOTROPIC : ImageScaleMode::NONE ); } } break; @@ -736,11 +736,11 @@ void VCLXImageControl::setProperty( cons 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: Modified: openoffice/trunk/main/toolkit/source/controls/animatedimages.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/controls/animatedimages.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/toolkit/source/controls/animatedimages.cxx (original) +++ openoffice/trunk/main/toolkit/source/controls/animatedimages.cxx Sun Dec 23 19:20:18 2012 @@ -305,11 +305,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( ::rtl::OUString(), *this, 1 ); } @@ -337,7 +337,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 ); @@ -387,7 +387,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; } Modified: openoffice/trunk/main/toolkit/source/controls/unocontrols.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/controls/unocontrols.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/toolkit/source/controls/unocontrols.cxx (original) +++ openoffice/trunk/main/toolkit/source/controls/unocontrols.cxx Sun Dec 23 19:20:18 2012 @@ -850,7 +850,7 @@ uno::Any UnoControlImageControlModel::Im return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlImageControl ) ); if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE ) - return makeAny( awt::ImageScaleMode::Anisotropic ); + return makeAny( awt::ImageScaleMode::ANISOTROPIC ); return GraphicControlModel::ImplGetDefaultValue( nPropId ); } @@ -886,9 +886,9 @@ void SAL_CALL UnoControlImageControlMode 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; @@ -898,7 +898,7 @@ void SAL_CALL UnoControlImageControlMode 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; Modified: openoffice/trunk/main/vcl/source/control/imgctrl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/imgctrl.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/vcl/source/control/imgctrl.cxx (original) +++ openoffice/trunk/main/vcl/source/control/imgctrl.cxx Sun Dec 23 19:20:18 2012 @@ -36,7 +36,7 @@ namespace ImageScaleMode = ::com::sun::s ImageControl::ImageControl( Window* pParent, WinBits nStyle ) :FixedImage( pParent, nStyle ) - ,mnScaleMode( ImageScaleMode::Anisotropic ) + ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } @@ -44,7 +44,7 @@ ImageControl::ImageControl( Window* pPar ImageControl::ImageControl( Window* pParent, const ResId& rResId ) :FixedImage( pParent, rResId ) - ,mnScaleMode( ImageScaleMode::Anisotropic ) + ,mnScaleMode( ImageScaleMode::ANISOTROPIC ) { } @@ -128,13 +128,13 @@ void ImageControl::ImplDraw( OutputDevic 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( @@ -144,7 +144,7 @@ void ImageControl::ImplDraw( OutputDevic } break; - case ImageScaleMode::Anisotropic: + case ImageScaleMode::ANISOTROPIC: { rDev.DrawImage( aDrawRect.TopLeft(), Modified: openoffice/trunk/main/vcl/source/control/throbber.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/throbber.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/vcl/source/control/throbber.cxx (original) +++ openoffice/trunk/main/vcl/source/control/throbber.cxx Sun Dec 23 19:20:18 2012 @@ -59,7 +59,7 @@ Throbber::Throbber( Window* i_parentWind maWaitTimer.SetTimeout( mnStepTime ); maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) ); - SetScaleMode( ImageScaleMode::None ); + SetScaleMode( ImageScaleMode::NONE ); initImages(); } @@ -75,7 +75,7 @@ Throbber::Throbber( Window* i_parentWind maWaitTimer.SetTimeout( mnStepTime ); maWaitTimer.SetTimeoutHdl( LINK( this, Throbber, TimeOutHdl ) ); - SetScaleMode( ImageScaleMode::None ); + SetScaleMode( ImageScaleMode::NONE ); initImages(); } Modified: openoffice/trunk/main/vcl/workben/svpclient.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/workben/svpclient.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/vcl/workben/svpclient.cxx (original) +++ openoffice/trunk/main/vcl/workben/svpclient.cxx Sun Dec 23 19:20:18 2012 @@ -176,7 +176,7 @@ MyWin::MyWin( Window* pParent, WinBits n m_aSvpBitmaps.Show(); m_aImage.SetPosSizePixel( Point( 170, 10 ), Size( 400, 400 ) ); - m_aImage.SetScaleMode( com::sun::star::awt::ImageScaleMode::None ); + m_aImage.SetScaleMode( com::sun::star::awt::ImageScaleMode::NONE ); m_aImage.Show(); m_aQuitButton.SetPosSizePixel( Point( 10, 300 ), Size( 120,25 ) ); Modified: openoffice/trunk/main/wizards/com/sun/star/wizards/document/DatabaseControl.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/com/sun/star/wizards/document/DatabaseControl.java?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/wizards/com/sun/star/wizards/document/DatabaseControl.java (original) +++ openoffice/trunk/main/wizards/com/sun/star/wizards/document/DatabaseControl.java Sun Dec 23 19:20:18 2012 @@ -250,7 +250,7 @@ public class DatabaseControl extends Con // } else if (getControlType() == FormHandler.SOIMAGECONTROL) { - xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.Isotropic); + xPropertySet.setPropertyValue("ScaleMode", com.sun.star.awt.ImageScaleMode.ISOTROPIC); } } catch (Exception e) Modified: openoffice/trunk/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java (original) +++ openoffice/trunk/main/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java Sun Dec 23 19:20:18 2012 @@ -801,7 +801,7 @@ abstract public class ReportBuilderLayou { // xImageControl.setScaleImage(true); - xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic); + xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.ISOTROPIC); } } else Modified: openoffice/trunk/main/xmloff/source/forms/formenums.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/formenums.cxx?rev=1425511&r1=1425510&r2=1425511&view=diff ============================================================================== --- openoffice/trunk/main/xmloff/source/forms/formenums.cxx (original) +++ openoffice/trunk/main/xmloff/source/forms/formenums.cxx Sun Dec 23 19:20:18 2012 @@ -320,11 +320,11 @@ namespace xmloff { static const SvXMLEnumMapEntry aScaleModeMap[] = { - { XML_BACKGROUND_NO_REPEAT, ImageScaleMode::None }, - { XML_REPEAT, ImageScaleMode::None }, // repeating the image is not supported - { XML_STRETCH, ImageScaleMode::Anisotropic }, - { XML_SCALE, ImageScaleMode::Isotropic }, - { XML_TOKEN_INVALID, ImageScaleMode::None } + { XML_BACKGROUND_NO_REPEAT, ImageScaleMode::NONE }, + { XML_REPEAT, ImageScaleMode::NONE }, // repeating the image is not supported + { XML_STRETCH, ImageScaleMode::ANISOTROPIC }, + { XML_SCALE, ImageScaleMode::ISOTROPIC }, + { XML_TOKEN_INVALID, ImageScaleMode::NONE } }; rReturn = aScaleModeMap; }