summaryrefslogtreecommitdiff
path: root/slideshow/test
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2011-04-20 10:31:26 +0200
committerDavid Tardon <dtardon@redhat.com>2011-04-21 20:56:05 +0200
commitca648de248f6bc93c269f1b7b198d832c66a4227 (patch)
tree1620217241015a06d7f8d514f60e2616ab24a17f /slideshow/test
parent3f8677fc6fa45ba2a8ce50466f4c42e2de0f34d4 (diff)
gbuildize slideshow
Diffstat (limited to 'slideshow/test')
-rw-r--r--slideshow/test/makefile.mk104
-rw-r--r--slideshow/test/slidetest.cxx5
2 files changed, 1 insertions, 108 deletions
diff --git a/slideshow/test/makefile.mk b/slideshow/test/makefile.mk
deleted file mode 100644
index d5a70898eade..000000000000
--- a/slideshow/test/makefile.mk
+++ /dev/null
@@ -1,104 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=slideshow
-PRJINC=$(PRJ)$/source
-TARGET=tests
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-# --- Common ----------------------------------------------------------
-
-# BEGIN target1 -------------------------------------------------------
-SHL1OBJS= \
- $(SLO)$/views.obj \
- $(SLO)$/slidetest.obj \
- $(SLO)$/testshape.obj \
- $(SLO)$/testview.obj
-
-SHL1TARGET= tests
-SHL1STDLIBS= $(SALLIB) \
- $(BASEGFXLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(CPPUNITLIB) \
- $(UNOTOOLSLIB) \
- $(VCLLIB)
-
-.IF "$(OS)"=="WNT"
- SHL1STDLIBS+=$(LIBPRE) islideshowtest.lib
-.ELSE
- SHL1STDLIBS+=-lslideshowtest$(DLLPOSTFIX)
-.ENDIF
-
-SHL1IMPLIB= i$(SHL1TARGET)
-
-DEF1NAME =$(SHL1TARGET)
-SHL1VERSIONMAP = export.map
-SHL1RPATH = NONE
-
-# END target1 ----------------------------------------------------------
-
-# BEGIN target2 --------------------------------------------------------
-APP2OBJS= \
- $(SLO)$/demoshow.obj
-
-APP2TARGET= demoshow
-APP2STDLIBS=$(TOOLSLIB) \
- $(COMPHELPERLIB) \
- $(CPPCANVASLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(UCBHELPERLIB) \
- $(SALLIB) \
- $(VCLLIB) \
- $(BASEGFXLIB)
-
-.IF "$(GUI)"!="UNX"
-APP2DEF= $(MISC)$/$(TARGET).def
-.ENDIF
-# END target2 ----------------------------------------------------------------
-
-#------------------------------- All object files ----------------------------
-
-# do this here, so we get right dependencies
-SLOFILES=$(SHL1OBJS)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-.INCLUDE : _cppunit.mk
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index df3fc0f4f6a6..cfc5f60fcf85 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -26,10 +26,7 @@
*
************************************************************************/
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
-#include "cppunit/plugin/TestPlugIn.h"
+#include <sal/cppunit.h>
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>