mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misuse of OUString::boolean on sal_uInt8 values

Browse Source 
regression since 64b993e046

Change-Id: Ifc907a34430c36a64318fc42342e630e2b84ad13
This commit is contained in:
Caolán McNamara
2014-01-20 12:31:44 +00:00
parent 224da771d3
commit fdf9406792
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/source/update/feed/updatefeed.cxx
View File

@@ -300,14 +300,14 @@ public:
uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) uno::Any SAL_CALL nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException)
{ {
if( m_nCount > 0 ) if( m_nCount > 0 )
throw container::NoSuchElementException(OUString::boolean(m_nCount), *this); throw container::NoSuchElementException(OUString::number(m_nCount), *this);
++m_nCount; ++m_nCount;
return uno::makeAny(m_aEntry); return uno::makeAny(m_aEntry);
}; };
private: private:
sal_uInt8 m_nCount; sal_Int32 m_nCount;
deployment::UpdateInformationEntry m_aEntry; deployment::UpdateInformationEntry m_aEntry;
}; };

2
include/comphelper/logging.hxx
View File

@@ -57,7 +57,7 @@ namespace comphelper
inline OUString convertLogArgToString( sal_Int32 _nValue ) { return OUString::number( _nValue ); } inline OUString convertLogArgToString( sal_Int32 _nValue ) { return OUString::number( _nValue ); }
inline OUString convertLogArgToString( sal_Int16 _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_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 } } // namespace log::convert

8
sw/source/ui/utlui/attrdesc.cxx
View File

@@ -213,12 +213,12 @@ SfxItemPresentation SwFmtDrop::GetPresentation
{ {
if ( GetChars() > 1 ) if ( GetChars() > 1 )
{ {
rText = OUString::boolean( GetChars() ) + " "; rText = OUString::number( GetChars() ) + " ";
} }
rText = rText + rText = rText +
OUString( SW_RESSTR( STR_DROP_OVER ) ) + OUString( SW_RESSTR( STR_DROP_OVER ) ) +
" " + " " +
OUString::boolean( GetLines() ) + OUString::number( GetLines() ) +
" " + " " +
OUString( SW_RESSTR( STR_DROP_LINES ) ); OUString( SW_RESSTR( STR_DROP_LINES ) );
} }
@@ -336,7 +336,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
rText = SW_RESSTR( STR_FRM_WIDTH ) + " "; rText = SW_RESSTR( STR_FRM_WIDTH ) + " ";
if ( GetWidthPercent() ) if ( GetWidthPercent() )
{ {
rText = rText + OUString::boolean(GetWidthPercent()) + "%"; rText = rText + OUString::number(GetWidthPercent()) + "%";
} }
else else
{ {
@@ -350,7 +350,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
rText = rText + ", " + SW_RESSTR( nId ) + " "; rText = rText + ", " + SW_RESSTR( nId ) + " ";
if ( GetHeightPercent() ) if ( GetHeightPercent() )
{ {
rText = rText + OUString::boolean(GetHeightPercent()) + "%"; rText = rText + OUString::number(GetHeightPercent()) + "%";
} }
else else
{ {