summaryrefslogtreecommitdiff
path: root/framework/source
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-10-12 09:41:19 +0000
committerOliver Bolte <obo@openoffice.org>2006-10-12 09:41:19 +0000
commit31392fec2a1faccd7688a6a27ea0a44c365bcbfd (patch)
treea8519233bf0d2695a6d1ceaf18df7064157b726c /framework/source
parentdccde65edadf33c9ac8b9255a2dca508c9c1037c (diff)
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).
Diffstat (limited to 'framework/source')
-rw-r--r--framework/source/interaction/stillinteraction.cxx6
-rw-r--r--framework/source/jobs/configaccess.cxx5
2 files changed, 6 insertions, 5 deletions
diff --git a/framework/source/interaction/stillinteraction.cxx b/framework/source/interaction/stillinteraction.cxx
index 87ac0afa2aed..46ec9776e82e 100644
--- a/framework/source/interaction/stillinteraction.cxx
+++ b/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
diff --git a/framework/source/jobs/configaccess.cxx b/framework/source/jobs/configaccess.cxx
index 30f2233b11f3..e1d04fbe7429 100644
--- a/framework/source/jobs/configaccess.cxx
+++ b/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))
}