From be0c9d802186671420b6ea6bcc654f66e49d3e2c Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Fri, 15 Oct 2010 12:11:00 -0500 Subject: merge vosremoval-reference.diff --- sd/source/core/EffectMigration.cxx | 1 - sd/util/makefile.mk | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) (limited to 'sd') diff --git a/sd/source/core/EffectMigration.cxx b/sd/source/core/EffectMigration.cxx index 3c894e491aa8..61b1a4c502d2 100644 --- a/sd/source/core/EffectMigration.cxx +++ b/sd/source/core/EffectMigration.cxx @@ -41,7 +41,6 @@ #include #include -using namespace ::vos; using namespace ::sd; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::animations; diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk index 088057e90ce0..8de0aedf2bf3 100755 --- a/sd/util/makefile.mk +++ b/sd/util/makefile.mk @@ -87,6 +87,7 @@ SHL1STDLIBS+= \ $(VOSLIB) \ $(CANVASLIB) \ $(SALLIB) \ + $(SALHELPERLIB) \ $(AVMEDIALIB) SHL1LIBS= $(LIB3TARGET) $(LIB5TARGET) $(LIB6TARGET) -- cgit v1.2.3