diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-08-16 20:45:53 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-08-16 20:46:52 +0300 |
| commit | 682dff097be62a325945c5edd7b81f076a8ef106 (patch) | |
| tree | cb20786ce67942aeff71d50795de243289d96391 /cui | |
| parent | da5eb782cb28f806a8ca08ef8ebf21772363307d (diff) | |
WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool' in operation
Change-Id: Icdc6189be1c8126f83e8585513709d44dfa6ec35
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optlingu.cxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/chardlg.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index f0ca44917812..3a497f526d96 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1334,7 +1334,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) // automatic spell checking - sal_Bool bNewAutoCheck = aLinguOptionsCLB.IsChecked( (sal_uInt16) EID_SPELL_AUTO ); + bool bNewAutoCheck = aLinguOptionsCLB.IsChecked( (sal_uInt16) EID_SPELL_AUTO ); const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK ); if ( !pOld || ( (SfxBoolItem*)pOld )->GetValue() != bNewAutoCheck ) { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 8167a913d255..4996fd9d2538 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -147,7 +147,7 @@ static sal_uInt16 pTwoLinesRanges[] = // C-Funktion ------------------------------------------------------------ -inline sal_Bool StateToAttr( TriState aState ) +inline bool StateToAttr( TriState aState ) { return ( STATE_CHECK == aState ); } @@ -2274,7 +2274,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet ) if ( pOld ) { const SvxWordLineModeItem& rItem = *( (const SvxWordLineModeItem*)pOld ); - if ( rItem.GetValue() == m_pIndividualWordsBtn->IsChecked() ) + if ( rItem.GetValue() == (bool) m_pIndividualWordsBtn->IsChecked() ) bChanged = false; } |