summaryrefslogtreecommitdiff
path: root/registry/source
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:28:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 13:28:05 +0000
commit14d98101d3948a31978e5164b167471b1b9e762a (patch)
tree841b93d439e195c9b8622d33affbd10dc97d088f /registry/source
parent6574e21b2aa967da3c1cd83a13397d27f1c57b8e (diff)
INTEGRATION: CWS warnings01 (1.2.118); FILE MERGED
2005/09/22 22:04:29 sb 1.2.118.2: RESYNC: (1.2-1.3); FILE MERGED 2005/09/05 10:06:51 sb 1.2.118.1: #i53898# Made code warning-free.
Diffstat (limited to 'registry/source')
-rw-r--r--registry/source/regimpl.hxx14
1 files changed, 4 insertions, 10 deletions
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 5307ed327d6d..7aa678179a1c 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: regimpl.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 05:16:28 $
+ * last change: $Author: hr $ $Date: 2006-06-19 14:28:05 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -165,8 +165,7 @@ public:
RegError getResolvedKeyName(RegKeyHandle hKey,
const OUString& keyName,
- OUString& resolvedName,
- sal_Bool firstLinkOnly=sal_False);
+ OUString& resolvedName);
friend class ORegKey;
protected:
@@ -187,17 +186,12 @@ protected:
sal_Bool bReport=sal_False);
RegError checkBlop(OStoreStream& rValue,
- ORegKey* pTargetKey,
const OUString& sTargetPath,
- const OUString& valueName,
sal_uInt32 srcValueSize,
sal_uInt8* pSrcBuffer,
sal_Bool bReport=sal_False);
RegError mergeModuleValue(OStoreStream& rTargetValue,
- ORegKey* pTargetKey,
- const OUString& sTargetPath,
- const OUString& valueName,
RegistryTypeReader& reader,
RegistryTypeReader& reader2);
@@ -220,7 +214,7 @@ protected:
const OUString& keyName,
RegKeyHandle* phOpenKey);
- OUString resolveLinks(ORegKey* pKey, const OUString& path, sal_Bool firstLinkOnly=sal_False);
+ OUString resolveLinks(ORegKey* pKey, const OUString& path);
ORegKey* resolveLink(ORegKey* pKey, OUString& resolvedPath, const OUString& name);
sal_Bool insertRecursionLink(ORegKey* pLink);