[Libreoffice-commits] core.git: Branch 'feature/vclptr' - filter/source

Michael Meeks michael.meeks at collabora.com
Fri Apr 17 04:23:26 PDT 2015


 filter/source/graphicfilter/ios2met/ios2met.cxx       |    2 +-
 filter/source/graphicfilter/ipict/ipict.cxx           |    2 +-
 filter/source/svg/impsvgdialog.cxx                    |   14 +++++++-------
 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |    2 +-
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |    6 +++---
 filter/source/xsltdialog/xmlfiltertabdialog.cxx       |    4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 9e43761446db5b085dbabea5df00f6fc253167ac
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 17 12:19:15 2015 +0100

    filter: convert new to ::Create.
    
    Change-Id: I6cea3011ff3c89c95fa19cc4264b43779aa0e0a9

diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 9e8b894..cecaf1f 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -2609,7 +2609,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF
 
     pOrdFile=NULL;
 
-    pVirDev = new VirtualDevice();
+    pVirDev = VclPtr<VirtualDevice>::Create();
     pVirDev->EnableOutput(false);
     rGDIMetaFile.Record(pVirDev);
 
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index a578272..f88fff3 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -1881,7 +1881,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
 
     aHRes = aVRes = Fraction( 1, 1 );
 
-    pVirDev = new VirtualDevice();
+    pVirDev = VclPtr<VirtualDevice>::Create();
     pVirDev->EnableOutput(false);
     rGDIMetaFile.Record(pVirDev);
 
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index c142178..2e70390 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -36,13 +36,13 @@ inline sal_Int32 implMap( vcl::Window& /*rWnd*/, sal_Int32 nVal )
 
 ImpSVGDialog::ImpSVGDialog( vcl::Window* pParent, Sequence< PropertyValue >& rFilterData ) :
     ModalDialog( pParent ),
-    maFI( new FixedLine(this) ),
-    maCBTinyProfile( new CheckBox(this) ),
-    maCBEmbedFonts( new CheckBox(this) ),
-    maCBUseNativeDecoration( new CheckBox(this) ),
-    maBTOK( new OKButton(this, WB_DEF_OK) ),
-    maBTCancel( new CancelButton(this) ),
-    maBTHelp( new HelpButton(this) ),
+    maFI( VclPtr<FixedLine>::Create(this) ),
+    maCBTinyProfile( VclPtr<CheckBox>::Create(this) ),
+    maCBEmbedFonts( VclPtr<CheckBox>::Create(this) ),
+    maCBUseNativeDecoration( VclPtr<CheckBox>::Create(this) ),
+    maBTOK( VclPtr<OKButton>::Create(this, WB_DEF_OK) ),
+    maBTCancel( VclPtr<CancelButton>::Create(this) ),
+    maBTHelp( VclPtr<HelpButton>::Create(this) ),
     maConfigItem( SVG_EXPORTFILTER_CONFIGPATH, &rFilterData ),
     mbOldNativeDecoration( false )
 {
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index 9ff555c..2ee2058 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -331,7 +331,7 @@ sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  ) throw(RuntimeException,
             pParent = VCLUnoHelper::GetWindow(mxParent);
 
         Reference< XComponent > xComp( this );
-        mpDialog = new XMLFilterSettingsDialog(pParent, mxContext);
+        mpDialog = VclPtr<XMLFilterSettingsDialog>::Create(pParent, mxContext);
         mpDialog->Execute();
     }
     else if( !mpDialog->IsVisible() )
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index a5597e5..514d337f 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -1356,12 +1356,12 @@ SvxPathControl::SvxPathControl(vcl::Window* pParent)
     : Window(pParent, WB_HIDE | WB_CLIPCHILDREN | WB_TABSTOP | WB_DIALOGCONTROL | WB_BORDER)
     , bHasBeenShown(false)
 {
-    m_pVBox = new VclVBox(this);
+    m_pVBox = VclPtr<VclVBox>::Create(this);
 
-    m_pHeaderBar = new HeaderBar(m_pVBox, WB_BOTTOMBORDER);
+    m_pHeaderBar = VclPtr<HeaderBar>::Create(m_pVBox, WB_BOTTOMBORDER);
     m_pHeaderBar->set_height_request(GetTextHeight() + 6);
 
-    m_pFocusCtrl = new XMLFilterListBox(m_pVBox, this);
+    m_pFocusCtrl = VclPtr<XMLFilterListBox>::Create(m_pVBox, this);
     m_pFocusCtrl->set_fill(true);
     m_pFocusCtrl->set_expand(true);
 
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index eb1eae8..ff725cc 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -56,13 +56,13 @@ XMLFilterTabDialog::XMLFilterTabDialog(vcl::Window *pParent, ResMgr& rResMgr,
     m_pTabCtrl->SetActivatePageHdl( LINK( this, XMLFilterTabDialog, ActivatePageHdl ) );
     m_pTabCtrl->SetDeactivatePageHdl( LINK( this, XMLFilterTabDialog, DeactivatePageHdl ) );
 
-    mpBasicPage = new XMLFilterTabPageBasic(m_pTabCtrl);
+    mpBasicPage = VclPtr<XMLFilterTabPageBasic>::Create(m_pTabCtrl);
     mpBasicPage->SetInfo( mpNewInfo );
 
     m_nBasicPageId = m_pTabCtrl->GetPageId("general");
     m_pTabCtrl->SetTabPage(m_nBasicPageId, mpBasicPage);
 
-    mpXSLTPage = new XMLFilterTabPageXSLT(m_pTabCtrl);
+    mpXSLTPage = VclPtr<XMLFilterTabPageXSLT>::Create(m_pTabCtrl);
     mpXSLTPage->SetInfo( mpNewInfo );
 
     m_nXSLTPageId = m_pTabCtrl->GetPageId("transformation");


More information about the Libreoffice-commits mailing list