chart2/uiconfig/ui/sidebarelements.ui | 92 ++++++++++++----------------
sw/qa/extras/ooxmlexport/data/tdf133643.doc |binary
sw/qa/extras/ooxmlexport/ooxmlexport11.cxx | 18 +++++
3 files changed, 60 insertions(+), 50 deletions(-)
New commits:
commit d2205a26b96ed321c869f6eb7c955648c83dd805
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Mon Jun 8 23:00:23 2020 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Wed Jun 10 09:41:56 2020 +0200
Give the legend checkbox a label
Change-Id: I95e8910e96335a03ebad6dd46255a902df2c47a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95860
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui
b/chart2/uiconfig/ui/sidebarelements.ui
index 22b1ff60c87e..d136ea8774cf 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.22.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.18"/>
<object class="GtkGrid" id="ChartElementsPanel">
@@ -100,74 +100,66 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkGrid" id="grid5">
+ <object class="GtkCheckButton" id="checkbutton_legend">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_legend">Show legend</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes"
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box_legend">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkCheckButton"
id="checkbutton_legend">
+ <object class="GtkLabel" id="placement_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
- <property name="margin_right">5</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin_left">4</property>
+ <property name="label" translatable="yes"
context="sidebarelements|placement_label">_Placement:</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="ellipsize">end</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box_legend">
+ <object class="GtkComboBoxText"
id="comboboxtext_legend">
+ <property name="width_request">100</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="placement_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="sidebarelements|placement_label">_Placement:</property>
- <property name="use_underline">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="comboboxtext_legend">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Right</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Top</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Bottom</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Left</item>
- </items>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <items>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Right</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Top</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Bottom</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Left</item>
+ </items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
@@ -183,7 +175,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
commit fb4109bbf816c9b915b255b7ff69060423337a62
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Jun 9 19:55:18 2020 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jun 10 09:41:51 2020 +0200
tdf#133643: sw: Add unittest
Change-Id: I1b4dbea5e858efa8f22bb568dc5fa95d71f1b792
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95962
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/ooxmlexport/data/tdf133643.doc
b/sw/qa/extras/ooxmlexport/data/tdf133643.doc
new file mode 100644
index 000000000000..52db5e344fa7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf133643.doc differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 087373aaf7e4..1be122da3e66 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -1224,6 +1224,24 @@
DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf121597TrackedDeletionOfMultipleParagr
assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr/w:rPr/w:del");
}
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133643, "tdf133643.doc")
+{
+ CPPUNIT_ASSERT_EQUAL(1, getPages());
+ xmlDocUniquePtr pXmlDoc = parseExport("word/document.xml");
+
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[1]/w:fldChar", "fldCharType",
"begin");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[1]/w:fldChar/w:ffData/w:ddList/w:listEntry[1]",
"val", "Bourgoin-Jallieu, ");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[1]/w:fldChar/w:ffData/w:ddList/w:listEntry[2]",
"val", "Fontaine, ");
+
+ assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[2]/w:instrText", " FORMDROPDOWN ");
+
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[3]/w:fldChar", "fldCharType",
"separate");
+ assertXPath(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[5]/w:fldChar", "fldCharType",
"end");
+
+ // Without the fix in place, this w:r wouldn't exist
+ assertXPathContent(pXmlDoc,
"/w:document/w:body/w:tbl/w:tr/w:tc/w:p/w:r[6]/w:t", "le 22 fevrier 2013");
+}
+
DECLARE_OOXMLEXPORT_TEST(testTdf123189_tableBackground,
"table-black_fill.docx")
{
uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
