INTEGRATION: CWS sb59 (1.3.196); FILE MERGED

2006/08/10 08:16:21 sb 1.3.196.1: #i67487# Made code warning-free (wntmsci10).

framework/source/interaction/stillinteraction.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: stillinteraction.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:02:50 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 10:40:59 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -178,7 +178,7 @@ void SAL_CALL StillInteraction::handle( const css::uno::Reference< css::task::XI
     {
         // warnings can be ignored   => approve
         // errors must break loading => abort
-        sal_Bool bWarning = (aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK == ERRCODE_WARNING_MASK);
+        sal_Bool bWarning = (aErrorCodeRequest.ErrCode & ERRCODE_WARNING_MASK) == ERRCODE_WARNING_MASK;
         if (xApprove.is() && bWarning)
             xApprove->select();
         else

framework/source/jobs/configaccess.cxx

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: configaccess.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-16 14:03:04 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 10:41:19 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -218,6 +218,7 @@ void ConfigAccess::open( /*IN*/ EOpenMode eMode )
             }
             catch(css::uno::Exception& ex)
             {
+                (void) ex; // avoid warning
                 LOG_WARNING("open config ...", U2B(ex.Message))
             }