summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2011-10-17 18:00:25 +0300
committerTor Lillqvist <tlillqvist@suse.com>2011-10-17 20:31:58 +0300
commit4cc0dfb2bb4b7e41464590d18070c439bc4af756 (patch)
tree578bdc72dbac4ae886ff733f7a49511435e23024 /sc/source/ui
parent0f96c76362874c6eb76f4cd956ba8311d06a2ed1 (diff)
WaE: unsafe mix of type 'bool' and type foo in operation
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/miscdlgs/acredlin.cxx4
-rw-r--r--sc/source/ui/miscdlgs/warnbox.cxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index e22dd14a0a1b..69585be38e1d 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1717,8 +1717,8 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG )
ScRedlinData* pEntryData = (ScRedlinData*) pEntry->GetUserData();
if( pEntryData )
{
- bRejectFlag &= pEntryData->bIsRejectable;
- bAcceptFlag &= pEntryData->bIsAcceptable;
+ bRejectFlag &= (bool) pEntryData->bIsRejectable;
+ bAcceptFlag &= (bool) pEntryData->bIsAcceptable;
const ScChangeAction* pScChangeAction = (ScChangeAction*) pEntryData->pData;
if( pScChangeAction && (pScChangeAction->GetType() != SC_CAT_DELETE_TABS) &&
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 8fa78a0f1a1c..1a68fe31207b 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -79,7 +79,7 @@ ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) :
bool ScReplaceWarnBox::IsDialogEnabled()
{
- return SC_MOD()->GetInputOptions().GetReplaceCellsWarn() == true;
+ return ((bool) SC_MOD()->GetInputOptions().GetReplaceCellsWarn()) == true;
}
void ScReplaceWarnBox::DisableDialog()