summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-19 20:39:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-19 21:00:18 +0000
commitb5a20001f4514975c6aadd985a6e8f096cbea87a (patch)
treeca3d00da16de87df4c9caf6f6cd6694406501dba
parent842fab105a3d078587754f94bb096bbb8b9dd30b (diff)
convert wizards from Image resources to BitmapEx resources
Change-Id: I19d509b2d54a87f8e00b50d0368ba02a9c40b4c5
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.py2
-rw-r--r--wizards/source/imagelists/imagelists.src96
3 files changed, 50 insertions, 50 deletions
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index f3b1c68dc5c9..c04db3dec926 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -831,7 +831,7 @@ public class UnoDialog
public String getWizardImageUrl(int _nResId)
{
- return "private:resource/wzi/image/" + _nResId;
+ return "private:resource/wzi/bitmapex/" + _nResId;
}
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 fd69fc25920f..118a4e503a60 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.py
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.py
@@ -369,4 +369,4 @@ class UnoDialog(object):
return nBlue
def getWizardImageUrl(self, _nResId):
- return "private:resource/wzi/image/" + str(_nResId)
+ return "private:resource/wzi/bitmapex/" + str(_nResId)
diff --git a/wizards/source/imagelists/imagelists.src b/wizards/source/imagelists/imagelists.src
index a072d452ea68..3da2bec38257 100644
--- a/wizards/source/imagelists/imagelists.src
+++ b/wizards/source/imagelists/imagelists.src
@@ -16,98 +16,98 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#define REPORTWIZARD_BASE 1000
-#define FORMWIZARD_BASE 1100
-#define WEBWIZARD_BASE 1200
+#define REPORTWIZARD_BASE 1000
+#define FORMWIZARD_BASE 1100
+#define WEBWIZARD_BASE 1200
-#define IMG_REPORT_ORIENTATION_PORTRAIT REPORTWIZARD_BASE + 0
-Image IMG_REPORT_ORIENTATION_PORTRAIT
+#define BMP_REPORT_ORIENTATION_PORTRAIT REPORTWIZARD_BASE + 0
+Bitmap BMP_REPORT_ORIENTATION_PORTRAIT
{
- ImageBitmap = Bitmap { File = "portrait_32.png"; };
+ File = "portrait_32.png";
};
-#define IMG_REPORT_ORIENTATION_LANDSCAPE REPORTWIZARD_BASE + 2
-Image IMG_REPORT_ORIENTATION_LANDSCAPE
+#define BMP_REPORT_ORIENTATION_LANDSCAPE REPORTWIZARD_BASE + 2
+Bitmap BMP_REPORT_ORIENTATION_LANDSCAPE
{
- ImageBitmap = Bitmap { File = "landscape_32.png"; };
+ File = "landscape_32.png";
};
-#define IMG_FORM_ARRANGELISTSIDE FORMWIZARD_BASE + 0
-Image IMG_FORM_ARRANGELISTSIDE
+#define BMP_FORM_ARRANGELISTSIDE FORMWIZARD_BASE + 0
+Bitmap BMP_FORM_ARRANGELISTSIDE
{
- ImageBitmap = Bitmap { File = "formarrangelistside_42.png"; };
+ File = "formarrangelistside_42.png";
};
-#define IMG_FORM_ARRANGELISTTOP FORMWIZARD_BASE + 2
-Image IMG_FORM_ARRANGELISTTOP
+#define BMP_FORM_ARRANGELISTTOP FORMWIZARD_BASE + 2
+Bitmap BMP_FORM_ARRANGELISTTOP
{
- ImageBitmap = Bitmap { File = "formarrangelisttop_42.png"; };
+ File = "formarrangelisttop_42.png";
};
-#define IMG_FORM_ARRANGETABLE FORMWIZARD_BASE + 4
-Image IMG_FORM_ARRANGETABLE
+#define BMP_FORM_ARRANGETABLE FORMWIZARD_BASE + 4
+Bitmap BMP_FORM_ARRANGETABLE
{
- ImageBitmap = Bitmap { File = "formarrangetable_42.png"; };
+ File = "formarrangetable_42.png";
};
-#define IMG_FORM_ARRANGEFREE FORMWIZARD_BASE + 6
-Image IMG_FORM_ARRANGEFREE
+#define BMP_FORM_ARRANGEFREE FORMWIZARD_BASE + 6
+Bitmap BMP_FORM_ARRANGEFREE
{
- ImageBitmap = Bitmap { File = "formarrangefree_42.png"; };
+ File = "formarrangefree_42.png";
};
-#define IMG_WEB_LAYOUT_TABLE3 WEBWIZARD_BASE + 0
-Image IMG_WEB_LAYOUT_TABLE3
+#define BMP_WEB_LAYOUT_TABLE3 WEBWIZARD_BASE + 0
+Bitmap BMP_WEB_LAYOUT_TABLE3
{
- ImageBitmap = Bitmap { File = "table_3.png"; };
+ File = "table_3.png";
};
-#define IMG_WEB_LAYOUT_TABLE2 WEBWIZARD_BASE + 2
-Image IMG_WEB_LAYOUT_TABLE2
+#define BMP_WEB_LAYOUT_TABLE2 WEBWIZARD_BASE + 2
+Bitmap BMP_WEB_LAYOUT_TABLE2
{
- ImageBitmap = Bitmap { File = "table_2.png"; };
+ File = "table_2.png";
};
-#define IMG_WEB_LAYOUT_SIMPLE WEBWIZARD_BASE + 4
-Image IMG_WEB_LAYOUT_SIMPLE
+#define BMP_WEB_LAYOUT_SIMPLE WEBWIZARD_BASE + 4
+Bitmap BMP_WEB_LAYOUT_SIMPLE
{
- ImageBitmap = Bitmap { File = "simple.png"; };
+ File = "simple.png";
};
-#define IMG_WEB_LAYOUT_DIAGONAL WEBWIZARD_BASE + 6
-Image IMG_WEB_LAYOUT_DIAGONAL
+#define BMP_WEB_LAYOUT_DIAGONAL WEBWIZARD_BASE + 6
+Bitmap BMP_WEB_LAYOUT_DIAGONAL
{
- ImageBitmap = Bitmap { File = "diagonal.png"; };
+ File = "diagonal.png";
};
-#define IMG_WEB_LAYOUT_ZIGZAG WEBWIZARD_BASE + 8
-Image IMG_WEB_LAYOUT_ZIGZAG
+#define BMP_WEB_LAYOUT_ZIGZAG WEBWIZARD_BASE + 8
+Bitmap BMP_WEB_LAYOUT_ZIGZAG
{
- ImageBitmap = Bitmap { File = "zigzag.png"; };
+ File = "zigzag.png";
};
-#define IMG_WEB_LAYOUT_FRAMELEFT WEBWIZARD_BASE + 10
-Image IMG_WEB_LAYOUT_FRAMELEFT
+#define BMP_WEB_LAYOUT_FRAMELEFT WEBWIZARD_BASE + 10
+Bitmap BMP_WEB_LAYOUT_FRAMELEFT
{
- ImageBitmap = Bitmap { File = "frame_left.png"; };
+ File = "frame_left.png";
};
-#define IMG_WEB_LAYOUT_FRAMERIGHT WEBWIZARD_BASE + 12
-Image IMG_WEB_LAYOUT_FRAMERIGHT
+#define BMP_WEB_LAYOUT_FRAMERIGHT WEBWIZARD_BASE + 12
+Bitmap BMP_WEB_LAYOUT_FRAMERIGHT
{
- ImageBitmap = Bitmap { File = "frame_right.png"; };
+ File = "frame_right.png";
};
-#define IMG_WEB_LAYOUT_FRAMETOP WEBWIZARD_BASE + 14
-Image IMG_WEB_LAYOUT_FRAMETOP
+#define BMP_WEB_LAYOUT_FRAMETOP WEBWIZARD_BASE + 14
+Bitmap BMP_WEB_LAYOUT_FRAMETOP
{
- ImageBitmap = Bitmap { File = "frame_top.png"; };
+ File = "frame_top.png";
};
-#define IMG_WEB_LAYOUT_FRAMEBOTTOM WEBWIZARD_BASE + 16
-Image IMG_WEB_LAYOUT_FRAMEBOTTOM
+#define BMP_WEB_LAYOUT_FRAMEBOTTOM WEBWIZARD_BASE + 16
+Bitmap BMP_WEB_LAYOUT_FRAMEBOTTOM
{
- ImageBitmap = Bitmap { File = "frame_bottom.png"; };
+ File = "frame_bottom.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */