diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:30:16 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 00:30:16 +0000 |
| commit | 186c2a865e079d81230ae021e76e12ff79a31f79 (patch) | |
| tree | 73f22573f4424304751bcc643ffc088ce545ced7 /connectivity/source/drivers/hsqldb | |
| parent | f8926d4505accdda2b5f9d9d320ea06c7007c934 (diff) | |
INTEGRATION: CWS warnings01 (1.8.14); FILE MERGED
2005/11/16 12:59:06 fs 1.8.14.3: #i57457# warning free code
2005/11/07 19:09:44 pl 1.8.14.2: RESYNC: (1.8-1.9); FILE MERGED
2005/11/07 14:43:37 fs 1.8.14.1: #i57457# warning-free code
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HStorageMap.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index fceb20c1f995..d31a133f77ad 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -4,9 +4,9 @@ * * $RCSfile: HStorageMap.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-10-24 08:21:25 $ + * last change: $Author: hr $ $Date: 2006-06-20 01:30:16 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -49,6 +49,9 @@ #ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include <com/sun/star/lang/DisposedException.hpp> #endif +#ifndef CONNECTIVITY_DIAGNOSE_EX_H +#include "diagnose_ex.h" +#endif #include <osl/thread.h> //........................................................................ @@ -95,7 +98,7 @@ namespace connectivity } catch(const Exception& e) { - e; + OSL_UNUSED( e ); OSL_ENSURE(0,"Could not dispose OutputStream"); } m_xOutputStream = NULL; @@ -301,8 +304,8 @@ namespace connectivity } catch(Exception& ) { - ::rtl::OUString sName = removeOldURLPrefix(sOrgName); - pHelper.reset(new StreamHelper(aStoragePair.first.first->openStreamElement(sName,_nMode))); + ::rtl::OUString sStrippedName = removeOldURLPrefix(sOrgName); + pHelper.reset( new StreamHelper(aStoragePair.first.first->openStreamElement( sStrippedName, _nMode ) ) ); } aFind->second.second.insert(TStreamMap::value_type(sName,pHelper)); } |