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)

1 files changed, 4 insertions, 26 deletions

diff --git a/registry/source/keyimpl.hxx b/registry/source/keyimpl.hxx
index 0325aa08e4b5..4e99696bcd44 100644
--- a/registry/source/keyimpl.hxx
+++ b/registry/source/keyimpl.hxx
@@ -52,8 +52,7 @@ public:
 
     RegError    createKey(const OUString& keyName, RegKeyHandle* phNewKey);
 
-    RegError    openKey(const OUString& keyName, RegKeyHandle* phOpenKey,
-                        RESOLVE eResolve=RESOLVE_FULL);
+    RegError    openKey(const OUString& keyName, RegKeyHandle* phOpenKey);
 
     RegError    openSubKeys(const OUString& keyName,
                             RegKeyHandle** phOpenSubKeys,
@@ -102,23 +101,12 @@ public:
                                      sal_Unicode*** pValueList,
                                     sal_uInt32* pLen) const;
 
-    RegError    createLink(const OUString& linkName, const OUString& linkTarget);
-
-    RegError    deleteLink(const OUString& linkName);
-
     RegError    getKeyType(const OUString& name,
                            RegKeyType* pKeyType) const;
 
-    RegError    getLinkTarget(const OUString& linkName,
-                              OUString& pLinkTarget) const;
-
     RegError    getResolvedKeyName(const OUString& keyName,
                                    OUString& resolvedName);
 
-public:
-    virtual ~ORegKey();
-
-
     sal_Bool        isDeleted() const
                     { return m_bDeleted; }
 
@@ -130,17 +118,11 @@ public:
 
     sal_uInt32      countSubKeys();
 
-    sal_Bool        isLink() const
-                    { return m_isLink; }
-
-    const OUString& getLinkTarget() const
-                    { return m_link; }
-
     ORegistry* getRegistry() const
                     { return m_pRegistry; }
 
     const OStoreFile& getStoreFile() const
-                    { return m_storeFile; }
+                    { return m_pRegistry->getStoreFile(); }
 
     OStoreDirectory getStoreDir();
 
@@ -150,17 +132,13 @@ public:
     sal_uInt32 getRefCount() const
                     { return m_refCount; }
 
-    friend class ORegistry;
-protected:
-    sal_Bool                checkLink();
+    OUString getFullPath(OUString const & path) const;
 
+private:
     sal_uInt32              m_refCount;
     OUString                m_name;
-    OUString                m_link;
     sal_Bool                m_bDeleted;
-    sal_Bool                m_isLink;
     ORegistry*              m_pRegistry;
-    OStoreFile              m_storeFile;
 };