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 /reportdesign | |
| 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 'reportdesign')
| -rw-r--r-- | reportdesign/source/core/api/ImageControl.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlHelper.cxx | 4 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlImage.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 5971aeb0d216..b159e6ce3bdf 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 75c142706be7..ae05c7dfebba 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 39b5930f543c..bc0e24714c11 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 { |