chart2/source/controller/dialogs/dlg_ChartType.cxx | 2 +-
chart2/uiconfig/ui/charttypedialog.ui | 14 +++++++++++++-
filter/source/svg/svgwriter.cxx | 1 -
sd/qa/unit/SVGExportTests.cxx | 8 ++++----
4 files changed, 18 insertions(+), 7 deletions(-)
New commits:
commit 888e20f8fadf570b8fa6d07a6cd208f2fa8921a1
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri Aug 4 10:01:26 2023 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Sep 11 11:56:20 2023 +0200
svg: export text decoration for text run not paragraph
Previously we exported text-decoration and other properties
for whole paragraph what was overriding run properties.
So we reused properties of the first run for all other runs
in the paragraph.
Change that so we write font properties for individual runs only.
Change-Id: Ie30f0166132b2ee302d0fdd12e7eb3ee36766a33
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155348
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156814
Tested-by: Jenkins
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 62aa05115fbb..c227408f01df 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1349,7 +1349,6 @@ void SVGTextWriter::startTextParagraph()
mrExport.AddAttribute( XML_NAMESPACE_NONE, "class", "TextParagraph" );
}
maParentFont = vcl::Font();
- addFontAttributes( /* isTexTContainer: */ true );
mpTextParagraphElem.reset(new SvXMLElementExport( mrExport,
XML_NAMESPACE_NONE, aXMLElemTspan, mbIWS, mbIWS ));
if( !mbIsListLevelStyleImage )
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx
index c300bb03527e..aae0d2e00a36 100644
--- a/sd/qa/unit/SVGExportTests.cxx
+++ b/sd/qa/unit/SVGExportTests.cxx
@@ -89,12 +89,12 @@ public:
assertXPath(svgDoc, SAL_STRINGIFY( /SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G
), "class", "Slide");
assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1] ), "class", "TitleText");
assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT ), "class",
"SVGTextShape");
- assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"class", "TextParagraph");
- assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"text-decoration", "underline");
+ assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN
), "class", "TextPosition");
+ assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[1]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN[1]
), "text-decoration", "underline");
assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT ), "class",
"SVGTextShape");
- assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"class", "TextParagraph");
- assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ),
"text-decoration", "line-through");
+ assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN
), "class", "TextPosition");
+ assertXPath(svgDoc, SAL_STRINGIFY(
/SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN/SVG_TSPAN/SVG_TSPAN
), "text-decoration", "line-through");
}
void testSVGExportJavascriptURL()
commit 359190cb6ae2c76356de7f9368abc849c7696415
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 29 15:59:26 2023 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Sep 11 11:56:12 2023 +0200
jsdialog: fix layout of chart type dialog
directly set content area container to avoid
buttons on top of the dialog in lok case
Change-Id: I8353102f679a8f19c3041c7b4ec0b1200ed7d515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156254
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Pranam Lashkari <lpra...@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156813
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 4fb7de7ead72..e6e88dae42b8 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -31,7 +31,7 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
rtl::Reference<::chart::ChartModel>
xChartModel)
: GenericDialogController(pParent, "modules/schart/ui/charttypedialog.ui",
"ChartTypeDialog")
, m_xChartModel(std::move(xChartModel))
- , m_xContentArea(m_xDialog->weld_content_area())
+ , m_xContentArea(m_xBuilder->weld_container("content"))
{
m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
m_xContentArea.get(), this, m_xChartModel, false /*don't show title
description*/);
diff --git a/chart2/uiconfig/ui/charttypedialog.ui
b/chart2/uiconfig/ui/charttypedialog.ui
index 5f7c1cb13f71..627a619d0b57 100644
--- a/chart2/uiconfig/ui/charttypedialog.ui
+++ b/chart2/uiconfig/ui/charttypedialog.ui
@@ -76,7 +76,19 @@
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkBox" id="content">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
