[Libreoffice-commits] core.git: sw/source

[Matteo Casalin]

 sw/source/ui/dochdl/selglos.cxx |    6 ++----
 sw/source/ui/inc/selglos.hxx    |   12 +++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 38e54583bcf07a71974777d13d2cf98519c8635b
Author: Matteo Casalin <matteo.casalin at yahoo.com>
Date:   Sun Jul 28 00:14:47 2013 +0200

    String to OUString
    
    Change-Id: I531522908c9d1ef6eefa0bc6026229f16a8ac388
    Reviewed-on: https://gerrit.libreoffice.org/5187
    Reviewed-by: Luboš Luňák <l.lunak at suse.cz>
    Tested-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index b87ce8d..930fb82 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -30,7 +30,7 @@
 
 // CTOR / DTOR -----------------------------------------------------------
 
-SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const String &rShortName)
+SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const OUString &rShortName)
     : ModalDialog(pParent, SW_RES(DLG_SEL_GLOS)),
     aGlosBox(this, SW_RES( LB_GLOS)),
     aGlosFL(this, SW_RES( FL_GLOS)),
@@ -38,9 +38,7 @@ SwSelGlossaryDlg::SwSelGlossaryDlg(Window * pParent, const String &rShortName)
     aCancelBtn(this, SW_RES( BT_CANCEL)),
     aHelpBtn(this, SW_RES(BT_HELP))
 {
-    String sText(aGlosFL.GetText());
-    sText += rShortName;
-    aGlosFL.SetText(sText);
+    aGlosFL.SetText(aGlosFL.GetText() + rShortName);
     FreeResource();
 
     aGlosBox.SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl));
diff --git a/sw/source/ui/inc/selglos.hxx b/sw/source/ui/inc/selglos.hxx
index d73b5a9..88da014 100644
--- a/sw/source/ui/inc/selglos.hxx
+++ b/sw/source/ui/inc/selglos.hxx
@@ -37,19 +37,17 @@ protected:
 
     DECL_LINK(DoubleClickHdl, ListBox*);
 public:
-    SwSelGlossaryDlg(Window * pParent, const String &rShortName);
+    SwSelGlossaryDlg(Window * pParent, const OUString &rShortName);
     ~SwSelGlossaryDlg();
-    void InsertGlos(const String &rRegion, const String &rGlosName);    // inline
+    void InsertGlos(const OUString &rRegion, const OUString &rGlosName);    // inline
     sal_uInt16 GetSelectedIdx() const;  // inline
     void SelectEntryPos(sal_uInt16 nIdx);   // inline
 };
 
-inline void SwSelGlossaryDlg::InsertGlos(const String &rRegion,
-                                const String &rGlosName)
+inline void SwSelGlossaryDlg::InsertGlos(const OUString &rRegion,
+                                const OUString &rGlosName)
 {
-    String aTmp( rRegion );
-    aTmp += ':';
-    aTmp += rGlosName;
+    const OUString aTmp = rRegion + ":" + rGlosName;
     aGlosBox.InsertEntry( aTmp );
 }
 inline sal_uInt16 SwSelGlossaryDlg::GetSelectedIdx() const