[gnumeric] Adjust formats wehn autofitting new entries. [#626903]
- From: Andreas J. Guelzow <guelzow src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Adjust formats wehn autofitting new entries. [#626903]
- Date: Sat, 14 Aug 2010 04:04:16 +0000 (UTC)
commit 39399e44041db7f94d441476586f5fe78bb39c0e
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date: Fri Aug 13 22:03:47 2010 -0600
Adjust formats wehn autofitting new entries. [#626903]
2010-08-13 Andreas J. Guelzow <aguelzow pyrshep ca>
* src/colrow.h (colrow_autofit_col): new
(colrow_autofit_row): new
* src/colrow.c (colrow_autofit_col): new
(colrow_autofit_row): new
* src/commands.c (cmd_set_text_full_autofit_row): renamed and moved to
src/colrow.c
(cmd_set_text_full_autofit_col): renamed and moved to src/colrow.c with
changes
(cmd_set_text_full): adjust calls to cmd_set_text_full_autofit_*
ChangeLog | 12 ++++++++++++
NEWS | 3 ++-
src/colrow.c | 19 +++++++++++++++++++
src/colrow.h | 2 ++
src/commands.c | 20 ++------------------
5 files changed, 37 insertions(+), 19 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 732944a..828eaea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2010-08-13 Andreas J. Guelzow <aguelzow pyrshep ca>
+ * src/colrow.h (colrow_autofit_col): new
+ (colrow_autofit_row): new
+ * src/colrow.c (colrow_autofit_col): new
+ (colrow_autofit_row): new
+ * src/commands.c (cmd_set_text_full_autofit_row): renamed and moved to
+ src/colrow.c
+ (cmd_set_text_full_autofit_col): renamed and moved to src/colrow.c with
+ changes
+ (cmd_set_text_full): adjust calls to cmd_set_text_full_autofit_*
+
+2010-08-13 Andreas J. Guelzow <aguelzow pyrshep ca>
+
* src/commands.c (cmd_set_text_full): check whether the same-text and
not same-markup situation in fact applies.
diff --git a/NEWS b/NEWS
index 45e13c2..66a7c74 100644
--- a/NEWS
+++ b/NEWS
@@ -14,7 +14,8 @@ Andreas:
[#626789]
* Fix autofitting on data entry. [#626861]
* Avoid some of the multiple undos when entering existing text in
- ranges. [#626797]
+ ranges. [#626797]
+ * Adjust formats wehn autofitting new entries. [#626903]
Jean:
* Import Guppi graphs from gnumeric-1.0.x files. [#567953]
diff --git a/src/colrow.c b/src/colrow.c
index 1f52112..699aec4 100644
--- a/src/colrow.c
+++ b/src/colrow.c
@@ -808,6 +808,25 @@ colrow_autofit (Sheet *sheet, const GnmRange *range, gboolean is_cols,
colrow_foreach (crs, a, b, handler, &data);
}
+void
+colrow_autofit_col (Sheet *sheet, GnmRange *r)
+{
+ colrow_autofit (sheet, r, TRUE, TRUE,
+ TRUE, FALSE, NULL, NULL);
+ sheet_foreach_cell_in_range (sheet, CELL_ITER_IGNORE_BLANK,
+ r->start.col, 0,
+ r->end.col, gnm_sheet_get_last_row (sheet),
+ (CellIterFunc) &cb_clear_variable_width_content,
+ NULL);
+}
+
+void
+colrow_autofit_row (Sheet *sheet, GnmRange *r)
+{
+ colrow_autofit (sheet, r, FALSE, FALSE,
+ TRUE, FALSE, NULL, NULL);
+}
+
/*****************************************************************************/
typedef struct
diff --git a/src/colrow.h b/src/colrow.h
index 55945f8..d15a9de 100644
--- a/src/colrow.h
+++ b/src/colrow.h
@@ -155,6 +155,8 @@ void colrow_autofit (Sheet *sheet,
gboolean min_default,
ColRowIndexList **indices,
ColRowStateList **sizes);
+void colrow_autofit_col (Sheet *sheet, GnmRange *r);
+void colrow_autofit_row (Sheet *sheet, GnmRange *r);
G_END_DECLS
diff --git a/src/commands.c b/src/commands.c
index cc217eb..ca03ca4 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -735,21 +735,6 @@ command_undo_sheet_delete (Sheet* sheet)
/******************************************************************/
-static void
-cmd_set_text_full_autofit_row (Sheet *sheet, GnmRange *r)
-{
- colrow_autofit (sheet, r, FALSE, FALSE,
- TRUE, FALSE, NULL, NULL);
-}
-
-static void
-cmd_set_text_full_autofit_col (Sheet *sheet, GnmRange *r)
-{
- colrow_autofit (sheet, r, TRUE, TRUE,
- TRUE, FALSE, NULL, NULL);
-}
-
-
static GnmValue *
cmd_set_text_full_check_texpr (GnmCellIter const *iter, GnmExprTop const *texpr)
{
@@ -1026,7 +1011,7 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
redo = go_undo_combine
(go_undo_binary_new
(sheet, new_r,
- (GOUndoBinaryFunc) cmd_set_text_full_autofit_row,
+ (GOUndoBinaryFunc) colrow_autofit_row,
NULL, g_free),
redo);
cri_row_list = colrow_get_index_list
@@ -1038,13 +1023,12 @@ cmd_set_text_full (WorkbookControl *wbc, GSList *selection, GnmEvalPos *ep,
redo = go_undo_combine
(go_undo_binary_new
(sheet, new_r,
- (GOUndoBinaryFunc) cmd_set_text_full_autofit_col,
+ (GOUndoBinaryFunc) colrow_autofit_col,
NULL, g_free),
redo);
cri_col_list = colrow_get_index_list
(r->start.col, r->end.col, cri_col_list);
}
-
}
undo = go_undo_combine (undo,
gnm_undo_colrow_restore_state_group_new
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]