CWS-TOOLING: integrate CWS sb103

2009-01-15 15:28:08 +0100 sb  r266375 : #i97629# set UNO_PATH in python start program and use it in bootstrap function in officehelper.py (and do not erroneously encode a vnd.sun.star.pathname URE_BOOTSTRAP value in tools::extendApplicationEnvironment)
2009-01-15 10:40:17 +0100 sb  r266338 : #i97424# explicit shut down of ImplImageTree singleton in DeInitVCL still required
2009-01-14 12:07:15 +0100 sb  r266276 : CWS-TOOLING: rebase CWS sb103 to trunk@265758 (milestone: DEV300:m38)
2009-01-14 08:53:02 +0100 sb  r266266 : #i96284# remove implementation of unused (but expensive) link feature; plus some general cleanup
2009-01-08 14:42:59 +0100 sb  r266010 : #i96683# enable dlclose for GCC 3 (based on a patch by cmc)
2009-01-06 14:18:23 +0100 sb  r265920 : #i97424# spurious unreferenced local variables
2008-12-19 15:33:39 +0100 sb  r265727 : #i57359# no need for a special glibc 2.2.4 based libgcc_s.so.1 for URE any more as the general one used for OOo is guaranteed to be based on at least glibc 2.2.4, anyway
2008-12-19 13:54:37 +0100 sb  r265724 : #i97424# clean up and speed up vcl ImplImageTree
2008-12-18 14:28:10 +0100 sb  r265690 : #i97132# spread usage of the rtl::Static pattern (patch by cmc)
2008-12-15 14:33:00 +0100 sb  r265499 : #i90492# generate UTF-8 encoded output (patch by tora)
2008-12-15 11:45:05 +0100 sb  r265469 : #i95593# -Djava.library.path to find libtest_javauno_any.so
2008-12-15 11:23:14 +0100 sb  r265468 : #i93769# it appears that Java nowadays expects file URIs in UTF-8, so ExternalUriReferenceTranslator.toExternal must not be called
2008-12-10 12:02:50 +0100 sb  r265164 : #i93219# use (corrected) signal handling instead of forking again (to avoid unintended generation of core files)

2 files changed, 3 insertions, 6 deletions

diff --git a/registry/tools/checksingleton.cxx b/registry/tools/checksingleton.cxx
index 9950087a8e7a..7900b1db7a62 100644
--- a/registry/tools/checksingleton.cxx
+++ b/registry/tools/checksingleton.cxx
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <set>
 #include "registry/registry.hxx"
 #include "registry/reflread.hxx"
 #include <rtl/ustring.hxx>
@@ -105,8 +104,6 @@ struct LessString
     }
 };
 
-typedef ::std::set< OUString, LessString > StringSet;
-
 class Options
 {
 public:
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index d7c9c03b5d8b..f41103afb826 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -112,7 +112,7 @@ struct LessString
     }
 };
 
-typedef ::std::set< OUString, LessString > StringSet;
+typedef ::std::set< OUString > StringSet;
 
 class Options
 {
@@ -1270,7 +1270,7 @@ static sal_uInt32 checkFieldsWithoutOrder(const OUString& keyName,
     }
 
     sal_Bool bFound = sal_False;
-    ::std::set< sal_uInt16, ::std::less< sal_uInt16 > > moreProps;
+    ::std::set< sal_uInt16 > moreProps;
 
     for (i=0; i < nFields1; i++)
     {
@@ -1533,7 +1533,7 @@ static sal_uInt32 checkBlob(const OUString& keyName, typereg::Reader& reader1, s
             }
 
             sal_Bool bFound = sal_False;
-            ::std::set< sal_uInt16, ::std::less< sal_uInt16 > > moreReferences;
+            ::std::set< sal_uInt16 > moreReferences;
 
             for (i=0; i < nReference1; i++)
             {