diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-08-22 23:04:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-25 13:34:08 +0000 |
| commit | d598bb3ec735e45e53d82258d8aa9788bf0dc9a4 (patch) | |
| tree | 9bf202edd674ae39e5580238f977c5a73d52889b /sw/source/ui | |
| parent | e593b3b38434d605fa450afdb7a58e06bc6f949a (diff) | |
String to OUString
Change-Id: Icc70248f48dd24a2940552f88590f02492a38824
Reviewed-on: https://gerrit.libreoffice.org/5612
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/utlui/content.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/utlui/glbltree.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/move.cxx | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index 2b38eac3465e..ca6895e0599f 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -464,7 +464,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); bool GotoRegion( const String& rName ); sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0, sal_uInt16 nSeqNo = 0 ); - sal_Bool GotoNextTOXBase( const String* pName = 0); + sal_Bool GotoNextTOXBase( const OUString* pName = 0); bool GotoTable( const String& rName ); sal_Bool GotoFld( const SwFmtFld& rFld ); const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 4dc34d42acd7..5bc51f2583c7 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -2963,8 +2963,9 @@ void SwContentTree::GotoContent(SwContent* pCnt) break; case CONTENT_TYPE_INDEX: { - if (!pActiveShell->GotoNextTOXBase(&pCnt->GetName())) - pActiveShell->GotoPrevTOXBase(&pCnt->GetName()); + const OUString sName(pCnt->GetName()); + if (!pActiveShell->GotoNextTOXBase(&sName)) + pActiveShell->GotoPrevTOXBase(&sName); } break; case CONTENT_TYPE_POSTIT: diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index 31b7f74bc1ab..e433b955cb14 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -1013,7 +1013,7 @@ void SwGlobalTree::GotoContent(const SwGlblDocContent* pCont) break; case GLBLDOC_TOXBASE: { - String sName = pCont->GetTOX()->GetTOXName(); + const OUString sName = pCont->GetTOX()->GetTOXName(); if (!pActiveShell->GotoNextTOXBase(&sName)) pActiveShell->GotoPrevTOXBase(&sName); } diff --git a/sw/source/ui/wrtsh/move.cxx b/sw/source/ui/wrtsh/move.cxx index 6b998f35a439..26125c5235f2 100644 --- a/sw/source/ui/wrtsh/move.cxx +++ b/sw/source/ui/wrtsh/move.cxx @@ -650,7 +650,7 @@ sal_Bool SwWrtShell::GotoRefMark( const String& rRefMark, sal_uInt16 nSubType, return bRet; } -sal_Bool SwWrtShell::GotoNextTOXBase( const String* pName ) +sal_Bool SwWrtShell::GotoNextTOXBase( const OUString* pName ) { SwPosition aPos = *GetCrsr()->GetPoint(); bool bRet = SwCrsrShell::GotoNextTOXBase(pName); |