sc/inc/scabstdlg.hxx | 2 +-
sc/source/ui/attrdlg/scdlgfact.cxx | 2 +-
sc/source/ui/attrdlg/scdlgfact.hxx | 2 +-
sc/source/ui/pagedlg/hfedtdlg.cxx | 9 +++------
4 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 387c6712c8c49ec7f4521f2c5ac615c355039352
Author: Olivier Hallot <olivier.hal...@edx.srv.br>
Date: Tue May 14 21:34:18 2013 -0300
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 <ati...@suse.com>
Tested-by: Andras Timar <ati...@suse.com>
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 93bae5a..9a0edf4 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -491,7 +491,7 @@ public:
virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*
pFrame, //add for ScHFEditDlg
Window* pParent,
const SfxItemSet&
rCoreSet,
- const String&
rPageStyle,
+ const OUString&
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT ) = 0;
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*
pParent,//add for ScStyleDlg
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 2e1ca49..4a8b9be 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1237,7 +1237,7 @@ SfxAbstractTabDialog *
ScAbstractDialogFactory_Impl::CreateScAttrDlg(SfxViewFram
SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg(
SfxViewFrame* pFrame,
Window* pParent,
const
SfxItemSet& rCoreSet,
- const
String& rPageStyle,
+ const
OUString& rPageStyle,
sal_uInt16 nResId )
{
SfxTabDialog* pDlg = NULL;
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 356776d..f207558 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -558,7 +558,7 @@ public:
virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*
pFrame, //add for ScHFEditDlg
Window* pParent,
const SfxItemSet&
rCoreSet,
- const String&
rPageStyle,
+ const OUString&
rPageStyle,
sal_uInt16
nResId = RID_SCDLG_HFEDIT );
virtual SfxAbstractTabDialog * CreateScStyleDlg( Window*
pParent,//add for ScStyleDlg
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx
b/sc/source/ui/pagedlg/hfedtdlg.cxx
index d3d8fa3..ce777e8 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 );
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
