filter/source/msfilter/svdfppt.cxx | 10 +++++----- framework/source/services/substitutepathvars.cxx | 4 ++-- mysqlc/source/mysqlc_preparedstatement.cxx | 2 +- registry/source/reflread.cxx | 12 ++++++------ sc/source/ui/unoobj/appluno.cxx | 2 +- sc/source/ui/vba/vbavalidation.cxx | 2 +- svx/source/svdraw/svdglev.cxx | 2 +- sw/source/filter/ww8/ww8par6.cxx | 2 +- vcl/source/gdi/bitmapex.cxx | 2 +- vcl/source/gdi/pdfwriter_impl.cxx | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-)
New commits: commit 9adf9a2d63927ef3e3573ce062bb741659534422 Author: Takeshi Abe <[email protected]> Date: Tue May 14 15:12:45 2013 +0900 sal_Int*/sal_uInt* to bool Change-Id: I133445673895e26d6f19a7843f005dc13870f9ca diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 59219d9..f9323ed 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -6380,7 +6380,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport DffRecordHeader aExtParaHd; aExtParaHd.nRecType = 0; // set empty - sal_uInt32 bStatus = sal_True; + bool bStatus = true; DffRecordHeader aShapeContainerHd; rIn >> aShapeContainerHd; @@ -6446,13 +6446,13 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport case PPT_SLIDEPAGE : break; default : - bStatus = sal_False; + bStatus = false; } if ( bStatus ) { sal_uInt32 nSlideId = rSdrPowerPointImport.GetAktPageId(); if ( !nSlideId ) - bStatus = sal_False; + bStatus = false; else { if ( !aExtParaHd.nRecType ) @@ -6496,7 +6496,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport if ( pPageList && ( rSdrPowerPointImport.nAktPageNum < pPageList->size() ) ) pE = (*pPageList)[ rSdrPowerPointImport.nAktPageNum ]; if ( (!pE) || (!pE->nSlidePersistStartOffset) || ( pE->aPersistAtom.nSlideId != nSlideId ) ) - bStatus = sal_False; + bStatus = false; else { rIn.Seek( pE->nSlidePersistStartOffset ); @@ -6516,7 +6516,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport aClientTextBoxHd.SeekToEndOfRecord( rIn ); } if ( rIn.Tell() > pE->nSlidePersistEndOffset ) - bStatus = sal_False; + bStatus = false; else { // patching the RecordHeader aClientTextBoxHd.nFilePos -= DFF_COMMON_RECORD_HEADER_SIZE; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index cdb13ab..eef36dd 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -790,7 +790,7 @@ throw ( NoSuchElementException, RuntimeException ) // Search for first occure of "$(...". sal_Int32 nDepth = 0; - sal_Int32 bSubstitutionCompleted = sal_False; + bool bSubstitutionCompleted = false; sal_Int32 nPosition = aWorkText.indexOf( m_aVarStart ); // = first position of "$(" in string sal_Int32 nLength = 0; // = count of letters from "$(" to ")" in string bool bVarNotSubstituted = false; @@ -907,7 +907,7 @@ throw ( NoSuchElementException, RuntimeException ) nPosition = aWorkText.indexOf( m_aVarStart ); if ( nPosition == -1 ) { - bSubstitutionCompleted = sal_True; + bSubstitutionCompleted = true; break; // All variables are substituted } else diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 20e6a5b..937eb84 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -4622,7 +4622,7 @@ we check in the following sequence: { if( m_aContext.ConvertOOoTargetToPDFTarget ) { - sal_Int32 bChangeFileExtensionToPDF = false; + bool bChangeFileExtensionToPDF = false; //examine the file type (.odm .odt. .odp, odg, ods) if( aFileExtension.equalsIgnoreAsciiCase(OUString( "odm" ) ) ) bChangeFileExtensionToPDF = true; commit 1136925b2377925e4f6b83c4aeb2374e1d5bf32f Author: Takeshi Abe <[email protected]> Date: Tue May 14 14:46:33 2013 +0900 initialized with plain 0, instead of sal_False/false Change-Id: I2df1bd52293c4423de5ac4c41f9392be1e8d2ccf diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index 004acf9..31c0f82 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -207,7 +207,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() MutexGuard aGuard(m_aMutex); checkDisposed(OPreparedStatement::rBHelper.bDisposed); - sal_Int32 affectedRows = sal_False; + sal_Int32 affectedRows = 0; try { affectedRows = ((sql::PreparedStatement *)cppStatement)->executeUpdate(); } catch (const sql::SQLException &e) { diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 62bfaa91..64e1de7 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -376,7 +376,7 @@ sal_Int8 ConstantPool::readBYTEConstant(sal_uInt16 index) sal_Int16 ConstantPool::readINT16Constant(sal_uInt16 index) { - sal_Int16 aINT16 = sal_False; + sal_Int16 aINT16 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { @@ -391,7 +391,7 @@ sal_Int16 ConstantPool::readINT16Constant(sal_uInt16 index) sal_uInt16 ConstantPool::readUINT16Constant(sal_uInt16 index) { - sal_uInt16 asal_uInt16 = sal_False; + sal_uInt16 asal_uInt16 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { @@ -406,7 +406,7 @@ sal_uInt16 ConstantPool::readUINT16Constant(sal_uInt16 index) sal_Int32 ConstantPool::readINT32Constant(sal_uInt16 index) { - sal_Int32 aINT32 = sal_False; + sal_Int32 aINT32 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { @@ -421,7 +421,7 @@ sal_Int32 ConstantPool::readINT32Constant(sal_uInt16 index) sal_uInt32 ConstantPool::readUINT32Constant(sal_uInt16 index) { - sal_uInt32 aUINT32 = sal_False; + sal_uInt32 aUINT32 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { @@ -436,7 +436,7 @@ sal_uInt32 ConstantPool::readUINT32Constant(sal_uInt16 index) sal_Int64 ConstantPool::readINT64Constant(sal_uInt16 index) { - sal_Int64 aINT64 = sal_False; + sal_Int64 aINT64 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { @@ -451,7 +451,7 @@ sal_Int64 ConstantPool::readINT64Constant(sal_uInt16 index) sal_uInt64 ConstantPool::readUINT64Constant(sal_uInt16 index) { - sal_uInt64 aUINT64 = sal_False; + sal_uInt64 aUINT64 = 0; if (m_pIndex && (index> 0) && (index <= m_numOfEntries)) { diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 73b18a8..3783fb1 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -389,7 +389,7 @@ sal_Bool ScSpreadsheetSettings::getPropertyBool(const OUString& aPropertyName) t sal_Int16 ScSpreadsheetSettings::getPropertyInt16(const OUString& aPropertyName) throw (css::uno::RuntimeException) { uno::Any any = getPropertyValue(aPropertyName); - sal_Int16 b = sal_False; + sal_Int16 b = 0; any >>= b; return b; } diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index 6d01454..51332f5 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -92,7 +92,7 @@ ScVbaValidation::getInCellDropdown() throw (uno::RuntimeException) void SAL_CALL ScVbaValidation::setInCellDropdown( ::sal_Bool _incelldropdown ) throw (uno::RuntimeException) { - sal_Int32 nDropDown = false; + sal_Int32 nDropDown = 0; if ( _incelldropdown ) nDropDown = 1; uno::Reference< beans::XPropertySet > xProps( lcl_getValidationProps(m_xRange) ); diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index c5f920c..359b413 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -107,7 +107,7 @@ TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const { ForceUndirtyMrkPnt(); sal_Bool bFirst=sal_True; - sal_uInt16 nRet=sal_False; + sal_uInt16 nRet=0; ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet); return (TRISTATE)nRet; } diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 3927540..4b39be0 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -1218,7 +1218,7 @@ static sal_uInt8 lcl_ReadBorders(bool bVer67, WW8_BRC* brc, WW8PLCFx_Cp_FKP* pPa //returns a sal_uInt8 filled with a bit for each position that had a sprm //setting that border - sal_uInt8 nBorder = false; + sal_uInt8 nBorder = 0; if( pSep ) { if( !bVer67 ) diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx index 5087f18..e160cb0 100644 --- a/vcl/source/gdi/bitmapex.cxx +++ b/vcl/source/gdi/bitmapex.cxx @@ -821,7 +821,7 @@ SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ) } else { - sal_uInt8 bTransparent = false; + sal_uInt8 bTransparent = 0; rIStm >> bTransparent; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
