ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

'!= false' is redundant, and confusing - kill it.

Browse Source 
Change-Id: I1a52b9ce7b590e8cf274a2daaa1c55cfc1efe48b
This commit is contained in:
Jan Holesovsky
2014-05-09 22:28:44 +02:00
parent dd484af7cf
commit 261b1ad80a
18 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
basctl/source/dlged/managelang.cxx
+3 -3
View File
@@ -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;
}
cppcanvas/source/mtfrenderer/implrenderer.cxx
+1 -1
View File
@@ -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() );
i18npool/source/nativenumber/nativenumbersupplier.cxx
+1 -1
View File
@@ -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]);
nlpsolver/ThirdParty/EvolutionarySolver/src/net/adaptivebox/global/GlobalFile.java
Vendored
+2 -2
View File
@@ -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;
sc/source/core/tool/address.cxx
+2 -2
View File
@@ -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 )
sc/source/core/tool/chgtrack.cxx
+6 -6
View File
@@ -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);
sd/source/ui/slideshow/slideshowimpl.cxx
+2 -2
View File
@@ -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 )
sfx2/source/appl/newhelp.cxx
+3 -3
View File
@@ -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();
sfx2/source/dialog/versdlg.cxx
+4 -4
View File
@@ -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;
}
svtools/source/contnr/fileview.cxx
+1 -1
View File
@@ -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 -------------------------------------------------------------
svtools/source/contnr/svlbitm.cxx
+1 -1
View File
@@ -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 );
svtools/source/contnr/treelistbox.cxx
+1 -1
View File
@@ -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() ) );
}
svx/source/form/formcontroller.cxx
+1 -1
View File
@@ -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 )
svx/source/inc/datanavi.hxx
+1 -1
View File
@@ -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); }
};
svx/source/table/cell.cxx
+1 -1
View File
@@ -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;
ucb/workben/ucb/ucbdemo.cxx
+2 -2
View File
@@ -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:
vcl/source/fontsubset/cff.cxx
+1 -1
View File
@@ -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,
vcl/win/source/gdi/salgdi3.cxx
+1 -1
View File
@@ -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);