[Libreoffice-commits] core.git: 2 commits - sc/inc sc/Library_scfilt.mk

[Michael Stahl]

 sc/Library_scfilt.mk          |   13 ++-----------
 sc/inc/pch/precompiled_sc.hxx |    1 -
 2 files changed, 2 insertions(+), 12 deletions(-)

New commits:
commit abc22a091c27b92c5b20964375098faa11d3546e
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 3 22:44:03 2014 +0100

    fix the PCH after 8e399602ea7aa11a81d704ff6ce8e660df4205b9
    
    Change-Id: Ia5e05901a066619e0e819b3b06c0a7da3b2de536

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index e46f17c..ff70147 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -779,7 +779,6 @@
 #include <svx/sdtditm.hxx>
 #include <svx/selctrl.hxx>
 #include <svx/shapepropertynotifier.hxx>
-#include <svx/sidebar/ColorControl.hxx>
 #include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
 #include <svx/sidebar/PopupContainer.hxx>
 #include <svx/sidebar/SelectionAnalyzer.hxx>
commit 39d445e0eb439e5aea94214f63aa4a04e5829011
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Nov 3 21:52:54 2014 +0100

    sc: clean up Library_scfilt.mk duplication wrt. ORCUS
    
    Change-Id: Ide3c9987fb15112d5a4c8c2b5e15277b2579ee51

diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 77c8486..d19b379 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -29,13 +29,8 @@ $(eval $(call gb_Library_use_custom_headers,scfilt,\
 ))
 
 $(eval $(call gb_Library_use_externals,scfilt,\
-	orcus \
-	orcus-parser \
 	boost_headers \
-	boost_system \
-	boost_iostreams \
 	mdds_headers \
-	zlib \
 ))
 
 $(eval $(call gb_Library_use_libraries,scfilt,\
@@ -230,15 +225,11 @@ ifeq ($(ENABLE_ORCUS),TRUE)
 $(eval $(call gb_Library_use_externals,scfilt,\
 	orcus \
 	orcus-parser \
+	boost_system \
+	boost_iostreams \
 	zlib \
 ))
 
-ifneq ($(SYSTEM_ZLIB),)
-$(eval $(call gb_Library_add_defs,scfilt,\
-	-DSYSTEM_ZLIB \
-))
-endif
-
 $(eval $(call gb_Library_add_exception_objects,scfilt,\
 	sc/source/filter/orcus/interface \
 	sc/source/filter/orcus/orcusfiltersimpl \