cui/source/tabpages/chardlg.cxx | 8 ++++---- cui/source/tabpages/grfpage.cxx | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 5b1fcd5262f087e3d1cabb240d1761064baeafc6 Author: Caolán McNamara <[email protected]> Date: Wed Nov 14 16:38:30 2012 +0000 replaceAll returns a new replaced string but leaves the original alone Change-Id: I79ef3158d520d2c328838e83ad8382483be332a8 diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 80ebc32..4beeaeb 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -3250,13 +3250,13 @@ void SvxCharPositionPage::FillUserData() { const sal_Unicode cTok = ';'; - OUString sUser( OUString::valueOf( m_nSuperEsc ) ); + OUString sUser( OUString::valueOf( static_cast<sal_Int32>(m_nSuperEsc)) ); sUser += OUString( cTok ); - sUser += OUString::valueOf( m_nSubEsc ); + sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSubEsc) ); sUser += OUString (cTok ); - sUser += OUString::valueOf( m_nSuperProp ); + sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSuperProp) ); sUser += OUString ( cTok ); - sUser += OUString::valueOf( m_nSubProp ); + sUser += OUString::valueOf( static_cast<sal_Int32>(m_nSubProp) ); SetUserData( sUser ); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 60ae1da..1d3694b 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -671,9 +671,9 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) sTemp += aFld.GetText(); if ( aOrigPixelSize.Width() && aOrigPixelSize.Height() ) { - int ax = int(floor((float)aOrigPixelSize.Width() / + sal_Int32 ax = sal_Int32(floor((float)aOrigPixelSize.Width() / ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5)); - int ay = int(floor((float)aOrigPixelSize.Height() / + sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() / ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5)); sTemp += OUString(" "); sTemp += CUI_RESSTR( STR_PPI ); @@ -682,7 +682,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound ) sPPI += OUString( sal_Unicode (0x00D7) ); sPPI += OUString::valueOf(ay); } - sTemp.replaceAll("%1", sPPI); + sTemp = sTemp.replaceAll("%1", sPPI); } aOrigSizeFT.SetText( sTemp ); }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
