[Libreoffice-commits] .: 2 commits - desktop/Package_soffice_bin.mk sw/source

[David Tardon]

 desktop/Package_soffice_bin.mk |    2 +-
 sw/source/core/tox/tox.cxx     |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit c92c5c6beed1c1c1004ced1e90b57393f62a0a31
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 3 07:21:47 2012 +0200

    use right target to force ordering
    
    Change-Id: I57ed1971414789e6efbe76e69bb3fabb8b51e22d

diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk
index 725902c..04378d7 100644
--- a/desktop/Package_soffice_bin.mk
+++ b/desktop/Package_soffice_bin.mk
@@ -33,6 +33,6 @@ ifeq ($(COM),MSC)
 $(eval $(call gb_Package_add_file,desktop_soffice_bin,bin/soffice.bin.manifest,soffice_bin$(gb_Executable_EXT).manifest))
 endif
 
-$(call gb_Package_get_target,desktop_soffice_bin) :| $(call gb_Executable_get_target,soffice_bin)
+$(call gb_Package_get_preparation_target,desktop_soffice_bin) :| $(call gb_Executable_get_target,soffice_bin)
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
commit e59347cf60825e49f1b6d834a1cfd4f7524d0bae
Author: David Tardon <dtardon at redhat.com>
Date:   Thu May 3 06:51:15 2012 +0200

    valgrind: cond. jump or move depends on uninit. value
    
    Change-Id: I721228fee5349a6b2aa0a652da65d8da67b40144

diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index cc949ed..fb47416 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -580,6 +580,7 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
     nOLEOptions = rSource.nOLEOptions;
     eLanguage = rSource.eLanguage;
     sSortAlgorithm = rSource.sSortAlgorithm;
+    bLevelFromChapter = rSource.bLevelFromChapter;
 
     for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
         aStyleNames[i] = rSource.aStyleNames[i];