diff options
Diffstat (limited to 'filter/source')
-rw-r--r-- | filter/source/flash/swfexporter.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 4 | ||||
-rw-r--r-- | filter/source/graphicfilter/icgm/cgm.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/escherex.cxx | 7 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 11 | ||||
-rw-r--r-- | filter/source/msfilter/util.cxx | 4 | ||||
-rw-r--r-- | filter/source/pdf/pdfexport.cxx | 8 | ||||
-rw-r--r-- | filter/source/pdf/pdffilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgexport.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgfilter.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgimport.cxx | 4 | ||||
-rw-r--r-- | filter/source/svg/svgwriter.cxx | 4 | ||||
-rw-r--r-- | filter/source/textfilterdetect/filterdetect.cxx | 4 | ||||
-rw-r--r-- | filter/source/xmlfilterdetect/filterdetect.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/LibXSLTTransformer.cxx | 4 | ||||
-rw-r--r-- | filter/source/xsltfilter/OleHandler.cxx | 6 |
16 files changed, 40 insertions, 42 deletions
diff --git a/filter/source/flash/swfexporter.cxx b/filter/source/flash/swfexporter.cxx index 8021b087c5a1..2a6a7005138f 100644 --- a/filter/source/flash/swfexporter.cxx +++ b/filter/source/flash/swfexporter.cxx @@ -36,7 +36,7 @@ #include <vcl/wmf.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/gdimetafiletools.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include "swfexporter.hxx" #include "swfwriter.hxx" @@ -594,7 +594,7 @@ void FlashExporter::exportShape( const Reference< XShape >& xShape, bool bMaster com::sun::star::awt::Rectangle aBoundRect; xPropSet->getPropertyValue( "BoundRect" ) >>= aBoundRect; - boost::scoped_ptr<ShapeInfo> pShapeInfo(new ShapeInfo()); + std::unique_ptr<ShapeInfo> pShapeInfo(new ShapeInfo()); pShapeInfo->mnX = aBoundRect.X; pShapeInfo->mnY = aBoundRect.Y; pShapeInfo->mnWidth = aBoundRect.Width; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 489ff7d3c50f..2a5856354574 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -41,7 +41,7 @@ #include "strings.hrc" #include <math.h> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star::uno; @@ -343,7 +343,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter // try to get the dialog selection if ( pFilterConfigItem ) { - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() )); if( pResMgr ) { diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx index aea0c6f58c04..5a7395fffd06 100644 --- a/filter/source/graphicfilter/icgm/cgm.cxx +++ b/filter/source/graphicfilter/icgm/cgm.cxx @@ -28,7 +28,7 @@ #include <main.hxx> #include <elements.hxx> #include <outact.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -717,12 +717,12 @@ ImportCGM( OUString const & rFileName, uno::Reference< frame::XModel > const & r { try { - boost::scoped_ptr<CGM> pCGM(new CGM( nMode, rXModel )); + std::unique_ptr<CGM> pCGM(new CGM( nMode, rXModel )); if ( pCGM && pCGM->IsValid() ) { if ( nMode & CGM_IMPORT_CGM ) { - boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, StreamMode::READ )); + std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( rFileName, StreamMode::READ )); if ( pIn ) { pIn->SetEndian( SvStreamEndian::BIG ); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index d3033b560a79..259236480dee 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -91,7 +91,6 @@ #include <rtl/crc.h> #include <rtl/strbuf.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> using namespace ::com::sun::star; @@ -1290,7 +1289,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( const ::com::sun::star::u if ( pGraphicProvider && pPicOutStrm && pShapeBoundRect && aXPropSet.is() ) { ::com::sun::star::uno::Any aAny; - boost::scoped_ptr< ::com::sun::star::awt::Rectangle> pVisArea; + std::unique_ptr< ::com::sun::star::awt::Rectangle> pVisArea; if ( EscherPropertyValueHelper::GetPropertyValue( aAny, aXPropSet, OUString("VisibleArea" ) ) ) { pVisArea.reset(new ::com::sun::star::awt::Rectangle); @@ -1423,7 +1422,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( bool bRetValue = false; bool bCreateFillStyles = false; - boost::scoped_ptr<GraphicAttr> pGraphicAttr; + std::unique_ptr<GraphicAttr> pGraphicAttr; GraphicObject aGraphicObject; OUString aGraphicUrl; OString aUniqueId; @@ -1592,7 +1591,7 @@ bool EscherPropertyContainer::CreateGraphicProperties( nFormat != GraphicFileFormat::WMF && nFormat != GraphicFileFormat::EMF) ) { - boost::scoped_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( + std::unique_ptr<SvStream> pIn(::utl::UcbStreamHelper::CreateStream( aTmp.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ )); if ( pIn ) { diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 679759f4022d..5c1cecdedb2c 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -123,7 +123,6 @@ #include <rtl/strbuf.hxx> #include <tools/time.hxx> #include <memory> -#include <boost/scoped_ptr.hpp> // PPT ColorScheme Slots #define PPT_COLSCHEME (0x08000000) @@ -1846,13 +1845,13 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, if ( aTmpFile.IsValid() ) { - boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::TRUNC | StreamMode::WRITE )); + std::unique_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::TRUNC | StreamMode::WRITE )); if ( pDest ) bSuccess = SdrPowerPointOLEDecompress( *pDest, rStCtrl, nLen ); } if ( bSuccess ) { - boost::scoped_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::READ )); + std::unique_ptr<SvStream> pDest(::utl::UcbStreamHelper::CreateStream( aTmpFile.GetURL(), StreamMode::READ )); Storage* pObjStor = pDest ? new Storage( *pDest, true ) : NULL; if ( pObjStor ) { @@ -2099,7 +2098,7 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOpt DffRecordHeader* pExEmbed = NULL; pHd->SeekToBegOfRecord( rStCtrl ); - boost::scoped_ptr<DffRecordManager> pExObjListManager(new DffRecordManager( rStCtrl )); + std::unique_ptr<DffRecordManager> pExObjListManager(new DffRecordManager( rStCtrl )); sal_uInt16 i, nRecType(PPT_PST_ExEmbed); for ( i = 0; i < 2; i++ ) @@ -2292,7 +2291,7 @@ SdrObject* SdrPowerPointImport::ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* for ( pPortion = pPara->First(); pPortion; pPortion = pPara->Next() ) { SfxItemSet aPortionAttribs( rOutliner.GetEmptyItemSet() ); - boost::scoped_ptr<SvxFieldItem> pFieldItem(pPortion->GetTextField()); + std::unique_ptr<SvxFieldItem> pFieldItem(pPortion->GetTextField()); if ( pFieldItem ) { rOutliner.QuickInsertField( *pFieldItem, ESelection( nParaIndex, aSelection.nEndPos, nParaIndex, aSelection.nEndPos + 1 ) ); @@ -2988,7 +2987,7 @@ SdrObject* SdrPowerPointImport::ImportPageBackgroundObject( const SdrPage& rPage { SdrObject* pRet = NULL; bool bCreateObj = bForce; - boost::scoped_ptr<SfxItemSet> pSet; + std::unique_ptr<SfxItemSet> pSet; sal_uLong nFPosMerk = rStCtrl.Tell(); // remember FilePos for restoring it later DffRecordHeader aPageHd; if ( SeekToAktPage( &aPageHd ) ) diff --git a/filter/source/msfilter/util.cxx b/filter/source/msfilter/util.cxx index ce51d20e8f7d..1a7f0a52f1b9 100644 --- a/filter/source/msfilter/util.cxx +++ b/filter/source/msfilter/util.cxx @@ -14,7 +14,7 @@ #include <vcl/svapp.hxx> #include <vcl/salbtype.hxx> #include <filter/msfilter/util.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <unordered_map> namespace msfilter { @@ -89,7 +89,7 @@ DateTime DTTM2DateTime( long lDTTM ) sal_Unicode bestFitOpenSymbolToMSFont(sal_Unicode cChar, rtl_TextEncoding& rChrSet, OUString& rFontName) { - boost::scoped_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont()); + std::unique_ptr<StarSymbolToMSMultiFont> pConvert(CreateStarSymbolToMSMultiFont()); OUString sFont = pConvert->ConvertChar(cChar); pConvert.reset(); if (!sFont.isEmpty()) diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index d2b511bd3e5d..5d59ea78c726 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -74,7 +74,7 @@ #include "com/sun/star/lang/XServiceInfo.hpp" #include "com/sun/star/drawing/XShapes.hpp" #include "com/sun/star/graphic/XGraphicProvider.hpp" -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -791,7 +791,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& aContext.SignTSA = msSignTSA; // all context data set, time to create the printing device - boost::scoped_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc )); + std::unique_ptr<vcl::PDFWriter> pPDFWriter(new vcl::PDFWriter( aContext, xEnc )); OutputDevice* pOut = pPDFWriter->GetReferenceDevice(); DBG_ASSERT( pOut, "PDFExport::Export: no reference device" ); @@ -811,7 +811,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( pOut ) { DBG_ASSERT( pOut->GetExtOutDevData() == NULL, "PDFExport: ExtOutDevData already set!!!" ); - boost::scoped_ptr<vcl::PDFExtOutDevData> pPDFExtOutDevData(new vcl::PDFExtOutDevData( *pOut )); + std::unique_ptr<vcl::PDFExtOutDevData> pPDFExtOutDevData(new vcl::PDFExtOutDevData( *pOut )); pOut->SetExtOutDevData( pPDFExtOutDevData.get() ); pPDFExtOutDevData->SetIsExportNotes( mbExportNotes ); pPDFExtOutDevData->SetIsExportTaggedPDF( mbUseTaggedPDF ); @@ -894,7 +894,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& if ( mxStatusIndicator.is() ) { - boost::scoped_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "pdffilter", Application::GetSettings().GetUILanguageTag() )); if ( pResMgr ) { sal_Int32 nTotalPageCount = aRangeEnum.size(); diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 2512ffb0214f..8c342b0b7ec7 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -24,7 +24,7 @@ #include <vcl/window.hxx> #include <svl/outstrm.hxx> #include <vcl/FilterConfigItem.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> // - PDFFilter - PDFFilter::PDFFilter( const Reference< XComponentContext > &rxContext ) : @@ -113,7 +113,7 @@ bool PDFFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) if( bRet ) { - boost::scoped_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ )); + std::unique_ptr<SvStream> pIStm(::utl::UcbStreamHelper::CreateStream( aTempFile.GetURL(), StreamMode::READ )); if( pIStm ) { diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index e39627bb2cdd..eec15ab0bc21 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -46,7 +46,7 @@ #include <xmloff/animationexport.hxx> #include <boost/preprocessor/repetition/repeat.hpp> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::geometry; @@ -530,7 +530,7 @@ bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ) ; Reference< XOutputStream > xOStm; - boost::scoped_ptr<SvStream> pOStm; + std::unique_ptr<SvStream> pOStm; sal_Int32 nLength = rDescriptor.getLength(); const PropertyValue* pValue = rDescriptor.getConstArray(); bool bRet = false; diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx index 0f20f8f9a832..a51336513fe5 100644 --- a/filter/source/svg/svgfilter.cxx +++ b/filter/source/svg/svgfilter.cxx @@ -50,7 +50,7 @@ #include "svgfilter.hxx" #include "svgwriter.hxx" -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; @@ -363,7 +363,7 @@ OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor) throw try { if (isStreamGZip(xInput)) { - boost::scoped_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInput, true )); + std::unique_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInput, true )); if(!aStream.get()) return OUString(); diff --git a/filter/source/svg/svgimport.cxx b/filter/source/svg/svgimport.cxx index 1d3daafe1963..66c88c625eca 100644 --- a/filter/source/svg/svgimport.cxx +++ b/filter/source/svg/svgimport.cxx @@ -43,7 +43,7 @@ #include <unotools/mediadescriptor.hxx> #include <tools/zcodec.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star; using namespace ::svgi; @@ -65,7 +65,7 @@ bool SVGFilter::implImport(const Sequence< PropertyValue >& rDescriptor) return false; xSeek->seek(0); - boost::scoped_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInputStream, true )); + std::unique_ptr<SvStream> aStream(utl::UcbStreamHelper::CreateStream(xInputStream, true )); if(!aStream.get()) return false; diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx index 72aeb4d80bda..37b84fd518bd 100644 --- a/filter/source/svg/svgwriter.cxx +++ b/filter/source/svg/svgwriter.cxx @@ -29,7 +29,7 @@ #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <sax/tools/converter.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #include <boost/shared_array.hpp> @@ -195,7 +195,7 @@ void SVGAttributeWriter::AddGradientDef( const Rectangle& rObjRect, const Gradie ( rGradientId = "Gradient_" ) += OUString::number( nCurGradientId++ ) ); { - boost::scoped_ptr< SvXMLElementExport > apGradient; + std::unique_ptr< SvXMLElementExport > apGradient; OUString aColorStr; if( rGradient.GetStyle() == GradientStyle_LINEAR || rGradient.GetStyle() == GradientStyle_AXIAL ) diff --git a/filter/source/textfilterdetect/filterdetect.cxx b/filter/source/textfilterdetect/filterdetect.cxx index 3ce15394a502..cd3e58dff52c 100644 --- a/filter/source/textfilterdetect/filterdetect.cxx +++ b/filter/source/textfilterdetect/filterdetect.cxx @@ -20,7 +20,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <cppuhelper/supportsservice.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> #define WRITER_TEXT_FILTER "Text" #define CALC_TEXT_FILTER "Text - txt - csv (StarCalc)" @@ -39,7 +39,7 @@ namespace { bool IsHTMLStream( const uno::Reference<io::XInputStream>& xInStream ) { - boost::scoped_ptr<SvStream> pInStream( utl::UcbStreamHelper::CreateStream( xInStream ) ); + std::unique_ptr<SvStream> pInStream( utl::UcbStreamHelper::CreateStream( xInStream ) ); if ( !pInStream || pInStream->GetError() ) // No stream return false; diff --git a/filter/source/xmlfilterdetect/filterdetect.cxx b/filter/source/xmlfilterdetect/filterdetect.cxx index d797a9fca61d..ea86801f36de 100644 --- a/filter/source/xmlfilterdetect/filterdetect.cxx +++ b/filter/source/xmlfilterdetect/filterdetect.cxx @@ -27,7 +27,7 @@ #include <cppuhelper/supportsservice.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace com::sun::star::container; using namespace com::sun::star::uno; @@ -93,7 +93,7 @@ OUString SAL_CALL FilterDetect::detect( com::sun::star::uno::Sequence< com::sun: } } - ::boost::scoped_ptr< SvStream > pInStream( ::utl::UcbStreamHelper::CreateStream( xInStream ) ); + std::unique_ptr< SvStream > pInStream( ::utl::UcbStreamHelper::CreateStream( xInStream ) ); pInStream->StartReadingUnicodeText( RTL_TEXTENCODING_DONTKNOW ); sal_Size nUniPos = pInStream->Tell(); diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx index 167d17604600..12de44a50565 100644 --- a/filter/source/xsltfilter/LibXSLTTransformer.cxx +++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx @@ -45,7 +45,7 @@ #include <LibXSLTTransformer.hxx> #include <OleHandler.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::cppu; using namespace ::osl; @@ -298,7 +298,7 @@ namespace XSLT xsltSetGenericDebugFunc(stderr, NULL); xsltDebugDumpExtensions(NULL); #endif - boost::scoped_ptr<OleHandler> oh(new OleHandler(m_transformer->getComponentContext())); + std::unique_ptr<OleHandler> oh(new OleHandler(m_transformer->getComponentContext())); if (styleSheet) { tcontext = xsltNewTransformContext(styleSheet, doc); diff --git a/filter/source/xsltfilter/OleHandler.cxx b/filter/source/xsltfilter/OleHandler.cxx index 55b89b74a646..dbf10e04a30b 100644 --- a/filter/source/xsltfilter/OleHandler.cxx +++ b/filter/source/xsltfilter/OleHandler.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <OleHandler.hxx> -#include <boost/scoped_ptr.hpp> +#include <memory> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -128,7 +128,7 @@ namespace XSLT } // Decompress the bytes - boost::scoped_ptr< ::ZipUtils::Inflater> decompresser(new ::ZipUtils::Inflater(false)); + std::unique_ptr< ::ZipUtils::Inflater> decompresser(new ::ZipUtils::Inflater(false)); decompresser->setInput(content); Sequence<sal_Int8> result(oleLength); decompresser->doInflateSegment(result, 0, oleLength); @@ -196,7 +196,7 @@ namespace XSLT // Compress the bytes Sequence<sal_Int8> output(oledata.getLength()); - boost::scoped_ptr< ::ZipUtils::Deflater> compresser(new ::ZipUtils::Deflater((sal_Int32) 3, false)); + std::unique_ptr< ::ZipUtils::Deflater> compresser(new ::ZipUtils::Deflater((sal_Int32) 3, false)); compresser->setInputSegment(oledata); compresser->finish(); int compressedDataLength = compresser->doDeflateSegment(output, 0, oledata.getLength()); |