[gnumeric] Update goffice requirement.
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Update goffice requirement.
- Date: Tue, 13 Mar 2012 07:26:31 +0000 (UTC)
commit baf29f38b01bfbcc3240c02cfef686fe49ed1f03
Author: Jean Brefort <jean brefort normalesup org>
Date: Tue Mar 13 08:20:07 2012 +0100
Update goffice requirement.
ChangeLog | 5 +
configure.in | 2 +-
src/dialogs/cell-format.ui | 206 +++++++++++++++---------------------------
src/sheet-object-component.c | 11 +--
4 files changed, 80 insertions(+), 144 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 40558a1..44848d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@
* src/sheet-style.c (cb_style_extent, cb_is_default)
(cb_most_common): Fix handling of width and height.
+2012-03-11 Jean Brefort <jean brefort normalesup org>
+
+ * configure.in: needs goffice >= 0.9.3.
+ * src/sheet-object-component.c (gnm_soc_copy): rewritten.
+
2012-03-11 Morten Welinder <terra gnome org>
* src/print-info.c (print_info_get_paper_size): New function.
diff --git a/configure.in b/configure.in
index f1b509e..a6e7d95 100644
--- a/configure.in
+++ b/configure.in
@@ -145,7 +145,7 @@ PKG_PROG_PKG_CONFIG(0.18)
dnl *****************************
libspreadsheet_reqs="
- libgoffice-${GOFFICE_API_VER} >= 0.9.2
+ libgoffice-${GOFFICE_API_VER} >= 0.9.3
libgsf-1 >= 1.14.18
libxml-2.0 >= 2.4.12
"
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index 1efbfea..1a2ad16 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">20</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkDialog" id="CellFormat">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -25,7 +20,6 @@
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -42,7 +36,6 @@
<child>
<object class="GtkButton" id="applybutton">
<property name="label">gtk-apply</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -59,7 +52,6 @@
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -76,7 +68,6 @@
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -129,7 +120,6 @@
<child>
<object class="GtkRadioButton" id="halign_left">
<property name="label" translatable="yes">_Left</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -151,7 +141,6 @@
<child>
<object class="GtkRadioButton" id="halign_general">
<property name="label" translatable="yes">_General</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -172,7 +161,6 @@
<child>
<object class="GtkRadioButton" id="halign_center_across_selection">
<property name="label" translatable="yes">Center across _selection</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -226,7 +214,6 @@
<child>
<object class="GtkRadioButton" id="halign_center">
<property name="label" translatable="yes">Ce_nter</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -246,7 +233,6 @@
<child>
<object class="GtkRadioButton" id="halign_right">
<property name="label" translatable="yes">_Right</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -266,7 +252,6 @@
<child>
<object class="GtkRadioButton" id="halign_fill">
<property name="label" translatable="yes">_Fill</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -286,7 +271,6 @@
<child>
<object class="GtkRadioButton" id="halign_justify">
<property name="label" translatable="yes">_Justify</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -306,7 +290,6 @@
<child>
<object class="GtkRadioButton" id="halign_distributed">
<property name="label" translatable="yes">D_istributed</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -346,7 +329,6 @@
<child>
<object class="GtkRadioButton" id="valign_top">
<property name="label" translatable="yes">_Top</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -368,7 +350,6 @@
<child>
<object class="GtkRadioButton" id="valign_center">
<property name="label" translatable="yes">C_enter</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -389,7 +370,6 @@
<child>
<object class="GtkRadioButton" id="valign_bottom">
<property name="label" translatable="yes">_Bottom</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -410,7 +390,6 @@
<child>
<object class="GtkRadioButton" id="valign_justify">
<property name="label" translatable="yes">J_ustify</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -430,7 +409,6 @@
<child>
<object class="GtkRadioButton" id="valign_distributed">
<property name="label" translatable="yes">_Distributed</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -466,7 +444,6 @@
<child>
<object class="GtkCheckButton" id="align_wrap">
<property name="label" translatable="yes">_Wrap text</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -487,7 +464,6 @@
<child>
<object class="GtkCheckButton" id="align_shrink">
<property name="label" translatable="yes">Shrin_k to fit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -574,7 +550,6 @@
<child>
<object class="GtkCheckButton" id="strikethrough_button">
<property name="label" translatable="yes">Stri_kethrough</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -591,27 +566,8 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkCheckButton" id="superscript_button">
<property name="label" translatable="yes">Sup_erscript</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -631,7 +587,6 @@
<child>
<object class="GtkCheckButton" id="subscript_button">
<property name="label" translatable="yes">Su_bscript</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -648,6 +603,18 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -685,7 +652,6 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkToggleButton" id="rev_diag_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -705,7 +671,6 @@
</child>
<child>
<object class="GtkToggleButton" id="top_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -725,7 +690,6 @@
</child>
<child>
<object class="GtkToggleButton" id="diag_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -745,7 +709,6 @@
</child>
<child>
<object class="GtkToggleButton" id="left_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -765,7 +728,6 @@
</child>
<child>
<object class="GtkToggleButton" id="right_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -785,7 +747,6 @@
</child>
<child>
<object class="GtkToggleButton" id="bottom_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -805,7 +766,6 @@
</child>
<child>
<object class="GtkButton" id="no_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -826,7 +786,6 @@
</child>
<child>
<object class="GtkButton" id="outline_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -847,7 +806,6 @@
</child>
<child>
<object class="GtkToggleButton" id="inside_vert_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -868,7 +826,6 @@
</child>
<child>
<object class="GtkButton" id="inside_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -889,7 +846,6 @@
</child>
<child>
<object class="GtkToggleButton" id="inside_horiz_border">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -908,6 +864,24 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -958,7 +932,6 @@
<child>
<object class="GtkToggleButton" id="line_pattern_none">
<property name="label" translatable="yes" context="line" comments="Cell border line">None</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -974,7 +947,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash_dot_dot">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -989,7 +961,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_hair">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1004,7 +975,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_slant">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1019,7 +989,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dotted">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1034,7 +1003,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash_dot">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1049,7 +1017,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dash_dot_dot">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1064,7 +1031,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1079,7 +1045,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dash_dot">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1094,7 +1059,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1109,7 +1073,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dashed">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1124,7 +1087,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_thick">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1139,7 +1101,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_thin">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1154,7 +1115,6 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_double">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1167,6 +1127,15 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1176,9 +1145,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="border_color_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1352,7 +1318,6 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkToggleButton" id="gp_solid">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1371,7 +1336,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_75grey">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1390,7 +1354,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_50grey">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1409,7 +1372,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_25grey">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1428,7 +1390,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_125grey">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1447,7 +1408,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_625grey">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1466,7 +1426,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_horiz">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1485,7 +1444,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_vert">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1504,7 +1462,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_rev_diag">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1523,7 +1480,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_diag">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1542,7 +1498,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_diag_cross">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1561,7 +1516,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thick_diag_cross">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1580,7 +1534,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_horiz">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1599,7 +1552,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_vert">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1618,7 +1570,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_rev_diag">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1637,7 +1588,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_diag">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1656,7 +1606,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_horiz_cross">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1675,7 +1624,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_diag_cross">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1694,7 +1642,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_foreground_solid">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1713,7 +1660,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_small_circle">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1732,7 +1678,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_semi_circle">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1751,7 +1696,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thatch">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1770,7 +1714,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_large_circles">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1789,7 +1732,6 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_bricks">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1822,12 +1764,6 @@
<child>
<placeholder/>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">3</property>
@@ -1855,7 +1791,6 @@
<child>
<object class="GtkCheckButton" id="protection_locked">
<property name="label" translatable="yes">_Lock</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -1874,7 +1809,6 @@
<child>
<object class="GtkCheckButton" id="protection_hidden">
<property name="label" translatable="yes">Hi_de</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -1910,7 +1844,6 @@
<child>
<object class="GtkCheckButton" id="protection_sheet_protected">
<property name="label" translatable="yes">_Protect worksheet</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -1926,6 +1859,24 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">4</property>
@@ -2044,7 +1995,6 @@
<child>
<object class="GtkCheckButton" id="validation_ignore_blank">
<property name="label" translatable="yes">Ignore _blank cells</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2064,7 +2014,6 @@
<child>
<object class="GtkCheckButton" id="validation_in_dropdown">
<property name="label" translatable="yes">I_n-cell dropdown</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2215,6 +2164,7 @@
<object class="GtkLabel" id="validation_expr0_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">18</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -2225,33 +2175,10 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="validation_expr1_name">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">18</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -2288,7 +2215,6 @@
<child>
<object class="GtkCheckButton" id="input_msg_flag">
<property name="label" translatable="yes">_Show input message when cell is selected</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2375,6 +2301,15 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">6</property>
@@ -2407,6 +2342,11 @@
<action-widget response="0">okbutton</action-widget>
</action-widgets>
</object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">20</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index f2968fa..f9e450f 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -321,16 +321,7 @@ static void
gnm_soc_copy (SheetObject *dst, SheetObject const *src)
{
SheetObjectComponent *soc = SHEET_OBJECT_COMPONENT (src);
- GOComponent *component;
- char *buf;
- int length;
- gpointer user_data = NULL;
- void (*clearfunc) (gpointer) = NULL;
- go_component_get_data (soc->component, (gpointer) &buf, &length, &clearfunc, &user_data);
- component = go_component_new_by_mime_type (go_component_get_mime_type (soc->component));
- go_component_set_data (component, buf, length);
- if (clearfunc)
- clearfunc ((user_data)? user_data: buf);
+ GOComponent *component = go_component_duplicate (soc->component);;
sheet_object_component_set_component (dst, component);
g_object_unref (component);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
