From 387c6712c8c49ec7f4521f2c5ac615c355039352 Mon Sep 17 00:00:00 2001 From: Olivier Hallot Date: Tue, 14 May 2013 21:34:18 -0300 Subject: String to OUString in calc header & footer edit Conflicts: sc/inc/scabstdlg.hxx sc/source/ui/attrdlg/scdlgfact.cxx sc/source/ui/attrdlg/scdlgfact.hxx sc/source/ui/inc/hfedtdlg.hxx sc/source/ui/pagedlg/hfedtdlg.cxx Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268 Reviewed-on: https://gerrit.libreoffice.org/3911 Reviewed-by: Andras Timar Tested-by: Andras Timar --- sc/source/ui/pagedlg/hfedtdlg.cxx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sc/source/ui/pagedlg') diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index d3d8fa3a0da9..ce777e84d7f1 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -58,13 +58,10 @@ ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, { eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType(); - String aTmp = GetText(); + OUString aTmp = GetText(); + + aTmp += " (" + ScGlobal::GetRscString( STR_PAGESTYLE ) + ": " + rPageStyle + ")"; - aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" )); - aTmp += ScGlobal::GetRscString( STR_PAGESTYLE ); - aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); - aTmp += rPageStyle; - aTmp += ')'; SetText( aTmp ); } -- cgit