summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-19 13:24:58 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-19 15:16:20 +0000
commiteca0aee7a5f862e63b2bb4b56ef69fb5761e4b5f (patch)
tree5dcd7c97d996c60b95b6ca4a0dcac027fcc87256 /wizards
parente5460ca2774ce121dca3f6d06fbfb556c8fffcd9 (diff)
getImageUrl now returns its arg, so remove it
Change-Id: Iee39f7462c2f4f23dfbdc11aa7542af996001042
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.py2
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java5
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.py3
4 files changed, 2 insertions, 10 deletions
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java
index 4791e63256d5..332397719afa 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.java
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java
@@ -103,7 +103,7 @@ public class PeerConfig implements XWindowListener
}
else if (AnyConverter.isString(aImageUrlTask.oResource))
{
- sImageUrl = oUnoDialog.getImageUrl(((String) aImageUrlTask.oResource));
+ sImageUrl = (String) aImageUrlTask.oResource;
}
if (!sImageUrl.equals(PropertyNames.EMPTY_STRING))
{
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.py b/wizards/com/sun/star/wizards/ui/PeerConfig.py
index 812c244fae08..0c6b60ea25d0 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.py
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py
@@ -58,7 +58,7 @@ class PeerConfig(object):
if isinstance(aImageUrlTask.oResource, int):
sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource)
elif isinstance(aImageUrlTask.oResource, str):
- sImageUrl = self.oUnoDialog.getImageUrl(aImageUrlTask.oResource)
+ sImageUrl = aImageUrlTask.oResource
if sImageUrl != "":
aImageUrlTask.oModel.ImageURL = sImageUrl
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 577ba9fefc9a..f3b1c68dc5c9 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -834,11 +834,6 @@ public class UnoDialog
return "private:resource/wzi/image/" + _nResId;
}
- public String getImageUrl(String _surl)
- {
- return _surl;
- }
-
public static short getListBoxLineCount()
{
return (short)20;
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 96777f20242f..fd69fc25920f 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -370,6 +370,3 @@ class UnoDialog(object):
def getWizardImageUrl(self, _nResId):
return "private:resource/wzi/image/" + str(_nResId)
-
- def getImageUrl(self, _surl):
- return _surl