summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorDaniel Boelzle <dbo@openoffice.org>2003-08-20 11:53:25 +0000
committerDaniel Boelzle <dbo@openoffice.org>2003-08-20 11:53:25 +0000
commitaddae3e87b9d919cdc7efadd0655ed0da0de222d (patch)
tree5daa7e563235a1570da1e768c48ca256960f2342 /cli_ure
parent136272073b7b35e34d82421907775b3e835de576 (diff)
#107130#
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/native/makefile.mk5
-rw-r--r--cli_ure/source/native/msvc.map2
-rw-r--r--cli_ure/source/native/native_bootstrap.cxx9
-rw-r--r--cli_ure/source/native/native_share.h8
-rw-r--r--cli_ure/source/ure/makefile.mk9
-rw-r--r--cli_ure/unotypes/makefile.mk8
6 files changed, 19 insertions, 22 deletions
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index 42d3eaf37d5a..b358c0ad55c6 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: dbo $ $Date: 2003-06-05 13:17:59 $
+# last change: $Author: dbo $ $Date: 2003-08-20 12:53:20 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -89,7 +89,6 @@ UNOTYPES = \
CFLAGS += -clr -AI $(OUT)$/bin
SLOFILES = \
- $(SLO)$/native_ure.obj \
$(SLO)$/native_bootstrap.obj
SHL1OBJS = $(SLOFILES)
diff --git a/cli_ure/source/native/msvc.map b/cli_ure/source/native/msvc.map
index edc8675c3eb0..2fba6b6d3e7e 100644
--- a/cli_ure/source/native/msvc.map
+++ b/cli_ure/source/native/msvc.map
@@ -1,7 +1,5 @@
UDK_3.1 {
global:
- ?ServiceFactory_load@util@uno@@YA?AV?$Reference@VXSingleComponentFactory@lang@star@sun@com@@@2star@sun@com@@ABV?$Reference@VXComponentContext@uno@star@sun@com@@@2456@ABVOUString@rtl@@1@Z;
- ?ServiceFactory_writeInfo@util@uno@@YAXABV?$Reference@VXComponentContext@uno@star@sun@com@@@2star@sun@com@@ABVOUString@rtl@@ABV?$Reference@VXRegistryKey@registry@star@sun@com@@@2456@@Z;
local:
*;
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index 76d1d7d10403..b46c5e7a826f 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: native_bootstrap.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: dbo $ $Date: 2003-04-22 16:33:56 $
+ * last change: $Author: dbo $ $Date: 2003-08-20 12:53:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,6 +65,11 @@
#include "cppuhelper/bootstrap.hxx"
+[assembly:System::Reflection::AssemblyProduct( "CLI-UNO Language Binding" )];
+// xxx todo AssemblyCompany, AssemblyCopyright, AssemblyTrademark
+[assembly:System::Reflection::AssemblyDescription( "CLI-UNO Helper Library" )];
+[assembly:System::Reflection::AssemblyVersion( "3.1.0.0" )];
+
using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/cli_ure/source/native/native_share.h b/cli_ure/source/native/native_share.h
index 2004f0b6c3df..096ae5644211 100644
--- a/cli_ure/source/native/native_share.h
+++ b/cli_ure/source/native/native_share.h
@@ -2,9 +2,9 @@
*
* $RCSfile: native_share.h,v $
*
- * $Revision: 1.4 $
+ * $Revision: 1.5 $
*
- * last change: $Author: dbo $ $Date: 2003-05-08 12:41:00 $
+ * last change: $Author: dbo $ $Date: 2003-08-20 12:53:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -63,11 +63,11 @@
#using "cli_ure.dll"
#using "cli_types.dll"
-#include <vcclr.h>
-
#include "rtl/ustring.hxx"
#include "uno/mapping.hxx"
+#include <vcclr.h>
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
diff --git a/cli_ure/source/ure/makefile.mk b/cli_ure/source/ure/makefile.mk
index b8998f0e2914..98a730489db1 100644
--- a/cli_ure/source/ure/makefile.mk
+++ b/cli_ure/source/ure/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.5 $
+# $Revision: 1.6 $
#
-# last change: $Author: dbo $ $Date: 2003-07-02 14:17:26 $
+# last change: $Author: dbo $ $Date: 2003-08-20 12:53:22 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -79,15 +79,10 @@ ALLTAR : \
CSFILES = \
assembly.cs \
- uno$/ServiceImplementationAttribute.cs \
- uno$/SingletonAttribute.cs \
uno$/util$/DisposeGuard.cs \
uno$/util$/WeakAdapter.cs \
uno$/util$/WeakBase.cs \
uno$/util$/WeakComponentBase.cs \
- uno$/util$/ServiceBase.cs \
- uno$/util$/ServiceFactory.cs \
- uno$/util$/DeployedTypeResolver.cs
$(OUT)$/bin$/cli_ure.dll : $(CSFILES) $(OUT)$/bin$/cli_types.dll
+csc $(CSCFLAGS) \
diff --git a/cli_ure/unotypes/makefile.mk b/cli_ure/unotypes/makefile.mk
index 1d99edc9c999..7920eecb46b1 100644
--- a/cli_ure/unotypes/makefile.mk
+++ b/cli_ure/unotypes/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: dbo $ $Date: 2003-06-05 13:18:00 $
+# last change: $Author: dbo $ $Date: 2003-08-20 12:53:25 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -86,8 +86,8 @@ $(OUT)$/bin$/cli_types.dll : $(OUT)$/bin$/climaker.exe $(SOLARBINDIR)$/types.rdb
+$(OUT)$/bin$/climaker.exe $(CLIMAKERFLAGS) \
--out $@ \
--version "1.0.0.0" \
- --product "OpenOffice.org SDK" \
- --description "This assembly contains API metadata of the OpenOffice.org Software Development Kit (SDK)." \
+ --product "Software Development Kit (SDK)" \
+ --description "This assembly contains API metadata of the Software Development Kit (SDK)." \
$(SOLARBINDIR)$/types_doc.rdb
.ENDIF