diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:10:17 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 03:10:17 +0000 |
| commit | d235956533556d3ac97a724fb5ab41451ea74a15 (patch) | |
| tree | 9158c829faf943436eb920c60a69712e32178eb6 /rdbmaker | |
| parent | 3d5e73c8187d050282733761dac6f96924fa992a (diff) | |
INTEGRATION: CWS warnings01 (1.6.120); FILE MERGED
2005/09/23 00:24:58 sb 1.6.120.3: RESYNC: (1.6-1.7); FILE MERGED
2005/09/07 13:50:21 sb 1.6.120.2: #i53898# Made code warning-free.
2005/09/01 07:48:39 sb 1.6.120.1: #i53898# Made code warning-free.
Diffstat (limited to 'rdbmaker')
| -rw-r--r-- | rdbmaker/source/rdbmaker/rdbmaker.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx index 58e6996dc..0c2bc2970 100644 --- a/rdbmaker/source/rdbmaker/rdbmaker.cxx +++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx @@ -4,9 +4,9 @@ * * $RCSfile: rdbmaker.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-09 05:05:19 $ + * last change: $Author: hr $ $Date: 2006-06-20 04:10:17 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -110,7 +110,6 @@ void initFilterTypes(RdbOptions* pOptions) if (pOptions->isValid("-FT")) { OString fOption(pOptions->getOption("-FT")); - sal_Bool ret = sal_False; sal_Int32 nIndex = 0; do { @@ -268,10 +267,10 @@ sal_Bool produceAllTypes(const OString& typeName, sal_Bool bFullScope, FileStream& o, RegistryKey& regKey, - StringSet& filterTypes) + StringSet& filterTypes2) throw( CannotDumpException ) { - if (!produceType(typeName, typeMgr, typeDependencies, pOptions, o, regKey, filterTypes)) + if (!produceType(typeName, typeMgr, typeDependencies, pOptions, o, regKey, filterTypes2)) { fprintf(stderr, "%s ERROR: %s\n", pOptions->getProgramName().getStr(), @@ -299,11 +298,11 @@ sal_Bool produceAllTypes(const OString& typeName, if (bFullScope) { if (!produceAllTypes(tmpName, typeMgr, typeDependencies, pOptions, sal_True, - o, regKey, filterTypes)) + o, regKey, filterTypes2)) return sal_False; } else { - if (!produceType(tmpName, typeMgr, typeDependencies, pOptions, o, regKey, filterTypes)) + if (!produceType(tmpName, typeMgr, typeDependencies, pOptions, o, regKey, filterTypes2)) return sal_False; } } |