[Libreoffice-commits] core.git: offapi/com oox/source reportdesign/source svx/source toolkit/source vcl/source vcl/workben wizards/com xmloff/source
Ariel Constenla-Haile
arielch at apache.org
Thu Jun 27 09:10:00 PDT 2013
offapi/com/sun/star/awt/ImageScaleMode.idl | 10 ++------
oox/source/ole/axcontrol.cxx | 8 +++---
reportdesign/source/core/api/ImageControl.cxx | 6 ++---
reportdesign/source/filter/xml/xmlHelper.cxx | 4 +--
reportdesign/source/filter/xml/xmlImage.cxx | 4 +--
svx/source/form/formcontrolfactory.cxx | 2 -
toolkit/source/awt/animatedimagespeer.cxx | 4 +--
toolkit/source/awt/vclxtoolkit.cxx | 4 +--
toolkit/source/awt/vclxwindows.cxx | 8 +++---
toolkit/source/controls/animatedimages.cxx | 12 +++++-----
toolkit/source/controls/unocontrols.cxx | 8 +++---
vcl/source/control/imgctrl.cxx | 10 ++++----
vcl/source/control/throbber.cxx | 4 +--
vcl/workben/svpclient.cxx | 2 -
wizards/com/sun/star/wizards/document/DatabaseControl.java | 2 -
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 2 -
xmloff/source/forms/formenums.cxx | 10 ++++----
17 files changed, 48 insertions(+), 52 deletions(-)
New commits:
commit 949f97ba480f96c7892602f3208467ac925fab15
Author: Ariel Constenla-Haile <arielch at apache.org>
Date: Sun Dec 23 18:20:18 2012 +0000
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
diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl b/offapi/com/sun/star/awt/ImageScaleMode.idl
index c0f69d3..cb05a16 100644
--- a/offapi/com/sun/star/awt/ImageScaleMode.idl
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -20,34 +20,30 @@
#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 isotropically,
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 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
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 2f777b4..35a0ea5 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 );
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 5971aeb..b159e6c 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -118,7 +118,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
: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);
@@ -131,7 +131,7 @@ OImageControl::OImageControl(uno::Reference< uno::XComponentContext > const & _x
: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);
@@ -472,7 +472,7 @@ OUString SAL_CALL OImageControl::getShapeType( ) throw (uno::RuntimeException)
// -----------------------------------------------------------------------------
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);
}
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 75c1427..ae05c7d 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -375,8 +375,8 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions()
{
static SvXMLEnumMapEntry s_aXML_EnumMap[] =
{
- { XML_ISOTROPIC, awt::ImageScaleMode::Isotropic },
- { XML_ANISOTROPIC, awt::ImageScaleMode::Anisotropic },
+ { XML_ISOTROPIC, awt::ImageScaleMode::ISOTROPIC },
+ { XML_ANISOTROPIC, awt::ImageScaleMode::ANISOTROPIC },
{ XML_TOKEN_INVALID, 0 }
};
return s_aXML_EnumMap;
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx
index 39b5930..bc0e247 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -80,10 +80,10 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
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
{
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index ccd1cf9..913e8b9 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -461,7 +461,7 @@ namespace svxform
{
const OUString sScaleModeProperty( "ScaleMode" );
if ( xPSI->hasPropertyByName( sScaleModeProperty ) )
- _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) );
+ _rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::ISOTROPIC ) );
}
break;
}
diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx
index 5f54044..57614e9 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 21c5b6d..7575987 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 a9f5e3d..fc8286c 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 e2cd1d9..26d03e6 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 f796796..19c50af 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;
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 40c5d23..cdc71fa 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 56ab52d..457bb2e 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();
}
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index d5b1964..3f1890a 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -140,7 +140,7 @@ MyWin::MyWin( Window* pParent, WinBits nWinStyle ) :
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 ) );
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java
index 0a0c5cd..97298e8 100644
--- a/wizards/com/sun/star/wizards/document/DatabaseControl.java
+++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java
@@ -218,7 +218,7 @@ public class DatabaseControl extends Control
}
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)
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index 6cbd91d..615634e 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -783,7 +783,7 @@ abstract public class ReportBuilderLayouter implements IReportBuilderLayouter
final XImageControl xImageControl = UnoRuntime.queryInterface(XImageControl.class, xReportControlModel);
if (xImageControl != null)
{
- xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.Isotropic);
+ xImageControl.setScaleMode(com.sun.star.awt.ImageScaleMode.ISOTROPIC);
}
}
else
diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx
index 583e1b9..84b15ab 100644
--- a/xmloff/source/forms/formenums.cxx
+++ b/xmloff/source/forms/formenums.cxx
@@ -315,11 +315,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;
}
More information about the Libreoffice-commits
mailing list