diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-11-03 20:48:38 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-11-04 00:02:08 +0100 |
| commit | 8ce49eab696d830d420fbf48b22ac151167bbd62 (patch) | |
| tree | 7149b7897534e9f9e63ac4394949743ac6ea79dc /sfx2 | |
| parent | f218f8f6c8c587d2d78679f935093329f145fede (diff) | |
sfx2: Omit unnecessary indirection of SfxFrameDescriptor_Impl
Change-Id: I43c9df757d78420bd119a06e7f7224e40690b753
Reviewed-on: https://gerrit.libreoffice.org/44255
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Tested-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx index 143c8742b2f4..2912b57c529e 100644 --- a/sfx2/source/doc/frmdescr.cxx +++ b/sfx2/source/doc/frmdescr.cxx @@ -25,19 +25,11 @@ #include <sfx2/app.hxx> #include <memory> -struct SfxFrameDescriptor_Impl -{ - std::unique_ptr<SfxItemSet> pArgs; - - SfxFrameDescriptor_Impl() {} -}; - SfxFrameDescriptor::SfxFrameDescriptor() : aMargin( -1, -1 ), eScroll( ScrollingMode::Auto ), bHasBorder( true ), - bHasBorderSet( false ), - pImpl( new SfxFrameDescriptor_Impl ) + bHasBorderSet( false ) { } @@ -47,9 +39,9 @@ SfxFrameDescriptor::~SfxFrameDescriptor() SfxItemSet* SfxFrameDescriptor::GetArgs() { - if( !pImpl->pArgs ) - pImpl->pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) ); - return pImpl->pArgs.get(); + if( !m_pArgs ) + m_pArgs.reset( new SfxAllItemSet( SfxGetpApp()->GetPool() ) ); + return m_pArgs.get(); } void SfxFrameDescriptor::SetURL( const OUString& rURL ) @@ -61,8 +53,8 @@ void SfxFrameDescriptor::SetURL( const OUString& rURL ) void SfxFrameDescriptor::SetActualURL( const OUString& rURL ) { aActualURL = INetURLObject(rURL); - if ( pImpl->pArgs ) - pImpl->pArgs->ClearItem(); + if ( m_pArgs ) + m_pArgs->ClearItem(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |