cui/uiconfig/ui/pageformatpage.ui | 546 +++++++++++++++++++-------------------
hwpfilter/source/drawing.h | 8
2 files changed, 284 insertions(+), 270 deletions(-)
New commits:
commit f35d1a9f16c811ea941be7d19228a92dd6be6acf
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 7 20:58:16 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Mar 8 10:02:41 2022 +0100
resave with latest glade
and drop empty column
Change-Id: I05aeb12fecf044aa8a95aa8bf35bf605c35f2498
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131154
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/pageformatpage.ui
b/cui/uiconfig/ui/pageformatpage.ui
index 8adcba3e944b..502941922cb7 100644
--- a/cui/uiconfig/ui/pageformatpage.ui
+++ b/cui/uiconfig/ui/pageformatpage.ui
@@ -1,192 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=3 -->
<object class="GtkGrid" id="PageFormatPage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="border_width">6</property>
- <property name="row_spacing">12</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">12</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="column_spacing">12</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="column-spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=6 -->
<object class="GtkGrid" id="grid3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="labelFormat">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelFormat">_Format:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">comboPageFormat</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">comboPageFormat</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboPageFormat">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelWidth">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelWidth">_Width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinWidth</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinWidth</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinWidth">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="halign">start</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelHeight">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelHeight">_Height:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinHeight</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinHeight</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinHeight">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="halign">start</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelOrientation">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelOrientation">_Orientation:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">radiobuttonPortrait</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">radiobuttonPortrait</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="radiobuttonPortrait">
<property name="label" translatable="yes"
context="pageformatpage|radiobuttonPortrait">_Portrait</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<property name="active">True</property>
- <property name="draw_indicator">True</property>
+ <property name="draw-indicator">True</property>
<accessibility>
<relation type="member-of" target="labelOrientation"/>
</accessibility>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkRadioButton" id="radiobuttonLandscape">
<property name="label" translatable="yes"
context="pageformatpage|radiobuttonLandscape">L_andscape</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<property name="group">radiobuttonPortrait</property>
<accessibility>
<relation type="member-of" target="labelOrientation"/>
</accessibility>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelTextFlow">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
<property name="label" translatable="yes"
context="pageformatpage|labelTextFlow">_Text direction:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboTextFlowBox</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">comboTextFlowBox</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboTextFlowBox">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
@@ -194,61 +194,61 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid" id="grid4">
<property name="visible">True</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkDrawingArea" id="drawingareaPageDirection">
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="halign">center</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelPaperTray">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelPaperTray">Paper _tray:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">comboPaperTray</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">comboPaperTray</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboPaperTray">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
@@ -256,7 +256,7 @@
<child type="label">
<object class="GtkLabel" id="labelPaperFormat">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelPaperFormat">Paper Format</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -265,46 +265,46 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="column_spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=5 -->
<object class="GtkGrid" id="grid6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="labelLeftMargin">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelLeftMargin">Left:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinMargLeft</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">spinMargLeft</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -315,10 +315,10 @@
</child>
<child>
<object class="GtkLabel" id="labelInner">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelInner">I_nner:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinMargLeft</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">spinMargLeft</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -329,34 +329,34 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinMargLeft">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="labelRightMargin">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelRightMargin">Right:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinMargRight</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">spinMargRight</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -367,10 +367,10 @@
</child>
<child>
<object class="GtkLabel" id="labelOuter">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelOuter">O_uter:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">spinMargRight</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">spinMargRight</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -381,98 +381,98 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinMargRight">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelTopMargin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelTopMargin">Top:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinMargTop</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinMargTop</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinMargTop">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelBottomMargin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelBottomMargin">Bottom:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinMargBot</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinMargBot</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinMargBot">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
- <property name="activates_default">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelGutterMargin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelGutterMargin">Gutter:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinMargGut</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinMargGut</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spinMargGut">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="truncate_multiline">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
+ <property name="truncate-multiline">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
</object>
@@ -480,7 +480,7 @@
<child type="label">
<object class="GtkLabel" id="labelMargins">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelMargins">Margins</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -489,64 +489,64 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=10 -->
<object class="GtkGrid" id="grid7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <property name="hexpand">True</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkLabel" id="labelPageLayout">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelPageLayout">_Page layout:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">comboPageLayout</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">comboPageLayout</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelPageNumbers">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelPageNumbers">Page numbers:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboLayoutFormat</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">comboLayoutFormat</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkRegisterTrue">
<property name="label" translatable="yes"
context="pageformatpage|checkRegisterTrue">Use page li_ne-spacing</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="tooltip_text" translatable="yes"
context="pageformatpage|checkRegisterTrue" comments="xdds">Enables page
line-spacing (register-true) using the selected Reference Style</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="tooltip-text" translatable="yes"
context="pageformatpage|checkRegisterTrue" comments="xdds">Enables page
line-spacing (register-true) using the selected Reference Style</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="checkRegisterTrue-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|checkRegisterTrue">If enabled, then
all paragraph styles with the option page line-spacing activated will be
affected, assuming the line spacing of the Reference Style. This will align
them to an invisible vertical page grid, regardless of their font size, so that
each line is the same height.</property>
@@ -554,14 +554,14 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboPageLayout">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<items>
<item translatable="yes"
context="pageformatpage|liststorePageLayout">Right and left</item>
<item translatable="yes"
context="pageformatpage|liststorePageLayout">Mirrored</item>
@@ -570,158 +570,151 @@
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboLayoutFormat">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelTblAlign">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
<property name="label" translatable="yes"
context="pageformatpage|labelTblAlign">Table alignment:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">checkbuttonHorz</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">checkbuttonHorz</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbuttonHorz">
<property name="label" translatable="yes"
context="pageformatpage|checkbuttonHorz">Hori_zontal</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbuttonVert">
<property name="label" translatable="yes"
context="pageformatpage|checkbuttonVert">_Vertical</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkAdaptBox">
<property name="label" translatable="yes"
context="pageformatpage|checkAdaptBox">_Fit object to paper format</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelRegisterStyle">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
<property name="label" translatable="yes"
context="pageformatpage|labelRegisterStyle">Reference _Style:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboRegisterStyle</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">comboRegisterStyle</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboRegisterStyle">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelGutterPosition">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelGutterPosition">Gutter position:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboGutterPosition</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">comboGutterPosition</property>
<property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="comboGutterPosition">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<items>
<item translatable="yes"
context="pageformatpage|liststoreGutterPosition">Left</item>
<item translatable="yes"
context="pageformatpage|liststoreGutterPosition">Top</item>
</items>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
<child>
<object class="GtkCheckButton" id="checkRtlGutter">
<property name="label" translatable="yes"
context="pageformatpage|checkRtlGutter">Gutter on right side of page</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">8</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkBackgroundFullSize">
<property name="label" translatable="yes"
context="pageformatpage|checkBackgroundFullSize">Background covers
margins</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="no_show_all">True</property>
- <property name="tooltip_text" translatable="yes"
context="pageformatpage|checkBackgroundFullSize" comments="xdds">Any background
will cover margins of the page as well</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="no-show-all">True</property>
+ <property name="tooltip-text" translatable="yes"
context="pageformatpage|checkBackgroundFullSize" comments="xdds">Any background
will cover margins of the page as well</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
<object class="AtkObject"
id="checkBackgroundFullSize-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|checkBackgroundFullSize">If enabled,
then any background will cover the entire page, including margins. If disabled,
any background will cover the page only inside the margins.</property>
@@ -729,16 +722,31 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">9</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">9</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|label5">Layout Settings</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -747,38 +755,38 @@
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="labelMsg">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="pageformatpage|labelMsg">The margin settings are out of print range.
Do you still want to apply these settings?</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
<widgets>
<widget name="grid3"/>
<widget name="grid6"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup2">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
<widgets>
<widget name="grid4"/>
<widget name="grid7"/>
@@ -807,7 +815,7 @@ Do you still want to apply these settings?</property>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroupWidget2">
- <property name="ignore_hidden">True</property>
+ <property name="ignore-hidden">True</property>
<widgets>
<widget name="comboPaperTray"/>
<widget name="comboPageLayout"/>
commit 873454c9f4e044a00d67320bcbee7d02d719a723
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Mar 7 20:21:15 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Mar 8 10:02:26 2022 +0100
ofz#45125 Indirect-leak
Change-Id: I208c0b6751eefbe6dddffa126fe3d89a3bd353af
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131149
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index 54d98bbf5262..e3f2a512e7c7 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -385,7 +385,13 @@ error:
}
if (hdo->property.pPara)
{
- hwpf.move_to_failed(std::unique_ptr<HWPPara>(hdo->property.pPara));
+ HWPPara* pPara = hdo->property.pPara;
+ while (pPara)
+ {
+ HWPPara* pNextPara = pPara->Next();
+ hwpf.move_to_failed(std::unique_ptr<HWPPara>(pPara));
+ pPara = pNextPara;
+ }
hdo->property.pPara = nullptr;
}
HWPDOFunc(hdo.get(), OBJFUNC_FREE, nullptr, 0);
