From 725eb40b0559aadd322ab1683c3473e7627fca5c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Wed, 24 May 2006 13:29:47 +0000 Subject: [PATCH] INTEGRATION: CWS ause043 (1.15.12); FILE MERGED 2006/03/10 10:55:45 hjs 1.15.12.2: #i56702# added missing type 2005/11/16 15:21:41 hjs 1.15.12.1: #i56702# added missing types --- javaunohelper/source/makefile.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk index 663b3cae0139..743e7a8795a0 100644 --- a/javaunohelper/source/makefile.mk +++ b/javaunohelper/source/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2005-09-07 18:42:43 $ +# last change: $Author: vg $ $Date: 2006-05-24 14:29:47 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -38,15 +38,12 @@ PRJ=.. PRJNAME=javaunohelper TARGET=juh USE_DEFFILE=TRUE -NO_BSYMBOLIC=TRUE ENABLE_EXCEPTIONS=TRUE LIBTARGET=NO # --- Settings ----------------------------------------------------- -.INCLUDE : svpre.mk .INCLUDE : settings.mk -.INCLUDE : sv.mk .IF "$(SOLAR_JAVA)"=="" nojava: @@ -60,14 +57,17 @@ UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb UNOUCROUT=$(OUT)$/inc$/comprehensive INCPRE+=$(OUT)$/inc$/comprehensive +NO_OFFUH=TRUE CPPUMAKERFLAGS+=-C UNOTYPES= \ + com.sun.star.beans.NamedValue \ com.sun.star.container.XHierarchicalNameAccess \ com.sun.star.loader.XImplementationLoader \ com.sun.star.registry.XRegistryKey \ com.sun.star.registry.XSimpleRegistry \ com.sun.star.beans.XPropertySet \ + com.sun.star.lang.DisposedException \ com.sun.star.lang.IllegalArgumentException \ com.sun.star.lang.XTypeProvider \ com.sun.star.lang.XServiceInfo \