diff options
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/sfxpicklist.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/docfile.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 2 |
5 files changed, 4 insertions, 12 deletions
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 451afe95cf8a..b32f14649f96 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -111,7 +111,7 @@ void SfxPickListImpl::AddDocumentToPickList( SfxObjectShell* pDocSh ) OUString aTitle = pDocSh->GetTitle(SFX_TITLE_PICKLIST); OUString aFilter; - std::shared_ptr<const SfxFilter> pFilter = pMed->GetOrigFilter(); + std::shared_ptr<const SfxFilter> pFilter = pMed->GetFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 6d2aa63dc242..bff1b39081f7 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -275,7 +275,6 @@ public: std::unique_ptr<SvStream> m_pInStream; std::unique_ptr<SvStream> m_pOutStream; - std::shared_ptr<const SfxFilter> pOrigFilter; OUString aOrigURL; DateTime aExpireTime; SfxFrameWeakRef wLoadTargetFrame; @@ -2799,13 +2798,6 @@ const std::shared_ptr<const SfxFilter>& SfxMedium::GetFilter() const return pImpl->m_pFilter; } - -std::shared_ptr<const SfxFilter> const & SfxMedium::GetOrigFilter() const -{ - return pImpl->pOrigFilter ? pImpl->pOrigFilter : pImpl->m_pFilter; -} - - sal_uInt32 SfxMedium::CreatePasswordToModifyHash( const OUString& aPasswd, bool bWriter ) { sal_uInt32 nHash = 0; diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 3eba938736ab..f08529be0ce2 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2090,7 +2090,7 @@ void SfxObjectShell::AddToRecentlyUsedList() if ( aUrl.GetProtocol() == INetProtocol::File ) { - std::shared_ptr<const SfxFilter> pOrgFilter = pMedium->GetOrigFilter(); + std::shared_ptr<const SfxFilter> pOrgFilter = pMedium->GetFilter(); Application::AddToRecentDocumentList( aUrl.GetURLNoPass( INetURLObject::DecodeMechanism::NONE ), pOrgFilter ? pOrgFilter->GetMimeType() : OUString(), pOrgFilter ? pOrgFilter->GetServiceName() : OUString() ); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 8ae28d2e291b..a14885f40752 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -326,7 +326,7 @@ void SfxFrame::UpdateDescriptor( SfxObjectShell const *pDoc ) // Mark FileOpen parameter SfxItemSet* pItemSet = pMed->GetItemSet(); - std::shared_ptr<const SfxFilter> pFilter = pMed->GetOrigFilter(); + std::shared_ptr<const SfxFilter> pFilter = pMed->GetFilter(); OUString aFilter; if ( pFilter ) aFilter = pFilter->GetFilterName(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 2e77d5d189a3..918cc51edc18 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -357,7 +357,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) && !pSh->IsModifyPasswordEntered() ) { const OUString aDocumentName = INetURLObject( pMed->GetOrigURL() ).GetMainURL( INetURLObject::DecodeMechanism::WithCharset ); - if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetOrigFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) ) + if( !AskPasswordToModify_Impl( pMed->GetInteractionHandler(), aDocumentName, pMed->GetFilter(), pSh->GetModifyPasswordHash(), pSh->GetModifyPasswordInfo() ) ) { // this is a read-only document, if it has "Password to modify" // the user should enter password before he can edit the document |