summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-11-14 16:38:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-11-14 16:39:31 +0000
commit5b1fcd5262f087e3d1cabb240d1761064baeafc6 (patch)
tree284a12976336108ec6f5c300c28ab16e38f24f7a /cui/source/tabpages
parent752cb97a8fb189b6e11d3a55704222b9aba1b11a (diff)
replaceAll returns a new replaced string but leaves the original alone
Change-Id: I79ef3158d520d2c328838e83ad8382483be332a8
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/chardlg.cxx8
-rw-r--r--cui/source/tabpages/grfpage.cxx6
2 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 80ebc3207228..4beeaebc24dc 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 60ae1da9add9..1d3694b22a65 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 );
}