[Libreoffice-commits] .: 2 commits - Module_tail_build.mk sw/source tail_build/prj

[Libreoffice Gerrit user]

 Module_tail_build.mk                |    1 -
 sw/source/filter/ww8/ww8toolbar.cxx |    3 ++-
 tail_build/prj/build.lst            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ffd30f7bf1bd0df32dff0835a288d6bcc6361dd5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 4 05:56:34 2012 -0600

    kick python3 out of tail_build for now to fix Mac build breakage
    
    Change-Id: I07fd96b7f956ea2c275f2112f403b9a29b3def8e

diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 61fcc43..e0664bb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -131,7 +131,6 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	padmin \
 	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	psprint_config \
-	$(call gb_Helper_optional,PYTHON,python3) \
 	$(call gb_Helper_optional,PYUNO,pyuno) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
 	readlicense_oo \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index ac96f9e..8090698 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb      tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
+tb      tail_build : CPPUNIT:cppunit EXPAT:expat FONTCONFIG:fontconfig ICU:icu LIBPNG:libpng LIBXML2:libxml2 LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python3 REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL
 tb tail_build\prj nmake - all tb_prj   NULL
commit 18ea351e9a9c73add62a0469e707ff3457c084c8
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Dec 4 03:21:26 2012 -0600

    WaE : call base copy constructor
    
    Change-Id: I6a31d51e8c20d2f8d8b2d14092e2ce84bf2aa95d

diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 2d8f5c7..5d8c502 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -1309,7 +1309,8 @@ MCD::MCD() :  reserved1(0x56)
 }
 
 MCD::MCD(const MCD& rO)
-    : reserved1(rO.reserved1)
+    : TBBase(rO)
+    , reserved1(rO.reserved1)
     , reserved2(rO.reserved2)
     , ibst(rO.ibst)
     , ibstName(rO.ibstName)