From 8a65284fe31e6c0a927cb88b75df7845cd248572 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Tue, 31 Mar 2015 23:04:14 +0100 Subject: Automated conversion of VclPtr construction to use Instance template. Change-Id: I8be9141b9653e73ebd23a5a3d810f240c376f97e --- filter/source/graphic/GraphicExportDialog.cxx | 2 +- filter/source/graphicfilter/eos2met/eos2met.cxx | 10 +++++----- filter/source/graphicfilter/epict/epict.cxx | 10 +++++----- filter/source/graphicfilter/eps/eps.cxx | 10 +++++----- filter/source/graphicfilter/ieps/ieps.cxx | 4 ++-- filter/source/msfilter/escherex.cxx | 2 +- filter/source/msfilter/msdffimp.cxx | 2 +- filter/source/pdf/impdialog.cxx | 4 ++-- filter/source/pdf/pdfinteract.cxx | 2 +- filter/source/svg/svgfontexport.cxx | 4 ++-- filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 12 ++++++------ filter/source/xsltdialog/xmlfiltertabdialog.cxx | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) (limited to 'filter') diff --git a/filter/source/graphic/GraphicExportDialog.cxx b/filter/source/graphic/GraphicExportDialog.cxx index 4f425d8b3273..94f02c58e62d 100644 --- a/filter/source/graphic/GraphicExportDialog.cxx +++ b/filter/source/graphic/GraphicExportDialog.cxx @@ -107,7 +107,7 @@ void GraphicExportDialog::setTitle( const OUString& aTitle ) sal_Int16 GraphicExportDialog::execute() throw ( RuntimeException, std::exception ) { sal_Int16 nReturn = ui::dialogs::ExecutableDialogResults::CANCEL; - ScopedVclPtr graphicExportOptionsDialog(new GraphicExportOptionsDialog( Application::GetDefDialogParent(), mxSourceDocument ) ); + ScopedVclPtrInstance< GraphicExportOptionsDialog > graphicExportOptionsDialog( Application::GetDefDialogParent(), mxSourceDocument ); if (graphicExportOptionsDialog->Execute() == RET_OK ) { maFilterDataSequence = graphicExportOptionsDialog->getFilterData(); diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index c6404e503cc5..fe8a90af8614 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -1851,7 +1851,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) if( aGDIFont.GetAlign() != ALIGN_BASELINE) { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; if( aGDIFont.GetAlign()==ALIGN_TOP ) aPt.Y()+=(long)pVDev->GetFontMetric( aGDIFont ).GetAscent(); @@ -1880,7 +1880,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) if( aGDIFont.GetAlign() != ALIGN_BASELINE ) { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; if( aGDIFont.GetAlign() == ALIGN_TOP ) aPt.Y()+=(long)pVDev->GetFontMetric(aGDIFont).GetAscent(); else @@ -1923,7 +1923,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) case META_STRETCHTEXT_ACTION: { const MetaStretchTextAction* pA = static_cast(pMA); - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; sal_uInt16 i; sal_Int32 nNormSize; OUString aStr; @@ -2068,7 +2068,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) case META_GRADIENT_ACTION: { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; GDIMetaFile aTmpMtf; const MetaGradientAction* pA = static_cast(pMA); @@ -2080,7 +2080,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF ) case META_HATCH_ACTION: { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; GDIMetaFile aTmpMtf; const MetaHatchAction* pA = static_cast(pMA); diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index d978c45a5d50..10736f5b78f0 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -1699,7 +1699,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) if ( aSrcFont.GetAlign() != ALIGN_BASELINE ) { - ScopedVclPtrInstance pVirDev; + ScopedVclPtrInstance< VirtualDevice > pVirDev; if (aSrcFont.GetAlign()==ALIGN_TOP) aPt.Y()+=(long)pVirDev->GetFontMetric(aSrcFont).GetAscent(); else @@ -1719,7 +1719,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) if (aSrcFont.GetAlign()!=ALIGN_BASELINE) { - ScopedVclPtr pVirDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVirDev; if (aSrcFont.GetAlign()==ALIGN_TOP) aPt.Y()+=(long)pVirDev->GetFontMetric(aSrcFont).GetAscent(); @@ -1737,7 +1737,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) const MetaStretchTextAction* pA = static_cast(pMA); Point aPt( pA->GetPoint() ); OUString aStr = pA->GetText().copy( pA->GetIndex(),pA->GetLen() ); - ScopedVclPtr pVirDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVirDev; boost::scoped_array pDXAry(new long[ aStr.getLength() ]); sal_Int32 nNormSize( pVirDev->GetTextArray( aStr,pDXAry.get() ) ); @@ -1773,7 +1773,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) { const MetaBmpAction* pA = static_cast(pMA); const Bitmap aBmp( pA->GetBitmap() ); - ScopedVclPtr pVirDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVirDev; WriteOpcode_BitsRect( pA->GetPoint(), pVirDev->PixelToLogic( aBmp.GetSizePixel(), aSrcMapMode ), aBmp ); } @@ -1800,7 +1800,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF ) { const MetaBmpExAction* pA = static_cast(pMA); const Bitmap aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() ); - ScopedVclPtr pVirDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVirDev; WriteOpcode_BitsRect( pA->GetPoint(), pVirDev->PixelToLogic( aBmp.GetSizePixel(), aSrcMapMode ), aBmp ); } diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 47071f7be51a..3be7cb400c7f 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -418,7 +418,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter { Bitmap aBmp( rGraphic.GetBitmap() ); pAMTF = new GDIMetaFile(); - ScopedVclPtr pTmpVDev(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pTmpVDev; pAMTF->Record( pTmpVDev ); pTmpVDev->DrawBitmap( Point(), aBmp ); pAMTF->Stop(); @@ -486,7 +486,7 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter pResMgr = ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() ); if( pResMgr ) { - ScopedVclPtr aInfoBox(new InfoBox( NULL, ResId(KEY_VERSION_CHECK, *pResMgr).toString() ) ); + ScopedVclPtrInstance< InfoBox > aInfoBox( nullptr, ResId(KEY_VERSION_CHECK, *pResMgr).toString() ); aInfoBox->Execute(); delete pResMgr; } @@ -940,7 +940,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_HATCH_ACTION : { - ScopedVclPtr l_pVirDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > l_pVirDev; GDIMetaFile aTmpMtf; l_pVirDev->SetMapMode( rVDev.GetMapMode() ); @@ -1608,7 +1608,7 @@ void PSWriter::ImplIntersect( const tools::PolyPolygon& rPolyPoly ) void PSWriter::ImplWriteGradient( const tools::PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev ) { - ScopedVclPtr l_pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > l_pVDev; GDIMetaFile aTmpMtf; l_pVDev->SetMapMode( rVDev.GetMapMode() ); l_pVDev->AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf ); @@ -2141,7 +2141,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, const lo vcl::Font aNotRotatedFont( maFont ); aNotRotatedFont.SetOrientation( 0 ); - ScopedVclPtr pVirDev( new VirtualDevice( 1 ) ); + ScopedVclPtrInstance< VirtualDevice > pVirDev( 1 ); pVirDev->SetMapMode( rVDev.GetMapMode() ); pVirDev->SetFont( aNotRotatedFont ); pVirDev->SetTextAlign( eTextAlign ); diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 41b699405363..503606dd4977 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -125,7 +125,7 @@ static int ImplGetLen( sal_uInt8* pBuf, int nMax ) static void MakeAsMeta(Graphic &rGraphic) { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; GDIMetaFile aMtf; Bitmap aBmp( rGraphic.GetBitmap() ); Size aSize = aBmp.GetPrefSize(); @@ -442,7 +442,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, long nWidth, long nHeight, Graphic &rGraphic) { GDIMetaFile aMtf; - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; vcl::Font aFont; pVDev->EnableOutput( false ); diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 4d51af094b97..57bc11ae283f 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -1387,7 +1387,7 @@ GraphicObject lclDrawHatch( const ::com::sun::star::drawing::Hatch& rHatch, cons // do not create a bitmap in page size, that would explode file sizes (and have no good quality). // Better use a MetaFile graphic in page size; thus we have good quality due to vector format and // no bit file sizes. - ScopedVclPtr pVDev(new VirtualDevice()); + ScopedVclPtrInstance< VirtualDevice > pVDev; GDIMetaFile aMtf; pVDev->SetOutputSizePixel(Size(2, 2)); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 6ed9b4ca872c..f5cccd94da1e 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4397,7 +4397,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r rOutliner.SetStyleSheetPool( static_cast(pModel->GetStyleSheetPool()) ); rOutliner.SetUpdateMode( false ); rOutliner.SetText( *pParaObj ); - ScopedVclPtr pVirDev( new VirtualDevice( 1 ) ); + ScopedVclPtrInstance< VirtualDevice > pVirDev( 1 ); pVirDev->SetMapMode( MAP_100TH_MM ); sal_Int32 i, nParagraphs = rOutliner.GetParagraphCount(); if ( nParagraphs ) diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 5a672f44b157..7f3a6cebedef 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -844,7 +844,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl) // if a password was set, inform the user that this will not be used in PDF/A case if( mpCbPDFA1b->IsChecked() && pSecPage && pSecPage->hasPassword() ) { - ScopedVclPtr aBox(new MessageDialog(this, PDFFilterResId(STR_WARN_PASSWORD_PDFA), VCL_MESSAGE_WARNING)); + ScopedVclPtrInstance< MessageDialog > aBox(this, PDFFilterResId(STR_WARN_PASSWORD_PDFA), VCL_MESSAGE_WARNING); aBox->Execute(); } @@ -1291,7 +1291,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl) { - ScopedVclPtr aPwdDialog(new SfxPasswordDialog( this, &msUserPwdTitle ) ); + ScopedVclPtrInstance< SfxPasswordDialog > aPwdDialog( this, &msUserPwdTitle ); aPwdDialog->SetMinLen( 0 ); aPwdDialog->ShowMinLengthText(false); aPwdDialog->ShowExtras( SHOWEXTRAS_CONFIRM | SHOWEXTRAS_PASSWORD2 | SHOWEXTRAS_CONFIRM2 ); diff --git a/filter/source/pdf/pdfinteract.cxx b/filter/source/pdf/pdfinteract.cxx index 0c2750547110..d01281211ebf 100644 --- a/filter/source/pdf/pdfinteract.cxx +++ b/filter/source/pdf/pdfinteract.cxx @@ -53,7 +53,7 @@ sal_Bool SAL_CALL PDFInteractionHandler::handleInteractionRequest( const Referen sal_Int32 nCodes = aExc.ErrorCodes.getLength(); for( sal_Int32 i = 0; i < nCodes; i++ ) aCodes.insert( (vcl::PDFWriter::ErrorCode)aExc.ErrorCodes.getConstArray()[i] ); - ScopedVclPtr aDlg(new ImplErrorDialog( aCodes ) ); + ScopedVclPtrInstance< ImplErrorDialog > aDlg( aCodes ); aDlg->Execute(); bHandled = true; } diff --git a/filter/source/svg/svgfontexport.cxx b/filter/source/svg/svgfontexport.cxx index bd97906c37f3..4d565088f280 100644 --- a/filter/source/svg/svgfontexport.cxx +++ b/filter/source/svg/svgfontexport.cxx @@ -78,7 +78,7 @@ SVGFontExport::GlyphSet& SVGFontExport::implGetGlyphSet( const vcl::Font& rFont void SVGFontExport::implCollectGlyphs() { - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; ObjectVector::const_iterator aIter( maObjects.begin() ); pVDev->EnableOutput( false ); @@ -189,7 +189,7 @@ void SVGFontExport::implEmbedFont( const vcl::Font& rFont ) SvXMLElementExport aExp( mrExport, XML_NAMESPACE_NONE, "defs", true, true ); OUString aCurIdStr( aEmbeddedFontStr ); OUString aUnitsPerEM( OUString::number( nFontEM ) ); - ScopedVclPtr pVDev( new VirtualDevice() ); + ScopedVclPtrInstance< VirtualDevice > pVDev; vcl::Font aFont( rFont ); aFont.SetSize( Size( 0, nFontEM ) ); diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index d889b1473c69..a5597e50f54b 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -242,7 +242,7 @@ void XMLFilterSettingsDialog::onNew() aTempInfo.maDocumentService = "com.sun.star.text.TextDocument"; // execute XML Filter Dialog - ScopedVclPtr aDlg(new XMLFilterTabDialog( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo ) ); + ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, &aTempInfo ); if ( aDlg->Execute() == RET_OK ) { // insert the new filter @@ -263,7 +263,7 @@ void XMLFilterSettingsDialog::onEdit() filter_info_impl* pOldInfo = static_cast(pEntry->GetUserData()); // execute XML Filter Dialog - ScopedVclPtr aDlg(new XMLFilterTabDialog( this, *getXSLTDialogResMgr(), mxContext, pOldInfo ) ); + ScopedVclPtrInstance< XMLFilterTabDialog > aDlg( this, *getXSLTDialogResMgr(), mxContext, pOldInfo ); if ( aDlg->Execute() == RET_OK ) { filter_info_impl* pNewInfo = aDlg->getNewFilterInfo(); @@ -788,7 +788,7 @@ void XMLFilterSettingsDialog::onTest() { filter_info_impl* pInfo = static_cast(pEntry->GetUserData()); - ScopedVclPtr aDlg(new XMLFilterTestDialog(this, mxContext)); + ScopedVclPtrInstance< XMLFilterTestDialog > aDlg(this, mxContext); aDlg->test( *pInfo ); } } @@ -806,7 +806,7 @@ void XMLFilterSettingsDialog::onDelete() OUString aMessage(RESIDSTR(STR_WARN_DELETE)); aMessage = aMessage.replaceFirst( aPlaceHolder, pInfo->maFilterName ); - ScopedVclPtr aWarnBox(new WarningBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage )); + ScopedVclPtrInstance< WarningBox > aWarnBox(this, (WinBits)(WB_YES_NO | WB_DEF_YES), aMessage ); if( aWarnBox->Execute() == RET_YES ) { try @@ -936,7 +936,7 @@ void XMLFilterSettingsDialog::onSave() aMsg = aMsg.replaceFirst( sPlaceholder, aURL.GetName() ); } - ScopedVclPtr aBox(new InfoBox(this, aMsg )); + ScopedVclPtrInstance< InfoBox > aBox(this, aMsg ); aBox->Execute(); } } @@ -1002,7 +1002,7 @@ void XMLFilterSettingsDialog::onOpen() aMsg = aMsg.replaceFirst( sPlaceholder, OUString::number( nFilters ) ); } - ScopedVclPtr aBox(new InfoBox(this, aMsg )); + ScopedVclPtrInstance< InfoBox > aBox(this, aMsg ); aBox->Execute(); } } diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 73caf6c297ac..eb1eae879e06 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -265,7 +265,7 @@ bool XMLFilterTabDialog::onOk() aMessage = aMessage.replaceAll( "%s", aReplace1 ); } - ScopedVclPtr aBox(new MessageDialog(this, aMessage)); + ScopedVclPtrInstance< MessageDialog > aBox(this, aMessage); aBox->Execute(); if( pFocusWindow ) -- cgit