summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2010-10-15 12:11:00 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2010-10-25 17:58:18 -0500
commitbe0c9d802186671420b6ea6bcc654f66e49d3e2c (patch)
tree3f6b0126d623b755ee9dfdd030f83d35f363e901 /sd
parent6bc8cf4fca5cc8d1c880c20eefc83d86ea0e6f98 (diff)
merge vosremoval-reference.diff
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/EffectMigration.cxx1
-rwxr-xr-xsd/util/makefile.mk1
2 files changed, 1 insertions, 1 deletions
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 <EffectMigration.hxx>
#include <anminfo.hxx>
-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)