diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-20 14:36:39 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-20 14:37:10 +0100 |
| commit | ba1c6c94fce9fd20e224a265475e0b80576a2dd9 (patch) | |
| tree | 0ad76cc89a465e007893e65681054ca2740a62b0 /editeng | |
| parent | a23231cbff9b18e7d2e02e91e9b674d71b8f39a9 (diff) | |
editeng: warning C4805 unsafe mix of type sal_Bool and type bool
Change-Id: I88fc77ea6c0b6a7c02d0b7eff64d8fdd3db6020e
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index f6e240792221..31b72db317df 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -597,7 +597,7 @@ private: sal_Bool IsScriptChange( const EditPaM& rPaM ) const; sal_Bool HasScriptType( sal_Int32 nPara, sal_uInt16 nType ) const; - sal_Bool ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray ); + bool ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray ); void ImplExpandCompressedPortions( EditLine* pLine, ParaPortion* pParaPortion, long nRemainingWidth ); void ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, sal_uInt16 nIndex ); diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 2375b4170cd2..57a05aaf3901 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4374,7 +4374,9 @@ Color ImpEditEngine::GetAutoColor() const } -sal_Bool ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray ) +bool ImpEditEngine::ImplCalcAsianCompression(ContentNode* pNode, + TextPortion* pTextPortion, sal_uInt16 nStartPos, sal_Int32* pDXArray, + sal_uInt16 n100thPercentFromMax, sal_Bool bManipulateDXArray) { DBG_ASSERT( GetAsianCompressionMode(), "ImplCalcAsianCompression - Why?" ); DBG_ASSERT( pTextPortion->GetLen(), "ImplCalcAsianCompression - Empty Portion?" ); @@ -4383,7 +4385,7 @@ sal_Bool ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortio if ( n100thPercentFromMax == 10000 ) pTextPortion->SetExtraInfos( NULL ); - sal_Bool bCompressed = sal_False; + bool bCompressed = false; if ( GetI18NScriptType( EditPaM( pNode, nStartPos+1 ) ) == i18n::ScriptType::ASIAN ) { @@ -4442,7 +4444,7 @@ sal_Bool ImpEditEngine::ImplCalcAsianCompression( ContentNode* pNode, TextPortio if ( nCompress ) { - bCompressed = sal_True; + bCompressed = true; nNewPortionWidth -= nCompress; pTextPortion->GetExtraInfos()->bCompressed = sal_True; |