diff options
author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-20 18:58:34 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:01:49 +0100 |
commit | ad8a2074c6143d3ce05c0a5d93a553c13b950520 (patch) | |
tree | 2f47189a78e80d478a15a3360906131fc9c16428 /svtools/source | |
parent | 8fb4672aef888fc5a582ca9508799ecdbe777c42 (diff) |
cure a lot of unfortunate ScopedVclPtrs.
Change-Id: I2149511f958ba75e81dc41b10b01eb9d19610037
Diffstat (limited to 'svtools/source')
-rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 2 | ||||
-rw-r--r-- | svtools/source/graphic/provider.cxx | 2 | ||||
-rw-r--r-- | svtools/source/misc/sampletext.cxx | 2 | ||||
-rw-r--r-- | svtools/source/table/gridtablerenderer.cxx | 2 |
5 files changed, 4 insertions, 6 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index dd6df462b05e..a78b1141203b 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -58,8 +58,6 @@ namespace } } - - void BrowseBox::ConstructImpl( BrowserMode nMode ) { OSL_TRACE( "BrowseBox: %p->ConstructImpl", this ); diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index eb7819814dd8..b923ab34bd57 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -1894,7 +1894,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c // First combine very small bitmaps into a larger tile - ScopedVclPtr<VirtualDevice> aVDev = new VirtualDevice; + ScopedVclPtr<VirtualDevice> aVDev( new VirtualDevice() ); const int nNumTilesInCacheX( (nTileCacheSize1D + rSizePixel.Width()-1) / rSizePixel.Width() ); const int nNumTilesInCacheY( (nTileCacheSize1D + rSizePixel.Height()-1) / rSizePixel.Height() ); diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 52e21499cc9d..e144f6bdea4b 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -634,7 +634,7 @@ void ImplApplyFilterData( ::Graphic& rGraphic, uno::Sequence< beans::PropertyVal } else if ( ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE ) && nImageResolution ) { - ScopedVclPtr<VirtualDevice> aDummyVDev = new VirtualDevice; + ScopedVclPtr<VirtualDevice> aDummyVDev( new VirtualDevice() ); GDIMetaFile aMtf( rGraphic.GetGDIMetaFile() ); Size aMtfSize( OutputDevice::LogicToLogic( aMtf.GetPrefSize(), aMtf.GetPrefMapMode(), MAP_100TH_MM ) ); if ( aMtfSize.Width() && aMtfSize.Height() ) diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index a1cb7a83d111..889103dc9efe 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1623,7 +1623,7 @@ OUString makeRepresentativeTextForFont(sal_Int16 nScriptType, const vcl::Font &r { OUString sRet(makeRepresentativeTextForLanguage(rFont.GetLanguage())); - ScopedVclPtr<VirtualDevice> aDevice = new VirtualDevice; + ScopedVclPtr<VirtualDevice> aDevice( new VirtualDevice() ); if (sRet.isEmpty() || (-1 != aDevice->HasGlyphs(rFont, sRet))) { aDevice->SetFont(rFont); diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index 4f4ad26a4415..b36ac6d9cf8a 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -86,7 +86,7 @@ namespace svt { namespace table Point const aBitmapPos( 0, 0 ); Size const aBitmapSize( nSortIndicatorWidth, nSortIndicatorHeight ); - ScopedVclPtr<VirtualDevice> aDevice = new VirtualDevice( i_device, 0, 0 ); + ScopedVclPtr<VirtualDevice> aDevice( new VirtualDevice( i_device, 0, 0 ) ); aDevice->SetOutputSizePixel( aBitmapSize ); DecorationView aDecoView( aDevice.get() ); |