diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-23 07:58:18 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-25 14:21:28 +0000 |
| commit | ed834ce6fdd222b97e3bc280e8430b33631b31f1 (patch) | |
| tree | 84b7d6bb5d67e70c64c6d462f58f08c0731f8708 /sw/source/ui/misc/glshell.cxx | |
| parent | d598bb3ec735e45e53d82258d8aa9788bf0dc9a4 (diff) | |
String to OUString
Change-Id: I54c8f641b6db1762404916c4e4174d1f0e15cc39
Reviewed-on: https://gerrit.libreoffice.org/5613
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/ui/misc/glshell.cxx')
| -rw-r--r-- | sw/source/ui/misc/glshell.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx index a4c0239db2a5..5c8bc94c5b13 100644 --- a/sw/source/ui/misc/glshell.cxx +++ b/sw/source/ui/misc/glshell.cxx @@ -95,8 +95,8 @@ static void lcl_GetState( SwDocShell& rSh, SfxItemSet& rSet ) } } -static sal_Bool lcl_Save( SwWrtShell& rSh, const String& rGroupName, - const String& rShortNm, const String& rLongNm ) +static sal_Bool lcl_Save( SwWrtShell& rSh, const OUString& rGroupName, + const OUString& rShortNm, const OUString& rLongNm ) { const SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get(); SwTextBlocks * pBlock = ::GetGlossaries()->GetGroupDoc( rGroupName ); @@ -197,7 +197,7 @@ sal_Bool SwWebGlosDocShell::Save() SV_IMPL_REF ( SwDocShell ) -SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rShortName, sal_Bool bShow ) +SwDocShellRef SwGlossaries::EditGroupDoc( const OUString& rGroup, const OUString& rShortName, sal_Bool bShow ) { SwDocShellRef xDocSh; @@ -206,7 +206,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS { // query which view is registered. In WebWriter there is no normal view sal_uInt16 nViewId = 0 != &SwView::Factory() ? 2 : 6; - String sLongName = pGroup->GetLongName(pGroup->GetIndex( rShortName )); + const OUString sLongName = pGroup->GetLongName(pGroup->GetIndex( rShortName )); if( 6 == nViewId ) { @@ -229,9 +229,7 @@ SwDocShellRef SwGlossaries::EditGroupDoc( const String& rGroup, const String& rS // set document title SfxViewFrame* pFrame = bShow ? SfxViewFrame::LoadDocument( *xDocSh, nViewId ) : SfxViewFrame::LoadHiddenDocument( *xDocSh, nViewId ); - String aDocTitle(SW_RES( STR_GLOSSARY )); - aDocTitle += ' '; - aDocTitle += sLongName; + const OUString aDocTitle(SW_RESSTR( STR_GLOSSARY ) + " " + sLongName); bool const bDoesUndo = xDocSh->GetDoc()->GetIDocumentUndoRedo().DoesUndo(); |