diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:19:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 22:19:20 +0000 |
| commit | 164602687884e4ad05fdd6cca0d1f60f51dce193 (patch) | |
| tree | 74d2083a370b5be49cfeeca822d70164bef28d49 /configmgr | |
| parent | 69ead7bd8f6247486df87bc0024f575a7b084074 (diff) | |
INTEGRATION: CWS warnings01 (1.6.4); FILE MERGED
2005/11/01 12:47:12 cd 1.6.4.1: #i53898# Warning free code for sun solaris compiler
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/backend/importmergehandler.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configmgr/source/backend/importmergehandler.cxx b/configmgr/source/backend/importmergehandler.cxx index 295b2e7e46..cd2ff55eb2 100644 --- a/configmgr/source/backend/importmergehandler.cxx +++ b/configmgr/source/backend/importmergehandler.cxx @@ -4,9 +4,9 @@ * * $RCSfile: importmergehandler.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: rt $ $Date: 2005-09-08 03:29:00 $ + * last change: $Author: hr $ $Date: 2006-06-19 23:19:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -261,6 +261,7 @@ void SAL_CALL ImportMergeHandler::dropNode( const OUString& aName ) void SAL_CALL ImportMergeHandler::overrideProperty( const OUString& aName, sal_Int16 aAttributes, const uno::Type& aType, sal_Bool bClear ) throw (MalformedDataException, lang::WrappedTargetException, uno::RuntimeException) { + (void) bClear; // avoid warning about unused parameter OSL_ENSURE(!bClear,"'clear' operation not supported on import"); getOutputHandler()->modifyProperty(aName,aAttributes,aAttributes,aType); } |