diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-10 16:09:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-12-11 09:44:00 +0100 |
| commit | d35061b21b1ae4f1dcd5d451af831a6a00a3f3f0 (patch) | |
| tree | e6aac0f924f885ef42cace1e2b2bd8743374518e /toolkit | |
| parent | 28726190d52b0729339d7257b84b449fafa4c34e (diff) | |
loplugin:useuniqueptr in svtools,toolkits
Change-Id: Ied7768293e7781772205c9e8f9fb743a584e3125
Reviewed-on: https://gerrit.libreoffice.org/64880
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index a81b4a911664..ffe7363bd9f7 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -774,7 +774,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre // No data for the model may be added following the properties // Used for import of old parts in css::awt::FontDescriptor - css::awt::FontDescriptor* pFD = nullptr; + std::unique_ptr<css::awt::FontDescriptor> pFD; sal_uInt32 i; for ( i = 0; i < nProps; i++ ) @@ -911,7 +911,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre { if ( !pFD ) { - pFD = new css::awt::FontDescriptor; + pFD.reset(new css::awt::FontDescriptor); if ( maData.find( BASEPROPERTY_FONTDESCRIPTOR ) != maData.end() ) // due to defaults... maData[ BASEPROPERTY_FONTDESCRIPTOR ] >>= *pFD; } @@ -928,7 +928,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre { if ( !pFD ) { - pFD = new css::awt::FontDescriptor; + pFD.reset(new css::awt::FontDescriptor); if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } @@ -945,7 +945,7 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre { if ( !pFD ) { - pFD = new css::awt::FontDescriptor; + pFD.reset(new css::awt::FontDescriptor); if ( maData.find(BASEPROPERTY_FONTDESCRIPTOR) != maData.end() ) // due to defaults... maData[BASEPROPERTY_FONTDESCRIPTOR] >>= *pFD; } @@ -1015,7 +1015,6 @@ void UnoControlModel::read( const css::uno::Reference< css::io::XObjectInputStre css::uno::Any aValue; aValue <<= *pFD; setPropertyValue( GetPropertyName( BASEPROPERTY_FONTDESCRIPTOR ), aValue ); - delete pFD; } } |