diff --git a/source/worksheet/cell_iterator.cpp b/source/worksheet/cell_iterator.cpp index e4c334e9..9caf9c19 100644 --- a/source/worksheet/cell_iterator.cpp +++ b/source/worksheet/cell_iterator.cpp @@ -30,12 +30,12 @@ namespace xlnt { cell_iterator::cell_iterator(worksheet ws, const cell_reference &cursor, const range_reference &bounds, major_order order, bool skip_null, bool wrap) - : ws_(ws), - cursor_(cursor), - bounds_(bounds), + : skip_null_(skip_null), + wrap_(wrap), order_(order), - skip_null_(skip_null), - wrap_(wrap) + ws_(ws), + cursor_(cursor), + bounds_(bounds) { if (skip_null && !ws.has_cell(cursor_)) { @@ -45,12 +45,12 @@ cell_iterator::cell_iterator(worksheet ws, const cell_reference &cursor, const_cell_iterator::const_cell_iterator(worksheet ws, const cell_reference &cursor, const range_reference &bounds, major_order order, bool skip_null, bool wrap) - : ws_(ws), - cursor_(cursor), - bounds_(bounds), + : skip_null_(skip_null), + wrap_(wrap), order_(order), - skip_null_(skip_null), - wrap_(wrap) + ws_(ws), + cursor_(cursor), + bounds_(bounds) { if (skip_null && !ws.has_cell(cursor_)) { diff --git a/source/worksheet/range_iterator.cpp b/source/worksheet/range_iterator.cpp index 2c7a3a10..0cd10896 100644 --- a/source/worksheet/range_iterator.cpp +++ b/source/worksheet/range_iterator.cpp @@ -40,11 +40,11 @@ const range_iterator::reference range_iterator::operator*() const range_iterator::range_iterator(worksheet &ws, const cell_reference &cursor, const range_reference &bounds, major_order order, bool skip_null) - : ws_(ws), - cursor_(cursor), - bounds_(bounds), + : skip_null_(skip_null), order_(order), - skip_null_(skip_null) + ws_(ws), + cursor_(cursor), + bounds_(bounds) { if (skip_null_ && (**this).empty()) { @@ -156,11 +156,11 @@ range_iterator range_iterator::operator++(int) const_range_iterator::const_range_iterator(const worksheet &ws, const cell_reference &cursor, const range_reference &bounds, major_order order, bool skip_null) - : ws_(ws.d_), - cursor_(cursor), - bounds_(bounds), + : skip_null_(skip_null), order_(order), - skip_null_(skip_null) + ws_(ws.d_), + cursor_(cursor), + bounds_(bounds) { if (skip_null_ && (**this).empty()) {