mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up odd sal::static_int_cast<sal_Bool> uses

Browse Source 
Change-Id: Idbd1cdb06315b96dc9f45e34108a1af45229ed2f
Reviewed-on: https://gerrit.libreoffice.org/15484
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2015-04-22 21:40:50 +02:00
parent bac01f8af7
commit 1a31dd5ec4
5 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cui/source/tabpages/tparea.cxx
View File

@@ -1200,8 +1200,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
TriState eState = m_pTsbTile->GetState(); TriState eState = m_pTsbTile->GetState();
if( m_pTsbTile->IsValueChangedFromSaved() ) if( m_pTsbTile->IsValueChangedFromSaved() )
{ {
XFillBmpTileItem aFillBmpTileItem( XFillBmpTileItem aFillBmpTileItem( eState != TRISTATE_FALSE );
sal::static_int_cast< sal_Bool >( eState ) );
pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE ); pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_TILE );
if ( !pOld || !( *static_cast<const XFillBmpTileItem*>(pOld) == aFillBmpTileItem ) ) if ( !pOld || !( *static_cast<const XFillBmpTileItem*>(pOld) == aFillBmpTileItem ) )
{ {
@@ -1217,7 +1216,7 @@ bool SvxAreaTabPage::FillItemSet( SfxItemSet* rAttrs )
if( m_pTsbStretch->IsValueChangedFromSaved() ) if( m_pTsbStretch->IsValueChangedFromSaved() )
{ {
XFillBmpStretchItem aFillBmpStretchItem( XFillBmpStretchItem aFillBmpStretchItem(
sal::static_int_cast< sal_Bool >( eState ) ); eState != TRISTATE_FALSE );
pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH ); pOld = GetOldItem( *rAttrs, XATTR_FILLBMP_STRETCH );
if ( !pOld || !( *static_cast<const XFillBmpStretchItem*>(pOld) == aFillBmpStretchItem ) ) if ( !pOld || !( *static_cast<const XFillBmpStretchItem*>(pOld) == aFillBmpStretchItem ) )
{ {
@@ -2244,12 +2243,12 @@ IMPL_LINK_NOARG(SvxAreaTabPage, ModifyTileHdl_Impl)
m_pMtrFldYSize->SetValue( m_pMtrFldYSize->GetValue() ); m_pMtrFldYSize->SetValue( m_pMtrFldYSize->GetValue() );
} }
rXFSet.Put( XFillBmpTileItem( sal::static_int_cast< sal_Bool >( eState ) ) ); rXFSet.Put( XFillBmpTileItem( eState != TRISTATE_FALSE ) );
if( m_pTsbStretch->IsEnabled() ) if( m_pTsbStretch->IsEnabled() )
rXFSet.Put( rXFSet.Put(
XFillBmpStretchItem( XFillBmpStretchItem(
sal::static_int_cast< sal_Bool >( m_pTsbStretch->GetState() ) ) ); m_pTsbStretch->GetState() != TRISTATE_FALSE ) );
if( m_pTsbScale->IsEnabled() ) if( m_pTsbScale->IsEnabled() )
rXFSet.Put( XFillBmpSizeLogItem( m_pTsbScale->GetState() == TRISTATE_FALSE ) ); rXFSet.Put( XFillBmpSizeLogItem( m_pTsbScale->GetState() == TRISTATE_FALSE ) );

4
cui/source/tabpages/tpline.cxx
View File

@@ -805,7 +805,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
TriState eState = m_pTsbCenterStart->GetState(); TriState eState = m_pTsbCenterStart->GetState();
if( m_pTsbCenterStart->IsValueChangedFromSaved() ) if( m_pTsbCenterStart->IsValueChangedFromSaved() )
{ {
XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); XLineStartCenterItem aItem( eState != TRISTATE_FALSE );
pOld = GetOldItem( *rAttrs, XATTR_LINESTARTCENTER ); pOld = GetOldItem( *rAttrs, XATTR_LINESTARTCENTER );
if ( !pOld || !( *static_cast<const XLineStartCenterItem*>(pOld) == aItem ) ) if ( !pOld || !( *static_cast<const XLineStartCenterItem*>(pOld) == aItem ) )
{ {
@@ -816,7 +816,7 @@ bool SvxLineTabPage::FillItemSet( SfxItemSet* rAttrs )
eState = m_pTsbCenterEnd->GetState(); eState = m_pTsbCenterEnd->GetState();
if( m_pTsbCenterEnd->IsValueChangedFromSaved() ) if( m_pTsbCenterEnd->IsValueChangedFromSaved() )
{ {
XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) ); XLineEndCenterItem aItem( eState != TRISTATE_FALSE );
pOld = GetOldItem( *rAttrs, XATTR_LINEENDCENTER ); pOld = GetOldItem( *rAttrs, XATTR_LINEENDCENTER );
if ( !pOld || !( *static_cast<const XLineEndCenterItem*>(pOld) == aItem ) ) if ( !pOld || !( *static_cast<const XLineEndCenterItem*>(pOld) == aItem ) )
{ {

2
i18npool/source/breakiterator/xdictionary.cxx
View File

@@ -196,7 +196,7 @@ void xdictionary::setJapaneseWordBreak()
bool xdictionary::exists(const sal_uInt32 c) bool xdictionary::exists(const sal_uInt32 c)
{ {
// 0x1FFF is the hardcoded limit in gendict for data.existMarks // 0x1FFF is the hardcoded limit in gendict for data.existMarks
bool exist = (data.existMark && ((c>>3) < 0x1FFF)) ? sal::static_int_cast<sal_Bool>((data.existMark[c>>3] & (1<<(c&0x07))) != 0) : sal_False; bool exist = data.existMark && (c>>3) < 0x1FFF && (data.existMark[c>>3] & (1<<(c&0x07))) != 0;
if (!exist && japaneseWordBreak) if (!exist && japaneseWordBreak)
return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN; return BreakIteratorImpl::getScriptClass(c) == ScriptType::ASIAN;
else else

7
i18npool/source/localedata/localedata.cxx
View File

@@ -710,7 +710,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale ) throw(RuntimeException
for(sal_Int16 i = 0; i < calendarsCount; i++) { for(sal_Int16 i = 0; i < calendarsCount; i++) {
OUString calendarID(allCalendars[offset]); OUString calendarID(allCalendars[offset]);
offset++; offset++;
bool defaultCalendar = sal::static_int_cast<sal_Bool>( allCalendars[offset][0] ); bool defaultCalendar = allCalendars[offset][0] != 0;
offset++; offset++;
Sequence< CalendarItem2 > days = getCalendarItems( allCalendars, offset, REF_DAYS, i, Sequence< CalendarItem2 > days = getCalendarItems( allCalendars, offset, REF_DAYS, i,
rLocale, calendarsSeq); rLocale, calendarsSeq);
@@ -879,7 +879,7 @@ LocaleDataImpl::getAllFormats( const Locale& rLocale ) throw(RuntimeException, s
formatArray[nOff + 3], formatArray[nOff + 3],
formatArray[nOff + 4], formatArray[nOff + 4],
formatArray[nOff + 5][0], formatArray[nOff + 5][0],
sal::static_int_cast<sal_Bool>(formatArray[nOff + 6][0])); formatArray[nOff + 6][0] != 0);
seq[f] = elem; seq[f] = elem;
} }
} }
@@ -943,8 +943,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& rLocale ) throw(Runtim
Sequence< Implementation > seq(collatorCount); Sequence< Implementation > seq(collatorCount);
for(sal_Int16 i = 0; i < collatorCount; i++) { for(sal_Int16 i = 0; i < collatorCount; i++) {
Implementation impl(collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_ALGO], Implementation impl(collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_ALGO],
sal::static_int_cast<sal_Bool>( collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_DEFAULT][0] != 0);
collatorArray[i * COLLATOR_ELEMENTS + COLLATOR_OFFSET_DEFAULT][0]));
seq[i] = impl; seq[i] = impl;
} }
return seq; return seq;

4
xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
View File

@@ -380,7 +380,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
if( xExtn == NULL ) if( xExtn == NULL )
throw RuntimeException() ; throw RuntimeException() ;
xExtn->setCertExtn( pExtn->Value.pbData, pExtn->Value.cbData, ( unsigned char* )pExtn->pszObjId, strlen( pExtn->pszObjId ), sal::static_int_cast<sal_Bool>(pExtn->fCritical) ) ; xExtn->setCertExtn( pExtn->Value.pbData, pExtn->Value.cbData, ( unsigned char* )pExtn->pszObjId, strlen( pExtn->pszObjId ), pExtn->fCritical ) ;
xExtns[i] = xExtn ; xExtns[i] = xExtn ;
} }
@@ -406,7 +406,7 @@ OUString SAL_CALL X509Certificate_MSCryptImpl :: getSubjectName() throw ( ::com:
if( xExtn == NULL ) if( xExtn == NULL )
throw RuntimeException() ; throw RuntimeException() ;
xExtn->setCertExtn( pExtn->Value.pbData, pExtn->Value.cbData, ( unsigned char* )pExtn->pszObjId, strlen( pExtn->pszObjId ), sal::static_int_cast<sal_Bool>(pExtn->fCritical) ) ; xExtn->setCertExtn( pExtn->Value.pbData, pExtn->Value.cbData, ( unsigned char* )pExtn->pszObjId, strlen( pExtn->pszObjId ), pExtn->fCritical ) ;
} }
} }