diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-08 14:13:54 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-08 16:05:24 +0100 |
| commit | 669128178f4697f4fba746f1ece1c18b0056022a (patch) | |
| tree | c742a7c7654ae302ad39b616a7bb80149fd68ca8 /sfx2 | |
| parent | fa7085bd182e1968237b742c544de3ff0a5b9742 (diff) | |
Make INetURLObject-from-OUString ctor explicit
...and clean up call sites.
Change-Id: I7219a33652835e82fdc44e9e801a7e62868e4f38
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index a758478d36b1..111257331899 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -933,7 +933,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) sal_Bool bLoadInternal = sal_False; // security reservation: => we have to check the referer before executing - if (SFX_APP()->IsSecureURL(OUString(), &aReferer)) + if (SFX_APP()->IsSecureURL(INetURLObject(), &aReferer)) { try { diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 06383d852283..289446b0d67e 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1278,7 +1278,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) RemoveEntry( nPos ); OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( *pURL ).GetHost(); - nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( aImageURL, false ) ); + nPos = InsertEntry( aDlg.GetTitle(), SvFileInformationManager::GetImage( INetURLObject(aImageURL), false ) ); SetEntryData( nPos, (void*)(sal_uIntPtr)( new OUString( *pURL ) ) ); SelectEntryPos( nPos ); delete pURL; @@ -1451,7 +1451,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString { OUString aImageURL = IMAGE_URL; aImageURL += INetURLObject( rURL ).GetHost(); - sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( aImageURL, false ) ); + sal_uInt16 nPos = aBookmarksBox.InsertEntry( rTitle, SvFileInformationManager::GetImage( INetURLObject(aImageURL), false ) ); aBookmarksBox.SetEntryData( nPos, (void*)(sal_uIntPtr)( new OUString( rURL ) ) ); } diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 95ff9dd888c4..a8125d20c992 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2994,8 +2994,7 @@ const INetURLObject& SfxMedium::GetURLObject() const if (!pImp->m_pURLObj) { pImp->m_pURLObj = new INetURLObject( pImp->m_aLogicName ); - if (pImp->m_pURLObj->HasMark()) - *pImp->m_pURLObj = INetURLObject( pImp->m_aLogicName ).GetURLNoMark(); + pImp->m_pURLObj->SetMark(""); } return *pImp->m_pURLObj; |