diff options
| -rw-r--r-- | sw/source/filter/html/htmlform.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx index a9c43e8c3e99..f0317e20d821 100644 --- a/sw/source/filter/html/htmlform.cxx +++ b/sw/source/filter/html/htmlform.cxx @@ -2359,7 +2359,7 @@ void SwHTMLParser::NewSelect() if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType ) { aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight ); - aTextSz.Height() = sal_False; + aTextSz.Height() = 0; bMinHeight = false; } if( aSz.Width() < MINFLY ) diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 142faf4e4edf..57800016b36c 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2025,7 +2025,7 @@ sal_uInt32 SwDBManager::GetSelectedRecordId() sal_uInt32 nRet = 0; OSL_ENSURE(pImpl->pMergeData && pImpl->pMergeData->xResultSet.is(), "no data source in merge"); if(!pImpl->pMergeData || !pImpl->pMergeData->xResultSet.is()) - return sal_False; + return 0; try { nRet = pImpl->pMergeData->xResultSet->getRow(); diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 4aea94f75545..7d458b21c945 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -959,7 +959,7 @@ int SwTransferable::PrepareForCopy( bool bIsCut ) AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR ); AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ); eBufferType = (TransferBufferType)( TRNSFR_INETFLD | eBufferType ); - nRet = sal_True; + nRet = 1; } } @@ -2740,7 +2740,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData, TransferableDataHelper aData( pHlp ); if( SwTransferable::_PasteFileName( aData, rSh, SOT_FORMAT_FILE, nAct, - pPt, sal_False, bMsg, 0 )) + pPt, 0, bMsg, 0 )) { if( bLink ) { |