cui/uiconfig/ui/gradientpage.ui | 4 ++--
cui/uiconfig/ui/transparencytabpage.ui | 4 ++--
oox/qa/unit/export.cxx | 8 ++++----
svx/uiconfig/ui/sidebararea.ui | 4 ++--
sw/source/uibase/shells/drawdlg.cxx | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 790dc4d759c3a2f7f7fc513d358cc0e116e6f17a
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Thu Mar 16 18:50:41 2023 +0100
Commit: Regina Henschel <rb.hensc...@t-online.de>
CommitDate: Mon Mar 20 17:14:33 2023 +0000
tdf#154071 UI rename gradient back to 'Rectangular'...
Commit e97e62a4707e09739f9c00f8fc4a943f0123a9cf had wrongly changed
'Rectangular' to 'Square' (API RECT, ODF rectangle) and 'Square' to
'Quadratic' (API SQUARE, ODF square).
This patch reverts 'Square' to 'Rectangular' and 'Quadratic' to
'Square (Quadratic)'. It uses 'Square (Quadratic)' instead of simple
'Square' to help users to find the correct type.
In addition, use of the wrong type names in comments is fixed.
Change-Id: Ibbd90be2cceb65c9857e473cb74c39df1b9530f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149004
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
diff --git a/cui/uiconfig/ui/gradientpage.ui b/cui/uiconfig/ui/gradientpage.ui
index 6cb56fcc54a6..76bfa8d7c161 100644
--- a/cui/uiconfig/ui/gradientpage.ui
+++ b/cui/uiconfig/ui/gradientpage.ui
@@ -220,8 +220,8 @@
<item translatable="yes"
context="gradientpage|gradienttypelb">Axial</item>
<item translatable="yes"
context="gradientpage|gradienttypelb">Radial</item>
<item translatable="yes"
context="gradientpage|gradienttypelb">Ellipsoid</item>
- <item translatable="yes"
context="gradientpage|gradienttypelb">Quadratic</item>
- <item translatable="yes"
context="gradientpage|gradienttypelb">Square</item>
+ <item translatable="yes"
context="gradientpage|gradienttypelb">Square (Quadratic)</item>
+ <item translatable="yes"
context="gradientpage|gradienttypelb">Rectangular</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="gradienttypelb-atkobject">
diff --git a/cui/uiconfig/ui/transparencytabpage.ui
b/cui/uiconfig/ui/transparencytabpage.ui
index 222acc29a2ba..0ae0707395ea 100644
--- a/cui/uiconfig/ui/transparencytabpage.ui
+++ b/cui/uiconfig/ui/transparencytabpage.ui
@@ -289,8 +289,8 @@
<item translatable="yes"
context="transparencytabpage|liststoreTYPE">Axial</item>
<item translatable="yes"
context="transparencytabpage|liststoreTYPE">Radial</item>
<item translatable="yes"
context="transparencytabpage|liststoreTYPE">Ellipsoid</item>
- <item translatable="yes"
context="transparencytabpage|liststoreTYPE">Quadratic</item>
- <item translatable="yes"
context="transparencytabpage|liststoreTYPE">Square</item>
+ <item translatable="yes"
context="transparencytabpage|liststoreTYPE">Square (Quadratic)</item>
+ <item translatable="yes"
context="transparencytabpage|liststoreTYPE">Rectangular</item>
</items>
<child internal-child="accessible">
<object class="AtkObject"
id="LB_TRGR_GRADIENT_TYPES-atkobject">
diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx
index 36859548f5f6..56df90eceee1 100644
--- a/oox/qa/unit/export.cxx
+++ b/oox/qa/unit/export.cxx
@@ -1201,8 +1201,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkEllipticalGradient)
CPPUNIT_TEST_FIXTURE(Test, testFontworkSquareGradient)
{
- // The document has a Fontwork shape with UI settings: gradient fill Type
"Quadratic" (which is
- // "square" in ODF and API), From Color #4963ef 40%, To Color #ffff6e 90%,
Center x|y 100%|50%,
+ // The document has a Fontwork shape with UI settings: gradient fill Type
"Square (Quadratic)",
+ // From Color #4963ef 40%, To Color #ffff6e 90%, Center x|y 100%|50%,
// no transparency
// Without fix the gradient was not exported at all.
loadFromURL(u"tdf51195_Fontwork_squareGradient.odt");
@@ -1245,8 +1245,8 @@ CPPUNIT_TEST_FIXTURE(Test, testFontworkSquareGradient)
CPPUNIT_TEST_FIXTURE(Test, testFontworkRectGradient)
{
// The document has a Fontwork shape with UI settings: solid color theme
Accent 4 60% lighter,
- // transparency gradient Type "Square" (which is "rectangle" in ODF and
API, tdf#154071),
- // Center x|y 50%|50%, Transition start 10%, Start value 70%, End value 5%.
+ // transparency gradient Type "Rectangular", Center x|y 50%|50%,
Transition start 10%,
+ // Start value 70%, End value 5%.
// Without fix the gradient was not exported at all.
loadFromURL(u"tdf51195_Fontwork_rectGradient.odt");
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index 0fd22958cb78..888d092c7714 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -136,8 +136,8 @@
<item translatable="yes"
context="sidebararea|gradientstyle">Axial</item>
<item translatable="yes"
context="sidebararea|gradientstyle">Radial</item>
<item translatable="yes"
context="sidebararea|gradientstyle">Ellipsoid</item>
- <item translatable="yes"
context="sidebararea|gradientstyle">Quadratic</item>
- <item translatable="yes"
context="sidebararea|gradientstyle">Square</item>
+ <item translatable="yes"
context="sidebararea|gradientstyle">Square (Quadratic)</item>
+ <item translatable="yes"
context="sidebararea|gradientstyle">Rectangular</item>
</items>
<child internal-child="accessible">
<object class="AtkObject" id="gradientstyle-atkobject">
diff --git a/sw/source/uibase/shells/drawdlg.cxx
b/sw/source/uibase/shells/drawdlg.cxx
index 8f7dfd9c73ea..6117cf0dc32a 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -297,7 +297,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest const & rReq)
static void lcl_unifyFillTransparencyItems(const SfxItemSet& rSet)
{
- // Transparent fill options are None, Solid, Linear, Axial, Radial,
Elliptical, Quadratic, Square.
+ // Transparent fill options are None, Solid, Linear, Axial, Radial,
Elliptical, Square, Rectangular.
// But this is represented across two items namely XFillTransparenceItem
(for None and Solid)
// and XFillFloatTransparenceItem (for the rest). To simplify the
representation in LOKit case let's
// use XFillFloatTransparenceItem to carry the information of
XFillTransparenceItem when gradients
