[PATCH] String to OUString in calc header & footer edit

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3911

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/11/3911/1

String to OUString in calc header & footer edit

Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
---
M sc/inc/scabstdlg.hxx
M sc/source/ui/attrdlg/scdlgfact.cxx
M sc/source/ui/attrdlg/scdlgfact.hxx
M sc/source/ui/inc/hfedtdlg.hxx
M sc/source/ui/pagedlg/hfedtdlg.cxx
5 files changed, 8 insertions(+), 11 deletions(-)



diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 5190c9a..f96344a 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -491,7 +491,7 @@
     virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*     pFrame, //add for 
ScHFEditDlg
                                                     Window*         pParent,
                                                     const SfxItemSet&   rCoreSet,
-                                                    const String&       rPageStyle,
+                                                    const OUString&       rPageStyle,
                                                     int nId,
                                                     sal_uInt16              nResId = 
RID_SCDLG_HFEDIT ) = 0;
 
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index e9945b8..6be8ac4 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1237,7 +1237,7 @@
 SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScHFEditDlg( SfxViewFrame*       pFrame,
                                                                         Window*         pParent,
                                                                         const SfxItemSet&   
rCoreSet,
-                                                                        const String&       
rPageStyle,
+                                                                        const OUString&     
rPageStyle,
                                                                         int nId,
                                                                         sal_uInt16              
nResId )
 {
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index a18767c..b622f42 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -558,7 +558,7 @@
     virtual SfxAbstractTabDialog * CreateScHFEditDlg( SfxViewFrame*     pFrame, //add for 
ScHFEditDlg
                                                     Window*         pParent,
                                                     const SfxItemSet&   rCoreSet,
-                                                    const String&       rPageStyle,
+                                                    const OUString&     rPageStyle,
                                                     int nId,
                                                     sal_uInt16              nResId = 
RID_SCDLG_HFEDIT );
 
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 56a50a9..0ec88c3 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -36,7 +36,7 @@
             ScHFEditDlg( SfxViewFrame*      pFrame,
                          Window*            pParent,
                          const SfxItemSet&  rCoreSet,
-                         const String&      rPageStyle,
+                         const OUString&    rPageStyle,
                          sal_uInt16         nResId = RID_SCDLG_HFEDIT );
 
             ~ScHFEditDlg();
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index a74e267..4f095d3 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -53,19 +53,16 @@
 ScHFEditDlg::ScHFEditDlg( SfxViewFrame*     pFrameP,
                           Window*           pParent,
                           const SfxItemSet& rCoreSet,
-                          const String&     rPageStyle,
+                          const OUString&   rPageStyle,
                           sal_uInt16        nResIdP )
     :   SfxTabDialog( pFrameP, pParent, ScResId( nResIdP ), &rCoreSet )
 {
     eNumType = ((const SvxPageItem&)rCoreSet.Get(ATTR_PAGE)).GetNumType();
 
-    String aTmp = GetText();
+    OUString aTmp = GetText();
 
-    aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " (" ));
-    aTmp += ScGlobal::GetRscString( STR_PAGESTYLE );
-    aTmp.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " ));
-    aTmp += rPageStyle;
-    aTmp += ')';
+    aTmp += " (" + ScGlobal::GetRscString( STR_PAGESTYLE ) + ": " + rPageStyle + ")";
+
     SetText( aTmp );
 
     switch ( nResIdP )

-- 
To view, visit https://gerrit.libreoffice.org/3911
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aa0f055f89c05c3d799b5ed1b21188f7f3a8268
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Olivier Hallot <olivier.hallot@edx.srv.br>