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 /wizards | |
| 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 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/document/DatabaseControl.java | 2 | ||||
| -rw-r--r-- | wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java index 0a0c5cd2e60f..97298e864d25 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 6cbd91debfed..615634ec7a2e 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 |