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 | |
parent | Improve description (diff) | |
download | core-d598bb3ec735e45e53d82258d8aa9788bf0dc9a4.tar.gz core-d598bb3ec735e45e53d82258d8aa9788bf0dc9a4.zip |
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>
-rw-r--r-- | sw/inc/crsrsh.hxx | 5 | ||||
-rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 4 | ||||
-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 |
6 files changed, 11 insertions, 9 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 61a7d2a2e493..df120f9825c5 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -21,6 +21,7 @@ #include <com/sun/star/i18n/WordType.hpp> +#include <rtl/ustring.hxx> #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/rtti.hxx> @@ -665,8 +666,8 @@ public: // in a headerframe otherwise in a footerframe bool IsInHeaderFooter( sal_Bool* pbInHeader = 0 ) const; - sal_Bool GotoNextTOXBase( const String* = 0 ); - sal_Bool GotoPrevTOXBase( const String* = 0 ); + sal_Bool GotoNextTOXBase( const OUString* = 0 ); + sal_Bool GotoPrevTOXBase( const OUString* = 0 ); sal_Bool GotoTOXMarkBase(); // jump to the next or previous index entry sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True ); diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 1b11a31e75a2..9e5630b1e561 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -284,7 +284,7 @@ sal_Bool SwCrsrShell::SetCrsrInHdFt( sal_uInt16 nDescNo, sal_Bool bInHeader ) } /// jump to the next index -sal_Bool SwCrsrShell::GotoNextTOXBase( const String* pName ) +sal_Bool SwCrsrShell::GotoNextTOXBase( const OUString* pName ) { sal_Bool bRet = sal_False; @@ -335,7 +335,7 @@ sal_Bool SwCrsrShell::GotoNextTOXBase( const String* pName ) } /// jump to previous index -sal_Bool SwCrsrShell::GotoPrevTOXBase( const String* pName ) +sal_Bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName ) { sal_Bool bRet = sal_False; 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); |