summaryrefslogtreecommitdiff
path: root/sd/source
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source')
-rw-r--r--sd/source/ui/app/sdxfer.cxx12
-rw-r--r--sd/source/ui/inc/View.hxx2
-rw-r--r--sd/source/ui/inc/sdxfer.hxx2
-rw-r--r--sd/source/ui/view/sdview3.cxx24
4 files changed, 20 insertions, 20 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 257a7c10aee4..065459e5d7ff 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -555,7 +555,7 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
return bOK;
}
-bool SdTransferable::WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
+bool SdTransferable::WriteObject( SvStream& rOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& )
{
bool bRet = false;
@@ -569,18 +569,18 @@ bool SdTransferable::WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pOb
SdDrawDocument* pDoc = static_cast<SdDrawDocument*>(pObject);
if ( !bDontBurnInStyleSheet )
pDoc->BurnInStyleSheetAttributes();
- rxOStm->SetBufferSize( 16348 );
+ rOStm.SetBufferSize( 16348 );
rtl::Reference< SdXImpressDocument > xComponent( new SdXImpressDocument( pDoc, true ) );
pDoc->setUnoModel( xComponent );
{
- css::uno::Reference<css::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( *rxOStm ) );
+ css::uno::Reference<css::io::XOutputStream> xDocOut( new utl::OOutputStreamWrapper( rOStm ) );
SvxDrawingLayerExport( pDoc, xDocOut, xComponent, (pDoc->GetDocumentType() == DocumentType::Impress) ? "com.sun.star.comp.Impress.XMLClipboardExporter" : "com.sun.star.comp.DrawingLayer.XMLExporter" );
}
xComponent->dispose();
- bRet = ( rxOStm->GetError() == ERRCODE_NONE );
+ bRet = ( rOStm.GetError() == ERRCODE_NONE );
}
catch( Exception& )
{
@@ -612,8 +612,8 @@ bool SdTransferable::WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pOb
if ( xTransact.is() )
xTransact->commit();
- rxOStm->SetBufferSize( 0xff00 );
- rxOStm->WriteStream( *pTempStream );
+ rOStm.SetBufferSize( 0xff00 );
+ rOStm.WriteStream( *pTempStream );
bRet = true;
}
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index bae64b0ac7cb..596816931c15 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -175,7 +175,7 @@ public:
SdrMediaObj* InsertMediaObj(const OUString& rURL, sal_Int8& rAction,
const Point& rPos, const Size& rSize );
- bool PasteRTFTable( const ::tools::SvRef<SotTempStream>& xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions );
+ bool PasteRTFTable( SvStream& rOStm, SdrPage* pPage, SdrInsertFlags nPasteOptions );
bool IsPresObjSelected(bool bOnPage = true, bool bOnMasterPage = true, bool bCheckPresObjListOnly = false, bool bCheckLayoutOnly = false) const;
diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx
index d6d382870dbb..b93ef331f1d4 100644
--- a/sd/source/ui/inc/sdxfer.hxx
+++ b/sd/source/ui/inc/sdxfer.hxx
@@ -105,7 +105,7 @@ protected:
virtual void AddSupportedFormats() override;
virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override;
- virtual bool WriteObject( tools::SvRef<SotTempStream>& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override;
+ virtual bool WriteObject( SvStream& rOStm, void* pUserObject, sal_uInt32 nUserObjectId, const css::datatransfer::DataFlavor& rFlavor ) override;
virtual void ObjectReleased() override final;
private:
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index ddd0ad28ece5..16947c001d72 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -322,7 +322,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
// ImageMap?
if( !pOwnData && aDataHelper.HasFormat( SotClipboardFormatId::SVIM ) )
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVIM, xStm ) )
{
@@ -341,7 +341,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( ( bIsRTF || aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) )
&& ! aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) )
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( bIsRTF ? SotClipboardFormatId::RTF : SotClipboardFormatId::RICHTEXT, xStm ) )
{
@@ -685,7 +685,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if(!bReturn && CHECK_FORMAT_TRANS( SotClipboardFormatId::PDF ))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::PDF, xStm ) )
{
Point aInsertPos(rPos);
@@ -705,7 +705,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if(!bReturn && CHECK_FORMAT_TRANS( SotClipboardFormatId::DRAWING ))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStm ) )
{
@@ -1227,7 +1227,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if(!bReturn && (!bLink || pPickObj) && CHECK_FORMAT_TRANS(SotClipboardFormatId::SVXB))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::SVXB, xStm ) )
{
@@ -1416,7 +1416,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SotClipboardFormatId::HTML))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::HTML, xStm ) )
{
@@ -1428,7 +1428,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if(!bReturn && !bLink && CHECK_FORMAT_TRANS(SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT, xStm ) )
{
OutlinerView* pOLV = GetTextEditOutlinerView();
@@ -1459,7 +1459,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool bIsRTF = CHECK_FORMAT_TRANS(SotClipboardFormatId::RTF);
if (bIsRTF || CHECK_FORMAT_TRANS(SotClipboardFormatId::RICHTEXT))
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if( aDataHelper.GetSotStorageStream( bIsRTF ? SotClipboardFormatId::RTF : SotClipboardFormatId::RICHTEXT, xStm ) )
{
@@ -1467,7 +1467,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
if( bTable )
{
- bReturn = PasteRTFTable( xStm, pPage, nPasteOptions );
+ bReturn = PasteRTFTable( *xStm, pPage, nPasteOptions );
}
else
{
@@ -1496,7 +1496,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
bool bIsHtmlSimple = CHECK_FORMAT_TRANS(SotClipboardFormatId::HTML_SIMPLE);
if (bIsHtmlSimple)
{
- ::tools::SvRef<SotTempStream> xStm;
+ std::unique_ptr<SvStream> xStm;
if (aDataHelper.GetSotStorageStream(SotClipboardFormatId::HTML_SIMPLE, xStm))
{
@@ -1598,7 +1598,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper,
return bReturn;
}
-bool View::PasteRTFTable( const ::tools::SvRef<SotTempStream>& xStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
+bool View::PasteRTFTable( SvStream& rStm, SdrPage* pPage, SdrInsertFlags nPasteOptions )
{
DrawDocShellRef xShell = new DrawDocShell(SfxObjectCreateMode::INTERNAL, false, DocumentType::Impress);
xShell->DoInitNew();
@@ -1607,7 +1607,7 @@ bool View::PasteRTFTable( const ::tools::SvRef<SotTempStream>& xStm, SdrPage* pP
pModel->GetItemPool().SetDefaultMetric(MapUnit::Map100thMM);
pModel->InsertPage(pModel->AllocPage(false).get());
- CreateTableFromRTF(*xStm, pModel);
+ CreateTableFromRTF(rStm, pModel);
bool bRet = Paste(*pModel, maDropPos, pPage, nPasteOptions);
xShell->DoClose();