diff options
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/core/unocore/unocrsrhelper.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 5e4d9d3af9fc..5a93eaedf06c 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -1061,7 +1061,7 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL, pMed->Download(); // if necessary: start the download if( aRef.is() && 1 < aRef->GetRefCount() ) // Ref still valid? { - std::unique_ptr<SwReader> pRdr; + SwReaderPtr pRdr; SfxItemSet* pSet = pMed->GetItemSet(); pSet->Put(SfxBoolItem(FN_API_CALL, true)); if(!sPassword.isEmpty()) diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index fd10b466dd54..97ada4680c47 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -153,7 +153,7 @@ bool SwDocShell::InsertGeneratedStream(SfxMedium & rMedium, if (!::sw::XTextRangeToSwPaM(aPam, xInsertPosition)) return false; // similar to SwView::InsertMedium - std::unique_ptr<SwReader> pReader; + SwReaderPtr pReader; Reader *const pRead = StartConvertFrom(rMedium, pReader, nullptr, &aPam); if (!pRead) return false; @@ -162,7 +162,7 @@ bool SwDocShell::InsertGeneratedStream(SfxMedium & rMedium, } // Prepare loading -Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, std::unique_ptr<SwReader>& rpRdr, +Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReaderPtr& rpRdr, SwCursorShell const *pCursorShell, SwPaM* pPaM ) { @@ -231,7 +231,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, std::unique_ptr<SwReade // Loading bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) { - std::unique_ptr<SwReader> pRdr; + SwReaderPtr pRdr; SwRead pRead = StartConvertFrom(rMedium, pRdr); if (!pRead) return false; // #129881# return if no reader is found diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index 957803246b80..a2df020257fd 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -1613,7 +1613,7 @@ ErrCode SwDocShell::LoadStylesFromFile( const OUString& rURL, if ( bImport ) { SwRead pRead = ReadXML; - std::unique_ptr<SwReader, o3tl::default_delete<SwReader>> pReader; + SwReaderPtr pReader; std::unique_ptr<SwPaM> pPam; // the SW3IO - Reader need the pam/wrtshell, because only then he // insert the styles! diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 4caf268458ab..8d2b1e91eabc 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2158,7 +2158,7 @@ long SwView::InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium> pMediu pMedium->Download(); // start download if needed if( aRef.is() && 1 < aRef->GetRefCount() ) // still a valid ref? { - std::unique_ptr<SwReader> pRdr; + SwReaderPtr pRdr; Reader *pRead = pDocSh->StartConvertFrom(*pMedium, pRdr, m_pWrtShell.get()); if( pRead || (pMedium->GetFilter()->GetFilterFlags() & SfxFilterFlags::STARONEFILTER) ) |