diff options
-rw-r--r-- | basctl/source/dlged/managelang.cxx | 6 | ||||
-rw-r--r-- | cppcanvas/source/mtfrenderer/implrenderer.cxx | 2 | ||||
-rw-r--r-- | i18npool/source/nativenumber/nativenumbersupplier.cxx | 2 | ||||
-rw-r--r-- | nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java | 4 | ||||
-rw-r--r-- | sc/source/core/tool/address.cxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/chgtrack.cxx | 12 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/newhelp.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/dialog/versdlg.cxx | 8 | ||||
-rw-r--r-- | svtools/source/contnr/fileview.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/svlbitm.cxx | 2 | ||||
-rw-r--r-- | svtools/source/contnr/treelistbox.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/formcontroller.cxx | 2 | ||||
-rw-r--r-- | svx/source/inc/datanavi.hxx | 2 | ||||
-rw-r--r-- | svx/source/table/cell.cxx | 2 | ||||
-rw-r--r-- | ucb/workben/ucb/ucbdemo.cxx | 4 | ||||
-rw-r--r-- | vcl/source/fontsubset/cff.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 |
18 files changed, 34 insertions, 34 deletions
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 5f0f4b8dbc33..175e464d3227 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -209,10 +209,10 @@ IMPL_LINK_NOARG(ManageLanguageDialog, SelectHdl) bool bEmpty = ( !nCount || m_pLanguageLB->GetEntryPos( m_sCreateLangStr ) != LISTBOX_ENTRY_NOTFOUND ); bool bSelect = ( m_pLanguageLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ); - bool bEnable = ( !bEmpty && bSelect != false ); + bool bEnable = !bEmpty && bSelect; - m_pDeletePB->Enable( bEnable != false ); - m_pMakeDefPB->Enable( bEnable != false && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1 ); + m_pDeletePB->Enable(bEnable); + m_pMakeDefPB->Enable(bEnable && nCount > 1 && m_pLanguageLB->GetSelectEntryCount() == 1); return 1; } diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx index 839aa402d58f..5b8c437ee8ca 100644 --- a/cppcanvas/source/mtfrenderer/implrenderer.cxx +++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx @@ -93,7 +93,7 @@ namespace const cppcanvas::CanvasSharedPtr& rCanvas ) { // set rIsColorSet and check for true at the same time - if( (rIsColorSet=pAct->IsSetting()) != false ) + if (rIsColorSet = pAct->IsSetting()) { ::Color aColor( pAct->GetColor() ); diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx index 18d1374ee644..51942ef15a07 100644 --- a/i18npool/source/nativenumber/nativenumbersupplier.cxx +++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx @@ -224,7 +224,7 @@ OUString SAL_CALL AsciiToNative( const OUString& inStr, sal_Int32 startPos, sal_ len = 0; } if (i < nCount) { - if ((doDecimal = (!doDecimal && i < nCount-1 && isDecimal(str[i]) && isNumber(str[i+1]))) != false) + if (doDecimal = (!doDecimal && i < nCount-1 && isDecimal(str[i]) && isNumber(str[i+1]))) newStr[count] = (DecimalChar[number->number] ? DecimalChar[number->number] : str[i]); else if (i < nCount-1 && isMinus(str[i]) && isNumber(str[i+1])) newStr[count] = (MinusChar[number->number] ? MinusChar[number->number] : str[i]); diff --git a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java index 03390e954690..b494d462bb6d 100644 --- a/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java +++ b/nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java @@ -144,11 +144,11 @@ public class GlobalFile { StringTokenizer st; String s; boolean start = false; - while(inReader.ready()!=false){ + while(inReader.ready()){ st = new StringTokenizer(inReader.readLine()); over:{ while(!st.hasMoreTokens()){//Justify blank lines. - if(inReader.ready()!=false){ + if(inReader.ready()){ st = new StringTokenizer(inReader.readLine()); }else break over; diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index 825daaeaf772..d1ea155f723e 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.cxx @@ -615,7 +615,7 @@ static const sal_Unicode* lcl_r1c1_get_col( const sal_Unicode* p, return NULL; p++; - if( (isRelative = (*p == '[') ) != false ) + if( isRelative = (*p == '[') ) p++; n = sal_Unicode_strtol( p, &pEnd ); if( NULL == pEnd ) @@ -661,7 +661,7 @@ static inline const sal_Unicode* lcl_r1c1_get_row( return NULL; p++; - if( (isRelative = (*p == '[') ) != false ) + if( isRelative = (*p == '[') ) p++; n = sal_Unicode_strtol( p, &pEnd ); if( NULL == pEnd ) diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index fe280e31177a..f6def98c04f3 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -1018,12 +1018,12 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) case SC_CAT_DELETE_COLS : if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) ) { // Only if not TabDelete - if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != false ) + if ( bOk = pDoc->CanInsertCol( aRange ) ) bOk = pDoc->InsertCol( aRange ); } break; case SC_CAT_DELETE_ROWS : - if ( ( bOk = pDoc->CanInsertRow( aRange ) ) != false ) + if ( bOk = pDoc->CanInsertRow( aRange ) ) bOk = pDoc->InsertRow( aRange ); break; case SC_CAT_DELETE_TABS : @@ -1031,7 +1031,7 @@ bool ScChangeActionDel::Reject( ScDocument* pDoc ) //TODO: Remember table names? OUString aName; pDoc->CreateValidTabName( aName ); - if ( ( bOk = pDoc->ValidNewTabName( aName ) ) != false ) + if ( bOk = pDoc->ValidNewTabName( aName ) ) bOk = pDoc->InsertTab( aRange.aStart.Tab(), aName ); } break; @@ -4224,7 +4224,7 @@ bool ScChangeTrack::Reject( bOk = Reject( itChangeAction->second, NULL, true ); //! Recursion } } - if ( bOk && (bRejected = pAct->Reject( pDoc )) != false ) + if ( bOk && (bRejected = pAct->Reject( pDoc )) ) { // pRefDoc NULL := Do not save deleted Cells AppendDeleteRange( pAct->GetBigRange().MakeRange(), NULL, (short) 0, @@ -4337,7 +4337,7 @@ bool ScChangeTrack::Reject( bOk = Reject( itChangeAction->second, NULL, true );//! Recursion } } - if ( bOk && (bRejected = pAct->Reject( pDoc )) != false ) + if ( bOk && (bRejected = pAct->Reject( pDoc )) ) { ScChangeActionMove* pReject = new ScChangeActionMove( pAct->GetBigRange().MakeRange(), @@ -4361,7 +4361,7 @@ bool ScChangeTrack::Reject( aCell.assign(*pDoc, aRange.aStart); pReject->SetOldValue(aCell, pDoc, pDoc); } - if ( (bRejected = pAct->Reject( pDoc )) != false && !bRecursion ) + if ( (bRejected = pAct->Reject( pDoc )) && !bRecursion ) { ScCellValue aCell; aCell.assign(*pDoc, aRange.aStart); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 8e2f17e7bae9..e9dd1f6e749c 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1056,7 +1056,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) aProperties.push_back( beans::PropertyValue( "ImageAnimationsAllowed" , - -1, Any( maPresSettings.mbAnimationAllowed != false ), + -1, Any( maPresSettings.mbAnimationAllowed ), beans::PropertyState_DIRECT_VALUE ) ); const bool bZOrderEnabled( @@ -1068,7 +1068,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings ) aProperties.push_back( beans::PropertyValue( "ForceManualAdvance" , - -1, Any( maPresSettings.mbManual != false ), + -1, Any( maPresSettings.mbManual ), beans::PropertyState_DIRECT_VALUE ) ); if( mbUsePen ) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 4bfa3f3d4257..fdc154c644c6 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2265,9 +2265,9 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) { // create descriptor, set string and find all words Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor(); - xSrchDesc->setPropertyValue( "SearchWords", makeAny( pDlg->IsOnlyWholeWords() != false ) ); - xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny( pDlg->IsMarchCase() != false ) ); - xSrchDesc->setPropertyValue( "SearchBackwards", makeAny( pDlg->IsSearchBackwards() != false ) ); + xSrchDesc->setPropertyValue( "SearchWords", makeAny(pDlg->IsOnlyWholeWords()) ); + xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny(pDlg->IsMarchCase()) ); + xSrchDesc->setPropertyValue( "SearchBackwards", makeAny(pDlg->IsSearchBackwards()) ); xSrchDesc->setSearchString( sSearchText ); Reference< XInterface > xSelection; Reference< XTextRange > xCursor = getCursor(); diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index da5f84d3e04c..8902006282af 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -374,14 +374,14 @@ IMPL_LINK_NOARG(SfxVersionDialog, SelectHdl_Impl) { bool bEnable = ( m_pVersionBox->FirstSelected() != NULL ); SfxObjectShell* pObjShell = pViewFrame->GetObjectShell(); - m_pDeleteButton->Enable( bEnable!= false && !pObjShell->IsReadOnly() ); - m_pOpenButton->Enable( bEnable!= false ); - m_pViewButton->Enable( bEnable!= false ); + m_pDeleteButton->Enable(bEnable && !pObjShell->IsReadOnly()); + m_pOpenButton->Enable(bEnable); + m_pViewButton->Enable(bEnable); const SfxPoolItem *pDummy=NULL; SfxItemState eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_MERGE, pDummy ); eState = pViewFrame->GetDispatcher()->QueryState( SID_DOCUMENT_COMPARE, pDummy ); - m_pCompareButton->Enable( bEnable!= false && eState >= SFX_ITEM_AVAILABLE ); + m_pCompareButton->Enable(bEnable && eState >= SFX_ITEM_AVAILABLE); return 0L; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index d7ee71b719fa..3e6d1f09870d 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -545,7 +545,7 @@ inline bool SvtFileView_Impl::EnableNameReplacing( bool bEnable ) inline void SvtFileView_Impl::EndEditing( bool _bCancel ) { if ( mpView->IsEditingActive() ) - mpView->EndEditing( _bCancel != false ); + mpView->EndEditing(_bCancel); } // functions ------------------------------------------------------------- diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index f42f86f23dfa..f624e75b9181 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -46,7 +46,7 @@ void SvLBoxButtonData::InitData( bool bImagesFromDefault, bool _bRadioBtn, const bDataOk = false; eState = SV_BUTTON_UNCHECKED; pImpl->bDefaultImages = bImagesFromDefault; - pImpl->bShowRadioButton = ( _bRadioBtn != false ); + pImpl->bShowRadioButton = _bRadioBtn; if ( bImagesFromDefault ) SetDefaultImages( pCtrl ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 57553c8f3a52..17da0b73c2f4 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3836,7 +3836,7 @@ bool SvTreeListBox::IsContextMenuHandlingEnabled( void ) const void SvTreeListBox::EnableList( bool _bEnable ) { // call base class method - Window::Enable( _bEnable != false ); + Window::Enable(_bEnable); // then paint immediately Paint( Rectangle( Point(), GetSizePixel() ) ); } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 2f4903db5c01..fd872b4e5c61 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -315,7 +315,7 @@ namespace { bool bInputRequired = true; OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_INPUT_REQUIRED ) >>= bInputRequired ); - return ( bInputRequired != false ); + return bInputRequired; } void lcl_resetColumnControlInfo( ColumnInfo& _rColInfo ) diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 738593ad0cc3..498c6f5d2629 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -630,7 +630,7 @@ namespace svxform OUString GetURL() const { return m_pURLED->GetText(); } void SetURL( const OUString& _rURL ) { m_pURLED->SetText( _rURL );} bool IsLinkInstance() const { return m_pLinkInstanceCB->IsChecked(); } - void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check( _bLink != false ); } + void SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check(_bLink); } }; diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 8e904c20f64c..ad69f65cb16d 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -433,7 +433,7 @@ void Cell::SetModel(SdrModel* pNewModel) void Cell::merge( sal_Int32 nColumnSpan, sal_Int32 nRowSpan ) { - if( (mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || (mbMerged != false) ) + if ((mnColSpan != nColumnSpan) || (mnRowSpan != nRowSpan) || mbMerged) { mnColSpan = nColumnSpan; mnRowSpan = nRowSpan; diff --git a/ucb/workben/ucb/ucbdemo.cxx b/ucb/workben/ucb/ucbdemo.cxx index 0be3ecfd72d1..e9a1a18b86da 100644 --- a/ucb/workben/ucb/ucbdemo.cxx +++ b/ucb/workben/ucb/ucbdemo.cxx @@ -2118,11 +2118,11 @@ IMPL_LINK( MyWin, ToolBarHandler, ToolBox*, pToolBox ) break; case MYWIN_ITEMID_TIMING: - m_bTiming = m_pTool->IsItemChecked(MYWIN_ITEMID_TIMING) != false; + m_bTiming = m_pTool->IsItemChecked(MYWIN_ITEMID_TIMING); break; case MYWIN_ITEMID_SORT: - m_bSort = m_pTool->IsItemChecked(MYWIN_ITEMID_SORT) != false; + m_bSort = m_pTool->IsItemChecked(MYWIN_ITEMID_SORT); break; case MYWIN_ITEMID_FETCHSIZE: diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 8dc4c9028b22..2ad874bb000f 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -1992,7 +1992,7 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, nPrivEntryCount += int(mpCffLocal->mfExpFactor != 0.0); nPrivEntryCount += int(mpCffLocal->mnLangGroup != 0); nPrivEntryCount += int(mpCffLocal->mnLangGroup == 1); - nPrivEntryCount += int(mpCffLocal->mbForceBold != false); + nPrivEntryCount += int(mpCffLocal->mbForceBold); #endif // IGNORE_HINTS // emit the privdict header pOut += sprintf( pOut, diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index dcc29cbe21e0..d2e13a9c634c 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -169,7 +169,7 @@ ImplFontAttrCache::~ImplFontAttrCache() aCacheFile.WriteInt16(rDFA.GetPitch()); aCacheFile.WriteInt16(rDFA.GetWidthType()); aCacheFile.WriteInt16(rDFA.GetFamilyType()); - aCacheFile.WriteInt16(rDFA.IsSymbolFont() != false); + aCacheFile.WriteInt16(rDFA.IsSymbolFont()); write_uInt16_lenPrefixed_uInt8s_FromOUString(aCacheFile, rDFA.GetStyleName(), RTL_TEXTENCODING_UTF8); |