core.git: Branch 'libreoffice-24-8' - include/svx sc/source solenv/sanitizers
include/svx/strings.hrc |2 +-
sc/source/ui/sidebar/CellBorderStyleControl.cxx |1 -
solenv/sanitizers/ui/modules/scalc.suppr|3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 9b2d11fcdcdc5f75caf3e7645f795011afd4aef2
Author: Kira Tubo
AuthorDate: Thu Jun 20 16:01:24 2024 -0700
Commit: Xisco Fauli
CommitDate: Fri Jun 21 14:02:25 2024 +0200
tdf#146468: Fix typo and move comments
Fix typo on variable RID_SVXSTR_TABLE_PRESET_OUTER and move comments
about consolidating border tooltip strings to
solenv/sanitizers/ui/modules/scalc.suppr
See comments on Gerrit for more information:
https://gerrit.libreoffice.org/c/core/+/169052
Change-Id: Ic5283e568e13023242858850dbce8922e2c80d8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169308
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169329
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index cf3c12e12a4e..8c61f7714e09 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,7 @@
// strings related to borders
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_OUTER", "Outer Border") // Sidebar/toolbar
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 12ac05d23794..f8e792ee183b 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -64,7 +64,6 @@ CellBorderStylePopup::~CellBorderStylePopup()
void CellBorderStylePopup::Initialize()
{
-// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
mxTBBorder1->connect_clicked ( LINK(this, CellBorderStylePopup,
TB1SelectHdl) );
mxTBBorder1->set_item_tooltip_text(0,
SvxResId(RID_SVXSTR_TABLE_PRESET_NONE));
mxTBBorder1->set_item_tooltip_text(1,
SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERALL));
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index 83df53230a57..e2e164de3b01 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -45,6 +45,8 @@
sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] orph
sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label
sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
+
+// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='none']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='all']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='outside']
button-no-label
@@ -61,6 +63,7 @@
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagup'] button
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagdown']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topbottom']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='leftright']
button-no-label
+
sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message']
orphan-label
sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM']
orphan-label
core.git: Branch 'libreoffice-24-8' - cui/source include/svx sc/source sc/uiconfig solenv/sanitizers svx/source
cui/source/tabpages/border.cxx |4 ++--
include/svx/strings.hrc | 22 +++---
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 20
sc/uiconfig/scalc/ui/floatingborderstyle.ui | 16
solenv/sanitizers/ui/modules/scalc.suppr| 16
svx/source/tbxctrls/tbcontrl.cxx|8
6 files changed, 57 insertions(+), 29 deletions(-)
New commits:
commit 4ab9fea75f552dcaa52e1c25d2bc841e965e0b4e
Author: Kira Tubo
AuthorDate: Sun Jun 16 23:22:11 2024 -0700
Commit: Xisco Fauli
CommitDate: Fri Jun 21 13:29:27 2024 +0200
tdf#146468: Match border tooltips in toolbar/sidebar
Update the border tooltips within Calc's toolbar and sidebar so that they
have matching descriptions.
Also update tooltips in Writer toolbar so that descriptions match across
both apps.
Change-Id: Ib7c682ed5035fe61d991209c4f2cf7f0a1a08a5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169052
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Stéphane Guillou
Signed-off-by: Xisco Fauli
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169328
Reviewed-by: Michael Weghorn
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index fe07cc5d8221..330f8f77aa17 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1377,8 +1377,8 @@ TranslateId SvxBorderTabPage::GetPresetStringId(
sal_uInt16 nValueSetIdx ) const
{
RID_SVXSTR_TABLE_PRESET_NONE,
RID_SVXSTR_PARA_PRESET_ALL,
-RID_SVXSTR_PARA_PRESET_LEFTRIGHT,
-RID_SVXSTR_PARA_PRESET_TOPBOTTOM,
+RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT,
+RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM,
RID_SVXSTR_PARA_PRESET_ONLYLEFT,
RID_SVXSTR_PARA_PRESET_DIAGONAL,
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2b46e77b6b66..cf3c12e12a4e 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,8 @@
// strings related to borders
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERVERI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERVERI", "Outer Border and Vertical Lines")
@@ -1821,15 +1822,22 @@
#define RID_SVXSTR_PARA_PRESET_DIAGONALUP
NC_("RID_SVXSTR_PARA_PRESET_DIAGONALUP", "Diagonal Up Border")
#define RID_SVXSTR_PARA_PRESET_CRISSCROSS
NC_("RID_SVXSTR_PARA_PRESET_CRISSCROSS", "Criss-Cross Border")
#define RID_SVXSTR_PARA_PRESET_ALL
NC_("RID_SVXSTR_PARA_PRESET_ALL", "All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT", "Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM", "Top and Bottom Borders Only")
#define RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI", "Top and Bottom Borders, and All
Horizontal Lines")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT
NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYTOP
NC_("RID_SVXSTR_
core.git: include/svx sc/source solenv/sanitizers
include/svx/strings.hrc |2 +-
sc/source/ui/sidebar/CellBorderStyleControl.cxx |1 -
solenv/sanitizers/ui/modules/scalc.suppr|3 +++
3 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit e5c55b2cfc47dcc5b711811fedc75ee982e3d46e
Author: Kira Tubo
AuthorDate: Thu Jun 20 16:01:24 2024 -0700
Commit: Michael Weghorn
CommitDate: Fri Jun 21 07:40:37 2024 +0200
tdf#146468: Fix typo and move comments
Fix typo on variable RID_SVXSTR_TABLE_PRESET_OUTER and move comments
about consolidating border tooltip strings to
solenv/sanitizers/ui/modules/scalc.suppr
See comments on Gerrit for more information:
https://gerrit.libreoffice.org/c/core/+/169052
Change-Id: Ic5283e568e13023242858850dbce8922e2c80d8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169308
Reviewed-by: Michael Weghorn
Tested-by: Jenkins
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index cf3c12e12a4e..8c61f7714e09 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,7 @@
// strings related to borders
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_OUTER", "Outer Border") // Sidebar/toolbar
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 12ac05d23794..f8e792ee183b 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -64,7 +64,6 @@ CellBorderStylePopup::~CellBorderStylePopup()
void CellBorderStylePopup::Initialize()
{
-// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
mxTBBorder1->connect_clicked ( LINK(this, CellBorderStylePopup,
TB1SelectHdl) );
mxTBBorder1->set_item_tooltip_text(0,
SvxResId(RID_SVXSTR_TABLE_PRESET_NONE));
mxTBBorder1->set_item_tooltip_text(1,
SvxResId(RID_SVXSTR_TABLE_PRESET_OUTERALL));
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr
b/solenv/sanitizers/ui/modules/scalc.suppr
index 83df53230a57..e2e164de3b01 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -45,6 +45,8 @@
sc/uiconfig/scalc/ui/definedatabaserangedialog.ui://GtkLabel[@id='invalid'] orph
sc/uiconfig/scalc/ui/definename.ui://GtkLabel[@id='label'] orphan-label
sc/uiconfig/scalc/ui/doubledialog.ui://GtkEntry[@id='value'] no-labelled-by
sc/uiconfig/scalc/ui/externaldata.ui://GtkLabel[@id='secondsft'] orphan-label
+
+// Tooltip values now controlled in svx/strings.hrc instead of
sc/uiconfig/scalc/ui/floatingborderstyle.ui
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='none']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='all']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='outside']
button-no-label
@@ -61,6 +63,7 @@
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagup'] button
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='diagdown']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='topbottom']
button-no-label
sc/uiconfig/scalc/ui/floatingborderstyle.ui://GtkToolButton[@id='leftright']
button-no-label
+
sc/uiconfig/scalc/ui/fourieranalysisdialog.ui://GtkLabel[@id='error-message']
orphan-label
sc/uiconfig/scalc/ui/groupbynumber.ui://GtkEntry[@id='edit_by'] no-labelled-by
sc/uiconfig/scalc/ui/headerfootercontent.ui://GtkLabel[@id='labelFT_H_CUSTOM']
orphan-label
core.git: cui/source include/svx sc/source sc/uiconfig solenv/sanitizers svx/source
cui/source/tabpages/border.cxx |4 ++--
include/svx/strings.hrc | 22 +++---
sc/source/ui/sidebar/CellBorderStyleControl.cxx | 20
sc/uiconfig/scalc/ui/floatingborderstyle.ui | 16
solenv/sanitizers/ui/modules/scalc.suppr| 16
svx/source/tbxctrls/tbcontrl.cxx|8
6 files changed, 57 insertions(+), 29 deletions(-)
New commits:
commit 14231e45ce5c8f2615fc5a448479960dfe1ed22b
Author: Kira Tubo
AuthorDate: Sun Jun 16 23:22:11 2024 -0700
Commit: Heiko Tietze
CommitDate: Thu Jun 20 09:11:16 2024 +0200
tdf#146468: Match border tooltips in toolbar/sidebar
Update the border tooltips within Calc's toolbar and sidebar so that they
have matching descriptions.
Also update tooltips in Writer toolbar so that descriptions match across
both apps.
Change-Id: Ib7c682ed5035fe61d991209c4f2cf7f0a1a08a5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169052
Tested-by: Jenkins
Reviewed-by: Heiko Tietze
Reviewed-by: Stéphane Guillou
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index fe07cc5d8221..330f8f77aa17 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -1377,8 +1377,8 @@ TranslateId SvxBorderTabPage::GetPresetStringId(
sal_uInt16 nValueSetIdx ) const
{
RID_SVXSTR_TABLE_PRESET_NONE,
RID_SVXSTR_PARA_PRESET_ALL,
-RID_SVXSTR_PARA_PRESET_LEFTRIGHT,
-RID_SVXSTR_PARA_PRESET_TOPBOTTOM,
+RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT,
+RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM,
RID_SVXSTR_PARA_PRESET_ONLYLEFT,
RID_SVXSTR_PARA_PRESET_DIAGONAL,
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 2b46e77b6b66..cf3c12e12a4e 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1811,7 +1811,8 @@
// strings related to borders
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "No Borders")
-#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only")
+#define RID_SVXSTR_TABLE_PRESET_OUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border") // Sidebar/toolbar
+#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Outer Border Only") // Format dialog
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Outer Border and Horizontal Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERALL
NC_("RID_SVXSTR_TABLE_PRESET_OUTERALL", "Outer Border and All Inner Lines")
#define RID_SVXSTR_TABLE_PRESET_OUTERVERI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERVERI", "Outer Border and Vertical Lines")
@@ -1821,15 +1822,22 @@
#define RID_SVXSTR_PARA_PRESET_DIAGONALUP
NC_("RID_SVXSTR_PARA_PRESET_DIAGONALUP", "Diagonal Up Border")
#define RID_SVXSTR_PARA_PRESET_CRISSCROSS
NC_("RID_SVXSTR_PARA_PRESET_CRISSCROSS", "Criss-Cross Border")
#define RID_SVXSTR_PARA_PRESET_ALL
NC_("RID_SVXSTR_PARA_PRESET_ALL", "All Four Borders")
-#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders Only")
-#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders Only")
+#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_LEFTRIGHT", "Left and Right Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFTRIGHT", "Left and Right Borders Only")
+#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOM", "Top and Bottom Borders")
+#define RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM
NC_("RID_SVXSTR_PARA_PRESET_ONLYTOPBOTTOM", "Top and Bottom Borders Only")
#define RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI
NC_("RID_SVXSTR_PARA_PRESET_TOPBOTTOMHORI", "Top and Bottom Borders, and All
Horizontal Lines")
-#define RID_SVXSTR_PARA_PRESET_ONLYLEFT
NC_("RID_SVXSTR_PARA_PRESET_ONLYLEFT", "Left Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYRIGHT
NC_("RID_SVXSTR_PARA_PRESET_ONLYRIGHT", "Right Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYTOP
NC_("RID_SVXSTR_PARA_PRESET_ONLYTOP", "Top Border Only")
-#define RID_SVXSTR_PARA_PRESET_ONLYTBOTTOM
NC_("RID_SVXSTR_PARA_PRES
core.git: sw/qa
sw/qa/extras/unowriter/unowriter.cxx | 91 +++
1 file changed, 91 insertions(+)
New commits:
commit 59540d082f4f2ef72b3b8728f5fa2ec8a1bb4fa0
Author: Kira Tubo
AuthorDate: Wed May 8 18:40:52 2024 -0700
Commit: Xisco Fauli
CommitDate: Wed Jun 19 13:00:09 2024 +0200
tdf#62603: sw unit test: replace string mix font style
Test to see if font style is retained when performing find/replace on
strings containing mixed font style/sizes.
1) For example, with a doc containing the string: "test
- Normal font: "
- Italic font: test
2) Search for: "t (this contains both normal and italic font)
3) Replace with: "gu
4) Resulting string should be: "guest
- Normal font: "
- Italic font: guest
An additional test has been added to test for changes in font sizes (per
comment 24).
Change-Id: I957077efbcced0b981c31d0e547299e12a61609b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168486
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index d1f8fce4dd0c..cf10599b85ad 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -805,6 +805,97 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter,
testSelectionInTableEnumEnd)
CPPUNIT_ASSERT(!xEnum->hasMoreElements());
}
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf62603)
+{
+// Unit test for tdf#62603
+// Test to see if font style is retained when performing find/replace on
strings
+// containing mixed font styles/sizes
+createSwDoc();
+uno::Reference xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Reference xText = xTextDocument->getText();
+uno::Reference xCursor = xText->createTextCursor();
+uno::Reference xCursorProps(xCursor, uno::UNO_QUERY);
+
+// Set up test by inserting strings with different font style/sizes
+// Inserts 1st string containing quotation marks (") with no font style
+xText->insertString(xCursor, "\"", false);
+xCursor->gotoStart(true); // selects full string
+CPPUNIT_ASSERT_EQUAL(OUString("\""), xCursor->getString());
+CPPUNIT_ASSERT_EQUAL(awt::FontSlant_NONE,
+ getProperty(xCursorProps,
"CharPosture"));
+xCursor->collapseToEnd();
+
+// Inserts 2nd string 'test' with italic font style
+xCursorProps->setPropertyValue("CharPosture",
uno::Any(awt::FontSlant_ITALIC));
+xText->insertString(xCursor, "test", false);
+xCursor->goLeft(4, true); // selects 2nd string
+CPPUNIT_ASSERT_EQUAL(OUString("test"), xCursor->getString());
+CPPUNIT_ASSERT_EQUAL(awt::FontSlant_ITALIC,
+ getProperty(xCursorProps,
"CharPosture"));
+xCursor->collapseToEnd();
+
+// Insert 3rd string '? ' with 28 pt font height
+xCursorProps->setPropertyValue("CharPosture",
uno::Any(awt::FontSlant_NONE)); // no font style
+xCursorProps->setPropertyValue("CharHeight", uno::Any(float(28.0)));
+xText->insertString(xCursor, "? ", false);
+xCursor->goLeft(2, true); // selects 3rd string
+CPPUNIT_ASSERT_EQUAL(float(28.0), getProperty(xCursorProps,
"CharHeight"));
+xCursor->collapseToEnd();
+
+// Insert 4th string 'who' with default 12 pt font height
+xCursorProps->setPropertyValue("CharHeight", uno::Any(float(12.0)));
+xText->insertString(xCursor, "who", false);
+xCursor->goLeft(3, true); // selects 4rd string
+CPPUNIT_ASSERT_EQUAL(float(12.0), getProperty(xCursorProps,
"CharHeight"));
+xCursor->collapseToEnd();
+
+// Asserts that full string is properly inserted as: '"test? who'
+CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+CPPUNIT_ASSERT_EQUAL(OUString("\"test? who"),
getParagraph(1)->getString());
+
+uno::Reference xReplace(mxComponent, uno::UNO_QUERY);
+uno::Reference
xReplaceDesc(xReplace->createReplaceDescriptor());
+
+// Searches for "t and replaces with "gu
+// Note: Search string contains both no font style and italic font style
+xReplaceDesc->setSearchString("\"t");
+xReplaceDesc->setReplaceString("\"gu");
+xReplace->replaceAll(xReplaceDesc);
+
+// Search/replace adds extra space between ? and w
+// Note: Search string contains both 28 pt and 12 pt font sizes
+xReplaceDesc->setSearchString("? w");
+xReplaceDesc->setReplaceString("? w");
+xReplace->replaceAll(xReplaceDesc);
+
+// Asserts that '"test? who' is replaced with '"guest? who'
+CPPUNIT_ASSERT_EQUAL(OUString("\"guest? who"),
getParagra
core.git: sw/qa
sw/qa/extras/unowriter/unowriter.cxx | 26 ++
1 file changed, 26 insertions(+)
New commits:
commit 0f7f0ba5104f1c330dac66f593044304f68245b1
Author: Kira Tubo
AuthorDate: Tue Apr 23 23:42:37 2024 -0700
Commit: Xisco Fauli
CommitDate: Thu Apr 25 10:20:23 2024 +0200
tdf#141525: sw unit test: line w/ arrow/circle endpoints
Unit test checks that the "Line with Arrow/Circle" shape is inserted with
"Arrow" at the start of the line and "Circle" at the end of the line.
Without the fix from tdf#141525, the "Circle" is missing at the end of the
line.
Change-Id: I2c952deffea908b3daf855dabd9d19f1f6133268
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166576
Tested-by: Jenkins
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index a11e928e8c1d..0d8704752b07 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -42,6 +42,7 @@
#include
#include
#include
+#include
#include
#include
@@ -1200,6 +1201,31 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf129841)
CPPUNIT_ASSERT_EQUAL(aRefColor, aColor);
}
+CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf141525)
+{
+// Unit test for tdf#141525:
+// Checks if "Line with Arrow/Circle" is inserted with correct end points
+createSwDoc();
+
+// Insert "Line with Arrow/Circle" shape with CTRL key
+uno::Sequence aArgs(
+comphelper::InitPropertySequence({ { "KeyModifier", uno::Any(KEY_MOD1)
} }));
+dispatchCommand(mxComponent, ".uno:LineArrowCircle", aArgs);
+
+// Asserts line shape has been inserted into the doc
+CPPUNIT_ASSERT_EQUAL(1, getShapes());
+CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.LineShape"),
getShape(1)->getShapeType());
+
+// Asserts end of line has a circle
+// Without the test, "Line Starts with Arrow" is inserted
+// i.e. the circle is missing from the line end point
+// - Expected: "Circle"
+// - Actual: ""
+CPPUNIT_ASSERT_EQUAL(OUString("Circle"),
getProperty(getShape(1), "LineEndName"));
+// Asserts start of line has an arrow
+CPPUNIT_ASSERT_EQUAL(OUString("Arrow"), getProperty(getShape(1),
"LineStartName"));
+}
+
CPPUNIT_TEST_FIXTURE(SwUnoWriter, testTdf160278)
{
createSwDoc();
core.git: sw/qa
sw/qa/extras/ooxmlexport/data/tdf154369.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport21.cxx | 21 +
2 files changed, 21 insertions(+)
New commits:
commit c37acfce0aab520f30714961d333b1cd52eba4e7
Author: Kira Tubo
AuthorDate: Mon Apr 22 00:32:14 2024 -0700
Commit: Xisco Fauli
CommitDate: Thu Apr 25 10:01:37 2024 +0200
tdf#154369: sw unit test: numbered list color in docx
Unit test checks that the color of the ordered list number is the same
color as paragraph color in the docx file.
Change-Id: I5e620ace079d6cba6d0aa0ba11c97e05a9db55c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166423
Reviewed-by: Xisco Fauli
Tested-by: Jenkins
diff --git a/sw/qa/extras/ooxmlexport/data/tdf154369.docx
b/sw/qa/extras/ooxmlexport/data/tdf154369.docx
new file mode 100755
index ..fefdc9655a18
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf154369.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
index 2683ccad087e..15af73057d75 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport21.cxx
@@ -511,6 +511,27 @@ DECLARE_OOXMLEXPORT_TEST(testTdf126533_pageBitmap,
"tdf126533_pageBitmap.docx")
"/rels:Relationships/rels:Relationship[@Target='media/image1.jpeg']"_ostr, 1);
}
+DECLARE_OOXMLEXPORT_TEST(testTdf154369, "tdf154369.docx")
+{
+//Unit test for bug fix in tdf#154369
+// Docx file contains ordered list formatted with Heading 1 style, font
color set as Accent 1 from theme
+xmlDocUniquePtr pXmlDoc = parseLayoutDump();
+
+// Without the fix in place, this test would have failed with:
+// - Expected result: A & B bullets display same green color #527d55 as
the paragraph
+// - Actual result: A & B bullets display black color, while the paragraph
is green color #527d55
+assertXPath(pXmlDoc,
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwFieldPortion"_ostr,
+"expand"_ostr, "A.");
+assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwFieldPortion/SwFont"_ostr,
+"color"_ostr, "00527d55");
+assertXPath(pXmlDoc,
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwFieldPortion"_ostr,
+"expand"_ostr, "B.");
+assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[2]/SwParaPortion/SwLineLayout/SwFieldPortion/SwFont"_ostr,
+"color"_ostr, "00527d55");
+}
+
} // end of anonymous namespace
CPPUNIT_PLUGIN_IMPLEMENT();
Re: Build failed for ooxmlexport21
Thanks for looking into this for me, Tomaž . Appreciate the advice! On Mon, Apr 22, 2024 at 6:52 PM Tomaž Vajngerl wrote: > Hi, > > On Tue, Apr 23, 2024 at 5:28 AM Kira Tubo wrote: > > > > Hello, > > > > My build seems to be failing in Gerrit: > https://gerrit.libreoffice.org/c/core/+/166423/1..2 > > > > Errors suggest that there is a core file missing for ooxmlexport21 in > Linux. I already rebased, but still see the error. Please advise. > > > > https://ci.libreoffice.org/job/gerrit_master_ml/16581/ > > No, you have to scroll up and look at the stack.. A crash happened in: > #11 > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/instdir/program/libmergedlo.so(_ZNK12OutputDevice11ImplNewFontEv+0x106) > [0x7f9c57e14ce6] > #12 > /home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/instdir/program/libmergedlo.so(_ZNK12OutputDevice13GetFontMetricEv+0x34) > [0x7f9c57e17034] > > Or if you look before stack dump you see: "terminating test due to > missing font: Rockwell" - which is indeed the font used in the > document. > > I think you have just taken the document from the bug document. I > strongly recommend not to do this. You know what specifically is > wrong, so the best is to reproduce the bug in a clean document and you > will end up with a test document that is smaller, is focused to show > precisely what the bug is without anything unneeded and will avoid > issues like this. > > Also I recommend to name the bug with what is tested in addition to > the bug number or put the bug number in the comments inside the test. > > > Thanks in advance! > > > > Regards, > > Kira > > Regards, Tomaž >
Build failed for ooxmlexport21
Hello, My build seems to be failing in Gerrit: https://gerrit.libreoffice.org/c/core/+/166423/1..2 Errors suggest that there is a core file missing for ooxmlexport21 in Linux. I already rebased, but still see the error. Please advise. https://ci.libreoffice.org/job/gerrit_master_ml/16581/ Thanks in advance! Regards, Kira
core.git: sw/qa
sw/qa/extras/uiwriter/uiwriter8.cxx | 37
1 file changed, 37 insertions(+)
New commits:
commit abab2d24b31f0857502d2fa527b433bd4ff0a0f5
Author: Kira Tubo
AuthorDate: Fri Apr 5 20:12:47 2024 -0700
Commit: Xisco Fauli
CommitDate: Thu Apr 18 12:20:54 2024 +0200
tdf#156546: sw unit test: freeze redo insert table
Unit test checks if writer freezes when the user performs redo on
table inserted into a new document.
Change-Id: I9d48f32a1ef27deb01c8042a68c21b0be20f2d05
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165919
Tested-by: Jenkins
Tested-by: Xisco Fauli
Reviewed-by: Xisco Fauli
diff --git a/sw/qa/extras/uiwriter/uiwriter8.cxx
b/sw/qa/extras/uiwriter/uiwriter8.cxx
index ab820a9dfc79..91d4ad34d4f7 100644
--- a/sw/qa/extras/uiwriter/uiwriter8.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter8.cxx
@@ -1135,6 +1135,43 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf131771)
getProperty(xTextTable2,
"TableTemplateName"));
}
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf156546)
+{
+createSwDoc();
+
+uno::Sequence aArgs(comphelper::InitPropertySequence(
+{ { "Rows", uno::Any(sal_Int32(2)) }, { "Columns",
uno::Any(sal_Int32(2)) } }));
+
+dispatchCommand(mxComponent, ".uno:InsertTable", aArgs);
+
+uno::Reference xTableSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTableSupplier->getTextTables(),
+uno::UNO_QUERY);
+
+// check that table was created and inserted into the document
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables->getCount());
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:SelectAll", {});
+dispatchCommand(mxComponent, ".uno:Copy", {});
+
+// create another document
+createSwDoc();
+dispatchCommand(mxComponent, ".uno:Paste", {});
+
+uno::Reference xTableSupplier2(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables2(xTableSupplier2->getTextTables(),
+ uno::UNO_QUERY);
+
+// check table exists after paste/undo
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables2->getCount());
+dispatchCommand(mxComponent, ".uno:Undo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xTables2->getCount());
+
+// without the test, writer freezes on redo table paste into new doc
+dispatchCommand(mxComponent, ".uno:Redo", {});
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTables2->getCount());
+}
+
CPPUNIT_TEST_FIXTURE(SwUiWriterTest8, testTdf80663)
{
createSwDoc();
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd570609281d92a48e7b3c0fe2d0c90457e7e3d5 Author: Kira Tubo AuthorDate: Tue Jan 16 04:38:31 2024 -0800 Commit: Gerrit Code Review CommitDate: Tue Jan 16 13:38:31 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to 92f7d7e64bd5154e6b1c780cbdefe4c50a316243 - tdf#138748 Help: Language -> Locale for Sort Options Update help documentation to match replacement of "Language" to "Locale" in Calc sort options. Related to commit 79f3a2655d995421c989b9479e3c63e8ebeabeb2 Change-Id: Id0ef7c9e8ff1e11f4d44e41dfcec9837d86e671d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162129 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/helpcontent2 b/helpcontent2 index 4b6dc2bb6c67..92f7d7e64bd5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 4b6dc2bb6c67853f31c6059ca1b8fda32f00d751 +Subproject commit 92f7d7e64bd5154e6b1c780cbdefe4c50a316243
help.git: source/text
source/text/scalc/01/12030200.xhp | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) New commits: commit 92f7d7e64bd5154e6b1c780cbdefe4c50a316243 Author: Kira Tubo AuthorDate: Mon Jan 15 12:59:53 2024 -0800 Commit: Olivier Hallot CommitDate: Tue Jan 16 13:38:31 2024 +0100 tdf#138748 Help: Language -> Locale for Sort Options Update help documentation to match replacement of "Language" to "Locale" in Calc sort options. Related to commit 79f3a2655d995421c989b9479e3c63e8ebeabeb2 Change-Id: Id0ef7c9e8ff1e11f4d44e41dfcec9837d86e671d Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162129 Tested-by: Jenkins Reviewed-by: Olivier Hallot diff --git a/source/text/scalc/01/12030200.xhp b/source/text/scalc/01/12030200.xhp index 7f13f40a0d..9c9ed54e7d 100644 --- a/source/text/scalc/01/12030200.xhp +++ b/source/text/scalc/01/12030200.xhp @@ -45,8 +45,8 @@ Case sensitive -Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies. -For Asian languages: Check Case Sensitive to apply multi-level collation. With multi-level collation, entries are first compared in their primitive forms with their cases and diacritics ignored. If they evaluate as the same, their diacritics are taken into account for the second-level comparison. If they still evaluate as the same, their cases, character widths, and Japanese Kana difference are considered for the third-level comparison.UFI: see #112590# and #112507# +Sorts first by uppercase letters and then by lowercase letters. For Asian locales, special handling applies. +For Asian locales: Check Case Sensitive to apply multi-level collation. With multi-level collation, entries are first compared in their primitive forms with their cases and diacritics ignored. If they evaluate as the same, their diacritics are taken into account for the second-level comparison. If they still evaluate as the same, their cases, character widths, and Japanese Kana difference are considered for the third-level comparison.UFI: see #112590# and #112507# Range contains row/column labels Omits the first row or the first column in the selection from the sort. The Direction setting at the bottom of the dialog defines the name and function of this check box. @@ -77,13 +77,13 @@ Custom sort order list Select the custom sort order that you want to apply. To define a custom sort order, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - Sort Lists. - Language + Locale - Language - Select the language for the sorting rules. + Locale + Select the locale for the sorting rules. Options - Select a sorting option for the language. For example, select the "phonebook" option for German to include the umlaut special character in the sorting. + Select a sorting option for the locale. For example, select the "phonebook" option for German to include the umlaut special character in the sorting. Direction Top to Bottom (Sort Rows)
core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 451ed367752ad36d75eddb0cc1c7a971080201ec Author: Kira Tubo AuthorDate: Sun Jan 14 15:14:17 2024 -0800 Commit: Gerrit Code Review CommitDate: Mon Jan 15 00:14:17 2024 +0100 Update git submodules * Update helpcontent2 from branch 'master' to be416c32550aa2fe0c0cfa94b437848a280261bb - tdf#125876 Update online help for Footnote/Endnote * Update menu navigation for Edit, Insert, Tools * Update "Edit Footnote/Endnote" dialog > "Auto" -> “Automatic” * Remove extra space Change-Id: I2e9209b62a1d1a81c8b0e830806047c298850ac0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162043 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/helpcontent2 b/helpcontent2 index b8c6c19ab2fa..be416c32550a 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit b8c6c19ab2fac10cdade1ae96721422814b19be3 +Subproject commit be416c32550aa2fe0c0cfa94b437848a280261bb
help.git: source/text
source/text/swriter/00/0402.xhp |2 +- source/text/swriter/00/0404.xhp |2 +- source/text/swriter/00/0406.xhp |6 +++--- source/text/swriter/01/0215.xhp |2 +- source/text/swriter/01/0403.xhp |4 ++-- source/text/swriter/guide/footnote_usage.xhp |6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) New commits: commit be416c32550aa2fe0c0cfa94b437848a280261bb Author: Kira Tubo AuthorDate: Sat Jan 13 22:14:27 2024 -0800 Commit: Adolfo Jayme Barrientos CommitDate: Mon Jan 15 00:14:16 2024 +0100 tdf#125876 Update online help for Footnote/Endnote * Update menu navigation for Edit, Insert, Tools * Update "Edit Footnote/Endnote" dialog > "Auto" -> “Automatic” * Remove extra space Change-Id: I2e9209b62a1d1a81c8b0e830806047c298850ac0 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/162043 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/source/text/swriter/00/0402.xhp b/source/text/swriter/00/0402.xhp index 486fcce25d..eb38344418 100644 --- a/source/text/swriter/00/0402.xhp +++ b/source/text/swriter/00/0402.xhp @@ -106,7 +106,7 @@ CommandCtrl + F2 -Choose Edit - Footnotes +Choose Edit - Reference - Footnote or Endnote diff --git a/source/text/swriter/00/0404.xhp b/source/text/swriter/00/0404.xhp index 41f82c55ab..434441fa2b 100644 --- a/source/text/swriter/00/0404.xhp +++ b/source/text/swriter/00/0404.xhp @@ -143,7 +143,7 @@ -Choose Insert - Footnote and Endnote - Footnote or Endnote +Choose Insert - Footnote and Endnote - Insert Special Footnote/Endnote Choose Footnote/Endnote (on inserted Footnote/Endnote) diff --git a/source/text/swriter/00/0406.xhp b/source/text/swriter/00/0406.xhp index ec3bf14c2e..59947fa4cd 100644 --- a/source/text/swriter/00/0406.xhp +++ b/source/text/swriter/00/0406.xhp @@ -84,9 +84,9 @@ Choose Tools - Heading Numbering - Numbering tab Choose Tools - Line Numbering (not for HTML format) -Choose Tools - Footnotes and Endnotes -Choose Tools - Footnotes and Endnotes - Footnotes tab -Choose Tools - Footnotes and Endnotes - Endnotes tab +Choose Tools - Footnote/Endnote Settings +Choose Tools - Footnote/Endnote Settings - Footnotes tab +Choose Tools - Footnote/Endnote Settings - Endnotes tab Choose Table - Convert - Text to Table Select paragraphs or table rows and choose Tools - Sort diff --git a/source/text/swriter/01/0215.xhp b/source/text/swriter/01/0215.xhp index 236679450d..a22f56d414 100644 --- a/source/text/swriter/01/0215.xhp +++ b/source/text/swriter/01/0215.xhp @@ -44,7 +44,7 @@ Numbering Select the numbering type for the footnote or endnote. -Auto +Automatic Character diff --git a/source/text/swriter/01/0403.xhp b/source/text/swriter/01/0403.xhp index 4b6608e43d..25322da4bc 100644 --- a/source/text/swriter/01/0403.xhp +++ b/source/text/swriter/01/0403.xhp @@ -48,7 +48,7 @@ Select the type of numbering that you want to use for footnotes and endnotes. Automatic -Automatically assigns consecutive numbers to the footnotes or endnotes that you insert. To change the settings for automatic numbering, choose Tools - Footnotes and Endnotes. +Automatically assigns consecutive numbers to the footnotes or endnotes that you insert. To change the settings for automatic numbering, choose Tools - Footnote/Endnote Settings. @@ -56,7 +56,7 @@ Choose this option to define a character or symbol for the current footnote. This can be either a letter, number or special character. Choose -Inserts a special character as a footnote or endnote anchor. +Inserts a special character as a footnote or endnote anchor. Type Select whether to insert a footnote or an endnote. Endnote numbering is separate from the footnote numbering. diff --git a/source/text/swriter/guide/footnote_usage.xhp b/source/text/swriter/guide/footnote_usage.xhp index 131db59b98..1d8b8a9456 100644 --- a/source/text/swriter/guide/footnote_usage.xhp +++ b/source/text/swriter/guide/footnote_usage.xhp @@ -46,7 +46,7 @@ Click in your document where you want to place the anchor of the note. -Choose Insert - Footnote and Endnote - Footnote or Endnote. +Choose Insert - Footnote and Endnote - Insert Special Footnote/Endnote. In the Numbering area, select the format that you want to use. If you select Character, click the Choose button and select the character that you want to use for the footnote. @@ -108,10 +108,10 @@ -To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose Edit - Footnote/Endnote. +To edit the numbering properties of a footnote or endnote anchor, click in front of the anchor, and choose Edit - Reference - Footnote or Endno
core.git: sw/source
sw/source/core/layout/layact.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ba8f4bff6015013013df652efbfaf4d9ae10c881
Author: Kira Tubo
AuthorDate: Wed Jan 10 15:31:19 2024 -0800
Commit: Hossein
CommitDate: Fri Jan 12 00:39:32 2024 +0100
tdf#145538 Use range based for loops
Change-Id: I2e31b6ff335b5884a5d02d53bafef4315ad0fe68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161902
Tested-by: Jenkins
Reviewed-by: Hossein
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 747470129c96..34c9df1ace1d 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -1299,14 +1299,14 @@ bool SwLayAction::FormatLayout( OutputDevice
*pRenderContext, SwLayoutFrame *pLa
{
SwRegionRects aRegion( aOldRect );
aRegion -= aPaint;
-for ( size_t i = 0; i < aRegion.size(); ++i )
-m_pImp->GetShell()->AddPaintRect( aRegion[i] );
+for ( auto const& aRect : aRegion )
+m_pImp->GetShell()->AddPaintRect( aRect );
aRegion.ChangeOrigin( aPaint );
aRegion.clear();
aRegion.push_back( aPaint );
aRegion -= aOldRect;
-for ( size_t i = 0; i < aRegion.size(); ++i )
-m_pImp->GetShell()->AddPaintRect( aRegion[i] );
+for ( auto const& aRect : aRegion )
+m_pImp->GetShell()->AddPaintRect( aRect );
}
}
else
core.git: sc/uiconfig
sc/uiconfig/scalc/ui/sortoptionspage.ui |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 79f3a2655d995421c989b9479e3c63e8ebeabeb2 Author: Kira Tubo AuthorDate: Tue Jan 9 21:31:45 2024 -0800 Commit: Ilmari Lauhakangas CommitDate: Thu Jan 11 12:27:56 2024 +0100 tdf#138748 Change label to locale in Calc sort dialog * Under Calc's Sort dialog > Options, update "Language" label to "Locale" * Update accessible descriptions to match the new label. Change-Id: If98d568900f27974b73aa2ead402458385306ab6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161870 Tested-by: Jenkins Reviewed-by: Heiko Tietze diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui index 171d5f7feefb..9ba51748c246 100644 --- a/sc/uiconfig/scalc/ui/sortoptionspage.ui +++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui @@ -34,7 +34,7 @@ True -Sorts first by uppercase letters and then by lowercase letters. For Asian languages, special handling applies. +Sorts first by uppercase letters and then by lowercase letters. For Asian locales, special handling applies. @@ -236,7 +236,7 @@ True False start -Language +Locale True language @@ -272,7 +272,7 @@ -Select the language for the sorting rules. +Select the locale for the sorting rules. @@ -288,7 +288,7 @@ True -Select a sorting option for the language. +Select a sorting option for the locale.
core.git: svl/source
svl/source/numbers/numfmuno.cxx |2 +-
svl/source/numbers/numfmuno.hxx |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 9d7d93bab83f7a421da6c2a3c3d68f54de93ab2b
Author: Kira Tubo
AuthorDate: Mon Jan 8 20:55:36 2024 -0800
Commit: Ilmari Lauhakangas
CommitDate: Wed Jan 10 19:05:36 2024 +0100
tdf#114441 Convert sal_uLong to sal_Int32
Update sal_uLong to sal_Int32 for nKey variable. Signed 32 bit variables
have been used for similar variables within numfmuno.cxx and
numfmuno.hxx
Change-Id: Iabb15fe70fec9b28f675d6a63a6a36b1fd91439f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161822
Tested-by: Jenkins
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 58094faa54e7..0c68ea5db8a8 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -639,7 +639,7 @@ uno::Sequence SAL_CALL
SvNumberFormatsObj::getSupportedServiceNames()
return { "com.sun.star.util.NumberFormats" };
}
-SvNumberFormatObj::SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent,
sal_uLong nK, ::comphelper::SharedMutex _aMutex )
+SvNumberFormatObj::SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent,
sal_Int32 nK, ::comphelper::SharedMutex _aMutex )
:m_xSupplier( )
,nKey( nK )
,m_aMutex(std::move( _aMutex ))
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index f88c2e6429af..8e9593d51a64 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.hxx
@@ -136,11 +136,11 @@ class SvNumberFormatObj : public cppu::WeakImplHelper<
private:
rtl::Reference
m_xSupplier;
-sal_uLong nKey;
+sal_Int32 nKey;
mutable ::comphelper::SharedMutex m_aMutex;
public:
-SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK,
::comphelper::SharedMutex _aMutex );
+SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_Int32 nK,
::comphelper::SharedMutex _aMutex );
virtual ~SvNumberFormatObj() override;
// XPropertySet
core.git: officecfg/registry
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 99261442d9e7d2e5bcee2a8987ff8fe89225f3a4 Author: Kira Tubo AuthorDate: Mon Jan 8 18:12:55 2024 -0800 Commit: Adolfo Jayme Barrientos CommitDate: Wed Jan 10 09:15:05 2024 +0100 tdf#125876 Update uno Footnote/Endnote labels Update labels according to comment 7: * Rename label in context menu > "Footnotes and Endnotes..." -> "Footnote/Endnote Settings..." * Rename label in Insert > "Footnote or Endnote" -> "Insert Special Footnote/Endnote" Change-Id: I4bef06cb95a52459331365588591a78c7413d579 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161811 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 247f94688255..5612705b04f1 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -642,7 +642,7 @@ - F~ootnote or Endnote... + Insert Special F~ootnote/Endnote... @@ -1552,7 +1552,7 @@ - ~Footnotes and Endnotes... + ~Footnote/Endnote Settings...
core.git: sw/qa
sw/qa/core/theme/ThemeTest.cxx | 10 +-
sw/qa/extras/rtfimport/rtfimport.cxx |4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 8555c3180c367d684af48b7ecb7ceb333fcd0962
Author: Kira Tubo
AuthorDate: Thu Dec 7 21:59:48 2023 -0800
Commit: Ilmari Lauhakangas
CommitDate: Thu Dec 21 06:43:54 2023 +0100
tdf#141908: replace hex colors with color keywords
Update hex colors 0x00, 0xFF, and 0xFF with COL_BLACK,
COL_WHITE,
and COL_LIGHTRED, respectively. See comment #30 for more details.
Change-Id: I82ff851d8c19f9ef4aeeb01bff313160da615222
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160452
Tested-by: Ilmari Lauhakangas
Reviewed-by: Ilmari Lauhakangas
diff --git a/sw/qa/core/theme/ThemeTest.cxx b/sw/qa/core/theme/ThemeTest.cxx
index 4be895dd3f06..1c2f00e33c65 100644
--- a/sw/qa/core/theme/ThemeTest.cxx
+++ b/sw/qa/core/theme/ThemeTest.cxx
@@ -320,7 +320,7 @@ void checkEffects(std::vector const&
rEffectStyleList)
CPPUNIT_ASSERT_EQUAL(false, rEffect.mbRotateWithShape);
CPPUNIT_ASSERT_EQUAL(model::ColorType::RGB, rEffect.maColor.getType());
-CPPUNIT_ASSERT_EQUAL(Color(0x00), rEffect.maColor.getRGB());
+CPPUNIT_ASSERT_EQUAL(COL_BLACK, rEffect.maColor.getRGB());
CPPUNIT_ASSERT_EQUAL(size_t(1),
rEffect.maColor.getTransformations().size());
CPPUNIT_ASSERT_EQUAL(model::TransformationType::Alpha,
@@ -351,9 +351,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest,
testDrawPageThemeExistsDOCX)
CPPUNIT_ASSERT_EQUAL(Color(0x9B8357),
pTheme->GetColor(model::ThemeColorType::Accent4));
CPPUNIT_ASSERT_EQUAL(Color(0xC2BC80),
pTheme->GetColor(model::ThemeColorType::Accent5));
CPPUNIT_ASSERT_EQUAL(Color(0x94A088),
pTheme->GetColor(model::ThemeColorType::Accent6));
-CPPUNIT_ASSERT_EQUAL(Color(0x00),
pTheme->GetColor(model::ThemeColorType::Dark1));
+CPPUNIT_ASSERT_EQUAL(COL_BLACK,
pTheme->GetColor(model::ThemeColorType::Dark1));
CPPUNIT_ASSERT_EQUAL(Color(0x637052),
pTheme->GetColor(model::ThemeColorType::Dark2));
-CPPUNIT_ASSERT_EQUAL(Color(0xFF),
pTheme->GetColor(model::ThemeColorType::Light1));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE,
pTheme->GetColor(model::ThemeColorType::Light1));
CPPUNIT_ASSERT_EQUAL(Color(0xCCDDEA),
pTheme->GetColor(model::ThemeColorType::Light2));
model::FontScheme const& rFontScheme = pTheme->getFontScheme();
@@ -397,9 +397,9 @@ CPPUNIT_TEST_FIXTURE(SwCoreThemeTest,
testDrawPageThemeExistsODT)
CPPUNIT_ASSERT_EQUAL(Color(0x9B8357),
pTheme->GetColor(model::ThemeColorType::Accent4));
CPPUNIT_ASSERT_EQUAL(Color(0xC2BC80),
pTheme->GetColor(model::ThemeColorType::Accent5));
CPPUNIT_ASSERT_EQUAL(Color(0x94A088),
pTheme->GetColor(model::ThemeColorType::Accent6));
-CPPUNIT_ASSERT_EQUAL(Color(0x00),
pTheme->GetColor(model::ThemeColorType::Dark1));
+CPPUNIT_ASSERT_EQUAL(COL_BLACK,
pTheme->GetColor(model::ThemeColorType::Dark1));
CPPUNIT_ASSERT_EQUAL(Color(0x637052),
pTheme->GetColor(model::ThemeColorType::Dark2));
-CPPUNIT_ASSERT_EQUAL(Color(0xFF),
pTheme->GetColor(model::ThemeColorType::Light1));
+CPPUNIT_ASSERT_EQUAL(COL_WHITE,
pTheme->GetColor(model::ThemeColorType::Light1));
CPPUNIT_ASSERT_EQUAL(Color(0xCCDDEA),
pTheme->GetColor(model::ThemeColorType::Light2));
}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3d516a004218..11bd8ab39484 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -1780,7 +1780,7 @@ CPPUNIT_TEST_FIXTURE(Test, test158044Tdf)
auto fillStyle = getProperty(xPara, "FillStyle");
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_NONE, fillStyle);
-CPPUNIT_ASSERT_EQUAL(Color(0xff), fillColor);
+CPPUNIT_ASSERT_EQUAL(COL_WHITE, fillColor);
}
{
@@ -1805,7 +1805,7 @@ CPPUNIT_TEST_FIXTURE(Test, test158044Tdf)
CPPUNIT_ASSERT_LESS(sal_Int32(2), tabStops.getLength());
CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_SOLID, fillStyle);
-CPPUNIT_ASSERT_EQUAL(Color(0xff), fillColor);
+CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, fillColor);
}
{
core.git: vcl/inc
vcl/inc/bitmap/BitmapColorizeFilter.hxx |6 +- 1 file changed, 1 insertion(+), 5 deletions(-) New commits: commit 7081b28dd6ed1ab8b8d6528d94e44e5dc3b3121d Author: Kira Tubo AuthorDate: Tue Dec 5 23:56:13 2023 -0800 Commit: Taichi Haradaguchi <20001...@ymail.ne.jp> CommitDate: Fri Dec 8 03:32:20 2023 +0100 tdf#143148 Use pragma once instead of include guards Replace include guards with #pragma once Change-Id: Id7378d6cf43817a8501a314dd8614467fb10e33a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160417 Tested-by: Jenkins Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp> diff --git a/vcl/inc/bitmap/BitmapColorizeFilter.hxx b/vcl/inc/bitmap/BitmapColorizeFilter.hxx index e05edf2191fb..ae511b322d0c 100644 --- a/vcl/inc/bitmap/BitmapColorizeFilter.hxx +++ b/vcl/inc/bitmap/BitmapColorizeFilter.hxx @@ -8,11 +8,9 @@ * */ -#ifndef INCLUDED_VCL_INC_BITMAP_BITMAPCOLORIZEFILTER_HXX -#define INCLUDED_VCL_INC_BITMAP_BITMAPCOLORIZEFILTER_HXX +#pragma once #include - #include class BitmapColorizeFilter final : public BitmapFilter @@ -29,6 +27,4 @@ private: Color maColor; }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Kira Tubo license statement
All of my past & future contributions to LibreOffice may be licensed under the MPLv2/LGPLv3+ dual license.
[Libreoffice-qa] Duplicate Bugs 156721 and 140339?
Hello, I'm new to triaging for LibreOffice, so I'm not super familiar with your known issues list yet. I wanted to confirm if bug 156721 is a duplicate of 140339? Just double checking before I mark it as duplicate. I appreciate your help! Bug 156721: https://bugs.documentfoundation.org/show_bug.cgi?id=156721 Bug 140339: https://bugs.documentfoundation.org/show_bug.cgi?id=140339 Thanks, Kira Tubo
