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 2022/12/25 09:32:39 UTC
[openoffice] branch AOO42X updated (18ec844f88 -> f98c8c9fb5)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 18ec844f88 Changes required w/ AOO42X and trunk
new e614db4a8b Bump up revision after tagging Dev4
new f98c8c9fb5 Temporary fix for issue 128546
The 2 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:
main/setup_native/source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/inc/minor.mk | 6 +++---
main/svx/source/sidebar/text/TextPropertyPanel.src | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
[openoffice] 01/02: Bump up revision after tagging Dev4
Posted by ms...@apache.org.
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
commit e614db4a8b33b3b95f1f92f547ed77c498e952c3
Author: mseidel <ms...@apache.org>
AuthorDate: Fri Dec 23 14:48:51 2022 +0100
Bump up revision after tagging Dev4
---
main/setup_native/source/win32/nsis/downloadtemplate.nsi | 2 +-
main/solenv/inc/minor.mk | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/setup_native/source/win32/nsis/downloadtemplate.nsi b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
index 4592d61b2a..1393e3130b 100644
--- a/main/setup_native/source/win32/nsis/downloadtemplate.nsi
+++ b/main/setup_native/source/win32/nsis/downloadtemplate.nsi
@@ -9,7 +9,7 @@ VIAddVersionKey CompanyName "Apache Software Foundation"
VIAddVersionKey LegalCopyright "(c) 2012-2022 The Apache Software Foundation"
VIAddVersionKey FileDescription "Apache PRODUCTNAMEPLACEHOLDER Installer"
VIAddVersionKey ProductVersion "PRODUCTVERSIONPLACEHOLDER"
-VIProductVersion "4.2.9823.500"
+VIProductVersion "4.2.9824.500"
; Enable Unicode
Unicode true
diff --git a/main/solenv/inc/minor.mk b/main/solenv/inc/minor.mk
index de1ff097e5..40be5ff465 100644
--- a/main/solenv/inc/minor.mk
+++ b/main/solenv/inc/minor.mk
@@ -21,7 +21,7 @@
# $Id$
RSCVERSION=420
-RSCREVISION=420m4(Build:9823)
-BUILD=9823
-LAST_MINOR=m4
+RSCREVISION=420m5(Build:9824)
+BUILD=9824
+LAST_MINOR=m5
SOURCEVERSION=AOO420
[openoffice] 02/02: Temporary fix for issue 128546
Posted by ms...@apache.org.
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
commit f98c8c9fb533e52d336e63fe0780036e8b7997d8
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Dec 22 17:28:33 2022 +0100
Temporary fix for issue 128546
(cherry picked from commit d9c7a900a20cf65441c562efd7b0803b10dc7af7)
---
main/svx/source/sidebar/text/TextPropertyPanel.src | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.src b/main/svx/source/sidebar/text/TextPropertyPanel.src
index 39fcea2126..cb56060544 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.src
@@ -43,7 +43,7 @@ Control RID_SIDEBAR_TEXT_PANEL
TabStop = TRUE ;
DropDown = TRUE ;
HelpID = HID_COMBO_FONT_NAME ;
- QuickHelpText [ en-US ] = "Font" ;
+ QuickHelpText [ en-US ] = "Font Name" ;
// Command = ".uno:CharFontName" ;
};
MetricBox MB_SBFONT_FONTSIZE
@@ -513,7 +513,7 @@ Control RID_POPUPPANEL_TEXTPAGE_SPACING
ListBox LB_KERNING
{
Border = TRUE ;
- Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL ); // 20
+ Pos = MAP_APPFONT ( CUSTOM_X + POPUPPANEL_MARGIN_LARGE, CUSTOM_Y + POPUPPANEL_MARGIN_LARGE + TEXT_HEIGHT + POPUPPANEL_MARGIN_SMALL ) ; // 20
Size = MAP_APPFONT ( CUSTOM_WIDTH - POPUPPANEL_MARGIN_LARGE * 2, 80 ) ;
TabStop = TRUE ;
DropDown = TRUE ;