summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-19 13:22:47 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-19 15:16:19 +0000
commite5460ca2774ce121dca3f6d06fbfb556c8fffcd9 (patch)
tree76445557fde8403335f853b1ff35425235be4920 /wizards
parent545c6e9d4fa3209eefd3867077c5fe820f0675d0 (diff)
drop the long dead hicontrast res id uses from wizards
Change-Id: Ia2fca72a1681d398bb85474981e224ef92d31d8a
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/report/ReportLayouter.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/PeerConfig.py4
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java22
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.py14
5 files changed, 14 insertions, 34 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 7c727dd2b4af..9ce18e9c52a0 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -267,7 +267,7 @@ public class ReportLayouter
catch (com.sun.star.lang.IllegalArgumentException e)
{
}
- Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1002, 1003));
+ Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1002));
break;
@@ -282,7 +282,7 @@ public class ReportLayouter
}
CurUnoDialog.setControlProperty("imgOrientation", PropertyNames.PROPERTY_IMAGEURL, Desktop.getBitmapPath(m_xMSF) + "/portrait.gif");
- Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1000, 1001));
+ Helper.setUnoPropertyValue(aOrientationImage, PropertyNames.PROPERTY_IMAGEURL, CurUnoDialog.getWizardImageUrl(1000));
break;
default:
diff --git a/wizards/com/sun/star/wizards/ui/PeerConfig.java b/wizards/com/sun/star/wizards/ui/PeerConfig.java
index 5b7b89d4b0f7..4791e63256d5 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.java
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.java
@@ -99,11 +99,11 @@ public class PeerConfig implements XWindowListener
String sImageUrl = PropertyNames.EMPTY_STRING;
if (AnyConverter.isInt(aImageUrlTask.oResource))
{
- sImageUrl = oUnoDialog.getWizardImageUrl(((Integer) aImageUrlTask.oResource).intValue(), ((Integer) aImageUrlTask.oHCResource).intValue());
+ sImageUrl = oUnoDialog.getWizardImageUrl(((Integer) aImageUrlTask.oResource).intValue());
}
else if (AnyConverter.isString(aImageUrlTask.oResource))
{
- sImageUrl = oUnoDialog.getImageUrl(((String) aImageUrlTask.oResource), ((String) aImageUrlTask.oHCResource));
+ sImageUrl = oUnoDialog.getImageUrl(((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 9b02dfcf8897..812c244fae08 100644
--- a/wizards/com/sun/star/wizards/ui/PeerConfig.py
+++ b/wizards/com/sun/star/wizards/ui/PeerConfig.py
@@ -56,9 +56,9 @@ class PeerConfig(object):
for aImageUrlTask in self.aImageUrlTasks:
if isinstance(aImageUrlTask.oResource, int):
- sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource, aImageUrlTask.oHCResource)
+ sImageUrl = self.oUnoDialog.getWizardImageUrl(aImageUrlTask.oResource)
elif isinstance(aImageUrlTask.oResource, str):
- sImageUrl = self.oUnoDialog.getImageUrl(aImageUrlTask.oResource, aImageUrlTask.oHCResource)
+ sImageUrl = self.oUnoDialog.getImageUrl(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 7801169ca035..577ba9fefc9a 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -829,28 +829,14 @@ public class UnoDialog
return nBlue;
}
- public String getWizardImageUrl(int _nResId, int _nHCResId)
+ public String getWizardImageUrl(int _nResId)
{
- if (isHighContrastModeActivated())
- {
- return "private:resource/wzi/image/" + _nHCResId;
- }
- else
- {
- return "private:resource/wzi/image/" + _nResId;
- }
+ return "private:resource/wzi/image/" + _nResId;
}
- public String getImageUrl(String _surl, String _shcurl)
+ public String getImageUrl(String _surl)
{
- if (isHighContrastModeActivated())
- {
- return _shcurl;
- }
- else
- {
- return _surl;
- }
+ return _surl;
}
public static short getListBoxLineCount()
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.py b/wizards/com/sun/star/wizards/ui/UnoDialog.py
index 81484fcf3d4a..96777f20242f 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -368,14 +368,8 @@ class UnoDialog(object):
nBlue = nGreenModulo
return nBlue
- def getWizardImageUrl(self, _nResId, _nHCResId):
- if (self.isHighContrastModeActivated()):
- return "private:resource/wzi/image/" + str(_nHCResId)
- else:
- return "private:resource/wzi/image/" + str(_nResId)
+ def getWizardImageUrl(self, _nResId):
+ return "private:resource/wzi/image/" + str(_nResId)
- def getImageUrl(self, _surl, _shcurl):
- if (self.isHighContrastModeActivated()):
- return _shcurl
- else:
- return _surl
+ def getImageUrl(self, _surl):
+ return _surl