offapi/com/sun/star/graphic/MediaProperties.idl | 1
svtools/source/graphic/provider.cxx | 10 -
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py | 2
wizards/com/sun/star/wizards/ui/UIConsts.java | 6
wizards/com/sun/star/wizards/ui/UIConsts.py | 6
wizards/com/sun/star/wizards/ui/UnoDialog.java | 2
wizards/com/sun/star/wizards/ui/UnoDialog.py | 2
wizards/source/imagelists/imagelists.src | 96 +++++++-------
8 files changed, 61 insertions(+), 64 deletions(-)
New commits:
commit e3cfa49e8113493cfc59ccc8302840d19fa7572e
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 20:56:48 2017 +0000
drop now unusd private:resource/.../image urls
Change-Id: Ic456113b295c3b90316d2792b630c44892ac20a7
diff --git a/offapi/com/sun/star/graphic/MediaProperties.idl
b/offapi/com/sun/star/graphic/MediaProperties.idl
index 585b834..a107e2b 100644
--- a/offapi/com/sun/star/graphic/MediaProperties.idl
+++ b/offapi/com/sun/star/graphic/MediaProperties.idl
@@ -46,7 +46,6 @@ published service MediaProperties
<ul>
<li>private:resource/projectshortname/bitmap/12345</li>
<li>private:resource/projectshortname/bitmapex/12345</li>
- <li>private:resource/projectshortname/image/12345</li>
</ul>
And additionally, GraphicObject scheme URLs like
<ul>
<li>vnd.sun.star.GraphicObject:10000000000001940000012FB99807BD</li> </ul>
diff --git a/svtools/source/graphic/provider.cxx
b/svtools/source/graphic/provider.cxx
index 3666fdc..f4631b79 100644
--- a/svtools/source/graphic/provider.cxx
+++ b/svtools/source/graphic/provider.cxx
@@ -284,16 +284,6 @@ uno::Reference< ::graphic::XGraphic >
GraphicProvider::implLoadResource( const O
aBmpEx = BitmapEx( aResId );
}
}
- else if( aResourceType == "image" )
- {
- aResId.SetRT( RSC_IMAGE );
-
- if( pResMgr->IsAvailable( aResId ) )
- {
- const Image aImage( aResId );
- aBmpEx = aImage.GetBitmapEx();
- }
- }
if( !aBmpEx.IsEmpty() )
{
commit a0f127d2209e80e085b95770a87df2898b7ad645
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 20:56:13 2017 +0000
document magic number and note it was already converted to a bitmapex
Change-Id: I2d78463d52f5866418eac7293a63a42c6af8b990
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java
b/wizards/com/sun/star/wizards/ui/UIConsts.java
index 7fb26d79..950145f 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.java
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.java
@@ -29,7 +29,11 @@ public interface UIConsts
int RID_TABLE = 2600;
int RID_IMG_FORM = 1100;
Integer INVISIBLESTEP = 99;
- String INFOIMAGEURL = "private:resource/dbu/image/19205";
+ /*
+ This is BMP_EXCEPTION_INFO (RID_IMAGE_START + 5, where RID_IMAGE_START +
5 is
+ RID_DBACCESS_START which is RID_LIB_START+9200 where RID_LIB_START is
10000)
+ */
+ String INFOIMAGEURL = "private:resource/dbu/bitmapex/19205";
/**
* 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/UIConsts.py
b/wizards/com/sun/star/wizards/ui/UIConsts.py
index bf947fb46..271e6f5 100644
--- a/wizards/com/sun/star/wizards/ui/UIConsts.py
+++ b/wizards/com/sun/star/wizards/ui/UIConsts.py
@@ -26,7 +26,11 @@ class UIConsts():
RID_IMG_FORM = 1100
RID_IMG_WEB = 1200
INVISIBLESTEP = 99
- INFOIMAGEURL = "private:resource/dbu/image/19205"
+ '''
+ This is BMP_EXCEPTION_INFO (RID_IMAGE_START + 5, where RID_IMAGE_START +
5 is
+ RID_DBACCESS_START which is RID_LIB_START+9200 where RID_LIB_START is
10000)
+ '''
+ INFOIMAGEURL = "private:resource/dbu/bitmapex/19205"
'''
The tabindex of the navigation buttons in a wizard must be assigned a very
commit 8911c7e177dcc2e9b5a9efcc308395081855b21f
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 20:53:21 2017 +0000
use the precanned constant for this
Change-Id: Iaa6283029f9de41e2506051c49dc18f876b28587
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
index 9d55a19..d28496d 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
@@ -1094,7 +1094,7 @@ class LetterWizardDialog(WizardDialog):
PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH),
(0, 10,
- "private:resource/dbu/image/19205",
+ UIConsts.INFOIMAGEURL,
"ImageControl2", 92, 145, False, 6, 66, 10))
self.insertLabel("lblTemplateName",
(PropertyNames.PROPERTY_HEIGHT,
commit b5a20001f4514975c6aadd985a6e8f096cbea87a
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jan 19 20:39:00 2017 +0000
convert wizards from Image resources to BitmapEx resources
Change-Id: I19d509b2d54a87f8e00b50d0368ba02a9c40b4c5
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java
b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index f3b1c68..c04db3d 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 fd69fc2..118a4e5 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 a072d45..3da2bec 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: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
