diff options
| author | Xisco Fauli <anistenis@gmail.com> | 2016-05-22 15:37:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-23 13:11:28 +0000 |
| commit | fb5b0f59b9c923f235eb40b5cef69f8e9a1d9eeb (patch) | |
| tree | 103f1ca981ce9f290c4a44f412b9d78a0176c4dc /sfx2 | |
| parent | 58544f07e133356d6109dab8a7d1168c91289cfe (diff) | |
tdf#89329: use unique_ptr for pImpl in frmdescr
Change-Id: I337e1ee34fe1571ca75c8ff8762b5d43fecc2cb4
Reviewed-on: https://gerrit.libreoffice.org/25310
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 8b67a02a3e2c..86c654a8b206 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -49,22 +49,20 @@ SfxFrameDescriptor::SfxFrameDescriptor() : bResizeHorizontal( true ), bResizeVertical( true ), bHasUI( true ), - bReadOnly( false ) + bReadOnly( false ), + pImpl( new SfxFrameDescriptor_Impl ) { - - pImp = new SfxFrameDescriptor_Impl; } SfxFrameDescriptor::~SfxFrameDescriptor() { - delete pImp; } SfxItemSet* SfxFrameDescriptor::GetArgs() { - if( !pImp->pArgs ) - pImp->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() ); - return pImp->pArgs; + if( !pImpl->pArgs ) + pImpl->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() ); + return pImpl->pArgs; } void SfxFrameDescriptor::SetURL( const OUString& rURL ) @@ -76,8 +74,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL ) void SfxFrameDescriptor::SetActualURL( const OUString& rURL ) { aActualURL = INetURLObject(rURL); - if ( pImp->pArgs ) - pImp->pArgs->ClearItem(); + if ( pImpl->pArgs ) + pImpl->pArgs->ClearItem(); } void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL ) @@ -87,12 +85,12 @@ void SfxFrameDescriptor::SetActualURL( const INetURLObject& rURL ) void SfxFrameDescriptor::SetEditable( bool bSet ) { - pImp->bEditable = bSet; + pImpl->bEditable = bSet; } bool SfxFrameDescriptor::IsEditable() const { - return pImp->bEditable; + return pImpl->bEditable; } SfxFrameDescriptor* SfxFrameDescriptor::Clone() const @@ -113,13 +111,13 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone() const pFrame->bHasUI = bHasUI; pFrame->SetReadOnly( IsReadOnly() ); pFrame->SetEditable( IsEditable() ); - if ( pImp->pWallpaper ) - pFrame->pImp->pWallpaper = new Wallpaper( *pImp->pWallpaper ); - if( pImp->pArgs ) + if ( pImpl->pWallpaper ) + pFrame->pImpl->pWallpaper = new Wallpaper( *pImpl->pWallpaper ); + if( pImpl->pArgs ) { // Currently in the clone of SfxAllItemSets there is still a bug ... - pFrame->pImp->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() ); - pFrame->pImp->pArgs->Put(*pImp->pArgs); + pFrame->pImpl->pArgs = new SfxAllItemSet( SfxGetpApp()->GetPool() ); + pFrame->pImpl->pArgs->Put(*pImpl->pArgs); } pFrame->nItemId = nItemId; @@ -129,10 +127,10 @@ SfxFrameDescriptor* SfxFrameDescriptor::Clone() const void SfxFrameDescriptor::SetWallpaper( const Wallpaper& rWallpaper ) { - DELETEZ( pImp->pWallpaper ); + DELETEZ( pImpl->pWallpaper ); if ( rWallpaper.GetStyle() != WallpaperStyle::NONE ) - pImp->pWallpaper = new Wallpaper( rWallpaper ); + pImpl->pWallpaper = new Wallpaper( rWallpaper ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |