INTEGRATION: CWS jl104 (1.3.4); FILE MERGED

2008/06/18 14:25:01 jl 1.3.4.1: #i88078#  cli_ure moved to URE, therefore it can only build ure types, tests moved to testtools

4 files changed, 15 insertions, 10 deletions

diff --git a/cli_ure/source/scripts/increment_version.pl b/cli_ure/source/scripts/increment_version.pl
index e7cfe5b522bb..35cc400519ca 100644
--- a/cli_ure/source/scripts/increment_version.pl
+++ b/cli_ure/source/scripts/increment_version.pl
@@ -8,7 +8,7 @@
 #
 # $RCSfile: increment_version.pl,v $
 #
-# $Revision: 1.3 $
+# $Revision: 1.4 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -61,7 +61,7 @@ my $usage =
 my $sNameForm =
 "The names must end on one of these names: NEW_VERSION, OLD_VERSION, POLICY_VERSION\n".
 "For example, valid names are: \n".
-"CLI_TYPES_NEW_VERSION\nCLI_TYPES_OLD_VERSION\nCLI_TYPES_POLICY_VERSION\n";
+"CLI_URETYPES_NEW_VERSION\nCLI_URETYPES_OLD_VERSION\nCLI_URETYPES_POLICY_VERSION\n";
 
 if (scalar @ARGV < 4) {
    print $usage;
@@ -148,7 +148,7 @@ sub processLine($$)
     my $name = substr($line, 0, $i);
     $name = trim($name);
     #We do not check the names here because the file can contain
-    #other names, e.g. CLI_TYPES_POLICY_ASSEMBLY
+    #other names, e.g. CLI_URETYPES_POLICY_ASSEMBLY
     if (length($name) == 0) {
     print "Wrong line in $ARGV[0]\n", $sNameForm;
     exit -1;
diff --git a/cli_ure/source/uno_bridge/cli_bridge.h b/cli_ure/source/uno_bridge/cli_bridge.h
index 53a78af8bda7..4fada5583b6f 100644
--- a/cli_ure/source/uno_bridge/cli_bridge.h
+++ b/cli_ure/source/uno_bridge/cli_bridge.h
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cli_bridge.h,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,7 +38,7 @@
 #include "cli_base.h"
 #include "cli_environment.h"
 #using <mscorlib.dll>
-#using <cli_types.dll>
+//#using <cli_uretypes.dll>
 #using <cli_basetypes.dll>
 #using <system.dll>
 
diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index c39a46412319..9242108a9c9f 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cli_data.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -46,6 +46,8 @@
 #include "cli_base.h"
 #include "cli_bridge.h"
 
+#using <cli_uretypes.dll>
+
 
 #undef VOID
 
diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx
index cfc2551f376c..1ff8c51ed21f 100644
--- a/cli_ure/source/uno_bridge/cli_proxy.cxx
+++ b/cli_ure/source/uno_bridge/cli_proxy.cxx
@@ -7,7 +7,9 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: cli_proxy.cxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
+ * $RCSfile: cli_proxy.cxx,v $
+ * $Revision: 1.4 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -38,6 +40,10 @@
 #include "cli_base.h"
 #include "cli_bridge.h"
 
+#using <mscorlib.dll>
+#using <cli_ure.dll>
+#using <cli_uretypes.dll>
+
 namespace sr = System::Reflection;
 namespace st = System::Text;
 namespace sre = System::Reflection::Emit;
@@ -50,9 +56,6 @@ namespace sd = System::Diagnostics;
 namespace css = com::sun::star;
 namespace ucss = unoidl::com::sun::star;
 
-#using <mscorlib.dll>
-#using <cli_ure.dll>
-
 using namespace cli_uno;
 using namespace rtl;
 extern "C"