This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 523c012 Icons were changed to PNG long ago
523c012 is described below
commit 523c0123c6b9c435c63a6ee7db7df5fb8a329e77
Author: mseidel <[email protected]>
AuthorDate: Mon Nov 25 16:38:51 2019 +0100
Icons were changed to PNG long ago
(cherry picked from commit b940e4177772fb0befb436107e58227dfdfca6d4)
---
main/svx/source/gallery2/gallery.src | 34 +++++++++++++++++-----------------
main/svx/source/svdraw/svdstr.src | 12 ++++++------
main/sw/source/ui/app/app.src | 14 +++++++-------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/main/svx/source/gallery2/gallery.src
b/main/svx/source/gallery2/gallery.src
index a066c5e..1a4ac8e 100644
--- a/main/svx/source/gallery2/gallery.src
+++ b/main/svx/source/gallery2/gallery.src
@@ -178,90 +178,90 @@ String RID_SVXSTR_GALLERY_LISTVIEW
Bitmap RID_SVXBMP_GALLERY
{
- File = "lx03135.bmp" ;
+ File = "lx03135.png" ;
};
Bitmap RID_SVXBMP_THEME_NORMAL
{
- File = "galnors.bmp" ;
+ File = "galnors.png" ;
};
Bitmap RID_SVXBMP_THEME_IMPORTED
{
- File = "galimps.bmp" ;
+ File = "galimps.png" ;
};
Bitmap RID_SVXBMP_THEME_READONLY
{
- File = "galrdos.bmp" ;
+ File = "galrdos.png" ;
};
Bitmap RID_SVXBMP_THEME_DEFAULT
{
- File = "galdefs.bmp" ;
+ File = "galdefs.png" ;
};
Bitmap RID_SVXBMP_GALLERY_MEDIA
{
- File = "galmedia.bmp";
+ File = "galmedia.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_1
{
- File = "galsnd1.bmp";
+ File = "galsnd1.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_2
{
- File = "galsnd2.bmp";
+ File = "galsnd2.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_3
{
- File = "galsnd3.bmp";
+ File = "galsnd3.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_4
{
- File = "galsnd4.bmp";
+ File = "galsnd4.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_5
{
- File = "galsnd5.bmp";
+ File = "galsnd5.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_6
{
- File = "galsnd6.bmp";
+ File = "galsnd6.png";
};
Bitmap RID_SVXBMP_GALLERY_SOUND_7
{
- File = "galsnd7.bmp";
+ File = "galsnd7.png";
};
Image RID_SVXIMG_GALLERY_VIEW_ICON
{
- ImageBitmap = Bitmap { File = "galicon.bmp"; };
+ ImageBitmap = Bitmap { File = "galicon.png"; };
MASKCOLOR
};
Image RID_SVXIMG_GALLERY_VIEW_LIST
{
- ImageBitmap = Bitmap { File = "gallist.bmp"; };
+ ImageBitmap = Bitmap { File = "gallist.png"; };
MASKCOLOR
};
Image RID_SVXIMG_GALLERY_VIEW_ICON_HC
{
- ImageBitmap = Bitmap { File = "galicon_h.bmp"; };
+ ImageBitmap = Bitmap { File = "galicon_h.png"; };
MASKCOLOR
};
Image RID_SVXIMG_GALLERY_VIEW_LIST_HC
{
- ImageBitmap = Bitmap { File = "gallist_h.bmp"; };
+ ImageBitmap = Bitmap { File = "gallist_h.png"; };
MASKCOLOR
};
diff --git a/main/svx/source/svdraw/svdstr.src
b/main/svx/source/svdraw/svdstr.src
index e771502..40f642a 100644
--- a/main/svx/source/svdraw/svdstr.src
+++ b/main/svx/source/svdraw/svdstr.src
@@ -1610,8 +1610,8 @@ String STR_ItemNam_SHEARANGLE
// Ende der gecachten Strings
// und hier noch Bitmaps
-Bitmap BMAP_GrafikEi { File = "grafikei.bmp" ; };
-Bitmap BMAP_GrafikDe { File = "grafikde.bmp" ; };
+Bitmap BMAP_GrafikEi { File = "grafikei.png" ; };
+Bitmap BMAP_GrafikDe { File = "grafikde.png" ; };
// Strings fuer den Vorlagen-Dialog
String SIP_UNKNOWN_ATTR
@@ -2769,7 +2769,7 @@ Bitmap SIP_SA_FINE_MARKERS
// #100499#
Bitmap BMP_SVXOLEOBJ
{
- File = "oleobj.bmp" ;
+ File = "oleobj.png" ;
};
// #101928#
@@ -2857,17 +2857,17 @@ String STR_ObjNamePluralTable
Bitmap SIP_SA_CROP_MARKERS
{
- File = "cropmarkers.bmp";
+ File = "cropmarkers.png";
};
Bitmap SIP_SA_CROP_FINE_MARKERS
{
- File = "cropmarkers2.bmp";
+ File = "cropmarkers2.png";
};
Bitmap SIP_SA_ACCESSIBILITY_CROP_MARKERS
{
- File = "cropmarkersACC.bmp";
+ File = "cropmarkersACC.png";
};
// DialControl bitmaps
diff --git a/main/sw/source/ui/app/app.src b/main/sw/source/ui/app/app.src
index aad9562..172a9ad 100644
--- a/main/sw/source/ui/app/app.src
+++ b/main/sw/source/ui/app/app.src
@@ -185,10 +185,10 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
// Default Bitmap fuer Toolbox
-BITMAP BMP_FEHLT { FILE = "x.bmp" ; };
+BITMAP BMP_FEHLT { FILE = "x.png" ; };
// Bitmap fuer die NumerierungsVorlagen im Organizer
-Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.bmp" ; };
-Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.bmp" ; };
+Bitmap BMP_STYLES_FAMILY_NUM { File = "styfamnu.png" ; };
+Bitmap BMP_STYLES_FAMILY_NUM_HC { File = "styfamnu_h.png" ; };
String STR_ENV_TITLE
{
@@ -385,22 +385,22 @@ QueryBox MSG_COMCORE_ASKSEARCH
Bitmap RID_GRAPHIC_REPLACEBMP
{
- File = "grafikei.bmp" ;
+ File = "grafikei.png" ;
};
Bitmap RID_GRAPHIC_ERRORBMP
{
- File = "grafikde.bmp" ;
+ File = "grafikde.png" ;
};
Bitmap RID_GRAPHIC_REPLACEBMP_HC
{
- File = "grafikei_h.bmp" ;
+ File = "grafikei_h.png" ;
};
Bitmap RID_GRAPHIC_ERRORBMP_HC
{
- File = "grafikde_h.bmp" ;
+ File = "grafikde_h.png" ;
};
String STR_TABLE_DEFNAME