Kaydet (Commit) cb8cbf9d authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien

INTEGRATION: CWS warnings01 (1.15.4); FILE MERGED

2006/04/07 19:44:45 sb 1.15.4.3: RESYNC: (1.15-1.16); FILE MERGED
2006/02/14 10:17:41 cd 1.15.4.2: #i55991# Fix warnings for ms c++ compiler
2005/11/09 18:02:42 pl 1.15.4.1: #i53898# removed warnings
üst 45653fdf
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: cachecontroller.cxx,v $ * $RCSfile: cachecontroller.cxx,v $
* *
* $Revision: 1.16 $ * $Revision: 1.17 $
* *
* last change: $Author: hr $ $Date: 2006-01-27 16:17:39 $ * last change: $Author: hr $ $Date: 2006-06-19 23:31:07 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -324,6 +324,7 @@ void CacheController::implDisposeOne(CacheRef const & _aDisposedCache, RequestOp ...@@ -324,6 +324,7 @@ void CacheController::implDisposeOne(CacheRef const & _aDisposedCache, RequestOp
} }
catch (uno::Exception& e) catch (uno::Exception& e)
{ {
(void)e;
CFG_TRACE_ERROR_NI("- Failed with exception %s (ignoring here)", OUSTRING2ASCII(e.Message) ); CFG_TRACE_ERROR_NI("- Failed with exception %s (ignoring here)", OUSTRING2ASCII(e.Message) );
} }
...@@ -807,7 +808,7 @@ void CacheController::savePendingChanges(CacheRef const & _aCache, ComponentRequ ...@@ -807,7 +808,7 @@ void CacheController::savePendingChanges(CacheRef const & _aCache, ComponentRequ
try try
{ {
CFG_TRACE_INFO("CacheController: saving updates for tree: '%s'", OUSTRING2ASCII(_aComponent.getComponentName().toString())); CFG_TRACE_INFO2("CacheController: saving updates for tree: '%s'", OUSTRING2ASCII(_aComponent.getComponentName().toString()));
std::auto_ptr<SubtreeChange> aChangeData = _aCache->releasePendingChanges(_aComponent.getComponentName()); std::auto_ptr<SubtreeChange> aChangeData = _aCache->releasePendingChanges(_aComponent.getComponentName());
...@@ -830,6 +831,7 @@ void CacheController::savePendingChanges(CacheRef const & _aCache, ComponentRequ ...@@ -830,6 +831,7 @@ void CacheController::savePendingChanges(CacheRef const & _aCache, ComponentRequ
} }
catch(uno::Exception& e) catch(uno::Exception& e)
{ {
(void)e;
CFG_TRACE_ERROR_NI("CacheController: saving tree '%s' failed: %s", CFG_TRACE_ERROR_NI("CacheController: saving tree '%s' failed: %s",
OUSTRING2ASCII(_aComponent.getComponentName().toString()), OUSTRING2ASCII(_aComponent.getComponentName().toString()),
OUSTRING2ASCII(e.Message) ); OUSTRING2ASCII(e.Message) );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment