misuse of OUString::boolean on sal_uInt8 values
regression since 64b993e046f23baaacaff1572b7d2a816588b5ef Change-Id: Ifc907a34430c36a64318fc42342e630e2b84ad13
This commit is contained in:
parent
224da771d3
commit
fdf9406792
@ -300,14 +300,14 @@ public:
|
||||
uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
|
||||
{
|
||||
if( m_nCount > 0 )
|
||||
throw container::NoSuchElementException(OUString::boolean(m_nCount), *this);
|
||||
throw container::NoSuchElementException(OUString::number(m_nCount), *this);
|
||||
|
||||
++m_nCount;
|
||||
return uno::makeAny(m_aEntry);
|
||||
};
|
||||
|
||||
private:
|
||||
sal_uInt8 m_nCount;
|
||||
sal_Int32 m_nCount;
|
||||
deployment::UpdateInformationEntry m_aEntry;
|
||||
};
|
||||
|
||||
|
@ -57,7 +57,7 @@ namespace comphelper
|
||||
inline OUString convertLogArgToString( sal_Int32 _nValue ) { return OUString::number( _nValue ); }
|
||||
inline OUString convertLogArgToString( sal_Int16 _nValue ) { return OUString::number( _nValue ); }
|
||||
inline OUString convertLogArgToString( sal_Unicode _nValue ) { return OUString( _nValue ); }
|
||||
inline OUString convertLogArgToString( sal_Bool _nValue ) { return OUString::boolean( _nValue ); }
|
||||
inline OUString convertLogArgToString( sal_Bool _bValue ) { return OUString::boolean( _bValue ); }
|
||||
|
||||
} } // namespace log::convert
|
||||
|
||||
|
@ -213,12 +213,12 @@ SfxItemPresentation SwFmtDrop::GetPresentation
|
||||
{
|
||||
if ( GetChars() > 1 )
|
||||
{
|
||||
rText = OUString::boolean( GetChars() ) + " ";
|
||||
rText = OUString::number( GetChars() ) + " ";
|
||||
}
|
||||
rText = rText +
|
||||
OUString( SW_RESSTR( STR_DROP_OVER ) ) +
|
||||
" " +
|
||||
OUString::boolean( GetLines() ) +
|
||||
OUString::number( GetLines() ) +
|
||||
" " +
|
||||
OUString( SW_RESSTR( STR_DROP_LINES ) );
|
||||
}
|
||||
@ -336,7 +336,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
|
||||
rText = SW_RESSTR( STR_FRM_WIDTH ) + " ";
|
||||
if ( GetWidthPercent() )
|
||||
{
|
||||
rText = rText + OUString::boolean(GetWidthPercent()) + "%";
|
||||
rText = rText + OUString::number(GetWidthPercent()) + "%";
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -350,7 +350,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
|
||||
rText = rText + ", " + SW_RESSTR( nId ) + " ";
|
||||
if ( GetHeightPercent() )
|
||||
{
|
||||
rText = rText + OUString::boolean(GetHeightPercent()) + "%";
|
||||
rText = rText + OUString::number(GetHeightPercent()) + "%";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user