[Libreoffice-commits] .: 18 commits - configure.ac cui/source dbaccess/source download.lst liborcus/ExternalProject_liborcus.mk liborcus/liborcus_0.1.0-link-with-Boost.System.patch liborcus/liborcus_0.1.0-mingw.patch liborcus/liborcus_0.1.0-warnings.patch liborcus/Package_liborcus.mk liborcus/UnpackedTarball_orcus.mk sc/Library_scfilt.mk sc/source sd/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source svx/source zlib/StaticLibrary_zlib.mk
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 28 07:09:35 PST 2012
configure.ac | 2
cui/source/customize/cfg.cxx | 4
dbaccess/source/ui/app/AppDetailView.cxx | 2
dbaccess/source/ui/control/listviewitems.cxx | 2
download.lst | 2
liborcus/ExternalProject_liborcus.mk | 2
liborcus/Package_liborcus.mk | 2
liborcus/UnpackedTarball_orcus.mk | 5
liborcus/liborcus_0.1.0-link-with-Boost.System.patch | 634 -------------------
liborcus/liborcus_0.1.0-mingw.patch | 123 ---
liborcus/liborcus_0.1.0-warnings.patch | 62 -
sc/Library_scfilt.mk | 7
sc/source/filter/orcus/orcusfiltersimpl.cxx | 9
sd/source/ui/animations/CustomAnimationList.cxx | 8
svtools/Library_svt.mk | 1
svtools/Package_inc.mk | 1
svtools/inc/svtools/treelist.hxx | 120 ---
svtools/inc/svtools/treelistbox.hxx | 38 -
svtools/inc/svtools/viewdataentry.hxx | 78 ++
svtools/source/contnr/fileview.cxx | 1
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/contnr/svlbitm.cxx | 8
svtools/source/contnr/treelist.cxx | 104 +--
svtools/source/contnr/treelistbox.cxx | 52 -
svtools/source/contnr/viewdataentry.cxx | 117 +++
svtools/source/uno/treecontrolpeer.cxx | 12
svx/source/form/filtnav.cxx | 4
zlib/StaticLibrary_zlib.mk | 4
28 files changed, 330 insertions(+), 1076 deletions(-)
New commits:
commit 29714cdc5a2752fe595911ecfbef98b31de6f0f4
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Nov 28 10:08:48 2012 -0500
New place to specify the tarball name.
Change-Id: Ia0fd46ae58bb2ae58e8ad9bdb16e1e948659492b
diff --git a/download.lst b/download.lst
index 5766d52..7f6d148 100644
--- a/download.lst
+++ b/download.lst
@@ -65,7 +65,7 @@ export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
export NSS_TARBALL := a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
export OPENSSL_TARBALL := 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
-export ORCUS_TARBALL := 46d9f4cf8b145c21ce1056e116d2ce71-liborcus_0.1.0.tar.bz2
+export ORCUS_TARBALL := 8755aac23317494a9028569374dc87b2-liborcus_0.1.0.tar.bz2
export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2
commit 89288d6e4f5a9c8578a5c34b236a53f5c361e785
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Wed Nov 28 07:02:19 2012 -0500
This is now struct, not class.
Change-Id: I36bceeb27ff03e09f78c794cdefb4093d94b23b9
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index ff2cd94..23a55f4 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -42,7 +42,7 @@
class Application;
class SvTreeListBox;
class SvTreeListEntry;
-class SvViewDataItem;
+struct SvViewDataItem;
class SvViewDataEntry;
class SvInplaceEdit2;
class SvLBoxString;
commit e3ee369076f0097f3415923bde06a1a760fa2d78
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 22:16:52 2012 -0500
Remove patches that are no longer needed.
Per feedback from David T. the patch author.
Change-Id: I6adae0a70926f6e402ba1f7680806e6c6097616e
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 0a662f5..3375c95 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -16,11 +16,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
orcus_patches :=
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
-# fix MinGW build
-#orcus_patches += liborcus_0.1.0-mingw.patch
# disable boost "auto lib" in MSVC build
orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
-#orcus_patches += liborcus_0.1.0-link-with-Boost.System.patch
$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
diff --git a/liborcus/liborcus_0.1.0-link-with-Boost.System.patch b/liborcus/liborcus_0.1.0-link-with-Boost.System.patch
deleted file mode 100644
index 55a6307..0000000
--- a/liborcus/liborcus_0.1.0-link-with-Boost.System.patch
+++ /dev/null
@@ -1,634 +0,0 @@
-diff -up ./configure.dt ./configure
---- ./configure.dt 2012-11-22 15:19:53.138663523 +0100
-+++ ./configure 2012-11-22 15:20:55.648956963 +0100
-@@ -650,6 +650,9 @@ LIBZIP_CFLAGS
- HAVE_STATIC_LIB_FALSE
- HAVE_STATIC_LIB_TRUE
- ORCUS_API_VERSION
-+BOOST_SYSTEM_LIB
-+BOOST_LDFLAGS
-+BOOST_CPPFLAGS
- LIBOBJS
- POW_LIB
- PKG_CONFIG_LIBDIR
-@@ -787,6 +790,9 @@ enable_fast_install
- with_gnu_ld
- with_sysroot
- enable_libtool_lock
-+with_boost
-+with_boost_libdir
-+with_boost_system
- enable_werror
- enable_debug
- with_libzip
-@@ -8555,6 +8574,10 @@ _lt_linker_boilerplate=`cat conftest.err
- $RM -r conftest*
-
-
-+## CAVEAT EMPTOR:
-+## There is no encapsulation within the following macros, do not change
-+## the running order or otherwise move them around unless you know exactly
-+## what you are doing...
- if test -n "$compiler"; then
-
- lt_prog_compiler_no_builtin_flag=
-@@ -16021,6 +16044,559 @@ $as_echo "#define _REENTRANT /**/" >>con
- $as_echo "#define BOOST_ALL_NO_LIB /**/" >>confdefs.h
-
-
-+
-+# Check whether --with-boost was given.
-+if test "${with_boost+set}" = set; then :
-+ withval=$with_boost;
-+ if test "$withval" = "no"; then
-+ want_boost="no"
-+ elif test "$withval" = "yes"; then
-+ want_boost="yes"
-+ ac_boost_path=""
-+ else
-+ want_boost="yes"
-+ ac_boost_path="$withval"
-+ fi
-+
-+else
-+ want_boost="yes"
-+fi
-+
-+
-+
-+
-+# Check whether --with-boost-libdir was given.
-+if test "${with_boost_libdir+set}" = set; then :
-+ withval=$with_boost_libdir;
-+ if test -d "$withval"
-+ then
-+ ac_boost_lib_path="$withval"
-+ else
-+ as_fn_error $? "--with-boost-libdir expected directory name" "$LINENO" 5
-+ fi
-+
-+else
-+ ac_boost_lib_path=""
-+
-+fi
-+
-+
-+if test "x$want_boost" = "xyes"; then
-+ boost_lib_version_req=1.20.0
-+ boost_lib_version_req_shorten=`expr $boost_lib_version_req : '\([0-9]*\.[0-9]*\)'`
-+ boost_lib_version_req_major=`expr $boost_lib_version_req : '\([0-9]*\)'`
-+ boost_lib_version_req_minor=`expr $boost_lib_version_req : '[0-9]*\.\([0-9]*\)'`
-+ boost_lib_version_req_sub_minor=`expr $boost_lib_version_req : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
-+ if test "x$boost_lib_version_req_sub_minor" = "x" ; then
-+ boost_lib_version_req_sub_minor="0"
-+ fi
-+ WANT_BOOST_VERSION=`expr $boost_lib_version_req_major \* 100000 \+ $boost_lib_version_req_minor \* 100 \+ $boost_lib_version_req_sub_minor`
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for boostlib >= $boost_lib_version_req" >&5
-+$as_echo_n "checking for boostlib >= $boost_lib_version_req... " >&6; }
-+ succeeded=no
-+
-+ libsubdirs="lib"
-+ ax_arch=`uname -m`
-+ if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
-+ libsubdirs="lib64 lib lib64"
-+ fi
-+
-+ if test "$ac_boost_path" != ""; then
-+ BOOST_CPPFLAGS="-I$ac_boost_path/include"
-+ for ac_boost_path_tmp in $libsubdirs; do
-+ if test -d "$ac_boost_path"/"$ac_boost_path_tmp" ; then
-+ BOOST_LDFLAGS="-L$ac_boost_path/$ac_boost_path_tmp"
-+ break
-+ fi
-+ done
-+ elif test "$cross_compiling" != yes; then
-+ for ac_boost_path_tmp in /usr /usr/local /opt /opt/local ; do
-+ if test -d "$ac_boost_path_tmp/include/boost" && test -r "$ac_boost_path_tmp/include/boost"; then
-+ for libsubdir in $libsubdirs ; do
-+ if ls "$ac_boost_path_tmp/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-+ done
-+ BOOST_LDFLAGS="-L$ac_boost_path_tmp/$libsubdir"
-+ BOOST_CPPFLAGS="-I$ac_boost_path_tmp/include"
-+ break;
-+ fi
-+ done
-+ fi
-+
-+ if test "$ac_boost_lib_path" != ""; then
-+ BOOST_LDFLAGS="-L$ac_boost_lib_path"
-+ fi
-+
-+ CPPFLAGS_SAVED="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-+ export CPPFLAGS
-+
-+ LDFLAGS_SAVED="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-+ export LDFLAGS
-+
-+
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ #include <boost/version.hpp>
-+
-+int
-+main ()
-+{
-+
-+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
-+ // Everything is okay
-+ #else
-+ # error Boost version is too old
-+ #endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ succeeded=yes
-+ found_system=yes
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+
-+ if test "x$succeeded" != "xyes"; then
-+ _version=0
-+ if test "$ac_boost_path" != ""; then
-+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-+ V_CHECK=`expr $_version_tmp \> $_version`
-+ if test "$V_CHECK" = "1" ; then
-+ _version=$_version_tmp
-+ fi
-+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-+ BOOST_CPPFLAGS="-I$ac_boost_path/include/boost-$VERSION_UNDERSCORE"
-+ done
-+ fi
-+ else
-+ if test "$cross_compiling" != yes; then
-+ for ac_boost_path in /usr /usr/local /opt /opt/local ; do
-+ if test -d "$ac_boost_path" && test -r "$ac_boost_path"; then
-+ for i in `ls -d $ac_boost_path/include/boost-* 2>/dev/null`; do
-+ _version_tmp=`echo $i | sed "s#$ac_boost_path##" | sed 's/\/include\/boost-//' | sed 's/_/./'`
-+ V_CHECK=`expr $_version_tmp \> $_version`
-+ if test "$V_CHECK" = "1" ; then
-+ _version=$_version_tmp
-+ best_path=$ac_boost_path
-+ fi
-+ done
-+ fi
-+ done
-+
-+ VERSION_UNDERSCORE=`echo $_version | sed 's/\./_/'`
-+ BOOST_CPPFLAGS="-I$best_path/include/boost-$VERSION_UNDERSCORE"
-+ if test "$ac_boost_lib_path" = ""; then
-+ for libsubdir in $libsubdirs ; do
-+ if ls "$best_path/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-+ done
-+ BOOST_LDFLAGS="-L$best_path/$libsubdir"
-+ fi
-+ fi
-+
-+ if test "x$BOOST_ROOT" != "x"; then
-+ for libsubdir in $libsubdirs ; do
-+ if ls "$BOOST_ROOT/stage/$libsubdir/libboost_"* >/dev/null 2>&1 ; then break; fi
-+ done
-+ if test -d "$BOOST_ROOT" && test -r "$BOOST_ROOT" && test -d "$BOOST_ROOT/stage/$libsubdir" && test -r "$BOOST_ROOT/stage/$libsubdir"; then
-+ version_dir=`expr //$BOOST_ROOT : '.*/\(.*\)'`
-+ stage_version=`echo $version_dir | sed 's/boost_//' | sed 's/_/./g'`
-+ stage_version_shorten=`expr $stage_version : '\([0-9]*\.[0-9]*\)'`
-+ V_CHECK=`expr $stage_version_shorten \>\= $_version`
-+ if test "$V_CHECK" = "1" -a "$ac_boost_lib_path" = "" ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: We will use a staged boost library from $BOOST_ROOT" >&5
-+$as_echo "$as_me: We will use a staged boost library from $BOOST_ROOT" >&6;}
-+ BOOST_CPPFLAGS="-I$BOOST_ROOT"
-+ BOOST_LDFLAGS="-L$BOOST_ROOT/stage/$libsubdir"
-+ fi
-+ fi
-+ fi
-+ fi
-+
-+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-+ export CPPFLAGS
-+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-+ export LDFLAGS
-+
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ #include <boost/version.hpp>
-+
-+int
-+main ()
-+{
-+
-+ #if BOOST_VERSION >= $WANT_BOOST_VERSION
-+ // Everything is okay
-+ #else
-+ # error Boost version is too old
-+ #endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ succeeded=yes
-+ found_system=yes
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ fi
-+
-+ if test "$succeeded" != "yes" ; then
-+ if test "$_version" = "0" ; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&5
-+$as_echo "$as_me: We could not detect the boost libraries (version $boost_lib_version_req_shorten or higher). If you have a staged boost library (still not installed) please specify \$BOOST_ROOT in your environment and do not give a PATH to --with-boost option. If you are sure you have boost installed, then check your version number looking in <boost/version.hpp>. See http://randspringer.de/boost for more documentation." >&6;}
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: Your boost libraries seems to old (version $_version)." >&5
-+$as_echo "$as_me: Your boost libraries seems to old (version $_version)." >&6;}
-+ fi
-+ # execute ACTION-IF-NOT-FOUND (if present):
-+ :
-+ else
-+
-+
-+
-+$as_echo "#define HAVE_BOOST /**/" >>confdefs.h
-+
-+ # execute ACTION-IF-FOUND (if present):
-+ :
-+ fi
-+
-+ CPPFLAGS="$CPPFLAGS_SAVED"
-+ LDFLAGS="$LDFLAGS_SAVED"
-+fi
-+
-+
-+
-+# ===========================================================
-+# Determine if we are going to need to link with Boost.System
-+# ===========================================================
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to link with Boost.System" >&5
-+$as_echo_n "checking if we need to link with Boost.System... " >&6; }
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+#include <boost/version.hpp>
-+
-+int
-+main ()
-+{
-+
-+#if BOOST_VERSION >= 105000
-+# error yes, we need to link with Boost.System
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+else
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+
-+# Check whether --with-boost-system was given.
-+if test "${with_boost_system+set}" = set; then :
-+ withval=$with_boost_system;
-+ if test "$withval" = "no"; then
-+ want_boost="no"
-+ elif test "$withval" = "yes"; then
-+ want_boost="yes"
-+ ax_boost_user_system_lib=""
-+ else
-+ want_boost="yes"
-+ ax_boost_user_system_lib="$withval"
-+ fi
-+
-+else
-+ want_boost="yes"
-+
-+fi
-+
-+
-+ if test "x$want_boost" = "xyes"; then
-+
-+
-+ CPPFLAGS_SAVED="$CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-+ export CPPFLAGS
-+
-+ LDFLAGS_SAVED="$LDFLAGS"
-+ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-+ export LDFLAGS
-+
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::System library is available" >&5
-+$as_echo_n "checking whether the Boost::System library is available... " >&6; }
-+if ${ax_cv_boost_system+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+ CXXFLAGS_SAVE=$CXXFLAGS
-+
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <boost/system/error_code.hpp>
-+int
-+main ()
-+{
-+boost::system::system_category
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+ ax_cv_boost_system=yes
-+else
-+ ax_cv_boost_system=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ CXXFLAGS=$CXXFLAGS_SAVE
-+ ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_system" >&5
-+$as_echo "$ax_cv_boost_system" >&6; }
-+ if test "x$ax_cv_boost_system" = "xyes"; then
-+
-+
-+
-+$as_echo "#define HAVE_BOOST_SYSTEM /**/" >>confdefs.h
-+
-+ BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/[^\/]*//'`
-+
-+ LDFLAGS_SAVE=$LDFLAGS
-+ if test "x$ax_boost_user_system_lib" = "x"; then
-+ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do
-+ ax_lib=${libextension}
-+ as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-+$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$ax_lib $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char exit ();
-+int
-+main ()
-+{
-+return exit ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
-+else
-+ eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+ BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-+else
-+ link_system="no"
-+fi
-+
-+ done
-+ if test "x$link_system" != "xyes"; then
-+ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do
-+ ax_lib=${libextension}
-+ as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-+$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$ax_lib $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char exit ();
-+int
-+main ()
-+{
-+return exit ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
-+else
-+ eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+ BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-+else
-+ link_system="no"
-+fi
-+
-+ done
-+ fi
-+
-+ else
-+ for ax_lib in $ax_boost_user_system_lib boost_system-$ax_boost_user_system_lib; do
-+ as_ac_Lib=`$as_echo "ac_cv_lib_$ax_lib''_exit" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exit in -l$ax_lib" >&5
-+$as_echo_n "checking for exit in -l$ax_lib... " >&6; }
-+if eval \${$as_ac_Lib+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$ax_lib $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char exit ();
-+int
-+main ()
-+{
-+return exit ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ eval "$as_ac_Lib=yes"
-+else
-+ eval "$as_ac_Lib=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+eval ac_res=\$$as_ac_Lib
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-+ BOOST_SYSTEM_LIB="-l$ax_lib"; link_system="yes"; break
-+else
-+ link_system="no"
-+fi
-+
-+ done
-+
-+ fi
-+ if test "x$ax_lib" = "x"; then
-+ as_fn_error $? "Could not find a version of the library!" "$LINENO" 5
-+ fi
-+ if test "x$link_system" = "xno"; then
-+ as_fn_error $? "Could not link against $ax_lib !" "$LINENO" 5
-+ fi
-+ fi
-+
-+ CPPFLAGS="$CPPFLAGS_SAVED"
-+ LDFLAGS="$LDFLAGS_SAVED"
-+ fi
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
- # =============
- # Set orcus api
- # =============
-diff -up ./src/liborcus/Makefile.in.dt ./src/liborcus/Makefile.in
---- ./src/liborcus/Makefile.in.dt 2012-11-22 15:20:12.680747546 +0100
-+++ ./src/liborcus/Makefile.in 2012-11-22 15:20:55.181954251 +0100
-@@ -303,6 +307,9 @@ AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-+BOOST_LDFLAGS = @BOOST_LDFLAGS@
-+BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
-@@ -437,11 +444,13 @@ liborcus_ at ORCUS_API_VERSION@_la_SOURCES
- liborcus- at ORCUS_API_VERSION@.la
-
- liborcus_ at ORCUS_API_VERSION@_la_CXXFLAGS = \
-+ $(BOOST_SYSTEM_CFLAGS) \
- $(LIBZIP_CFLAGS) \
- $(LIBIXION_CFLAGS)
-
- liborcus_ at ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined
- liborcus_ at ORCUS_API_VERSION@_la_LIBADD = \
-+ $(BOOST_SYSTEM_LIBS) $(BOOST_SYSTEM_LIB) \
- $(LIBZIP_LIBS) \
- $(LIBIXION_LIBS)
-
-diff -up ./src/Makefile.in.dt ./src/Makefile.in
---- ./src/Makefile.in.dt 2012-11-22 15:20:04.274713103 +0100
-+++ ./src/Makefile.in 2012-11-22 15:20:55.059953542 +0100
-@@ -288,6 +292,9 @@ AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-+BOOST_LDFLAGS = @BOOST_LDFLAGS@
-+BOOST_SYSTEM_LIB = @BOOST_SYSTEM_LIB@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
diff --git a/liborcus/liborcus_0.1.0-mingw.patch b/liborcus/liborcus_0.1.0-mingw.patch
deleted file mode 100644
index 68d5150..0000000
--- a/liborcus/liborcus_0.1.0-mingw.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-+++ configure.dt
-+++ configure
-@@ -619,6 +619,8 @@ WITH_LIBZIP_FALSE
- WITH_LIBZIP_TRUE
- LIBZIP_LIBS
- LIBZIP_CFLAGS
-+HAVE_STATIC_LIB_FALSE
-+HAVE_STATIC_LIB_TRUE
- ORCUS_API_VERSION
- LIBOBJS
- POW_LIB
-@@ -15985,6 +15987,18 @@ if test x"$enable_werror" != "xno"; then
-
- fi
-
-+# =========================================================
-+# Determine if we are going to build static lib (for MinGW)
-+# =========================================================
-+ if test "$enable_shared" = no -a "$enable_static" = yes; then
-+ HAVE_STATIC_LIB_TRUE=
-+ HAVE_STATIC_LIB_FALSE='#'
-+else
-+ HAVE_STATIC_LIB_TRUE='#'
-+ HAVE_STATIC_LIB_FALSE=
-+fi
-+
-+
- # =====
- # Debug
- # =====
-@@ -16413,6 +16427,10 @@ if test -z "${am__fastdepCXX_TRUE}" && t
- as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${HAVE_STATIC_LIB_TRUE}" && test -z "${HAVE_STATIC_LIB_FALSE}"; then
-+ as_fn_error $? "conditional \"HAVE_STATIC_LIB\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${WITH_LIBZIP_TRUE}" && test -z "${WITH_LIBZIP_FALSE}"; then
- as_fn_error $? "conditional \"WITH_LIBZIP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+++ src/liborcus/Makefile.in.dt
-+++ src/liborcus/Makefile.in
-@@ -362,7 +361,8 @@ INCDIR = $(top_srcdir)/include
- SRCDIR = $(top_srcdir)/src/liborcus
- BINDIR = $(top_srcdir)/bin
- INCLUDES = -I$(top_srcdir)/include
--AM_CXXFLAGS = -D__ORCUS_BUILDING_DLL=1
-+ at HAVE_STATIC_LIB_FALSE@AM_CPPFLAGS = -D__ORCUS_BUILDING_DLL=1
-+ at HAVE_STATIC_LIB_TRUE@AM_CPPFLAGS = -D__ORCUS_STATIC_LIB=1
- lib_LTLIBRARIES = liborcus- at ORCUS_API_VERSION@.la
- liborcus_ at ORCUS_API_VERSION@_la_SOURCES = dom_tree.cpp exception.cpp \
- global.cpp spreadsheet_interface.cpp orcus_css.cpp \
-+++ src/Makefile.in.dt
-+++ src/Makefile.in
-@@ -37,26 +37,35 @@ host_triplet = @host@
- bin_PROGRAMS = orcus-xml-dump$(EXEEXT) $(am__EXEEXT_2) $(am__EXEEXT_3)
- EXTRA_PROGRAMS = orcus-test-common$(EXEEXT) orcus-test-xml$(EXEEXT) \
- $(am__EXEEXT_1)
-+ at HAVE_STATIC_LIB_TRUE@am__append_1 = -D__ORCUS_STATIC_LIB=1
-+ at HAVE_STATIC_LIB_TRUE@am__append_2 = -D__ORCUS_STATIC_LIB=1
-+ at HAVE_STATIC_LIB_TRUE@am__append_3 = -D__ORCUS_STATIC_LIB=1
- TESTS = orcus-test-common$(EXEEXT) orcus-test-xml$(EXEEXT) \
- $(am__EXEEXT_1)
-
- #----------------------------------------------------------------------------
- # spreadsheet model
- #----------------------------------------------------------------------------
-- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_1 = \
-+ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_4 = \
- @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-csv orcus-xml
-
-- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_2 = \
-+ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_5 = \
- @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-csv \
- @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-xml-mapped
-
-- at BUILD_SPREADSHEET_MODEL_TRUE@am__append_3 = \
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_6 = -D__ORCUS_STATIC_LIB=1
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_7 = -D__ORCUS_STATIC_LIB=1
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_8 = -D__ORCUS_STATIC_LIB=1
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE at am__append_9 = -D__ORCUS_STATIC_LIB=1
-+ at BUILD_SPREADSHEET_MODEL_TRUE@am__append_10 = \
- @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-csv \
- @BUILD_SPREADSHEET_MODEL_TRUE@ orcus-test-xml-mapped
-
-- at BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE at am__append_4 = \
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE at am__append_11 = \
- @BUILD_SPREADSHEET_MODEL_TRUE@@WITH_LIBZIP_TRUE@ orcus-ods orcus-xlsx
-
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE@@WITH_LIBZIP_TRUE at am__append_12 = -D__ORCUS_STATIC_LIB=1
-+ at BUILD_SPREADSHEET_MODEL_TRUE@@HAVE_STATIC_LIB_TRUE@@WITH_LIBZIP_TRUE at am__append_13 = -D__ORCUS_STATIC_LIB=1
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -344,21 +353,24 @@ orcus_format_xml_SOURCES = orcus_format_xml.
- orcus_format_xml_LDADD = \
- liborcus/liborcus- at ORCUS_API_VERSION@.la
-
--orcus_format_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
-+orcus_format_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la \
-+ $(am__append_1)
-
- # orcus-test-common
- orcus_test_common_SOURCES = orcus_test_common.cpp
- orcus_test_common_LDADD = \
- liborcus/liborcus- at ORCUS_API_VERSION@.la
-
--orcus_test_common_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
-+orcus_test_common_CPPFLAGS = \
-+ -I$(top_builddir)/lib/liborcus/liborcus.la $(am__append_2)
-
- # orcus-test-xml
- orcus_test_xml_SOURCES = orcus_test_xml.cpp
- orcus_test_xml_LDADD = \
- liborcus/liborcus- at ORCUS_API_VERSION@.la
-
--orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la
-+orcus_test_xml_CPPFLAGS = -I$(top_builddir)/lib/liborcus/liborcus.la \
-+ $(am__append_3)
-
- # orcus-csv
- @BUILD_SPREADSHEET_MODEL_TRUE at orcus_csv_SOURCES = \
commit edf0652d878587f9a0d0d79361f045e02ce44bff
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 14:55:47 2012 -0500
Fix various build breaks.
Change-Id: Ie33a4a02f9820e0d52ca3f17c6b410ebe1e6e8f0
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 97bf17a..d657db0 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1377,9 +1377,9 @@ public:
}
SvViewDataItem* pItem = rOutDev.GetViewDataItem( pEntry, this );
- nX -= pItem->aSize.Height();
+ nX -= pItem->maSize.Height();
- long nSize = pItem->aSize.Height() / 2;
+ long nSize = pItem->maSize.Height() / 2;
long nHalfSize = nSize / 2;
long nY = rPos.Y() + nHalfSize;
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index d0f3dc5..afb6c95 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -162,7 +162,7 @@ Rectangle OCreationList::GetFocusRect( SvTreeListEntry* _pEntry, long _nLine )
SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, pBitmapItem ) : NULL;
OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not find the first bitmap item!" );
if ( pTab && pItemData )
- aRect.Left() = pTab->GetPos() - pItemData->aSize.Width() / 2;
+ aRect.Left() = pTab->GetPos() - pItemData->maSize.Width() / 2;
// inflate the rectangle a little bit - looks better, too
aRect.Left() = ::std::max< long >( 0, aRect.Left() - 2 );
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 1d2cc2d..81d4ea0 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -39,7 +39,7 @@ namespace dbaui
Font aFont( pView->GetFont());
aFont.SetWeight(WEIGHT_BOLD);
pView->Control::SetFont( aFont );
- _pViewData->aSize = Size(pView->GetTextWidth(GetText()), pView->GetTextHeight());
+ _pViewData->maSize = Size(pView->GetTextWidth(GetText()), pView->GetTextHeight());
pView->Pop();
}
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index d4cdece..62ec3b5 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -241,7 +241,7 @@ void CustomAnimationListEntryItem::InitViewData( SvTreeListBox* pView, SvTreeLis
Size aSize(pView->GetTextWidth( maDescription ) + 2 * 19, pView->GetTextHeight() );
if( aSize.Height() < 19 )
aSize.Height() = 19;
- pViewData->aSize = aSize;
+ pViewData->maSize = aSize;
}
// --------------------------------------------------------------------
@@ -252,7 +252,7 @@ void CustomAnimationListEntryItem::Paint( const Point& rPos, SvTreeListBox& rDev
SvViewDataItem* pViewData = mpParent->GetViewDataItem( pEntry, this );
Point aPos( rPos );
- Size aSize( pViewData->aSize );
+ Size aSize( pViewData->maSize );
sal_Int16 nNodeType = mpEffect->getNodeType();
if( nNodeType == EffectNodeType::ON_CLICK )
@@ -394,7 +394,7 @@ void CustomAnimationTriggerEntryItem::InitViewData( SvTreeListBox* pView, SvTree
Size aSize(pView->GetTextWidth( maDescription ) + 2 * 19, pView->GetTextHeight() );
if( aSize.Height() < 19 )
aSize.Height() = 19;
- pViewData->aSize = aSize;
+ pViewData->maSize = aSize;
}
// --------------------------------------------------------------------
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index d033ade..cb7d51f 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1082,7 +1082,7 @@ void FmFilterItemsString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pE
Size aSize(pView->GetTextWidth(GetText()), pView->GetTextHeight());
aSize.Width() += nxDBmp;
- pViewData->aSize = aSize;
+ pViewData->maSize = aSize;
}
//========================================================================
@@ -1120,7 +1120,7 @@ void FmFilterString::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
Size aSize(pView->GetTextWidth(m_aName), pView->GetTextHeight());
pView->Control::SetFont( aOldFont );
aSize.Width() += pView->GetTextWidth(GetText()) + nxD;
- pViewData->aSize = aSize;
+ pViewData->maSize = aSize;
}
//------------------------------------------------------------------------
commit 62d7eb4700f86b5a3fc43043ec3ca2efa025cd2e
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 14:26:31 2012 -0500
Finally merge SvViewData and SvViewDataEntry.
Change-Id: Ic85e2a239990aeaa017eaef95ea25487dd1ec968
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 0b7e535..d4cdece 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -667,7 +667,7 @@ void CustomAnimationList::update()
aDescription += getShapeDescription( xShape, false );
pLBoxEntry->AddItem( new CustomAnimationTriggerEntryItem( pLBoxEntry, 0, aDescription ) );
Insert( pLBoxEntry );
- SvViewData* pViewData = GetViewData( pLBoxEntry );
+ SvViewDataEntry* pViewData = GetViewData( pLBoxEntry );
if( pViewData )
pViewData->SetSelectable(false);
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 1c4d664..ff31dc4 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -46,7 +46,7 @@
class SvTreeListEntry;
class SvListView;
-class SvViewData;
+class SvViewDataEntry;
enum SvSortMode { SortAscending, SortDescending, SortNone };
@@ -236,7 +236,7 @@ class SVT_DLLPUBLIC SvListView
{
friend class SvTreeList;
- typedef boost::ptr_map<SvTreeListEntry*, SvViewData> SvDataTable;
+ typedef boost::ptr_map<SvTreeListEntry*, SvViewDataEntry> SvDataTable;
sal_uLong nVisibleCount;
sal_uLong nSelectionCount;
@@ -343,13 +343,13 @@ public:
sal_Bool IsSelected( SvTreeListEntry* pEntry ) const;
sal_Bool HasEntryFocus( SvTreeListEntry* pEntry ) const;
void SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus );
- const SvViewData* GetViewData( const SvTreeListEntry* pEntry ) const;
- SvViewData* GetViewData( SvTreeListEntry* pEntry );
+ const SvViewDataEntry* GetViewData( const SvTreeListEntry* pEntry ) const;
+ SvViewDataEntry* GetViewData( SvTreeListEntry* pEntry );
sal_Bool HasViewData() const
{ return maDataTable.size() > 1; } // There's always a ROOT
- virtual SvViewData* CreateViewData( SvTreeListEntry* pEntry );
- virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry );
+ virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* pEntry );
+ virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry );
virtual void ModelHasCleared();
virtual void ModelHasInserted( SvTreeListEntry* pEntry );
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 1a591fd..ff2cd94 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -310,10 +310,10 @@ protected:
bool IsEmptyTextAllowed() const;
// Return value must be derived from SvViewDataEntry!
- virtual SvViewData* CreateViewData( SvTreeListEntry* );
+ virtual SvViewDataEntry* CreateViewData( SvTreeListEntry* );
// InitViewData is called right after CreateViewData
// The Entry is has not yet been added to the View in InitViewData!
- virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry );
+ virtual void InitViewData( SvViewDataEntry*, SvTreeListEntry* pEntry );
// Calls InitViewData for all Items
void RecalcViewData();
// Callback of RecalcViewData
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index fa1969e..35b9a58 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -38,18 +38,24 @@ struct SvViewDataItem
Size maSize;
};
-class SVT_DLLPUBLIC SvViewData
+/**
+ * View-dependent data for an Entry is created in the virtual function
+ * SvTreeListBox::CreateViewData. The View creation of Items should not be
+ * changed.
+ */
+class SVT_DLLPUBLIC SvViewDataEntry
{
-friend class SvTreeList;
-friend class SvListView;
+ friend class SvTreeList;
+ friend class SvListView;
+ std::vector<SvViewDataItem> maItems;
sal_uLong nVisPos;
-protected:
sal_uInt16 nFlags;
+
public:
- SvViewData();
- SvViewData( const SvViewData& );
- virtual ~SvViewData();
+ SvViewDataEntry();
+ SvViewDataEntry( const SvViewDataEntry& );
+ ~SvViewDataEntry();
bool IsSelected() const;
bool IsExpanded() const;
@@ -60,17 +66,6 @@ public:
void SetCursored( bool bCursored );
sal_uInt16 GetFlags() const;
void SetSelectable( bool bSelectable );
-};
-
-// View-dependent data for an Entry is created in the virtual function
-// SvTreeListBox::CreateViewData. The View creation of Items cannot be
-// changed (because it's an array)
-class SvViewDataEntry : public SvViewData
-{
- std::vector<SvViewDataItem> maItems;
-public:
- SvViewDataEntry();
- virtual ~SvViewDataEntry();
void Init(size_t nSize);
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index a81ec76..99612f9 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2590,8 +2590,6 @@ void SvImpLBox::LoseFocus()
SvTreeListEntry* pEntry = pView->FirstSelected();
while( pEntry )
{
- //SvViewData* pViewData = pView->GetViewData( pEntry );
- //pViewData->SetCursored( true );
InvalidateEntry( pEntry );
pEntry = pView->NextSelected( pEntry );
}
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 4750c61..9d752ef 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -588,7 +588,7 @@ sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* p
((SvListView*)pView)->nVisibleCount = 0;
GetVisibleCount( const_cast<SvListView*>(pView) );
}
- const SvViewData* pViewData = pView->GetViewData( pEntry );
+ const SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
return pViewData->nVisPos;
}
@@ -604,7 +604,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const
SvTreeListEntry* pEntry = First(); // first entry is always visible
while ( pEntry )
{
- SvViewData* pViewData = pView->GetViewData( pEntry );
+ SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
pViewData->nVisPos = nPos;
nPos++;
pEntry = NextVisible( pView, pEntry );
@@ -939,7 +939,7 @@ void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry )
DBG_ASSERT(!pEntry->maChildren.empty(), "SvTreeList::Expand: We expected to have child entries.");
- SvViewData* pViewData = pView->GetViewData(pEntry);
+ SvViewDataEntry* pViewData = pView->GetViewData(pEntry);
pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED;
SvTreeListEntry* pParent = pEntry->pParent;
// if parent is visible, invalidate status data
@@ -958,7 +958,7 @@ void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry )
DBG_ASSERT(!pEntry->maChildren.empty(), "SvTreeList::Collapse: We expected have child entries.");
- SvViewData* pViewData = pView->GetViewData( pEntry );
+ SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED);
SvTreeListEntry* pParent = pEntry->pParent;
@@ -972,7 +972,7 @@ void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry )
sal_Bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, sal_Bool bSelect )
{
DBG_ASSERT(pView&&pEntry,"Select:View/Entry?");
- SvViewData* pViewData = pView->GetViewData( pEntry );
+ SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
if ( bSelect )
{
if ( pViewData->IsSelected() || !pViewData->IsSelectable() )
@@ -1053,7 +1053,7 @@ void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect )
SvTreeListEntry* pEntry = First();
while ( pEntry )
{
- SvViewData* pViewData = pView->GetViewData( pEntry );
+ SvViewDataEntry* pViewData = pView->GetViewData( pEntry );
if ( bSelect )
pViewData->nFlags |= SVLISTENTRYFLAG_SELECTED;
else
@@ -1197,11 +1197,11 @@ void SvListView::InitTable()
}
SvTreeListEntry* pEntry;
- SvViewData* pViewData;
+ SvViewDataEntry* pViewData;
// insert root entry
pEntry = pModel->pRootItem;
- pViewData = new SvViewData;
+ pViewData = new SvViewDataEntry;
pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED;
maDataTable.insert( pEntry, pViewData );
// now all the other entries
@@ -1216,10 +1216,10 @@ void SvListView::InitTable()
}
}
-SvViewData* SvListView::CreateViewData( SvTreeListEntry* )
+SvViewDataEntry* SvListView::CreateViewData( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
- return new SvViewData;
+ return new SvViewDataEntry;
}
void SvListView::Clear()
@@ -1232,7 +1232,7 @@ void SvListView::Clear()
{
// insert root entry
SvTreeListEntry* pEntry = pModel->pRootItem;
- SvViewData* pViewData = new SvViewData;
+ SvViewDataEntry* pViewData = new SvViewDataEntry;
pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED;
maDataTable.insert( pEntry, pViewData );
}
@@ -1307,7 +1307,7 @@ void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLon
DBG_ASSERT(pParent,"Model not consistent");
if (pParent != pModel->pRootItem && pParent->maChildren.size() == 1)
{
- SvViewData* pViewData = maDataTable.find( pParent )->second;
+ SvViewDataEntry* pViewData = maDataTable.find( pParent )->second;
pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED);
}
// vorlaeufig
@@ -1328,7 +1328,7 @@ void SvListView::ActionInserted( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Insert:No Entry");
- SvViewData* pData = CreateViewData( pEntry );
+ SvViewDataEntry* pData = CreateViewData( pEntry );
InitViewData( pData, pEntry );
#ifdef DBG_UTIL
std::pair<SvDataTable::iterator, bool> aSuccess =
@@ -1356,7 +1356,7 @@ void SvListView::ActionInsertedTree( SvTreeListEntry* pEntry )
while( pCurEntry )
{
DBG_ASSERT(maDataTable.find(pCurEntry) != maDataTable.end(),"Entry already in Table");
- SvViewData* pViewData = CreateViewData( pCurEntry );
+ SvViewDataEntry* pViewData = CreateViewData( pCurEntry );
DBG_ASSERT(pViewData,"No ViewData");
InitViewData( pViewData, pEntry );
maDataTable.insert( pCurEntry, pViewData );
@@ -1385,7 +1385,7 @@ void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Remove:No Entry");
- SvViewData* pViewData = maDataTable.find( pEntry )->second;
+ SvViewDataEntry* pViewData = maDataTable.find( pEntry )->second;
sal_uLong nSelRemoved = 0;
if ( pViewData->IsSelected() )
nSelRemoved = 1 + pModel->GetChildSelectionCount( this, pEntry );
@@ -1477,7 +1477,7 @@ void SvListView::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntr
}
}
-void SvListView::InitViewData( SvViewData*, SvTreeListEntry* )
+void SvListView::InitViewData( SvViewDataEntry*, SvTreeListEntry* )
{
}
@@ -1513,14 +1513,14 @@ void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
itr->second->SetFocus(bFocus);
}
-const SvViewData* SvListView::GetViewData( const SvTreeListEntry* pEntry ) const
+const SvViewDataEntry* SvListView::GetViewData( const SvTreeListEntry* pEntry ) const
{
SvDataTable::const_iterator itr = maDataTable.find( const_cast<SvTreeListEntry*>(pEntry) );
DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
return itr->second;
}
-SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry )
+SvViewDataEntry* SvListView::GetViewData( SvTreeListEntry* pEntry )
{
SvDataTable::iterator itr = maDataTable.find( pEntry );
DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 296a036..6c4eb5e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -951,14 +951,14 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt
return pEntryData->GetItem(nItemPos);
}
-SvViewData* SvTreeListBox::CreateViewData( SvTreeListEntry* )
+SvViewDataEntry* SvTreeListBox::CreateViewData( SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvViewDataEntry* pEntryData = new SvViewDataEntry;
- return (SvViewData*)pEntryData;
+ return (SvViewDataEntry*)pEntryData;
}
-void SvTreeListBox::InitViewData( SvViewData* pData, SvTreeListEntry* pEntry )
+void SvTreeListBox::InitViewData( SvViewDataEntry* pData, SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvTreeListEntry* pInhEntry = (SvTreeListEntry*)pEntry;
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 0fda3dd..5288466 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -21,58 +21,56 @@
#include "tools/debug.hxx"
-DBG_NAME(SvViewData);
+DBG_NAME(SvViewDataEntry);
-SvViewData::SvViewData()
+SvViewDataEntry::SvViewDataEntry() :
+ nVisPos(0), nFlags(0)
{
- DBG_CTOR(SvViewData,0);
- nFlags = 0;
- nVisPos = 0;
+ DBG_CTOR(SvViewDataEntry,0);
}
-SvViewData::SvViewData( const SvViewData& rData )
+SvViewDataEntry::SvViewDataEntry( const SvViewDataEntry& rData ) :
+ nVisPos(rData.nVisPos), nFlags(rData.nFlags)
{
- DBG_CTOR(SvViewData,0);
- nFlags = rData.nFlags;
+ DBG_CTOR(SvViewDataEntry,0);
nFlags &= ~( SVLISTENTRYFLAG_SELECTED | SVLISTENTRYFLAG_FOCUSED );
- nVisPos = rData.nVisPos;
}
-SvViewData::~SvViewData()
+SvViewDataEntry::~SvViewDataEntry()
{
- DBG_DTOR(SvViewData,0);
+ DBG_DTOR(SvViewDataEntry,0);
#ifdef DBG_UTIL
nVisPos = 0x12345678;
nFlags = 0x1234;
#endif
}
-bool SvViewData::IsSelected() const
+bool SvViewDataEntry::IsSelected() const
{
return (nFlags & SVLISTENTRYFLAG_SELECTED) != 0;
}
-bool SvViewData::IsExpanded() const
+bool SvViewDataEntry::IsExpanded() const
{
return (nFlags & SVLISTENTRYFLAG_EXPANDED) != 0;
}
-bool SvViewData::HasFocus() const
+bool SvViewDataEntry::HasFocus() const
{
return (nFlags & SVLISTENTRYFLAG_FOCUSED) != 0;
}
-bool SvViewData::IsCursored() const
+bool SvViewDataEntry::IsCursored() const
{
return (nFlags & SVLISTENTRYFLAG_CURSORED) != 0;
}
-bool SvViewData::IsSelectable() const
+bool SvViewDataEntry::IsSelectable() const
{
return (nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0;
}
-void SvViewData::SetFocus( bool bFocus )
+void SvViewDataEntry::SetFocus( bool bFocus )
{
if ( !bFocus )
nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
@@ -80,7 +78,7 @@ void SvViewData::SetFocus( bool bFocus )
nFlags |= SVLISTENTRYFLAG_FOCUSED;
}
-void SvViewData::SetCursored( bool bCursored )
+void SvViewDataEntry::SetCursored( bool bCursored )
{
if ( !bCursored )
nFlags &= (~SVLISTENTRYFLAG_CURSORED);
@@ -88,12 +86,12 @@ void SvViewData::SetCursored( bool bCursored )
nFlags |= SVLISTENTRYFLAG_CURSORED;
}
-sal_uInt16 SvViewData::GetFlags() const
+sal_uInt16 SvViewDataEntry::GetFlags() const
{
return nFlags;
}
-void SvViewData::SetSelectable( bool bSelectable )
+void SvViewDataEntry::SetSelectable( bool bSelectable )
{
if( bSelectable )
nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
@@ -101,19 +99,6 @@ void SvViewData::SetSelectable( bool bSelectable )
nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
}
-DBG_NAME(SvViewDataEntry);
-
-SvViewDataEntry::SvViewDataEntry()
- : SvViewData()
-{
- DBG_CTOR(SvViewDataEntry,0);
-}
-
-SvViewDataEntry::~SvViewDataEntry()
-{
- DBG_DTOR(SvViewDataEntry,0);
-}
-
void SvViewDataEntry::Init(size_t nSize)
{
maItems.resize(nSize);
commit 8369a21642c3f7abd3b3784ee1a27b5cc02562e0
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 14:11:30 2012 -0500
Use std::vector over c-style pointer array.
Change-Id: I91ab1fb269070deb8389cf4e8473a223c1bbca1d
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 0aa4177..1a591fd 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -145,7 +145,7 @@ public:
const Size& GetSize(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const;
const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
{
- const SvViewDataItem* pIData = pData->pItemData + nItemPos;
+ const SvViewDataItem* pIData = pData->GetItem(nItemPos);
return pIData->maSize;
}
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 4e14bc5..fa1969e 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -24,6 +24,8 @@
#include "tools/solar.h"
#include "tools/gen.hxx"
+#include <vector>
+
// Entryflags that are attached to the View
#define SVLISTENTRYFLAG_SELECTED 0x0001
#define SVLISTENTRYFLAG_EXPANDED 0x0002
@@ -65,12 +67,15 @@ public:
// changed (because it's an array)
class SvViewDataEntry : public SvViewData
{
+ std::vector<SvViewDataItem> maItems;
public:
- SvViewDataItem* pItemData; // An array of SvViewDataItems
- sal_uInt16 nItmCnt; // Item count for delete operator
-
SvViewDataEntry();
virtual ~SvViewDataEntry();
+
+ void Init(size_t nSize);
+
+ const SvViewDataItem* GetItem(size_t nPos) const;
+ SvViewDataItem* GetItem(size_t nPos);
};
#endif
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index f7fe4d8..296a036 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -947,9 +947,8 @@ const SvViewDataItem* SvTreeListBox::GetViewDataItem(const SvTreeListEntry* pEnt
{
const SvViewDataEntry* pEntryData = (const SvViewDataEntry*)SvListView::GetViewData(pEntry);
DBG_ASSERT(pEntryData,"Entry not in View");
- DBG_ASSERT(pEntryData->pItemData,"No ItemData");
sal_uInt16 nItemPos = pEntry->GetPos(pItem);
- return (pEntryData->pItemData + nItemPos);
+ return pEntryData->GetItem(nItemPos);
}
SvViewData* SvTreeListBox::CreateViewData( SvTreeListEntry* )
@@ -965,14 +964,13 @@ void SvTreeListBox::InitViewData( SvViewData* pData, SvTreeListEntry* pEntry )
SvTreeListEntry* pInhEntry = (SvTreeListEntry*)pEntry;
SvViewDataEntry* pEntryData = (SvViewDataEntry*)pData;
- pEntryData->pItemData = new SvViewDataItem[ pInhEntry->ItemCount() ];
- SvViewDataItem* pItemData = pEntryData->pItemData;
- pEntryData->nItmCnt = pInhEntry->ItemCount(); // number of items to delete
+ pEntryData->Init(pInhEntry->ItemCount());
sal_uInt16 nCount = pInhEntry->ItemCount();
sal_uInt16 nCurPos = 0;
while( nCurPos < nCount )
{
SvLBoxItem* pItem = pInhEntry->GetItem( nCurPos );
+ SvViewDataItem* pItemData = pEntryData->GetItem(nCurPos);
pItem->InitViewData( this, pInhEntry, pItemData );
pItemData++;
nCurPos++;
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 3b35c75..0fda3dd 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -107,13 +107,26 @@ SvViewDataEntry::SvViewDataEntry()
: SvViewData()
{
DBG_CTOR(SvViewDataEntry,0);
- pItemData = 0;
}
SvViewDataEntry::~SvViewDataEntry()
{
DBG_DTOR(SvViewDataEntry,0);
- delete [] pItemData;
+}
+
+void SvViewDataEntry::Init(size_t nSize)
+{
+ maItems.resize(nSize);
+}
+
+const SvViewDataItem* SvViewDataEntry::GetItem(size_t nPos) const
+{
+ return &maItems[nPos];
+}
+
+SvViewDataItem* SvViewDataEntry::GetItem(size_t nPos)
+{
+ return &maItems[nPos];
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit c391ebbf8c8472911af52bbf3ff028ccee5155be
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 14:00:27 2012 -0500
Make SvViewDataItem a struct, with only one public data member...
Change-Id: Ib6b710f87fcdfe465fb78a397100f82da11b3611
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 6624934..0aa4177 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -146,7 +146,7 @@ public:
const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const
{
const SvViewDataItem* pIData = pData->pItemData + nItemPos;
- return pIData->aSize;
+ return pIData->maSize;
}
virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev,
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 87def0a..4e14bc5 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -31,7 +31,10 @@
#define SVLISTENTRYFLAG_CURSORED 0x0008
#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
-class SvViewDataItem;
+struct SvViewDataItem
+{
+ Size maSize;
+};
class SVT_DLLPUBLIC SvViewData
{
@@ -70,15 +73,6 @@ public:
virtual ~SvViewDataEntry();
};
-class SvViewDataItem
-{
-public:
- Size aSize;
-
- SvViewDataItem();
- ~SvViewDataItem();
-};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 1545543..138ae3b 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -245,7 +245,7 @@ void SvLBoxString::InitViewData(
DBG_CHKTHIS(SvLBoxString,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
- pViewData->aSize = Size(pView->GetTextWidth(maText), pView->GetTextHeight());
+ pViewData->maSize = Size(pView->GetTextWidth(maText), pView->GetTextHeight());
}
// ***************************************************************
@@ -276,7 +276,7 @@ void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
DBG_CHKTHIS(SvLBoxBmp,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
- pViewData->aSize = aBmp.GetSizePixel();
+ pViewData->maSize = aBmp.GetSizePixel();
}
void SvLBoxBmp::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */,
@@ -447,7 +447,7 @@ void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
ControlType eCtrlType = (pData->IsRadio())? CTRL_RADIOBUTTON : CTRL_CHECKBOX;
if ( eKind != SvLBoxButtonKind_staticImage && pView )
ImplAdjustBoxSize( aSize, eCtrlType, pView );
- pViewData->aSize = aSize;
+ pViewData->maSize = aSize;
}
bool SvLBoxButton::CheckModification() const
@@ -525,7 +525,7 @@ void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntr
DBG_CHKTHIS(SvLBoxContextBmp,0);
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
- pViewData->aSize = m_pImpl->m_aImage1.GetSizePixel();
+ pViewData->maSize = m_pImpl->m_aImage1.GetSizePixel();
}
void SvLBoxContextBmp::Paint( const Point& _rPos, SvTreeListBox& _rDev,
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 5f8a40b..f7fe4d8 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -363,7 +363,7 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
{
DBG_CHKTHIS(SvLBoxItem,0);
const SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this );
- return pViewData->aSize;
+ return pViewData->maSize;
}
struct SvTreeListBoxImpl
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 544bb03..3b35c75 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -116,16 +116,4 @@ SvViewDataEntry::~SvViewDataEntry()
delete [] pItemData;
}
-DBG_NAME(SvViewDataItem);
-
-SvViewDataItem::SvViewDataItem()
-{
- DBG_CTOR(SvViewDataItem,0);
-}
-
-SvViewDataItem::~SvViewDataItem()
-{
- DBG_DTOR(SvViewDataItem,0);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index cd9e13f..8a40909 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -1673,18 +1673,18 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
- pViewData->aSize = maImage.GetSizePixel();
+ pViewData->maSize = maImage.GetSizePixel();
const Size aTextSize(pView->GetTextWidth( maText ), pView->GetTextHeight());
- if( pViewData->aSize.Width() )
+ if( pViewData->maSize.Width() )
{
- pViewData->aSize.Width() += 6 + aTextSize.Width();
- if( pViewData->aSize.Height() < aTextSize.Height() )
- pViewData->aSize.Height() = aTextSize.Height();
+ pViewData->maSize.Width() += 6 + aTextSize.Width();
+ if( pViewData->maSize.Height() < aTextSize.Height() )
+ pViewData->maSize.Height() = aTextSize.Height();
}
else
{
- pViewData->aSize = aTextSize;
+ pViewData->maSize = aTextSize;
}
}
commit 22040a74cc0a598b54cc33259b5f39b6bd5ada5d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 13:55:44 2012 -0500
sal_Bool to bool.
Change-Id: I63bff9f8ba19e8f037edf29bc82555b8c6e77d1e
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 594a1c0..87def0a 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -51,8 +51,8 @@ public:
bool HasFocus() const;
bool IsCursored() const;
bool IsSelectable() const;
- void SetFocus( sal_Bool bFocus);
- void SetCursored( sal_Bool bCursored );
+ void SetFocus( bool bFocus );
+ void SetCursored( bool bCursored );
sal_uInt16 GetFlags() const;
void SetSelectable( bool bSelectable );
};
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index f26ad15..544bb03 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -72,7 +72,7 @@ bool SvViewData::IsSelectable() const
return (nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0;
}
-void SvViewData::SetFocus( sal_Bool bFocus)
+void SvViewData::SetFocus( bool bFocus )
{
if ( !bFocus )
nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
@@ -80,7 +80,7 @@ void SvViewData::SetFocus( sal_Bool bFocus)
nFlags |= SVLISTENTRYFLAG_FOCUSED;
}
-void SvViewData::SetCursored( sal_Bool bCursored )
+void SvViewData::SetCursored( bool bCursored )
{
if ( !bCursored )
nFlags &= (~SVLISTENTRYFLAG_CURSORED);
commit 591e284d3b2d416d3eff5d91b2ec7f7fee6c38a0
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 13:50:31 2012 -0500
Deliver this new header file.
Change-Id: I71c4ec404acfef12cc2a9bf0fc9c0e98bf45cb2d
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index 054bd29..85afa18 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -170,6 +170,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoevent.hxx,svtools/u
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/unoimap.hxx,svtools/unoimap.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/urlcontrol.hxx,svtools/urlcontrol.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/valueset.hxx,svtools/valueset.hxx))
+$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/viewdataentry.hxx,svtools/viewdataentry.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wallitem.hxx,svtools/wallitem.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizardmachine.hxx,svtools/wizardmachine.hxx))
$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/wizdlg.hxx,svtools/wizdlg.hxx))
commit 80ee754ca184ab98fa0d23b58294255f8592422b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 13:48:44 2012 -0500
Move SvViewDataEntry and SvViewDataItem into these files too.
Change-Id: Ib25e7b4ff692804e4e4b617ffba228c4b2cae1db
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 11e36c1..6624934 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -132,31 +132,6 @@ public:
};
// *********************************************************************
-// *********************** View-dependent data *************************
-// *********************************************************************
-
-class SvViewDataItem
-{
-public:
- Size aSize;
- SvViewDataItem();
- ~SvViewDataItem();
-};
-
-// View-dependent data for an Entry is created in the virtual function
-// SvTreeListBox::CreateViewData. The View creation of Items cannot be
-// changed (because it's an array)
-class SvViewDataEntry : public SvViewData
-{
-public:
- SvViewDataItem* pItemData; // An array of SvViewDataItems
- sal_uInt16 nItmCnt; // Item count for delete operator
-
- SvViewDataEntry();
- virtual ~SvViewDataEntry();
-};
-
-// *********************************************************************
// ****************************** Items ********************************
// *********************************************************************
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index b657cbc..594a1c0 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -22,6 +22,7 @@
#include "svtdllapi.h"
#include "tools/solar.h"
+#include "tools/gen.hxx"
// Entryflags that are attached to the View
#define SVLISTENTRYFLAG_SELECTED 0x0001
@@ -30,6 +31,8 @@
#define SVLISTENTRYFLAG_CURSORED 0x0008
#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
+class SvViewDataItem;
+
class SVT_DLLPUBLIC SvViewData
{
friend class SvTreeList;
@@ -54,6 +57,28 @@ public:
void SetSelectable( bool bSelectable );
};
+// View-dependent data for an Entry is created in the virtual function
+// SvTreeListBox::CreateViewData. The View creation of Items cannot be
+// changed (because it's an array)
+class SvViewDataEntry : public SvViewData
+{
+public:
+ SvViewDataItem* pItemData; // An array of SvViewDataItems
+ sal_uInt16 nItmCnt; // Item count for delete operator
+
+ SvViewDataEntry();
+ virtual ~SvViewDataEntry();
+};
+
+class SvViewDataItem
+{
+public:
+ Size aSize;
+
+ SvViewDataItem();
+ ~SvViewDataItem();
+};
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index a5cd300..5f8a40b 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -366,37 +366,6 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr
return pViewData->aSize;
}
-DBG_NAME(SvViewDataItem);
-
-SvViewDataItem::SvViewDataItem()
-{
- DBG_CTOR(SvViewDataItem,0);
-}
-
-SvViewDataItem::~SvViewDataItem()
-{
- DBG_DTOR(SvViewDataItem,0);
-}
-
-// ***************************************************************
-// class SvLBoxViewData
-// ***************************************************************
-
-DBG_NAME(SvViewDataEntry);
-
-SvViewDataEntry::SvViewDataEntry()
- : SvViewData()
-{
- DBG_CTOR(SvViewDataEntry,0);
- pItemData = 0;
-}
-
-SvViewDataEntry::~SvViewDataEntry()
-{
- DBG_DTOR(SvViewDataEntry,0);
- delete [] pItemData;
-}
-
struct SvTreeListBoxImpl
{
bool m_bIsEmptyTextAllowed:1;
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index b0efde0..f26ad15 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -101,4 +101,31 @@ void SvViewData::SetSelectable( bool bSelectable )
nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
}
+DBG_NAME(SvViewDataEntry);
+
+SvViewDataEntry::SvViewDataEntry()
+ : SvViewData()
+{
+ DBG_CTOR(SvViewDataEntry,0);
+ pItemData = 0;
+}
+
+SvViewDataEntry::~SvViewDataEntry()
+{
+ DBG_DTOR(SvViewDataEntry,0);
+ delete [] pItemData;
+}
+
+DBG_NAME(SvViewDataItem);
+
+SvViewDataItem::SvViewDataItem()
+{
+ DBG_CTOR(SvViewDataItem,0);
+}
+
+SvViewDataItem::~SvViewDataItem()
+{
+ DBG_DTOR(SvViewDataItem,0);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit cf9b196bf8b925f6059c638251e93011e6ebde23
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 13:41:05 2012 -0500
Make these methods non-inline.
Change-Id: Ifa0a78213edbdf997985bf89bc769219223feab9
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
index 769381a..b657cbc 100644
--- a/svtools/inc/svtools/viewdataentry.hxx
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -35,55 +35,23 @@ class SVT_DLLPUBLIC SvViewData
friend class SvTreeList;
friend class SvListView;
- sal_uLong nVisPos;
+ sal_uLong nVisPos;
protected:
- sal_uInt16 nFlags;
+ sal_uInt16 nFlags;
public:
- SvViewData();
- SvViewData( const SvViewData& );
- virtual ~SvViewData();
-
- sal_Bool IsSelected() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_SELECTED) != 0; }
-
- sal_Bool IsExpanded() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_EXPANDED) != 0; }
-
- sal_Bool HasFocus() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_FOCUSED) != 0; }
-
- sal_Bool IsCursored() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_CURSORED) != 0; }
-
- bool IsSelectable() const
- { return (bool)(nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0; }
-
- void SetFocus( sal_Bool bFocus)
- {
- if ( !bFocus )
- nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
- else
- nFlags |= SVLISTENTRYFLAG_FOCUSED;
- }
-
- void SetCursored( sal_Bool bCursored )
- {
- if ( !bCursored )
- nFlags &= (~SVLISTENTRYFLAG_CURSORED);
- else
- nFlags |= SVLISTENTRYFLAG_CURSORED;
- }
-
- sal_uInt16 GetFlags() const
- { return nFlags; }
-
- void SetSelectable( bool bSelectable )
- {
- if( bSelectable )
- nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
- else
- nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
- }
+ SvViewData();
+ SvViewData( const SvViewData& );
+ virtual ~SvViewData();
+
+ bool IsSelected() const;
+ bool IsExpanded() const;
+ bool HasFocus() const;
+ bool IsCursored() const;
+ bool IsSelectable() const;
+ void SetFocus( sal_Bool bFocus);
+ void SetCursored( sal_Bool bCursored );
+ sal_uInt16 GetFlags() const;
+ void SetSelectable( bool bSelectable );
};
#endif
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
index 4508782..b0efde0 100644
--- a/svtools/source/contnr/viewdataentry.cxx
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -47,4 +47,58 @@ SvViewData::~SvViewData()
#endif
}
+bool SvViewData::IsSelected() const
+{
+ return (nFlags & SVLISTENTRYFLAG_SELECTED) != 0;
+}
+
+bool SvViewData::IsExpanded() const
+{
+ return (nFlags & SVLISTENTRYFLAG_EXPANDED) != 0;
+}
+
+bool SvViewData::HasFocus() const
+{
+ return (nFlags & SVLISTENTRYFLAG_FOCUSED) != 0;
+}
+
+bool SvViewData::IsCursored() const
+{
+ return (nFlags & SVLISTENTRYFLAG_CURSORED) != 0;
+}
+
+bool SvViewData::IsSelectable() const
+{
+ return (nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0;
+}
+
+void SvViewData::SetFocus( sal_Bool bFocus)
+{
+ if ( !bFocus )
+ nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
+ else
+ nFlags |= SVLISTENTRYFLAG_FOCUSED;
+}
+
+void SvViewData::SetCursored( sal_Bool bCursored )
+{
+ if ( !bCursored )
+ nFlags &= (~SVLISTENTRYFLAG_CURSORED);
+ else
+ nFlags |= SVLISTENTRYFLAG_CURSORED;
+}
+
+sal_uInt16 SvViewData::GetFlags() const
+{
+ return nFlags;
+}
+
+void SvViewData::SetSelectable( bool bSelectable )
+{
+ if( bSelectable )
+ nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
+ else
+ nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 0ce2977569c5d08e66b325590ee470504afb928f
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 13:35:46 2012 -0500
Extract SvViewData into separate header/source files.
I'll merge it with SvViewDataEntry next...
Change-Id: I542732213f52a3efafaa059dd46668888d4c20f1
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 7ed5a70..97b7e2e 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -97,6 +97,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/contnr/treelist \
svtools/source/contnr/treelistbox \
svtools/source/contnr/treelistentry \
+ svtools/source/contnr/viewdataentry \
svtools/source/control/asynclink \
svtools/source/control/calendar \
svtools/source/control/collatorres \
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 9886207..1c4d664 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -44,71 +44,9 @@
#define LISTACTION_RESORTED 10
#define LISTACTION_CLEARED 11
-// Entryflags that are attached to the View
-#define SVLISTENTRYFLAG_SELECTED 0x0001
-#define SVLISTENTRYFLAG_EXPANDED 0x0002
-#define SVLISTENTRYFLAG_FOCUSED 0x0004
-#define SVLISTENTRYFLAG_CURSORED 0x0008
-#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
-
class SvTreeListEntry;
class SvListView;
-
-class SvViewData
-{
-friend class SvTreeList;
-friend class SvListView;
-
- sal_uLong nVisPos;
-protected:
- sal_uInt16 nFlags;
-public:
- SvViewData();
- SvViewData( const SvViewData& );
- virtual ~SvViewData();
-
- sal_Bool IsSelected() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_SELECTED) != 0; }
-
- sal_Bool IsExpanded() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_EXPANDED) != 0; }
-
- sal_Bool HasFocus() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_FOCUSED) != 0; }
-
- sal_Bool IsCursored() const
- { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_CURSORED) != 0; }
-
- bool IsSelectable() const
- { return (bool)(nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0; }
-
- void SetFocus( sal_Bool bFocus)
- {
- if ( !bFocus )
- nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
- else
- nFlags |= SVLISTENTRYFLAG_FOCUSED;
- }
-
- void SetCursored( sal_Bool bCursored )
- {
- if ( !bCursored )
- nFlags &= (~SVLISTENTRYFLAG_CURSORED);
- else
- nFlags |= SVLISTENTRYFLAG_CURSORED;
- }
-
- sal_uInt16 GetFlags() const
- { return nFlags; }
-
- void SetSelectable( bool bSelectable )
- {
- if( bSelectable )
- nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
- else
- nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
- }
-};
+class SvViewData;
enum SvSortMode { SortAscending, SortDescending, SortNone };
@@ -427,52 +365,6 @@ public:
virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry );
};
-inline sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const
-{
- DBG_ASSERT(pEntry,"IsExpanded:No Entry");
- SvDataTable::const_iterator itr = maDataTable.find(pEntry);
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
- return itr->second->IsExpanded();
-}
-
-inline sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const
-{
- DBG_ASSERT(pEntry,"IsExpanded:No Entry");
- SvDataTable::const_iterator itr = maDataTable.find(pEntry );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
- return itr->second->IsSelected();
-}
-
-inline sal_Bool SvListView::HasEntryFocus( SvTreeListEntry* pEntry ) const
-{
- DBG_ASSERT(pEntry,"IsExpanded:No Entry");
- SvDataTable::const_iterator itr = maDataTable.find(pEntry );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
- return itr->second->HasFocus();
-}
-
-inline void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
-{
- DBG_ASSERT(pEntry,"SetEntryFocus:No Entry");
- SvDataTable::iterator itr = maDataTable.find(pEntry);
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
- itr->second->SetFocus(bFocus);
-}
-
-inline const SvViewData* SvListView::GetViewData( const SvTreeListEntry* pEntry ) const
-{
- SvDataTable::const_iterator itr = maDataTable.find( const_cast<SvTreeListEntry*>(pEntry) );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
- return itr->second;
-}
-
-inline SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry )
-{
- SvDataTable::iterator itr = maDataTable.find( pEntry );
- DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
- return itr->second;
-}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 549e859..11e36c1 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -37,6 +37,7 @@
#include <tools/contnr.hxx>
#include <svtools/treelist.hxx>
#include <svtools/transfer.hxx>
+#include "svtools/viewdataentry.hxx"
class Application;
class SvTreeListBox;
diff --git a/svtools/inc/svtools/viewdataentry.hxx b/svtools/inc/svtools/viewdataentry.hxx
new file mode 100644
index 0000000..769381a
--- /dev/null
+++ b/svtools/inc/svtools/viewdataentry.hxx
@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef __SVTOOLS_VIEWDATAENTRY_HXX__
+#define __SVTOOLS_VIEWDATAENTRY_HXX__
+
+#include "svtdllapi.h"
+#include "tools/solar.h"
+
+// Entryflags that are attached to the View
+#define SVLISTENTRYFLAG_SELECTED 0x0001
+#define SVLISTENTRYFLAG_EXPANDED 0x0002
+#define SVLISTENTRYFLAG_FOCUSED 0x0004
+#define SVLISTENTRYFLAG_CURSORED 0x0008
+#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
+
+class SVT_DLLPUBLIC SvViewData
+{
+friend class SvTreeList;
+friend class SvListView;
+
+ sal_uLong nVisPos;
+protected:
+ sal_uInt16 nFlags;
+public:
+ SvViewData();
+ SvViewData( const SvViewData& );
+ virtual ~SvViewData();
+
+ sal_Bool IsSelected() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_SELECTED) != 0; }
+
+ sal_Bool IsExpanded() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_EXPANDED) != 0; }
+
+ sal_Bool HasFocus() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_FOCUSED) != 0; }
+
+ sal_Bool IsCursored() const
+ { return (sal_Bool)(nFlags & SVLISTENTRYFLAG_CURSORED) != 0; }
+
+ bool IsSelectable() const
+ { return (bool)(nFlags & SVLISTENTRYFLAG_NOT_SELECTABLE) == 0; }
+
+ void SetFocus( sal_Bool bFocus)
+ {
+ if ( !bFocus )
+ nFlags &= (~SVLISTENTRYFLAG_FOCUSED);
+ else
+ nFlags |= SVLISTENTRYFLAG_FOCUSED;
+ }
+
+ void SetCursored( sal_Bool bCursored )
+ {
+ if ( !bCursored )
+ nFlags &= (~SVLISTENTRYFLAG_CURSORED);
+ else
+ nFlags |= SVLISTENTRYFLAG_CURSORED;
+ }
+
+ sal_uInt16 GetFlags() const
+ { return nFlags; }
+
+ void SetSelectable( bool bSelectable )
+ {
+ if( bSelectable )
+ nFlags &= (~SVLISTENTRYFLAG_NOT_SELECTABLE);
+ else
+ nFlags |= SVLISTENTRYFLAG_NOT_SELECTABLE;
+ }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 5233af6..32fd7d3 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -26,6 +26,7 @@
#include <svtools/headbar.hxx>
#include <svtools/svtabbx.hxx>
#include <svtools/svtools.hrc>
+#include "svtools/viewdataentry.hxx"
#include "fileview.hrc"
#include "contentenumeration.hxx"
#include <svtools/AccessibleBrowseBoxObjType.hxx>
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index b18f1c0..4750c61 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -23,32 +23,6 @@
#include <stdio.h>
-DBG_NAME(SvViewData);
-
-SvViewData::SvViewData()
-{
- DBG_CTOR(SvViewData,0);
- nFlags = 0;
- nVisPos = 0;
-}
-
-SvViewData::SvViewData( const SvViewData& rData )
-{
- DBG_CTOR(SvViewData,0);
- nFlags = rData.nFlags;
- nFlags &= ~( SVLISTENTRYFLAG_SELECTED | SVLISTENTRYFLAG_FOCUSED );
- nVisPos = rData.nVisPos;
-}
-
-SvViewData::~SvViewData()
-{
- DBG_DTOR(SvViewData,0);
-#ifdef DBG_UTIL
- nVisPos = 0x12345678;
- nFlags = 0x1234;
-#endif
-}
-
SvTreeList::SvTreeList()
{
nEntryCount = 0;
@@ -1507,6 +1481,52 @@ void SvListView::InitViewData( SvViewData*, SvTreeListEntry* )
{
}
+sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const
+{
+ DBG_ASSERT(pEntry,"IsExpanded:No Entry");
+ SvDataTable::const_iterator itr = maDataTable.find(pEntry);
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
+ return itr->second->IsExpanded();
+}
+
+sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const
+{
+ DBG_ASSERT(pEntry,"IsExpanded:No Entry");
+ SvDataTable::const_iterator itr = maDataTable.find(pEntry );
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
+ return itr->second->IsSelected();
+}
+
+sal_Bool SvListView::HasEntryFocus( SvTreeListEntry* pEntry ) const
+{
+ DBG_ASSERT(pEntry,"IsExpanded:No Entry");
+ SvDataTable::const_iterator itr = maDataTable.find(pEntry );
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
+ return itr->second->HasFocus();
+}
+
+void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
+{
+ DBG_ASSERT(pEntry,"SetEntryFocus:No Entry");
+ SvDataTable::iterator itr = maDataTable.find(pEntry);
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in Table");
+ itr->second->SetFocus(bFocus);
+}
+
+const SvViewData* SvListView::GetViewData( const SvTreeListEntry* pEntry ) const
+{
+ SvDataTable::const_iterator itr = maDataTable.find( const_cast<SvTreeListEntry*>(pEntry) );
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
+ return itr->second;
+}
+
+SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry )
+{
+ SvDataTable::iterator itr = maDataTable.find( pEntry );
+ DBG_ASSERT(itr != maDataTable.end(),"Entry not in model or wrong view");
+ return itr->second;
+}
+
StringCompare SvTreeList::Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const
{
if( aCompareLink.IsSet())
diff --git a/svtools/source/contnr/viewdataentry.cxx b/svtools/source/contnr/viewdataentry.cxx
new file mode 100644
index 0000000..4508782
--- /dev/null
+++ b/svtools/source/contnr/viewdataentry.cxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include "svtools/viewdataentry.hxx"
+
+#include "tools/debug.hxx"
+
+DBG_NAME(SvViewData);
+
+SvViewData::SvViewData()
+{
+ DBG_CTOR(SvViewData,0);
+ nFlags = 0;
+ nVisPos = 0;
+}
+
+SvViewData::SvViewData( const SvViewData& rData )
+{
+ DBG_CTOR(SvViewData,0);
+ nFlags = rData.nFlags;
+ nFlags &= ~( SVLISTENTRYFLAG_SELECTED | SVLISTENTRYFLAG_FOCUSED );
+ nVisPos = rData.nVisPos;
+}
+
+SvViewData::~SvViewData()
+{
+ DBG_DTOR(SvViewData,0);
+#ifdef DBG_UTIL
+ nVisPos = 0x12345678;
+ nFlags = 0x1234;
+#endif
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3bf14d298342806125e54a075ea4c8ec6132aa38
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 12:57:47 2012 -0500
Hide this, and don't expose method definitions of exported class.
Change-Id: I52ff833c9b552f4593dedf771f6370bdeedf2b7d
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index 308b2b2..549e859 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -411,7 +411,7 @@ public:
sal_uLong GetChildCount( SvTreeListEntry* pParent ) const;
sal_uLong GetLevelChildCount( SvTreeListEntry* pParent ) const;
- SvViewDataEntry* GetViewDataEntry( SvTreeListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); }
+ SvViewDataEntry* GetViewDataEntry( SvTreeListEntry* pEntry ) const;
SvViewDataItem* GetViewDataItem(SvTreeListEntry*, SvLBoxItem*);
const SvViewDataItem* GetViewDataItem(const SvTreeListEntry*, const SvLBoxItem*) const;
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index bf9493d..a5cd300 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -964,6 +964,11 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const
return nCount;
}
+SvViewDataEntry* SvTreeListBox::GetViewDataEntry( SvTreeListEntry* pEntry ) const
+{
+ return (SvViewDataEntry*)SvListView::GetViewData(pEntry);
+}
+
SvViewDataItem* SvTreeListBox::GetViewDataItem(SvTreeListEntry* pEntry, SvLBoxItem* pItem)
{
return const_cast<SvViewDataItem*>(static_cast<const SvTreeListBox*>(this)->GetViewDataItem(pEntry, pItem));
commit 3f662c726d5fb53aa3374866dab1f8c8246ca804
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Nov 27 00:57:11 2012 -0500
Get it to build on Windows with liborcus gnumeric bits enabled.
Now scfilt must statically link zlib because gnumeric uses gzip
compression.
Change-Id: I79c527d381d3c2f9bccdf091ff2b0799efee4700
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index d583a22..6e225f9 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -23,6 +23,7 @@ ifeq ($(VCVER),90)
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
&& touch $@
@@ -30,6 +31,7 @@ else
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
+ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \
&& MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 6403539..58e6d14 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\
))
$(eval $(call gb_Library_use_externals,scfilt,\
+ zlib \
orcus \
))
@@ -222,4 +223,10 @@ $(eval $(call gb_Library_add_exception_objects,scfilt,\
sc/source/filter/orcus/orcusfiltersimpl \
))
+ifeq ($(SYSTEM_ZLIB),YES)
+$(eval $(call gb_Library_add_defs,scfilt,\
+ -DSYSTEM_ZLIB \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/zlib/StaticLibrary_zlib.mk b/zlib/StaticLibrary_zlib.mk
index 69e7017..3071e61 100644
--- a/zlib/StaticLibrary_zlib.mk
+++ b/zlib/StaticLibrary_zlib.mk
@@ -18,6 +18,10 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\
UnpackedTarball/zlib/compress \
UnpackedTarball/zlib/crc32 \
UnpackedTarball/zlib/deflate \
+ UnpackedTarball/zlib/gzclose \
+ UnpackedTarball/zlib/gzlib \
+ UnpackedTarball/zlib/gzread \
+ UnpackedTarball/zlib/gzwrite \
UnpackedTarball/zlib/inffast \
UnpackedTarball/zlib/inflate \
UnpackedTarball/zlib/inftrees \
commit 337efa331a55623335b6e806b6be4af729d57320
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Tue Oct 2 19:46:47 2012 -0400
orcus from master now has a new interface.
Change-Id: I1d03d5dd2b12cdc1eab2d599199c333d49d306b8
diff --git a/sc/source/filter/orcus/orcusfiltersimpl.cxx b/sc/source/filter/orcus/orcusfiltersimpl.cxx
index 3c8c211..84ec7e7 100644
--- a/sc/source/filter/orcus/orcusfiltersimpl.cxx
+++ b/sc/source/filter/orcus/orcusfiltersimpl.cxx
@@ -60,6 +60,9 @@ public:
virtual void set_formula_result(row_t row, col_t col, const char* p, size_t n);
virtual void set_shared_formula(
row_t row, col_t col, formula_grammar_t grammar, size_t sindex,
+ const char* p_formula, size_t n_formula);
+ virtual void set_shared_formula(
+ row_t row, col_t col, formula_grammar_t grammar, size_t sindex,
const char* p_formula, size_t n_formula, const char* p_range, size_t n_range);
virtual void set_shared_formula(row_t row, col_t col, size_t sindex);
virtual void set_string(row_t row, col_t col, size_t sindex);
@@ -121,6 +124,12 @@ void ScOrcusSheet::set_formula_result(row_t /*row*/, col_t /*col*/, const char*
void ScOrcusSheet::set_shared_formula(
row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, size_t /*sindex*/,
+ const char* /*p_formula*/, size_t /*n_formula*/)
+{
+}
+
+void ScOrcusSheet::set_shared_formula(
+ row_t /*row*/, col_t /*col*/, formula_grammar_t /*grammar*/, size_t /*sindex*/,
const char* /*p_formula*/, size_t /*n_formula*/, const char* /*p_range*/, size_t /*n_range*/)
{
}
commit d2691d7cce5fe0f433597666628265f22500a923
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Nov 26 16:01:52 2012 -0500
Temporarily disable patches that don't apply.
Change-Id: I77cd13301fb4ab98ba1ded49e5b4aa1f3974c8e1
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index 6d2a7f2..0a662f5 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -17,10 +17,10 @@ orcus_patches :=
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
# fix MinGW build
-orcus_patches += liborcus_0.1.0-mingw.patch
+#orcus_patches += liborcus_0.1.0-mingw.patch
# disable boost "auto lib" in MSVC build
orcus_patches += liborcus_0.1.0-boost_disable_auto_lib.patch
-orcus_patches += liborcus_0.1.0-link-with-Boost.System.patch
+#orcus_patches += liborcus_0.1.0-link-with-Boost.System.patch
$(eval $(call gb_UnpackedTarball_fix_end_of_line,orcus,\
vsprojects/liborcus-static-nozip/liborcus-static-nozip.vcproj \
commit d7636ee3d3ba2003389d97e0a29328b5fd69ec2c
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Nov 26 15:42:41 2012 -0500
This one has been upstreamed.
Change-Id: I1f55575b07cfc3cddd27b3d42ab354405f13fa60
diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk
index ec1f7c4..6d2a7f2 100644
--- a/liborcus/UnpackedTarball_orcus.mk
+++ b/liborcus/UnpackedTarball_orcus.mk
@@ -14,8 +14,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0))
orcus_patches :=
-# -Werror,-Wunused-variable -Werror,-Wunused-private-field
-orcus_patches += liborcus_0.1.0-warnings.patch
# make config.sub recognize arm-linux-androideabi
orcus_patches += liborcus_0.1.0-configure.patch
# fix MinGW build
diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch
deleted file mode 100644
index 8ce6533..0000000
--- a/liborcus/liborcus_0.1.0-warnings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/liborcus/pstring.cpp 2012-09-07 06:00:35.000000000 +0200
-+++ src/liborcus/pstring.cpp 2012-09-07 16:56:14.000000000 +0200
-@@ -57,25 +57,25 @@
-
- pstring pstring::intern(const char* str, size_t n)
- {
-- ::boost::mutex::scoped_lock(interned_strings.mtx);
-+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
- return interned_strings.store.intern(str, n);
- }
-
- void pstring::intern::dispose()
- {
-- ::boost::mutex::scoped_lock(interned_strings.mtx);
-+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
- interned_strings.store.clear();
- }
-
- size_t pstring::intern::size()
- {
-- ::boost::mutex::scoped_lock(interned_strings.mtx);
-+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
- return interned_strings.store.size();
- }
-
- void pstring::intern::dump()
- {
-- ::boost::mutex::scoped_lock(interned_strings.mtx);
-+ ::boost::mutex::scoped_lock lock(interned_strings.mtx);
- interned_strings.store.dump();
- }
-
---- src/liborcus/xml_map_tree.cpp 2012-09-07 06:00:35.000000000 +0200
-+++ src/liborcus/xml_map_tree.cpp 2012-09-07 16:59:23.000000000 +0200
-@@ -55,15 +55,14 @@
- {
- const char* mp_char;
- const char* mp_end;
-- size_t m_size;
- public:
-- xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n), m_size(n)
-+ xpath_parser(const char* p, size_t n) : mp_char(p), mp_end(p+n)
- {
- if (!n)
-- xml_map_tree::xpath_error("empty path");
-+ throw xml_map_tree::xpath_error("empty path");
-
- if (*p != '/')
-- xml_map_tree::xpath_error("first character must be '/'.");
-+ throw xml_map_tree::xpath_error("first character must be '/'.");
-
- ++mp_char;
- }
-@@ -414,7 +413,7 @@
- {
- // Make sure the root element's names are the same.
- if (mp_root->name != name)
-- xpath_error("path begins with inconsistent root level name.");
-+ throw xpath_error("path begins with inconsistent root level name.");
- }
- else
- {
commit 2ef1f2cad18b49f10edcbe28c5a1225302fd199d
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Mon Nov 26 15:35:32 2012 -0500
Update liborcus package to (pre-release) 0.3.0.
This is not the official 0.3.0 release.
Change-Id: I1d097ed30ea6c1835ac10d6be77e45a644449497
diff --git a/configure.ac b/configure.ac
index cb6a7a4..c283b03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8756,7 +8756,7 @@ AC_MSG_CHECKING([which orcus library to use])
if test "$with_system_orcus" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_LIBORCUS=YES
- PKG_CHECK_MODULES(ORCUS, liborcus-0.2 >= 0.1.0)
+ PKG_CHECK_MODULES(ORCUS, liborcus-0.4 >= 0.3.0)
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE ORCUS"
diff --git a/liborcus/Package_liborcus.mk b/liborcus/Package_liborcus.mk
index 57e5ea9..9ad1459 100644
--- a/liborcus/Package_liborcus.mk
+++ b/liborcus/Package_liborcus.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Package_use_external_project,liborcus,liborcus))
ifeq ($(OS)$(COM),WNTMSC)
$(eval $(call gb_Package_add_file,liborcus,lib/orcus.lib,vsprojects/liborcus-static-nozip/Release/orcus.lib))
else
-$(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.2.a))
+$(eval $(call gb_Package_add_file,liborcus,lib/liborcus.a,src/liborcus/.libs/liborcus-0.4.a))
endif
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list