diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 13:30:00 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-19 15:16:24 +0000 |
commit | d0293ed2421e2d7d0290c24d89959c84d1060623 (patch) | |
tree | 62f1d373f3722272614b8aab8f6b0ac1ed53aa3a /wizards | |
parent | eca0aee7a5f862e63b2bb4b56ef69fb5761e4b5f (diff) |
drop unused hicontrast arg to setImageUrl
Change-Id: I6befc077a79a944275e436ffa601b6c14d59977a
Diffstat (limited to 'wizards')
-rw-r--r-- | wizards/com/sun/star/wizards/report/ReportLayouter.java | 4 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/ButtonList.java | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/ImageList.py | 2 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/PeerConfig.java | 12 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/PeerConfig.py | 7 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/UIConsts.java | 1 | ||||
-rw-r--r-- | wizards/com/sun/star/wizards/ui/UnoDialog2.java | 2 |
7 files changed, 13 insertions, 17 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java index 9ce18e9c52a0..08baeab70a26 100644 --- a/wizards/com/sun/star/wizards/report/ReportLayouter.java +++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java @@ -191,11 +191,11 @@ public class ReportLayouter }); if (m_nLandscapeState == 1) { - CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002, 1003); + CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1002); } else { - CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000, 1001); + CurUnoDialog.getPeerConfiguration().setImageUrl(aOrientationImage, 1000); } } catch (Exception exception) diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index b0624c907583..f2aa6eabd094 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -297,7 +297,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener } else if (oResources.length == 2) { - oUnoDialog.getPeerConfiguration().setImageUrl(m_aButtons[i].getModel(), oResources[0], oResources[1]); + oUnoDialog.getPeerConfiguration().setImageUrl(m_aButtons[i].getModel(), oResources[0]); } boolean bTabStop = Boolean.TRUE; // focusable ? Boolean.TRUE : Boolean.FALSE; Helper.setUnoPropertyValue(m_aButtons[i].getModel(), "Tabstop", bTabStop); diff --git a/wizards/com/sun/star/wizards/ui/ImageList.py b/wizards/com/sun/star/wizards/ui/ImageList.py index 7decec705c71..5d7dd792299e 100644 --- a/wizards/com/sun/star/wizards/ui/ImageList.py +++ b/wizards/com/sun/star/wizards/ui/ImageList.py @@ -230,7 +230,7 @@ class ImageList(ListDataListener): item.Model.ImageURL = oResources[0] elif len(oResources) == 2: self.oUnoDialog.getPeerConfiguration().setImageUrl( - item.Model, oResources[0], oResources[1]) + item.Model, oResources[0]) item.Model.Tabstop = bool(focusable) if self.refreshOverNull: diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java index 332397719afa..07f6258a584a 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.java +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java @@ -62,12 +62,10 @@ public class PeerConfig implements XWindowListener Object oModel; Object oResource; - Object oHCResource; - public ImageUrlTask(Object _oModel, Object _oResource, Object _oHCResource) + public ImageUrlTask(Object _oModel, Object _oResource) { oResource = _oResource; - oHCResource = _oHCResource; oModel = _oModel; } } @@ -154,9 +152,9 @@ public class PeerConfig implements XWindowListener * Assigns an image to the property 'ImageUrl' of a dialog control. The image ids that the Resource urls point to * may be assigned in a Resource file outside the wizards project */ - public void setImageUrl(Object _ocontrolmodel, String _sResourceUrl, String _sHCResourceUrl) + public void setImageUrl(Object _ocontrolmodel, String _sResourceUrl) { - ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _sResourceUrl, _sHCResourceUrl); + ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _sResourceUrl); this.aImageUrlTasks.add(oImageUrlTask); } @@ -165,9 +163,9 @@ public class PeerConfig implements XWindowListener * within the wizards project * wizards project */ - public void setImageUrl(Object _ocontrolmodel, Object _oResource, Object _oHCResource) + public void setImageUrl(Object _ocontrolmodel, Object _oResource) { - ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _oResource, _oHCResource); + ImageUrlTask oImageUrlTask = new ImageUrlTask(_ocontrolmodel, _oResource); this.aImageUrlTasks.add(oImageUrlTask); } } diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py index 0c6b60ea25d0..241d1fdb1fa9 100644 --- a/wizards/com/sun/star/wizards/ui/PeerConfig.py +++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py @@ -43,10 +43,9 @@ class PeerConfig(object): class ImageUrlTask(object): - def __init__(self, _oModel, _oResource, _oHCResource): + def __init__(self, _oModel, _oResource): self.oModel = _oModel self.oResource = _oResource - self.oHCResource = _oHCResource def windowShown(self): try: @@ -76,6 +75,6 @@ class PeerConfig(object): oPeerTask = self.PeerTask(_xControl, propnames, propvalues) self.m_aPeerTasks.append(oPeerTask) - def setImageUrl(self, _ocontrolmodel, _oResource, _oHCResource): - oImageUrlTask = self.ImageUrlTask(_ocontrolmodel, _oResource, _oHCResource) + def setImageUrl(self, _ocontrolmodel, _oResource): + oImageUrlTask = self.ImageUrlTask(_ocontrolmodel, _oResource) self.aImageUrlTasks.append(oImageUrlTask) diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index d62bc55f547d..7fb26d79bca0 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -30,7 +30,6 @@ public interface UIConsts int RID_IMG_FORM = 1100; Integer INVISIBLESTEP = 99; String INFOIMAGEURL = "private:resource/dbu/image/19205"; - String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; /** * The tabindex of the navigation buttons in a wizard must be assigned a very * high tabindex because on every step their taborder must appear at the end diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 0e70598e696f..24064585ae19 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -130,7 +130,7 @@ public class UnoDialog2 extends UnoDialog { Short.valueOf((short) 0), 10, UIConsts.INFOIMAGEURL, Integer.valueOf(_posx), Integer.valueOf(_posy), Boolean.FALSE, Integer.valueOf(_iStep), 10 }); - super.getPeerConfiguration().setImageUrl(getModel(xImgControl), UIConsts.INFOIMAGEURL, UIConsts.INFOIMAGEURL_HC); + super.getPeerConfiguration().setImageUrl(getModel(xImgControl), UIConsts.INFOIMAGEURL); return xImgControl; } |