Hello community, here is the log from the commit of package libixion for openSUSE:Factory checked in at 2016-06-14 23:05:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libixion (Old) and /work/SRC/openSUSE:Factory/.libixion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libixion" Changes: -------- --- /work/SRC/openSUSE:Factory/libixion/libixion.changes 2016-03-11 09:37:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libixion.new/libixion.changes 2016-06-14 23:05:06.000000000 +0200 @@ -1,0 +2,7 @@ +Wed May 25 11:55:37 UTC 2016 - [email protected] + +- Version update to 0.11.1: + * Switch to mdds-1.2 + * Few small fixes + +------------------------------------------------------------------- Old: ---- libixion-0.11.0.tar.xz New: ---- libixion-0.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libixion.spec ++++++ --- /var/tmp/diff_new_pack.DOy3lG/_old 2016-06-14 23:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.DOy3lG/_new 2016-06-14 23:05:07.000000000 +0200 @@ -18,7 +18,7 @@ %define libname libixion-0_11-0 Name: libixion -Version: 0.11.0 +Version: 0.11.1 Release: 0 Summary: Threaded multi-target formula parser & interpreter License: MIT @@ -31,7 +31,7 @@ BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: pkgconfig(mdds-1.0) +BuildRequires: pkgconfig(mdds-1.2) BuildRequires: pkgconfig(python3) BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ libixion-0.11.0.tar.xz -> libixion-0.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/ChangeLog new/libixion-0.11.1/ChangeLog --- old/libixion-0.11.0/ChangeLog 2016-02-13 14:42:29.000000000 +0100 +++ new/libixion-0.11.1/ChangeLog 2016-05-12 02:35:45.000000000 +0200 @@ -1,5 +1,59 @@ # Generated by Makefile. Do not edit. +commit 4e3e34fd5adc3134332b0634347df8e0fdc70785 +Author: Kohei Yoshida <[email protected]> +Date: Wed May 11 20:35:33 2016 -0400 + + Update it. + +commit 44539859a75774d3ad14f1ff5edccabeafca3d42 +Author: Kohei Yoshida <[email protected]> +Date: Mon Apr 4 20:03:05 2016 -0400 + + Add method docs. + +commit c1dc87c6c1284aa89b9d8a7af0bf5e5673df590f +Author: Kohei Yoshida <[email protected]> +Date: Mon Apr 4 19:37:26 2016 -0400 + + It now requires mdds API version 1.2 (from the master branch). + +commit 5ebabdacfde847e7000e00ed79c7056c967b230f +Author: Kohei Yoshida <[email protected]> +Date: Sat Apr 2 20:37:12 2016 -0400 + + Add model_context::get_columns(). + +commit b0787b0d01b509559ec8779e3b06669d484f062b +Author: David Tardon <[email protected]> +Date: Sun Feb 14 17:07:03 2016 +0100 + + MDDS_HASH_CONTAINER_BOOST was removed in mdds 1.0 + +commit 97b5fe6bf868341e743b7b6e106b8991fc6b3684 +Author: Kohei Yoshida <[email protected]> +Date: Sun Feb 14 08:32:08 2016 -0500 + + Fix one factual error. cell.hpp still depends on boost::thread. + +commit 8da8a5b402e9e2861210baa0c1b236cf3750c964 +Author: David Tardon <[email protected]> +Date: Sun Feb 14 09:04:18 2016 +0100 + + distribute LICENSE + +commit cb8626668248d1de109c725569e97eadf96e7d28 +Author: Kohei Yoshida <[email protected]> +Date: Sat Feb 13 12:19:11 2016 -0500 + + We don't use shared_lock in ixion. + +commit aad829b30a0a4c13dcad84ff3a8fa883b08977de +Author: Kohei Yoshida <[email protected]> +Date: Sat Feb 13 10:02:04 2016 -0500 + + Added URLs to the 0.11.0 packages. + commit e7b9b3f2dd5314ff99dfe893c0c130707ce2c650 Author: Kohei Yoshida <[email protected]> Date: Sat Feb 13 08:37:47 2016 -0500 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/LICENSE new/libixion-0.11.1/LICENSE --- old/libixion-0.11.0/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/libixion-0.11.1/LICENSE 2015-07-01 01:08:40.000000000 +0200 @@ -0,0 +1,4 @@ +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/Makefile.am new/libixion-0.11.1/Makefile.am --- old/libixion-0.11.0/Makefile.am 2016-02-13 05:00:41.000000000 +0100 +++ new/libixion-0.11.1/Makefile.am 2016-02-14 14:33:07.000000000 +0100 @@ -50,6 +50,7 @@ doc/sheet.rst EXTRA_DIST = \ + LICENSE \ libixion.pc.in \ autogen.sh \ $(bin_data) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/Makefile.in new/libixion-0.11.1/Makefile.in --- old/libixion-0.11.0/Makefile.in 2016-02-13 05:00:53.000000000 +0100 +++ new/libixion-0.11.1/Makefile.in 2016-05-12 02:33:43.000000000 +0200 @@ -433,6 +433,7 @@ doc/sheet.rst EXTRA_DIST = \ + LICENSE \ libixion.pc.in \ autogen.sh \ $(bin_data) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/README new/libixion-0.11.1/README --- old/libixion-0.11.0/README 2016-02-13 02:38:06.000000000 +0100 +++ new/libixion-0.11.1/README 2016-05-12 02:33:38.000000000 +0200 @@ -56,13 +56,15 @@ ## Download source packages -| Version | Release Date | Download | Check Sum | -|---------|--------------|----------|-----------| -| 0.9.1 | 2015-04-05 | [libixion-0.9.1.tar.xz](http://kohei.us/files/ixion/src/libixion-0.9.1.tar.xz) | md5sum: d292f6d62847f2305178459390842eac<br/>sha1sum: 8ae071e7e89784933caadeffc16ed7b0764350a9 | -| 0.9.0 | 2015-02-16 | [libixion-0.9.0.tar.xz](http://kohei.us/files/ixion/src/libixion-0.9.0.tar.xz) | md5sum: 26f293e708513dea5e6e25e9232a7400<br/>sha1sum: 4f97682546236aee686e86293f9890d79f25cf23 | -| 0.7.0 | 2013-12-13 | [libixion-0.7.0.tar.bz2](http://kohei.us/files/ixion/src/libixion-0.7.0.tar.bz2) | md5sum: 000157117801f9507f34b26ba998c4d1<br/>sha1sum: 99b8f9f49078ef7e15280f5c73dff639a6e9472c | -| 0.5.0 | 2013-03-27 | [libixion-0.5.0.tar.bz2](http://kohei.us/files/ixion/src/libixion-0.5.0.tar.bz2) | md5sum: ebaeab9ffe1e6bd68b2a20bfa430b3af<br/>sha1sum: 99290ed5aa2ab2338ba04737210256c48885107c | -| 0.3.0 | 2011-11-01 | [libixion_0.3.0.tar.bz2](http://kohei.us/files/ixion/src/libixion_0.3.0.tar.bz2) | md5sum: 96a36a0016f968a5a7c4b167eeb1643b<br/>sha1sum: ac1fa915303ed8492ac50d6f0aa4d974e8405954 | +| Version | API Version | Release Date | Download | Check Sum | File Size (bytes) | +|---------|-------------|--------------|----------|-----------|-------------------| +| 0.11.0 | 0.11.0 | 2016-02-13 | [libixion-0.11.0.tar.xz](http://kohei.us/files/ixion/src/libixion-0.11.0.tar.xz) | sha256sum: 97a6e7f2b1fcbff69e76fe4e1df62f1cfcc353820472991e37de00aacb024293 | 365652 | +| | | | [libixion-0.11.0.tar.gz](http://kohei.us/files/ixion/src/libixion-0.11.0.tar.gz) | sha256sum: fd697e9ab334bb1cf0161fab25f46bbbcf517248de9bbc1f684d9854b9b287c0 | 567644 | +| 0.9.1 | | 2015-04-05 | [libixion-0.9.1.tar.xz](http://kohei.us/files/ixion/src/libixion-0.9.1.tar.xz) | md5sum: d292f6d62847f2305178459390842eac<br/>sha1sum: 8ae071e7e89784933caadeffc16ed7b0764350a9 | - | +| 0.9.0 | | 2015-02-16 | [libixion-0.9.0.tar.xz](http://kohei.us/files/ixion/src/libixion-0.9.0.tar.xz) | md5sum: 26f293e708513dea5e6e25e9232a7400<br/>sha1sum: 4f97682546236aee686e86293f9890d79f25cf23 | - | +| 0.7.0 | | 2013-12-13 | [libixion-0.7.0.tar.bz2](http://kohei.us/files/ixion/src/libixion-0.7.0.tar.bz2) | md5sum: 000157117801f9507f34b26ba998c4d1<br/>sha1sum: 99b8f9f49078ef7e15280f5c73dff639a6e9472c | - | +| 0.5.0 | | 2013-03-27 | [libixion-0.5.0.tar.bz2](http://kohei.us/files/ixion/src/libixion-0.5.0.tar.bz2) | md5sum: ebaeab9ffe1e6bd68b2a20bfa430b3af<br/>sha1sum: 99290ed5aa2ab2338ba04737210256c48885107c | - | +| 0.3.0 | | 2011-11-01 | [libixion_0.3.0.tar.bz2](http://kohei.us/files/ixion/src/libixion_0.3.0.tar.bz2) | md5sum: 96a36a0016f968a5a7c4b167eeb1643b<br/>sha1sum: ac1fa915303ed8492ac50d6f0aa4d974e8405954 | - | ## Building from source code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/configure new/libixion-0.11.1/configure --- old/libixion-0.11.0/configure 2016-02-13 05:00:54.000000000 +0100 +++ new/libixion-0.11.1/configure 2016-05-12 02:33:43.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libixion 0.11.0. +# Generated by GNU Autoconf 2.69 for libixion 0.11.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='libixion' PACKAGE_TARNAME='libixion' -PACKAGE_VERSION='0.11.0' -PACKAGE_STRING='libixion 0.11.0' +PACKAGE_VERSION='0.11.1' +PACKAGE_STRING='libixion 0.11.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1370,7 +1370,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libixion 0.11.0 to adapt to many kinds of systems. +\`configure' configures libixion 0.11.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1440,7 +1440,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libixion 0.11.0:";; + short | recursive ) echo "Configuration of libixion 0.11.1:";; esac cat <<\_ACEOF @@ -1564,7 +1564,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libixion configure 0.11.0 +libixion configure 0.11.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2191,7 +2191,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libixion $as_me 0.11.0, which was +It was created by libixion $as_me 0.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3056,7 +3056,7 @@ # Define the identity of the package. PACKAGE='libixion' - VERSION='0.11.0' + VERSION='0.11.1' cat >>confdefs.h <<_ACEOF @@ -4240,11 +4240,11 @@ fi -IXION_VERSION=0.11.0 +IXION_VERSION=0.11.1 IXION_API_VERSION=0.11 IXION_MAJOR_VERSION=0 IXION_MINOR_VERSION=11 -IXION_MICRO_VERSION=0 +IXION_MICRO_VERSION=1 @@ -17006,12 +17006,12 @@ pkg_cv_MDDS_CFLAGS="$MDDS_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0 >= 1.1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mdds-1.0 >= 1.1.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.2 >= 1.2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mdds-1.2 >= 1.2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.0 >= 1.1.0" 2>/dev/null` + pkg_cv_MDDS_CFLAGS=`$PKG_CONFIG --cflags "mdds-1.2 >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17023,12 +17023,12 @@ pkg_cv_MDDS_LIBS="$MDDS_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.0 >= 1.1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mdds-1.0 >= 1.1.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mdds-1.2 >= 1.2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mdds-1.2 >= 1.2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.0 >= 1.1.0" 2>/dev/null` + pkg_cv_MDDS_LIBS=`$PKG_CONFIG --libs "mdds-1.2 >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17049,14 +17049,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.0 >= 1.1.0" 2>&1` + MDDS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mdds-1.2 >= 1.2.0" 2>&1` else - MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.0 >= 1.1.0" 2>&1` + MDDS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mdds-1.2 >= 1.2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$MDDS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (mdds-1.0 >= 1.1.0) were not met: + as_fn_error $? "Package requirements (mdds-1.2 >= 1.2.0) were not met: $MDDS_PKG_ERRORS @@ -19170,7 +19170,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libixion $as_me 0.11.0, which was +This file was extended by libixion $as_me 0.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19236,7 +19236,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libixion config.status 0.11.0 +libixion config.status 0.11.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/configure.ac new/libixion-0.11.1/configure.ac --- old/libixion-0.11.0/configure.ac 2016-02-13 05:00:41.000000000 +0100 +++ new/libixion-0.11.1/configure.ac 2016-04-05 02:48:42.000000000 +0200 @@ -3,7 +3,7 @@ m4_define([ixion_major_version], [0]) m4_define([ixion_minor_version], [11]) -m4_define([ixion_micro_version], [0]) +m4_define([ixion_micro_version], [1]) m4_define([ixion_major_api_version], [0]) m4_define([ixion_minor_api_version], [11]) @@ -84,7 +84,7 @@ BOOST_REQUIRE([1.36]) # Check for mdds. -PKG_CHECK_MODULES([MDDS],[mdds-1.0 >= 1.1.0]) +PKG_CHECK_MODULES([MDDS],[mdds-1.2 >= 1.2.0]) # Check for python. AS_IF([test "x$enable_python" != "xno"], [ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/include/ixion/column_store_type.hpp new/libixion-0.11.1/include/ixion/column_store_type.hpp --- old/libixion-0.11.0/include/ixion/column_store_type.hpp 2015-07-01 01:08:40.000000000 +0200 +++ new/libixion-0.11.1/include/ixion/column_store_type.hpp 2016-04-03 02:19:29.000000000 +0200 @@ -39,7 +39,9 @@ MDDS_MTV_DEFINE_ELEMENT_CALLBACKS_PTR(formula_cell, element_type_formula, NULL, formula_element_block) typedef mdds::mtv::custom_block_func1<formula_element_block> ixion_element_block_func; + typedef mdds::multi_type_vector<ixion_element_block_func> column_store_t; +typedef std::vector<column_store_t*> column_stores_t; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/include/ixion/formula_result.hpp new/libixion-0.11.1/include/ixion/formula_result.hpp --- old/libixion-0.11.0/include/ixion/formula_result.hpp 2015-07-01 01:08:40.000000000 +0200 +++ new/libixion-0.11.1/include/ixion/formula_result.hpp 2016-04-05 02:48:42.000000000 +0200 @@ -41,12 +41,46 @@ void set_string(string_id_t strid); void set_error(formula_error_t e); + /** + * Get a numeric result value. The caller must make sure the result is of + * numeric type, else the behavior is undefined. + * + * @return numeric result value. + */ double get_value() const; + + /** + * Get a string ID for textural result value. The caller must make sure + * the result is of textural type, else the behavior is undefined. + * + * @return string ID. + */ string_id_t get_string() const; + + /** + * Get an error value of the result. The caller must make sure that the + * result is of error type, else the behavior is undefined. + * + * @return enum value representing the error. + * @see ixion::get_formula_error_name + */ formula_error_t get_error() const; + /** + * Get the type of result. + * + * @return enum value representing the result type. + */ result_type get_type() const; + /** + * Get a string representation of the result value no matter what the + * result type is. + * + * @param cxt model context object. + * + * @return string representation of the result value. + */ std::string str(const iface::formula_model_access& cxt) const; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/include/ixion/model_context.hpp new/libixion-0.11.1/include/ixion/model_context.hpp --- old/libixion-0.11.0/include/ixion/model_context.hpp 2015-08-23 02:56:40.000000000 +0200 +++ new/libixion-0.11.1/include/ixion/model_context.hpp 2016-04-03 02:23:16.000000000 +0200 @@ -152,6 +152,17 @@ */ const column_store_t* get_column(sheet_t sheet, col_t col) const; + /** + * Get an array of column stores for the entire sheet. + * + * + * @param sheet sheet index. + * + * @return const pointer to an array of column stores, or nullptr in case + * the sheet index is out of bound. + */ + const column_stores_t* get_columns(sheet_t sheet) const; + void get_all_formula_cells(dirty_formula_cells_t& cells) const; private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/src/libixion/cell_queue_manager.cpp new/libixion-0.11.1/src/libixion/cell_queue_manager.cpp --- old/libixion-0.11.0/src/libixion/cell_queue_manager.cpp 2015-07-01 01:08:40.000000000 +0200 +++ new/libixion-0.11.1/src/libixion/cell_queue_manager.cpp 2016-02-13 18:18:26.000000000 +0100 @@ -11,7 +11,6 @@ #include "ixion/interface/formula_model_access.hpp" #include <boost/thread.hpp> -#include <boost/thread/shared_mutex.hpp> #include <boost/thread/mutex.hpp> #include <cassert> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/src/libixion/model_context.cpp new/libixion-0.11.1/src/libixion/model_context.cpp --- old/libixion-0.11.0/src/libixion/model_context.cpp 2015-08-23 02:56:40.000000000 +0200 +++ new/libixion-0.11.1/src/libixion/model_context.cpp 2016-04-03 02:26:47.000000000 +0200 @@ -235,6 +235,7 @@ void dump_strings() const; const column_store_t* get_column(sheet_t sheet, col_t col) const; + const column_stores_t* get_columns(sheet_t sheet) const; const formula_tokens_t* get_formula_tokens(sheet_t sheet, size_t identifier) const; size_t add_formula_tokens(sheet_t sheet, formula_tokens_t* p); @@ -428,16 +429,25 @@ const column_store_t* model_context_impl::get_column(sheet_t sheet, col_t col) const { if (static_cast<size_t>(sheet) >= m_sheets.size()) - return NULL; + return nullptr; const worksheet& sh = m_sheets[sheet]; if (static_cast<size_t>(col) >= sh.size()) - return NULL; + return nullptr; return &sh[col]; } +const column_stores_t* model_context_impl::get_columns(sheet_t sheet) const +{ + if (static_cast<size_t>(sheet) >= m_sheets.size()) + return nullptr; + + const worksheet& sh = m_sheets[sheet]; + return &sh.get_columns(); +} + const formula_tokens_t* model_context_impl::get_formula_tokens(sheet_t sheet, size_t identifier) const { if (m_tokens.size() <= identifier) @@ -1310,6 +1320,11 @@ return mp_impl->get_column(sheet, col); } +const column_stores_t* model_context::get_columns(sheet_t sheet) const +{ + return mp_impl->get_columns(sheet); +} + void model_context::get_all_formula_cells(dirty_formula_cells_t& cells) const { mp_impl->get_all_formula_cells(cells); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libixion-0.11.0/src/libixion/workbook.hpp new/libixion-0.11.1/src/libixion/workbook.hpp --- old/libixion-0.11.0/src/libixion/workbook.hpp 2015-07-01 01:08:40.000000000 +0200 +++ new/libixion-0.11.1/src/libixion/workbook.hpp 2016-04-03 02:26:44.000000000 +0200 @@ -38,8 +38,10 @@ */ size_type size() const { return m_columns.size(); } + const column_stores_t& get_columns() const { return m_columns; } + private: - std::vector<column_store_t*> m_columns; + column_stores_t m_columns; std::vector<column_store_t::iterator> m_pos_hints; };
