diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-21 15:27:39 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-22 12:21:35 +0100 |
| commit | 28c9207da43551059e283008225abfdfb4a988be (patch) | |
| tree | 111ae9308cd0903e8c930cca45857ad119a493e2 /sw/source/core/draw | |
| parent | 3656a57e885065db046d774e27d0834884744a3c (diff) | |
Related: fdo#38838 remove UniString::InsertAscii
Change-Id: I949b62842d77fe83caed2cc79784fe1e3f3ae400
Diffstat (limited to 'sw/source/core/draw')
| -rw-r--r-- | sw/source/core/draw/dpage.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index db945d6ac19c..a512539f4b78 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -139,14 +139,14 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, { SwFlyFrm *pFly = ((SwVirtFlyDrawObj*)pObj)->GetFlyFrm(); const SwFmtURL &rURL = pFly->GetFmt()->GetURL(); - String sTxt; + OUString sTxt; if( rURL.GetMap() ) { IMapObject *pTmpObj = pFly->GetFmt()->GetIMapObject( aPos, pFly ); if( pTmpObj ) { sTxt = pTmpObj->GetAltText(); - if ( !sTxt.Len() ) + if ( sTxt.isEmpty() ) sTxt = URIHelper::removePassword( pTmpObj->GetURL(), INetURLObject::WAS_ENCODED, INetURLObject::DECODE_UNAMBIGUOUS); @@ -167,12 +167,12 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, // without MapMode-Offset, without Offset, w ... !!!!! aPt = pWindow->LogicToPixel( aPt, MapMode( MAP_TWIP ) ); - ((( sTxt += '?' ) += OUString::number( aPt.getX() )) - += ',' ) += OUString::number( aPt.getY() ); + sTxt += "?" + OUString::number( aPt.getX() ) + + "," + OUString::number( aPt.getY() ); } } - if ( sTxt.Len() ) + if ( !sTxt.isEmpty() ) { // #i80029# sal_Bool bExecHyperlinks = rDoc.GetDocShell()->IsReadOnly(); @@ -183,8 +183,7 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, if ( !bExecHyperlinks ) { - sTxt.InsertAscii( ": ", 0 ); - sTxt.Insert( ViewShell::GetShellRes()->aHyperlinkClick, 0 ); + sTxt = ViewShell::GetShellRes()->aHyperlinkClick + ": " + sTxt; } } |