mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify pFilterConfigItem to a smart pointer

Browse Source 
Change-Id: Ie964f064f4f5d3735878c2a6b4f6d4b801a8e8e9
Reviewed-on: https://gerrit.libreoffice.org/31195
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Mark Page
2016-11-25 10:50:33 +00:00
committed by Noel Grandin
parent 9b1d370710
commit ca48cb1dfa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vcl/source/filter/graphicfilter.cxx
View File

@@ -19,6 +19,7 @@
#include <config_folders.h> #include <config_folders.h>
#include <o3tl/make_unique.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx> #include <comphelper/string.hxx>
@@ -1337,7 +1338,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
GfxLinkType eLinkType = GfxLinkType::NONE; GfxLinkType eLinkType = GfxLinkType::NONE;
bool bDummyContext = rGraphic.IsDummyContext(); bool bDummyContext = rGraphic.IsDummyContext();
const bool bLinkSet = rGraphic.IsLink(); const bool bLinkSet = rGraphic.IsLink();
FilterConfigItem* pFilterConfigItem = nullptr; std::unique_ptr<FilterConfigItem> pFilterConfigItem;
Size aPreviewSizeHint( 0, 0 ); Size aPreviewSizeHint( 0, 0 );
bool bAllowPartialStreamRead = false; bool bAllowPartialStreamRead = false;
@@ -1726,13 +1727,13 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
if( nFormat != GRFILTER_FORMAT_DONTKNOW ) if( nFormat != GRFILTER_FORMAT_DONTKNOW )
{ {
aShortName = GetImportFormatShortName( nFormat ).toAsciiUpperCase(); aShortName = GetImportFormatShortName( nFormat ).toAsciiUpperCase();
if ( ( pFilterConfigItem == nullptr ) && aShortName == "PCD" ) if ( ( !pFilterConfigItem ) && aShortName == "PCD" )
{ {
OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Import/PCD" ); OUString aFilterConfigPath( "Office.Common/Filter/Graphic/Import/PCD" );
pFilterConfigItem = new FilterConfigItem( aFilterConfigPath ); pFilterConfigItem = o3tl::make_unique<FilterConfigItem>( aFilterConfigPath );
} }
} }
if( !(*pFunc)( rIStream, rGraphic, pFilterConfigItem ) ) if( !(*pFunc)( rIStream, rGraphic, pFilterConfigItem.get() ) )
nStatus = GRFILTER_FORMATERROR; nStatus = GRFILTER_FORMATERROR;
else else
{ {
@@ -1790,7 +1791,6 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const OUString& rPat
rGraphic.Clear(); rGraphic.Clear();
} }
delete pFilterConfigItem;
return nStatus; return nStatus;
} }