[gnumeric] Sheet Object: new accessor for print flag.



commit adf20a39a055639a30433d822360636790dee36d
Author: Morten Welinder <terra gnome org>
Date:   Mon May 4 22:12:10 2020 -0400

    Sheet Object: new accessor for print flag.

 ChangeLog                             | 4 ++++
 src/dialogs/dialog-sheetobject-size.c | 6 +++---
 src/sheet-object.c                    | 6 ++++++
 src/sheet-object.h                    | 1 +
 src/xml-sax-write.c                   | 2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index ac52b9b1e..9c44ee8a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-04  Morten Welinder  <terra gnome org>
+
+       * src/sheet-object.c (sheet_object_get_print_flag): New function.
+
 2020-04-29  Morten Welinder  <terra gnome org>
 
        * src/sheet.c (cb_pending_redraw_handler): Do some cheap merging
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index 7e36a6547..c2a37da9b 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -257,7 +257,7 @@ cb_dialog_so_size_apply_clicked (G_GNUC_UNUSED GtkWidget *button,
                cnt++;
        }
        if (state->so_print_check_changed) {
-               gboolean val = ((state->so->flags & SHEET_OBJECT_PRINT) != 0);
+               gboolean val = sheet_object_get_print_flag (state->so);
                undo = go_undo_combine (undo, set_print_flag
                                        (state->so,  val));
                redo = go_undo_combine (redo, set_print_flag
@@ -315,7 +315,7 @@ cb_dialog_so_size_print_check_toggled (GtkToggleButton *togglebutton,
                                       SOSizeState *state)
 {
        gboolean new_print = !gtk_toggle_button_get_active (togglebutton);
-       gboolean old_print = ((state->so->flags & SHEET_OBJECT_PRINT) != 0);
+       gboolean old_print = sheet_object_get_print_flag (state->so);
 
        state->so_print_check_changed
                = (new_print != old_print);
@@ -400,7 +400,7 @@ dialog_so_size (WBCGtk *wbcg, GObject *so)
        gtk_spin_button_set_value (state->xspin, 0.);
        gtk_spin_button_set_value (state->yspin, 0.);
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->print_check),
-                                     !(state->so->flags & SHEET_OBJECT_PRINT));
+                                     !sheet_object_get_print_flag (state->so));
        gnm_so_anchor_mode_chooser_set_mode (state->modecombo,
                                             state->so->anchor.mode);
        grid = GTK_GRID (gtk_builder_get_object (state->gui, "main-grid"));
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 3b07f365c..9fa57a231 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -111,6 +111,12 @@ sheet_object_set_print_flag (SheetObject *so, gboolean *print)
                so->flags &= ~SHEET_OBJECT_PRINT;
 }
 
+gboolean
+sheet_object_get_print_flag (SheetObject *so)
+{
+       return (so->flags & SHEET_OBJECT_PRINT) != 0;
+}
+
 
 static void
 cb_so_size_position (SheetObject *so, SheetControl *sc)
diff --git a/src/sheet-object.h b/src/sheet-object.h
index b71277648..d2b238cdb 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -55,6 +55,7 @@ void        sheet_object_clear_sheet   (SheetObject *so);
 
 void          sheet_object_set_name      (SheetObject *so, const char *name);
 void          sheet_object_set_print_flag (SheetObject *so, gboolean *print);
+gboolean      sheet_object_get_print_flag (SheetObject *so);
 
 SheetObject  *sheet_object_dup          (SheetObject const *so);
 gboolean      sheet_object_can_print    (SheetObject const *so);
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index 683d277ab..31d845b8d 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -1317,7 +1317,7 @@ xml_write_objects (GnmOutputXML *state, GSList *objects)
                        so->anchor.base.direction);
                gsf_xml_out_add_int
                  (state->output, "Print",
-                  (so->flags & SHEET_OBJECT_PRINT) ? 1 : 0);
+                  sheet_object_get_print_flag (so) ? 1 : 0);
 
                (*klass->write_xml_sax) (so, state->output, state->convs);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]