diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-07-28 00:14:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-30 14:26:52 +0000 |
| commit | 38e54583bcf07a71974777d13d2cf98519c8635b (patch) | |
| tree | 07eaf992cdfb2b28bd15f7f5945f6313183907b4 /sw | |
| parent | 3f252060c6a21d21be8cd56d82de148dd27de191 (diff) | |
String to OUString
Change-Id: I531522908c9d1ef6eefa0bc6026229f16a8ac388
Reviewed-on: https://gerrit.libreoffice.org/5187
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dochdl/selglos.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/inc/selglos.hxx | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx index b87ce8d9653a..930fb8215b57 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 d73b5a91fb82..88da01455595 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 |