This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new dd97415 Icons were changed to PNG long ago
dd97415 is described below
commit dd97415427a400ef7bc0a51ed0d847c2699d5ffd
Author: mseidel <[email protected]>
AuthorDate: Sat Nov 30 18:06:56 2019 +0100
Icons were changed to PNG long ago
---
main/sw/source/ui/frmdlg/frmpage.src | 4 +-
main/sw/source/ui/index/cnttab.src | 22 +++---
main/sw/source/ui/utlui/initui.src | 4 +-
main/sw/source/ui/utlui/navipi.src | 20 +++---
main/sw/source/ui/utlui/poolfmt.src | 82 +++++++++++------------
main/uui/source/cookiedg.src | 2 +-
main/xmlsecurity/source/dialogs/macrosecurity.src | 4 +-
7 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/main/sw/source/ui/frmdlg/frmpage.src
b/main/sw/source/ui/frmdlg/frmpage.src
index be3d754..4730f7f 100644
--- a/main/sw/source/ui/frmdlg/frmpage.src
+++ b/main/sw/source/ui/frmdlg/frmpage.src
@@ -588,11 +588,11 @@ TabPage TP_GRF_EXT
Size = MAP_APPFONT ( 260 , 185 ) ;
Bitmap BMP_EXAMPLE
{
- File = "dog.bmp" ;
+ File = "dog.png" ;
};
Bitmap BMP_EXAMPLE_HC
{
- File = "dog_h.bmp" ;
+ File = "dog_h.png" ;
};
FixedLine FL_CONNECT
{
diff --git a/main/sw/source/ui/index/cnttab.src
b/main/sw/source/ui/index/cnttab.src
index c744047..53c05a0 100644
--- a/main/sw/source/ui/index/cnttab.src
+++ b/main/sw/source/ui/index/cnttab.src
@@ -978,12 +978,12 @@ TabPage TP_TOX_ENTRY
};
Image IMG_SORTUP_HC
{
- ImageBitmap = Bitmap{File = "sch10712.bmp"; };
+ ImageBitmap = Bitmap{File = "sch10712.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
Image IMG_SORTDOWN_HC
{
- ImageBitmap = Bitmap{File = "sch10713.bmp"; };
+ ImageBitmap = Bitmap{File = "sch10713.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
ImageRadioButton RB_SORTUP1
@@ -994,7 +994,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10712.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10712.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
Check = TRUE;
@@ -1008,7 +1008,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10713.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10713.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
QuickHelpText [ en-US ] = "Descending";
@@ -1021,7 +1021,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10712.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10712.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
Check = TRUE;
@@ -1035,7 +1035,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10713.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10713.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
QuickHelpText [ en-US ] = "Descending";
@@ -1048,7 +1048,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10712.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10712.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
Check = TRUE;
@@ -1062,7 +1062,7 @@ TabPage TP_TOX_ENTRY
RadioButtonImage =
Image
{
- ImageBitmap = Bitmap{File = "sc10713.bmp"; };
+ ImageBitmap = Bitmap{File = "sc10713.png"; };
MaskColor = IMAGE_MASK_COLOR ;
};
QuickHelpText [ en-US ] = "Descending";
@@ -1171,7 +1171,7 @@ TabPage TP_TOX_STYLES
{
ImageBitmap = Bitmap
{
- File = "one_left.bmp" ;
+ File = "one_left.png" ;
};
MaskColor = IMAGE_MASK_COLOR ;
};
@@ -1226,7 +1226,7 @@ ModalDialog DLG_ADD_IDX_STYLES
{
ImageBitmap = Bitmap
{
- File = "all_left.bmp" ;
+ File = "all_left.png" ;
};
MaskColor = IMAGE_MASK_COLOR ;
};
@@ -1242,7 +1242,7 @@ ModalDialog DLG_ADD_IDX_STYLES
{
ImageBitmap = Bitmap
{
- File = "all_right.bmp" ;
+ File = "all_right.png" ;
};
MaskColor = IMAGE_MASK_COLOR ;
};
diff --git a/main/sw/source/ui/utlui/initui.src
b/main/sw/source/ui/utlui/initui.src
index e27ae98..8a46c31 100644
--- a/main/sw/source/ui/utlui/initui.src
+++ b/main/sw/source/ui/utlui/initui.src
@@ -185,8 +185,8 @@ Resource RID_SW_SHELLRES
{
Text [ en-US ] = "Total editing time" ;
};
- BITMAP BMP_FRAME_ANCHOR { FILE = "anchor.bmp" ; };
- BITMAP BMP_FRAME_DRAG_ANCHOR { FILE = "danchor.bmp" ; };
+ BITMAP BMP_FRAME_ANCHOR { FILE = "anchor.png" ; };
+ BITMAP BMP_FRAME_DRAG_ANCHOR { FILE = "danchor.png" ; };
String STR_PAGEDESC_NAME
{
diff --git a/main/sw/source/ui/utlui/navipi.src
b/main/sw/source/ui/utlui/navipi.src
index 61eb47e..a35dbb1 100644
--- a/main/sw/source/ui/utlui/navipi.src
+++ b/main/sw/source/ui/utlui/navipi.src
@@ -117,7 +117,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_UP ;
- //
ItemBitmap = Bitmap { File = "navup.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navup.png"; };
HelpID = HID_NAVI_TBX2 ;
/* ### ACHTUNG: Neuer Text in Resource?
R�ckw�rts : R�ckw�rts */
Text [ en-US ] = "Back" ;
@@ -125,7 +125,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_DOWN ;
- //
ItemBitmap = Bitmap { File = "navdn.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navdn.png"; };
HelpID = HID_NAVI_TBX3 ;
/* ### ACHTUNG: Neuer Text in Resource?
Vorw�rts : Vorw�rts */
Text [ en-US ] = "Forward" ;
@@ -145,7 +145,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_ITEM_UP ;
- //
ItemBitmap = Bitmap { File = "navchup.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navchup.png"; };
HelpID = HID_NAVI_TBX5 ;
Text [ en-US ] = "Promote Chapter" ;
//HelpText[english_us-wrong] = "Move chapter
down";//"Move chapter up"
@@ -153,7 +153,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_ITEM_DOWN ;
- //
ItemBitmap = Bitmap { File = "navchdn.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navchdn.png"; };
HelpID = HID_NAVI_TBX6 ;
Text [ en-US ] = "Demote Chapter" ;
};
@@ -181,7 +181,7 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_SELECT_SET_AUTO_BOOKMARK ;
HelpID = HID_NAVI_TBX9 ;
- //
ItemBitmap = Bitmap { File = "navstmp.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navstmp.png"; };
Text [ en-US ] = "Set Reminder" ;
};
ToolBoxItem
@@ -191,14 +191,14 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_SELECT_HEADER ;
- //
ItemBitmap = Bitmap { File = "navhead.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navhead.png"; };
HelpID = HID_NAVI_TBX10 ;
Text [ en-US ] = "Header" ;
};
ToolBoxItem
{
Identifier = FN_SELECT_FOOTER ;
- //
ItemBitmap = Bitmap { File = "navfoot.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navfoot.png"; };
HelpID = HID_NAVI_TBX11 ;
/* ### ACHTUNG: Neuer Text in Resource?
Fu�zeile : Fu�zeile */
Text [ en-US ] = "Footer" ;
@@ -207,7 +207,7 @@ Window DLG_NAVIGATION_PI
ToolBoxItem
{
Identifier = FN_SELECT_FOOTNOTE ;
- //
ItemBitmap = Bitmap { File = "navnote.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navnote.png"; };
HelpID = HID_NAVI_TBX12 ;
Text [ en-US ] = "Anchor<->Text" ;
/* ### ACHTUNG: Neuer Text in Resource?
Springen zwischen Fu�notenankern und dem Fu�notentext : Springen zwischen
Fu�notenankern und dem Fu�notentext */
@@ -232,13 +232,13 @@ Window DLG_NAVIGATION_PI
{
Identifier = FN_ITEM_LEFT ;
HelpID = HID_NAVI_TBX14 ;
- //
ItemBitmap = Bitmap { File = "navchlf.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navchlf.png"; };
Text [ en-US ] = "Promote Level" ;
};
ToolBoxItem
{
Identifier = FN_ITEM_RIGHT ;
- //
ItemBitmap = Bitmap { File = "navchrg.bmp"; };
+ //
ItemBitmap = Bitmap { File = "navchrg.png"; };
HelpID = HID_NAVI_TBX15 ;
Text [ en-US ] = "Demote Level" ;
};
diff --git a/main/sw/source/ui/utlui/poolfmt.src
b/main/sw/source/ui/utlui/poolfmt.src
index 94b5589..1304861 100644
--- a/main/sw/source/ui/utlui/poolfmt.src
+++ b/main/sw/source/ui/utlui/poolfmt.src
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,23 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
#include "poolfmt.hrc"
- // -----------------
- // Format-Namen
- // -----------------
+// Character styles
String STR_POOLCHR_FOOTNOTE
{
Text [ en-US ] = "Footnote Characters" ;
@@ -71,7 +70,7 @@ String STR_POOLCHR_ENDNOTE
};
String STR_POOLPAGE_LANDSCAPE
{
- Text [ en-US ] = "Landscape" ;
+ Text [ en-US ] = "Landscape" ;
};
String STR_POOLCHR_LINENUM
{
@@ -79,18 +78,18 @@ String STR_POOLCHR_LINENUM
};
String STR_POOLCHR_IDX_MAIN_ENTRY
{
- Text [ en-US ] = "Main index entry";
+ Text [ en-US ] = "Main index entry" ;
};
String STR_POOLCHR_FOOTNOTE_ANCHOR
{
- Text [ en-US ] = "Footnote anchor";
+ Text [ en-US ] = "Footnote anchor" ;
};
String STR_POOLCHR_ENDNOTE_ANCHOR
{
- Text [ en-US ] = "Endnote anchor";
+ Text [ en-US ] = "Endnote anchor" ;
};
- // Zeichenvorlagen fuer HTML
+// HTML styles
String STR_POOLCHR_HTML_EMPHASIS
{
Text [ en-US ] = "Emphasis" ;
@@ -128,7 +127,7 @@ String STR_POOLCHR_HTML_TELETYPE
Text [ en-US ] = "Teletype" ;
};
-// Rahmenvorlagen
+// Frame styles
String STR_POOLFRM_FRAME
{
Text [ en-US ] = "Frame" ;
@@ -157,9 +156,8 @@ String STR_POOLFRM_LABEL
{
Text [ en-US ] = "Labels" ;
};
- // -----------------
- // Vorlagen-Namen
- // -----------------
+
+// Style names
String STR_POOLCOLL_STANDARD
{
Text [ en-US ] = "Default" ;
@@ -470,7 +468,7 @@ String STR_POOLCOLL_LABEL_FRAME
};
String STR_POOLCOLL_LABEL_DRAWING
{
- Text [ en-US ] = "Drawing";
+ Text [ en-US ] = "Drawing" ;
};
String STR_POOLCOLL_JAKETADRESS
{
@@ -590,35 +588,35 @@ String STR_POOLCOLL_TOX_USER10
};
String STR_POOLCOLL_TOX_ILLUSH
{
- Text [ en-US ] = "Illustration Index Heading";
+ Text [ en-US ] = "Illustration Index Heading" ;
};
String STR_POOLCOLL_TOX_ILLUS1
{
- Text [ en-US ] = "Illustration Index 1";
+ Text [ en-US ] = "Illustration Index 1" ;
};
String STR_POOLCOLL_TOX_OBJECTH
{
- Text [ en-US ] = "Object index heading";
+ Text [ en-US ] = "Object index heading" ;
};
String STR_POOLCOLL_TOX_OBJECT1
{
- Text [ en-US ] = "Object index 1";
+ Text [ en-US ] = "Object index 1" ;
};
String STR_POOLCOLL_TOX_TABLESH
{
- Text [ en-US ] = "Table index heading";
+ Text [ en-US ] = "Table index heading" ;
};
String STR_POOLCOLL_TOX_TABLES1
{
- Text [ en-US ] = "Table index 1";
+ Text [ en-US ] = "Table index 1" ;
};
String STR_POOLCOLL_TOX_AUTHORITIESH
{
- Text [ en-US ] = "Bibliography Heading";
+ Text [ en-US ] = "Bibliography Heading" ;
};
String STR_POOLCOLL_TOX_AUTHORITIES1
{
- Text [ en-US ] = "Bibliography 1";
+ Text [ en-US ] = "Bibliography 1" ;
};
String STR_POOLCOLL_DOC_TITEL
@@ -649,7 +647,8 @@ String STR_POOLCOLL_HTML_DT
{
Text [ en-US ] = "List Heading" ;
};
-//page style names
+
+// Page styles
String STR_POOLPAGE_STANDARD
{
Text [ en-US ] = "Default" ;
@@ -686,9 +685,8 @@ String STR_POOLPAGE_ENDNOTE
{
Text [ en-US ] = "Endnote" ;
};
-/*
- Numerierungs Regeln
-*/
+
+// Numbering Rules
String STR_POOLNUMRULE_NUM1
{
Text [ en-US ] = "Numbering 1" ;
@@ -732,29 +730,31 @@ String STR_POOLNUMRULE_BUL5
String STR_POOLCHR_RUBYTEXT
{
- Text [ en-US ] = "Rubies";
+ Text [ en-US ] = "Rubies" ;
};
String STR_COLUMN_VALUESET_ITEM0
-{
- Text [ en-US ] = "1 column";
+{
+ Text [ en-US ] = "1 column" ;
};
String STR_COLUMN_VALUESET_ITEM1
-{
- Text [ en-US ] = "2 columns with equal size";
+{
+ Text [ en-US ] = "2 columns with equal size" ;
};
String STR_COLUMN_VALUESET_ITEM2
-{
- Text [ en-US ] = "3 columns with equal size";
+{
+ Text [ en-US ] = "3 columns with equal size" ;
};
String STR_COLUMN_VALUESET_ITEM3
-{
- Text [ en-US ] = "2 columns with different size (left > right)";
+{
+ Text [ en-US ] = "2 columns with different size (left > right)" ;
};
String STR_COLUMN_VALUESET_ITEM4
-{
- Text [ en-US ] = "2 columns with different size (left < right)";
+{
+ Text [ en-US ] = "2 columns with different size (left < right)" ;
};
String STR_POOLCHR_VERT_NUM
{
- Text [ en-US ] = "Vertical Numbering Symbols";
+ Text [ en-US ] = "Vertical Numbering Symbols" ;
};
+
+// ********************************************************************** EOF
diff --git a/main/uui/source/cookiedg.src b/main/uui/source/cookiedg.src
index 7e434d5..22787ae 100644
--- a/main/uui/source/cookiedg.src
+++ b/main/uui/source/cookiedg.src
@@ -43,7 +43,7 @@ ModalDialog DLG_COOKIES
Hide = TRUE ;
Fixed = Bitmap
{
- File = "cookie.bmp" ;
+ File = "cookie.png" ;
};
};
FixedText FT_COOKIES
diff --git a/main/xmlsecurity/source/dialogs/macrosecurity.src
b/main/xmlsecurity/source/dialogs/macrosecurity.src
index c0470e8..7b19134 100644
--- a/main/xmlsecurity/source/dialogs/macrosecurity.src
+++ b/main/xmlsecurity/source/dialogs/macrosecurity.src
@@ -231,7 +231,7 @@ Image RID_XMLSECTP_LOCK
{
ImageBitmap = Bitmap
{
- File = "lock.bmp";
+ File = "lock.png";
};
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
@@ -239,7 +239,7 @@ Image RID_XMLSECTP_LOCK_HC
{
ImageBitmap = Bitmap
{
- File = "lock_hc.bmp";
+ File = "lock_hc.png";
};
MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
};
