xlsx-write.c (gnumeric-1.12.49.tar.xz) | : | xlsx-write.c (gnumeric-1.12.50.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 2013 | skipping to change at line 2013 | |||
default : /* fall back to the default */ | default : /* fall back to the default */ | |||
case GNM_VALIDATION_STYLE_STOP : /* "stop" the default */ break; | case GNM_VALIDATION_STYLE_STOP : /* "stop" the default */ break; | |||
case GNM_VALIDATION_STYLE_WARNING : tmp = "warning"; break; | case GNM_VALIDATION_STYLE_WARNING : tmp = "warning"; break; | |||
case GNM_VALIDATION_STYLE_INFO : tmp = "information"; break; | case GNM_VALIDATION_STYLE_INFO : tmp = "information"; break; | |||
} | } | |||
if (NULL != tmp) | if (NULL != tmp) | |||
gsf_xml_out_add_cstr_unchecked (info->xml, "errorStyle", tmp); | gsf_xml_out_add_cstr_unchecked (info->xml, "errorStyle", tmp); | |||
if (vip->v->allow_blank) | if (vip->v->allow_blank) | |||
xlsx_add_bool (info->xml, "allowBlank", TRUE); | xlsx_add_bool (info->xml, "allowBlank", TRUE); | |||
if (vip->v->use_dropdown) | ||||
xlsx_add_bool (info->xml, "showDropDown", TRUE); | // Inverted sense | |||
xlsx_add_bool (info->xml, "showDropDown", !vip->v->use_dropdown); | ||||
if (NULL != vip->v->title) | if (NULL != vip->v->title) | |||
gsf_xml_out_add_cstr (info->xml, "errorTitle", vip->v->ti tle->str); | gsf_xml_out_add_cstr (info->xml, "errorTitle", vip->v->ti tle->str); | |||
if (NULL != vip->v->msg) | if (NULL != vip->v->msg) | |||
gsf_xml_out_add_cstr (info->xml, "error", vip->v->msg->st r); | gsf_xml_out_add_cstr (info->xml, "error", vip->v->msg->st r); | |||
} | } | |||
/* ?? Always TRUE but not the default ?? */ | /* ?? Always TRUE but not the default ?? */ | |||
xlsx_add_bool (info->xml, "showInputMessage", TRUE); | xlsx_add_bool (info->xml, "showInputMessage", TRUE); | |||
xlsx_add_bool (info->xml, "showErrorMessage", TRUE); | xlsx_add_bool (info->xml, "showErrorMessage", TRUE); | |||
skipping to change at line 2091 | skipping to change at line 2092 | |||
static void | static void | |||
xlsx_write_hlink (GnmHLink const *lnk, GSList *ranges, XLSXClosure *info) | xlsx_write_hlink (GnmHLink const *lnk, GSList *ranges, XLSXClosure *info) | |||
{ | { | |||
gchar *target = g_strdup (gnm_hlink_get_target (lnk)); | gchar *target = g_strdup (gnm_hlink_get_target (lnk)); | |||
gchar const *rid = NULL; | gchar const *rid = NULL; | |||
gchar *location = NULL; | gchar *location = NULL; | |||
gchar const *tip = gnm_hlink_get_tip (lnk); | gchar const *tip = gnm_hlink_get_tip (lnk); | |||
GType const t = G_OBJECT_TYPE (lnk); | GType const t = G_OBJECT_TYPE (lnk); | |||
if (target && g_type_is_a (t, gnm_hlink_url_get_type ())) { | if (target && | |||
(g_type_is_a (t, gnm_hlink_url_get_type ()) || | ||||
GNM_IS_HLINK_EXTERNAL (lnk))) { | ||||
// URLs, including email. | // URLs, including email. | |||
char *hash = strchr (target, '#'); | char *hash = strchr (target, '#'); | |||
if (hash) { | if (hash) { | |||
location = g_strdup (hash + 1); | location = g_strdup (hash + 1); | |||
*hash = 0; | *hash = 0; | |||
} | } | |||
rid = gsf_outfile_open_pkg_add_extern_rel ( | rid = gsf_outfile_open_pkg_add_extern_rel ( | |||
GSF_OUTFILE_OPEN_PKG (gsf_xml_out_get_output (info->xml)) , | GSF_OUTFILE_OPEN_PKG (gsf_xml_out_get_output (info->xml)) , | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 6 lines changed or added |