diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 09:31:59 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-07-25 15:02:32 -0400 |
| commit | d1cc007108442056f50d3a6d1212b2b4cfdc4c14 (patch) | |
| tree | 09d2b40a466930120c926bcc0f8474f061a877f4 /sd | |
| parent | 452e452d3e9dcc259bc3e58ed6509284004f04fe (diff) | |
sal_Bool to bool, String to OUString, in SfxMedium.
Change-Id: I1bc8486b3fbbcdd45407eeda52a7e239646cd204
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 73b9441a810f..d8ec4ec7a52d 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -340,7 +340,7 @@ void SdPage::ConnectLink() **********************************************************************/ ::sd::DrawDocShell* pDocSh = ((SdDrawDocument*) pModel)->GetDocSh(); - if (!pDocSh || pDocSh->GetMedium()->GetOrigURL() != maFileName) + if (!pDocSh || !pDocSh->GetMedium()->GetOrigURL().equals(maFileName)) { // Keine Links auf Dokument-eigene Seiten! mpPageLink = new SdPageLink(this, maFileName, maBookmarkName); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index fd235bb5fb9f..cda0fbd31a7c 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -700,7 +700,7 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName ) aInfo.mpDocShell = pDocShell; SfxMedium *pMedium = pDocShell->GetMedium(); - aStr = pMedium ? pMedium->GetName() : String(); + aStr = pMedium ? pMedium->GetName() : OUString(); if( aStr.Len() ) aInfo.SetName(); else diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 5811fa18de07..aa119e048fdd 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -542,7 +542,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge else if( pSourceView ) { if( !( nDropAction & DND_ACTION_LINK ) || - pSourceView->GetDocSh()->GetMedium()->GetName().Len() ) + !pSourceView->GetDocSh()->GetMedium()->GetName().isEmpty() ) { nRet = nDropAction; } @@ -787,9 +787,9 @@ sal_Int8 View::ExecuteDrop( const ExecuteDropEvent& rEvt, DropTargetHelper& rTar sal_Int32 nIndex = aBookmark.indexOf( (sal_Unicode)'#' ); if( nIndex != -1 ) { - const String aDocName( aBookmark.copy( 0, nIndex ) ); + const OUString aDocName( aBookmark.copy( 0, nIndex ) ); - if( mpDocSh->GetMedium()->GetName() == aDocName || mpDocSh->GetName() == aDocName ) + if (mpDocSh->GetMedium()->GetName() == aDocName || aDocName.equals(mpDocSh->GetName())) { // internal jump, only use the part after and including '#' eClickAction = presentation::ClickAction_BOOKMARK; |