diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-10-04 22:03:44 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-10-05 19:44:38 +0200 |
| commit | 2c5e78f90eb8f584a3bff15b5abc6bac099f156e (patch) | |
| tree | 3024d279a59341b49e145809b3cfb57f41981229 | |
| parent | Add back xsltproc --path arguments (diff) | |
| download | core-2c5e78f90eb8f584a3bff15b5abc6bac099f156e.tar.gz core-2c5e78f90eb8f584a3bff15b5abc6bac099f156e.zip | |
String to OUString
Change-Id: I08064ad6f919b99ce5536eaef36b38523cf82610
| -rw-r--r-- | sw/source/ui/dochdl/swdtflvr.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/inc/wrtsh.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/wrtsh/wrtsh3.cxx | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 4bcdfd6d6f15..fbb6d49c095f 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -423,7 +423,8 @@ sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor ) pOrigGrf = pClpBitmap; // is it an URL-Button ? - String sURL, sDesc; + OUString sURL; + OUString sDesc; if( pWrtShell->GetURLFromButton( sURL, sDesc ) ) { pBkmk = new INetBookmark( sURL, sDesc ); @@ -923,7 +924,8 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut ) pOrigGrf = pClpBitmap; // is it an URL-Button ? - String sURL, sDesc; + OUString sURL; + OUString sDesc; if( pWrtShell->GetURLFromButton( sURL, sDesc ) ) { AddFormat( FORMAT_STRING ); @@ -3010,7 +3012,8 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos ) pOrigGrf = pClpBitmap; // is it an URL-Button ? - String sURL, sDesc; + OUString sURL; + OUString sDesc; if( pWrtShell->GetURLFromButton( sURL, sDesc ) ) { AddFormat( FORMAT_STRING ); diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx index ca6895e0599f..d9d446a8f299 100644 --- a/sw/source/ui/inc/wrtsh.hxx +++ b/sw/source/ui/inc/wrtsh.hxx @@ -428,7 +428,7 @@ typedef sal_Bool (SwWrtShell:: *FNSimpleMove)(); inline bool IsInClickToEdit() const ; // if a URL-Button is selected, return its URL; otherwise an empty string - bool GetURLFromButton( String& rURL, String& rDescr ) const; + bool GetURLFromButton( OUString& rURL, OUString& rDescr ) const; void NavigatorPaste( const NaviContentBookmark& rBkmk, const sal_uInt16 nAction ); diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx index d8b8bbfea5d7..eeb46b06e56c 100644 --- a/sw/source/ui/wrtsh/wrtsh3.cxx +++ b/sw/source/ui/wrtsh/wrtsh3.cxx @@ -169,7 +169,7 @@ sal_uInt16 SwWrtShell::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCa // If a util::URL-Button is selected, return its util::URL // otherwise an emtpy string. -bool SwWrtShell::GetURLFromButton( String& rURL, String& rDescr ) const +bool SwWrtShell::GetURLFromButton( OUString& rURL, OUString& rDescr ) const { bool bRet = false; const SdrView *pDView = GetDrawView(); @@ -207,14 +207,14 @@ bool SwWrtShell::GetURLFromButton( String& rURL, String& rDescr ) const OUString uTmp; if( (aTmp >>= uTmp) && !uTmp.isEmpty()) { - rDescr = String(uTmp); + rDescr = uTmp; } // util::URL aTmp = xPropSet->getPropertyValue( "TargetURL" ); if( (aTmp >>= uTmp) && !uTmp.isEmpty()) { - rURL = String(uTmp); + rURL = uTmp; } bRet = true; } |