You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/01/04 00:03:54 UTC
[openoffice] branch AOO41X updated (8bd01b408c -> 3e4cee8e79)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 8bd01b408c Align graphics in StartCenter
new 5cadf9ee3a Cleaned up resource file, removed whitespace
new 9cced779e2 Unifying dimensions and names for StartCenter graphics
new 3e4cee8e79 Add the "'" entity definition to our HTML parser, so that we can correctly read it and convert it a "'", but when writing to HTML write out the "'" directly for now.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../framework/res/addtemplate_32_hc.png | Bin 0 -> 309 bytes
.../res/{extension.png => extension_32.png} | Bin
.../framework/res/extension_32_hc.png | Bin 0 -> 409 bytes
main/default_images/framework/res/extension_hc.png | Bin 205 -> 0 bytes
.../framework/res/{info_26.png => info_32.png} | Bin
main/default_images/framework/res/info_32_hc.png | Bin 0 -> 268 bytes
main/default_images/framework/res/info_hc.png | Bin 3649 -> 0 bytes
.../framework/res/register_32_hc.png | Bin 0 -> 342 bytes
main/default_images/framework/res/register_hc.png | Bin 3729 -> 0 bytes
main/default_images/framework/res/template_hc.png | Bin 3703 -> 0 bytes
main/framework/source/services/fwk_services.src | 371 +++++++++++----------
main/svtools/inc/svtools/htmlkywd.hxx | 1 +
main/svtools/source/svhtml/htmlkywd.cxx | 1 +
13 files changed, 188 insertions(+), 185 deletions(-)
create mode 100644 main/default_images/framework/res/addtemplate_32_hc.png
rename main/default_images/framework/res/{extension.png => extension_32.png} (100%)
create mode 100644 main/default_images/framework/res/extension_32_hc.png
delete mode 100644 main/default_images/framework/res/extension_hc.png
rename main/default_images/framework/res/{info_26.png => info_32.png} (100%)
create mode 100644 main/default_images/framework/res/info_32_hc.png
delete mode 100644 main/default_images/framework/res/info_hc.png
create mode 100644 main/default_images/framework/res/register_32_hc.png
delete mode 100644 main/default_images/framework/res/register_hc.png
delete mode 100644 main/default_images/framework/res/template_hc.png
[openoffice] 02/03: Unifying dimensions and names for StartCenter graphics
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9cced779e24a5d41ee1a9320f8ee6ed63631052e
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Jan 4 00:53:31 2023 +0100
Unifying dimensions and names for StartCenter graphics
(cherry picked from commit 67a4a8ddd19f16733c2e09c8b39e7b8330d5fc6b)
---
main/default_images/framework/res/addtemplate_32_hc.png | Bin 0 -> 309 bytes
.../framework/res/{extension.png => extension_32.png} | Bin
main/default_images/framework/res/extension_32_hc.png | Bin 0 -> 409 bytes
main/default_images/framework/res/extension_hc.png | Bin 205 -> 0 bytes
.../framework/res/{info_26.png => info_32.png} | Bin
main/default_images/framework/res/info_32_hc.png | Bin 0 -> 268 bytes
main/default_images/framework/res/info_hc.png | Bin 3649 -> 0 bytes
main/default_images/framework/res/register_32_hc.png | Bin 0 -> 342 bytes
main/default_images/framework/res/register_hc.png | Bin 3729 -> 0 bytes
main/default_images/framework/res/template_hc.png | Bin 3703 -> 0 bytes
main/framework/source/services/fwk_services.src | 12 ++++++------
11 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/default_images/framework/res/addtemplate_32_hc.png b/main/default_images/framework/res/addtemplate_32_hc.png
new file mode 100644
index 0000000000..a70a8c5c8f
Binary files /dev/null and b/main/default_images/framework/res/addtemplate_32_hc.png differ
diff --git a/main/default_images/framework/res/extension.png b/main/default_images/framework/res/extension_32.png
similarity index 100%
rename from main/default_images/framework/res/extension.png
rename to main/default_images/framework/res/extension_32.png
diff --git a/main/default_images/framework/res/extension_32_hc.png b/main/default_images/framework/res/extension_32_hc.png
new file mode 100644
index 0000000000..4cc5240f4a
Binary files /dev/null and b/main/default_images/framework/res/extension_32_hc.png differ
diff --git a/main/default_images/framework/res/extension_hc.png b/main/default_images/framework/res/extension_hc.png
deleted file mode 100644
index 18887f7ea5..0000000000
Binary files a/main/default_images/framework/res/extension_hc.png and /dev/null differ
diff --git a/main/default_images/framework/res/info_26.png b/main/default_images/framework/res/info_32.png
similarity index 100%
rename from main/default_images/framework/res/info_26.png
rename to main/default_images/framework/res/info_32.png
diff --git a/main/default_images/framework/res/info_32_hc.png b/main/default_images/framework/res/info_32_hc.png
new file mode 100644
index 0000000000..5950596697
Binary files /dev/null and b/main/default_images/framework/res/info_32_hc.png differ
diff --git a/main/default_images/framework/res/info_hc.png b/main/default_images/framework/res/info_hc.png
deleted file mode 100644
index 2e6978d6b3..0000000000
Binary files a/main/default_images/framework/res/info_hc.png and /dev/null differ
diff --git a/main/default_images/framework/res/register_32_hc.png b/main/default_images/framework/res/register_32_hc.png
new file mode 100644
index 0000000000..eddb5010d3
Binary files /dev/null and b/main/default_images/framework/res/register_32_hc.png differ
diff --git a/main/default_images/framework/res/register_hc.png b/main/default_images/framework/res/register_hc.png
deleted file mode 100644
index ae11037077..0000000000
Binary files a/main/default_images/framework/res/register_hc.png and /dev/null differ
diff --git a/main/default_images/framework/res/template_hc.png b/main/default_images/framework/res/template_hc.png
deleted file mode 100644
index 33afbfb768..0000000000
Binary files a/main/default_images/framework/res/template_hc.png and /dev/null differ
diff --git a/main/framework/source/services/fwk_services.src b/main/framework/source/services/fwk_services.src
index 09960e0682..817f113e1a 100644
--- a/main/framework/source/services/fwk_services.src
+++ b/main/framework/source/services/fwk_services.src
@@ -91,7 +91,7 @@ Resource RES_BACKING_IMAGES
};
Bitmap BMP_BACKING_EXT
{
- File = "extension.png" ;
+ File = "extension_32.png" ;
};
Bitmap BMP_BACKING_REG
{
@@ -99,7 +99,7 @@ Resource RES_BACKING_IMAGES
};
Bitmap BMP_BACKING_INFO
{
- File = "info_26.png" ;
+ File = "info_32.png" ;
};
Bitmap BMP_BACKING_TPLREP
{
@@ -163,19 +163,19 @@ Resource RES_BACKING_IMAGES_HC
};
Bitmap BMP_BACKING_EXT
{
- File = "extension_hc.png" ;
+ File = "extension_32_hc.png" ;
};
Bitmap BMP_BACKING_REG
{
- File = "register_hc.png" ;
+ File = "register_32_hc.png" ;
};
Bitmap BMP_BACKING_INFO
{
- File = "info_hc.png" ;
+ File = "info_32_hc.png" ;
};
Bitmap BMP_BACKING_TPLREP
{
- File = "template_hc.png" ;
+ File = "addtemplate_32_hc.png" ;
};
Bitmap BMP_BACKING_WRITER
{
[openoffice] 01/03: Cleaned up resource file, removed whitespace
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 5cadf9ee3a22bebf2c36285e51e67139f22455f5
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Jun 11 00:45:22 2022 +0200
Cleaned up resource file, removed whitespace
(cherry picked from commit d42a595daaa6d99342c3923b65ea5204784cb7d0)
---
main/framework/source/services/fwk_services.src | 371 ++++++++++++------------
1 file changed, 186 insertions(+), 185 deletions(-)
diff --git a/main/framework/source/services/fwk_services.src b/main/framework/source/services/fwk_services.src
index 5a1d17f8f7..09960e0682 100644
--- a/main/framework/source/services/fwk_services.src
+++ b/main/framework/source/services/fwk_services.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,16 +7,16 @@
* 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.
- *
+ *
*************************************************************/
@@ -25,199 +25,200 @@
Window DLG_BACKING
{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Border = FALSE;
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ Border = FALSE ;
- String STR_BACKING_WELCOME
- {
- Text [ en-US ] = "Welcome to";
- };
- String STR_BACKING_WELCOMEPRODUCT
- {
- Text [ en-US ] = "%PRODUCTNAME";
- };
- String STR_BACKING_CREATE
- {
- Text [ en-US ] = "Create a new document";
- };
- String STR_BACKING_TEMPLATE
- {
- Text [ en-US ] = "~Templates...";
- };
- String STR_BACKING_FILE
- {
- Text [ en-US ] = "~Open...";
- };
- String STR_BACKING_EXTHELP
- {
- Text [ en-US ] = "Add new features to %PRODUCTNAME";
- };
- String STR_BACKING_REGHELP
- {
- Text [ en-US ] = "Register your %PRODUCTNAME";
- };
- String STR_BACKING_INFOHELP
- {
- Text [ en-US ] = "Get more information about %PRODUCTNAME";
- };
- String STR_BACKING_TPLREP
- {
- Text [ en-US ] = "Get more templates for %PRODUCTNAME";
- };
+ String STR_BACKING_WELCOME
+ {
+ Text [ en-US ] = "Welcome to" ;
+ };
+ String STR_BACKING_WELCOMEPRODUCT
+ {
+ Text [ en-US ] = "%PRODUCTNAME" ;
+ };
+ String STR_BACKING_CREATE
+ {
+ Text [ en-US ] = "Create a new document" ;
+ };
+ String STR_BACKING_TEMPLATE
+ {
+ Text [ en-US ] = "~Templates..." ;
+ };
+ String STR_BACKING_FILE
+ {
+ Text [ en-US ] = "~Open..." ;
+ };
+ String STR_BACKING_EXTHELP
+ {
+ Text [ en-US ] = "Add new features to %PRODUCTNAME" ;
+ };
+ String STR_BACKING_REGHELP
+ {
+ Text [ en-US ] = "Register your %PRODUCTNAME" ;
+ };
+ String STR_BACKING_INFOHELP
+ {
+ Text [ en-US ] = "Get more information about %PRODUCTNAME" ;
+ };
+ String STR_BACKING_TPLREP
+ {
+ Text [ en-US ] = "Get more templates for %PRODUCTNAME" ;
+ };
};
Resource RES_BACKING_IMAGES
{
- Bitmap BMP_BACKING_BACKGROUND_LEFT
- {
- File = "backing.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_MIDDLE
- {
- File = "backing_space.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RIGHT
- {
- File = "backing_right.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
- {
- File = "backing_rtl_left.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
- {
- File = "backing_rtl_right.png";
- };
- Bitmap BMP_BACKING_EXT
- {
- File = "extension.png";
- };
- Bitmap BMP_BACKING_REG
- {
- File = "register_32.png";
- };
- Bitmap BMP_BACKING_INFO
- {
- File = "info_26.png";
- };
- Bitmap BMP_BACKING_TPLREP
- {
- File = "addtemplate_32.png";
- };
- Bitmap BMP_BACKING_WRITER
- {
- File = "odt_32.png";
- };
- Bitmap BMP_BACKING_CALC
- {
- File = "ods_32.png";
- };
- Bitmap BMP_BACKING_IMPRESS
- {
- File = "odp_32.png";
- };
- Bitmap BMP_BACKING_DRAW
- {
- File = "odg_32.png";
- };
- Bitmap BMP_BACKING_DATABASE
- {
- File = "odb_32.png";
- };
- Bitmap BMP_BACKING_FORMULA
- {
- File = "odf_32.png";
- };
- Bitmap BMP_BACKING_OPENFILE
- {
- File = "folder_32.png";
- };
- Bitmap BMP_BACKING_OPENTEMPLATE
- {
- File = "templates_32.png";
- };
+ Bitmap BMP_BACKING_BACKGROUND_LEFT
+ {
+ File = "backing.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_MIDDLE
+ {
+ File = "backing_space.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RIGHT
+ {
+ File = "backing_right.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
+ {
+ File = "backing_rtl_left.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
+ {
+ File = "backing_rtl_right.png" ;
+ };
+ Bitmap BMP_BACKING_EXT
+ {
+ File = "extension.png" ;
+ };
+ Bitmap BMP_BACKING_REG
+ {
+ File = "register_32.png" ;
+ };
+ Bitmap BMP_BACKING_INFO
+ {
+ File = "info_26.png" ;
+ };
+ Bitmap BMP_BACKING_TPLREP
+ {
+ File = "addtemplate_32.png" ;
+ };
+ Bitmap BMP_BACKING_WRITER
+ {
+ File = "odt_32.png" ;
+ };
+ Bitmap BMP_BACKING_CALC
+ {
+ File = "ods_32.png" ;
+ };
+ Bitmap BMP_BACKING_IMPRESS
+ {
+ File = "odp_32.png" ;
+ };
+ Bitmap BMP_BACKING_DRAW
+ {
+ File = "odg_32.png" ;
+ };
+ Bitmap BMP_BACKING_DATABASE
+ {
+ File = "odb_32.png" ;
+ };
+ Bitmap BMP_BACKING_FORMULA
+ {
+ File = "odf_32.png" ;
+ };
+ Bitmap BMP_BACKING_OPENFILE
+ {
+ File = "folder_32.png" ;
+ };
+ Bitmap BMP_BACKING_OPENTEMPLATE
+ {
+ File = "templates_32.png" ;
+ };
};
Resource RES_BACKING_IMAGES_HC
{
- Bitmap BMP_BACKING_BACKGROUND_LEFT
- {
- File = "backing_hc.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_MIDDLE
- {
- File = "backing_space_hc.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RIGHT
- {
- File = "backing_right_hc.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
- {
- File = "backing_rtl_left_hc.png";
- };
- Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
- {
- File = "backing_rtl_right_hc.png";
- };
- Bitmap BMP_BACKING_EXT
- {
- File = "extension_hc.png";
- };
- Bitmap BMP_BACKING_REG
- {
- File = "register_hc.png";
- };
- Bitmap BMP_BACKING_INFO
- {
- File = "info_hc.png";
- };
- Bitmap BMP_BACKING_TPLREP
- {
- File = "template_hc.png";
- };
- Bitmap BMP_BACKING_WRITER
- {
- File = "odt_32_hc.png";
- };
- Bitmap BMP_BACKING_CALC
- {
- File = "ods_32_hc.png";
- };
- Bitmap BMP_BACKING_IMPRESS
- {
- File = "odp_32_hc.png";
- };
- Bitmap BMP_BACKING_DRAW
- {
- File = "odg_32_hc.png";
- };
- Bitmap BMP_BACKING_DATABASE
- {
- File = "odb_32_hc.png";
- };
- Bitmap BMP_BACKING_FORMULA
- {
- File = "odf_32_hc.png";
- };
- Bitmap BMP_BACKING_OPENFILE
- {
- File = "folder_32_hc.png";
- };
- Bitmap BMP_BACKING_OPENTEMPLATE
- {
- File = "templates_32_hc.png";
- };
+ Bitmap BMP_BACKING_BACKGROUND_LEFT
+ {
+ File = "backing_hc.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_MIDDLE
+ {
+ File = "backing_space_hc.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RIGHT
+ {
+ File = "backing_right_hc.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RTL_LEFT
+ {
+ File = "backing_rtl_left_hc.png" ;
+ };
+ Bitmap BMP_BACKING_BACKGROUND_RTL_RIGHT
+ {
+ File = "backing_rtl_right_hc.png" ;
+ };
+ Bitmap BMP_BACKING_EXT
+ {
+ File = "extension_hc.png" ;
+ };
+ Bitmap BMP_BACKING_REG
+ {
+ File = "register_hc.png" ;
+ };
+ Bitmap BMP_BACKING_INFO
+ {
+ File = "info_hc.png" ;
+ };
+ Bitmap BMP_BACKING_TPLREP
+ {
+ File = "template_hc.png" ;
+ };
+ Bitmap BMP_BACKING_WRITER
+ {
+ File = "odt_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_CALC
+ {
+ File = "ods_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_IMPRESS
+ {
+ File = "odp_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_DRAW
+ {
+ File = "odg_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_DATABASE
+ {
+ File = "odb_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_FORMULA
+ {
+ File = "odf_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_OPENFILE
+ {
+ File = "folder_32_hc.png" ;
+ };
+ Bitmap BMP_BACKING_OPENTEMPLATE
+ {
+ File = "templates_32_hc.png" ;
+ };
};
Window WIN_TABWINDOW
{
- OutputSize = TRUE ;
- SVLook = TRUE ;
- TabControl TC_TABCONTROL
- {
- OutputSize = TRUE ;
- };
+ OutputSize = TRUE ;
+ SVLook = TRUE ;
+ TabControl TC_TABCONTROL
+ {
+ OutputSize = TRUE ;
+ };
};
+// ********************************************************************** EOF
[openoffice] 03/03: Add the "'" entity definition to our HTML parser, so that we can correctly read it and convert it a "'", but when writing to HTML write out the "'" directly for now.
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 3e4cee8e792e2b0ceced47872f3819d43f0c36ff
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Tue Jan 3 08:41:13 2023 +0200
Add the "'" entity definition to our HTML parser, so that we can correctly
read it and convert it a "'", but when writing to HTML write out the "'"
directly for now.
Fixes: https://bz.apache.org/ooo/show_bug.cgi?id=80657
Patch by: me
(cherry picked from commit 3304210c5c53f441cdb2c462fbbf6d8351380b01)
---
main/svtools/inc/svtools/htmlkywd.hxx | 1 +
main/svtools/source/svhtml/htmlkywd.cxx | 1 +
2 files changed, 2 insertions(+)
diff --git a/main/svtools/inc/svtools/htmlkywd.hxx b/main/svtools/inc/svtools/htmlkywd.hxx
index ff11057f1a..5ec2e37c79 100644
--- a/main/svtools/inc/svtools/htmlkywd.hxx
+++ b/main/svtools/inc/svtools/htmlkywd.hxx
@@ -182,6 +182,7 @@
#define OOO_STRING_SVTOOLS_HTML_C_lt "lt"
#define OOO_STRING_SVTOOLS_HTML_C_gt "gt"
#define OOO_STRING_SVTOOLS_HTML_C_amp "amp"
+#define OOO_STRING_SVTOOLS_HTML_C_apos "apos"
#define OOO_STRING_SVTOOLS_HTML_C_quot "quot"
#define OOO_STRING_SVTOOLS_HTML_C_Aacute "Aacute"
#define OOO_STRING_SVTOOLS_HTML_C_Agrave "Agrave"
diff --git a/main/svtools/source/svhtml/htmlkywd.cxx b/main/svtools/source/svhtml/htmlkywd.cxx
index 24b3160009..7554343ec6 100644
--- a/main/svtools/source/svhtml/htmlkywd.cxx
+++ b/main/svtools/source/svhtml/htmlkywd.cxx
@@ -278,6 +278,7 @@ static HTML_CharEntry __FAR_DATA aHTMLCharNameTab[] = {
{{OOO_STRING_SVTOOLS_HTML_C_lt}, 60},
{{OOO_STRING_SVTOOLS_HTML_C_gt}, 62},
{{OOO_STRING_SVTOOLS_HTML_C_amp}, 38},
+ {{OOO_STRING_SVTOOLS_HTML_C_apos}, 39},
{{OOO_STRING_SVTOOLS_HTML_C_quot}, 34},
{{OOO_STRING_SVTOOLS_HTML_C_Agrave}, 192},