Author: hdu
Date: Thu Apr 18 12:57:35 2013
New Revision: 1469301
URL: http://svn.apache.org/r1469301
Log:
WaE: fix implicit conversions from boolean false to the NULL pointer
Modified:
openoffice/trunk/main/basctl/source/basicide/baside2.cxx
openoffice/trunk/main/editeng/source/editeng/impedit3.cxx
openoffice/trunk/main/sc/source/core/tool/interpr1.cxx
openoffice/trunk/main/sc/source/filter/xcl97/XclExpChangeTrack.cxx
openoffice/trunk/main/sd/source/ui/app/sdmod2.cxx
openoffice/trunk/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx
openoffice/trunk/main/sfx2/source/appl/appmisc.cxx
openoffice/trunk/main/sw/source/core/docnode/node.cxx
openoffice/trunk/main/sw/source/core/docnode/node2lay.cxx
openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx
openoffice/trunk/main/sw/source/core/unocore/unofield.cxx
openoffice/trunk/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx
openoffice/trunk/main/vcl/source/window/accel.cxx
Modified: openoffice/trunk/main/basctl/source/basicide/baside2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside2.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/basctl/source/basicide/baside2.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside2.cxx Thu Apr 18
12:57:35 2013
@@ -543,7 +543,7 @@ sal_Bool ModulWindow::SaveBasicSource()
{
Sequence< ::rtl::OUString > aPaths = xFP->getFiles();
aCurPath = aPaths[0];
- SfxMedium aMedium( aCurPath, STREAM_WRITE |
STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_True, sal_False );
+ SfxMedium aMedium( aCurPath, STREAM_WRITE |
STREAM_SHARE_DENYWRITE | STREAM_TRUNC, sal_True, NULL );
SvStream* pStream = aMedium.GetOutStream();
if ( pStream )
{
Modified: openoffice/trunk/main/editeng/source/editeng/impedit3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/impedit3.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/impedit3.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/impedit3.cxx Thu Apr 18
12:57:35 2013
@@ -3717,10 +3717,10 @@ void ImpEditEngine::Paint( ImpEditView*
pVDev->Erase();
}
}
- DBG_ASSERT( bVDevValid, "VDef konnte nicht vergroessert
werden!" );
+ DBG_ASSERT( bVDevValid, "VirtualDevice failed to be enlarged!"
);
if ( !bVDevValid )
{
- Paint( pView, rRec, sal_False /* ohne VDev */ );
+ Paint( pView, rRec, NULL /* without VirtualDevice */ );
return;
}
Modified: openoffice/trunk/main/sc/source/core/tool/interpr1.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/tool/interpr1.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/core/tool/interpr1.cxx (original)
+++ openoffice/trunk/main/sc/source/core/tool/interpr1.cxx Thu Apr 18 12:57:35
2013
@@ -6506,7 +6506,7 @@ ScDBQueryParamBase* ScInterpreter::GetDB
return pParam.release();
}
}
- return false;
+ return NULL;
}
Modified: openoffice/trunk/main/sc/source/filter/xcl97/XclExpChangeTrack.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/filter/xcl97/XclExpChangeTrack.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sc/source/filter/xcl97/XclExpChangeTrack.cxx
(original)
+++ openoffice/trunk/main/sc/source/filter/xcl97/XclExpChangeTrack.cxx Thu Apr
18 12:57:35 2013
@@ -1166,7 +1166,7 @@ ScChangeTrack* XclExpChangeTrack::Create
DBG_ASSERT( nOrigCount == pTempDoc->GetTableCount(),
"XclExpChangeTrack::CreateTempChangeTrack - table count
mismatch" );
if( nOrigCount != pTempDoc->GetTableCount() )
- return sal_False;
+ return NULL;
return pOrigChangeTrack->Clone(pTempDoc);
}
Modified: openoffice/trunk/main/sd/source/ui/app/sdmod2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/app/sdmod2.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/app/sdmod2.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/app/sdmod2.cxx Thu Apr 18 12:57:35 2013
@@ -710,7 +710,7 @@ void SdModule::ApplyItemSet( sal_uInt16
sal_uInt32 nCntrl;
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl = pDocument->GetDrawOutliner(
sal_False );
+ SdrOutliner& rOutl = pDocument->GetDrawOutliner( NULL );
nCntrl = rOutl.GetControlWord() &~
EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl = pDocument->GetOutliner(
sal_False );
Modified: openoffice/trunk/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/unoidl/UnoDocumentSettings.cxx Thu Apr
18 12:57:35 2013
@@ -734,7 +734,7 @@ void DocumentSettings::_setPropertyValue
pDoc->SetSummationOfParagraphs(
bIsSummationOfParagraphs );
SdDrawDocument* pDocument =
pDocSh->GetDoc();
- SdrOutliner& rOutl =
pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl =
pDocument->GetDrawOutliner( NULL );
nCntrl = rOutl.GetControlWord() &~
EE_CNTRL_ULSPACESUMMATION;
rOutl.SetControlWord( nCntrl | nSum );
::sd::Outliner* pOutl =
pDocument->GetOutliner( sal_False );
@@ -763,7 +763,7 @@ void DocumentSettings::_setPropertyValue
pDoc->SetCharCompressType(
(sal_uInt16)nCharCompressType );
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl =
pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl =
pDocument->GetDrawOutliner( NULL );
rOutl.SetAsianCompressionMode(
(sal_uInt16)nCharCompressType );
::sd::Outliner* pOutl = pDocument->GetOutliner(
sal_False );
if( pOutl )
@@ -788,7 +788,7 @@ void DocumentSettings::_setPropertyValue
pDoc->SetKernAsianPunctuation(
bAsianPunct );
SdDrawDocument* pDocument = pDocSh->GetDoc();
- SdrOutliner& rOutl =
pDocument->GetDrawOutliner( sal_False );
+ SdrOutliner& rOutl =
pDocument->GetDrawOutliner( NULL );
rOutl.SetKernAsianPunctuation( bAsianPunct );
::sd::Outliner* pOutl = pDocument->GetOutliner(
sal_False );
if( pOutl )
Modified: openoffice/trunk/main/sfx2/source/appl/appmisc.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/appl/appmisc.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sfx2/source/appl/appmisc.cxx (original)
+++ openoffice/trunk/main/sfx2/source/appl/appmisc.cxx Thu Apr 18 12:57:35 2013
@@ -256,7 +256,7 @@ SfxModule* SfxApplication::GetModule_Imp
{
SfxModule* pModule = SfxModule::GetActiveModule();
if ( !pModule )
- pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst(
sal_False ) );
+ pModule = SfxModule::GetActiveModule( SfxViewFrame::GetFirst( NULL ) );
if( pModule )
return pModule;
else
Modified: openoffice/trunk/main/sw/source/core/docnode/node.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/node.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/node.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/node.cxx Thu Apr 18 12:57:35
2013
@@ -631,8 +631,8 @@ const SwPageDesc* SwNode::FindPageDesc(
}
if( n >= rFmts.Count() )
{
- ASSERT( !this, "Fly-Section aber kein Format
gefunden" );
- return sal_False;
+ ASSERT( !this, "Fly-Section but no format found" );
+ return NULL;
}
}
}
Modified: openoffice/trunk/main/sw/source/core/docnode/node2lay.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/docnode/node2lay.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/docnode/node2lay.cxx (original)
+++ openoffice/trunk/main/sw/source/core/docnode/node2lay.cxx Thu Apr 18
12:57:35 2013
@@ -201,7 +201,7 @@ SwFrm* SwNode2LayImpl::NextFrm()
{
SwFrm* pRet;
if( !pIter )
- return sal_False;
+ return NULL;
if( !bInit )
{
pRet = pIter->First();
Modified: openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx (original)
+++ openoffice/trunk/main/sw/source/core/layout/ftnfrm.cxx Thu Apr 18 12:57:35
2013
@@ -1211,7 +1211,7 @@ SwFtnFrm *SwFtnBossFrm::FindFirstFtn()
pBoss = pRet->GetRef()->FindFtnBossFrm();
ASSERT( pBoss, "FindFirstFtn: No boss found" );
if( !pBoss )
- return sal_False; // ?There must be a bug, but no GPF
+ return NULL; // ?There must be a bug, but no GPF
pPage = pBoss->FindPageFrm();
nPgNum = pPage->GetPhyPageNum();
if ( nPgNum == nRefNum )
Modified: openoffice/trunk/main/sw/source/core/unocore/unofield.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unofield.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/core/unocore/unofield.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unofield.cxx Thu Apr 18
12:57:35 2013
@@ -2190,7 +2190,7 @@ uno::Any SwXTextField::getPropertyValue(
break;
case FIELD_PROP_IS_FIELD_USED:
case FIELD_PROP_IS_FIELD_DISPLAYED:
- aRet.setValue( sal_False, ::getCppuBooleanType() );
+ aRet.setValue( NULL, ::getCppuBooleanType() );
break;
}
}
Modified: openoffice/trunk/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
(original)
+++ openoffice/trunk/main/sw/source/ui/dialog/SwSpellDialogChildWindow.cxx Thu
Apr 18 12:57:35 2013
@@ -251,7 +251,7 @@ svx::SpellPortions SwSpellDialogChildWin
{
m_pSpellState->pOtherCursor = new
SwPaM(*pWrtShell->GetCrsr()->GetPoint());
m_pSpellState->m_bStartedInOther = true;
- pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND,
DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_OTHERSTART, DOCPOS_OTHEREND,
DOCPOS_CURR, NULL );
}
else
{
@@ -264,7 +264,7 @@ svx::SpellPortions SwSpellDialogChildWin
*pWrtShell->GetDoc(),
*pCrsr->Start(), pCrsr->End());
}
- pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END,
DOCPOS_CURR, sal_False );
+ pWrtShell->SpellStart( DOCPOS_START, DOCPOS_END,
DOCPOS_CURR, NULL );
}
}
else
@@ -309,7 +309,7 @@ The code below would only be part of the
//if there's any that has not been spelled yet
if(!m_pSpellState->m_bOtherSpelled &&
pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART,
DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART,
DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet,
m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
@@ -321,7 +321,7 @@ The code below would only be part of the
//if no result has been found try at the body text -
completely
if(!m_pSpellState->m_bBodySpelled && !aRet.size())
{
- pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END,
DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START, DOCPOS_END,
DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet,
m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -350,7 +350,7 @@ The code below would only be part of the
pWrtShell->SpellEnd();
delete m_pSpellState->pOtherCursor;
m_pSpellState->pOtherCursor = 0;
- pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR,
DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART, DOCPOS_CURR,
DOCPOS_OTHERSTART, NULL );
pWrtShell->SpellSentence(aRet, m_bIsGrammarCheckingOn);
}
if(!aRet.size())
@@ -363,7 +363,7 @@ The code below would only be part of the
//has the body been spelled?
if(!m_pSpellState->m_bBodySpelled)
{
- pWrtShell->SpellStart(DOCPOS_START,
DOCPOS_END, DOCPOS_START, sal_False );
+ pWrtShell->SpellStart(DOCPOS_START,
DOCPOS_END, DOCPOS_START, NULL );
if(!pWrtShell->SpellSentence(aRet,
m_bIsGrammarCheckingOn))
{
m_pSpellState->m_bBodySpelled = true;
@@ -376,7 +376,7 @@ The code below would only be part of the
m_pSpellState->m_bBodySpelled = true;
if(!m_pSpellState->m_bOtherSpelled &&
pWrtShell->HasOtherCnt())
{
- pWrtShell->SpellStart(DOCPOS_OTHERSTART,
DOCPOS_OTHEREND, DOCPOS_OTHERSTART, sal_False );
+ pWrtShell->SpellStart(DOCPOS_OTHERSTART,
DOCPOS_OTHEREND, DOCPOS_OTHERSTART, NULL );
if(!pWrtShell->SpellSentence(aRet,
m_bIsGrammarCheckingOn))
{
pWrtShell->SpellEnd();
Modified: openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/shells/textsh2.cxx Thu Apr 18 12:57:35
2013
@@ -220,7 +220,7 @@ void SwTextShell::ExecDB(SfxRequest &rRe
sDBName += (String)sColumnName;
SwFldMgr aFldMgr(GetShellPtr());
- SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0,
sal_False, sal_True);
+ SwInsertFld_Data aData(TYP_DBFLD, 0, sDBName, aEmptyStr, 0,
NULL, sal_True);
if(pConnectionItem)
aData.aDBConnection =
((SfxUsrAnyItem*)pConnectionItem)->GetValue();
if(pColumnItem)
Modified: openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/bitmap3.cxx Thu Apr 18 12:57:35 2013
@@ -341,7 +341,7 @@ sal_Bool Bitmap::Convert( BmpConversion
case( BMP_CONVERSION_24BIT ):
{
if( nBitCount < 24 )
- bRet = ImplConvertUp( 24, sal_False );
+ bRet = ImplConvertUp( 24, NULL );
else
bRet = sal_True;
}
Modified: openoffice/trunk/main/vcl/source/window/accel.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/accel.cxx?rev=1469301&r1=1469300&r2=1469301&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/accel.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/accel.cxx Thu Apr 18 12:57:35 2013
@@ -637,7 +637,7 @@ Accelerator* Accelerator::GetAccel( cons
if ( pEntry )
return pEntry->mpAccel;
else
- return sal_False;
+ return NULL;
}
// -----------------------------------------------------------------------
