diff options
| -rw-r--r-- | include/sfx2/frmdescr.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/frmdescr.cxx | 20 |
2 files changed, 7 insertions, 15 deletions
diff --git a/include/sfx2/frmdescr.hxx b/include/sfx2/frmdescr.hxx index 8433afa93887..cd0184c1f2e4 100644 --- a/include/sfx2/frmdescr.hxx +++ b/include/sfx2/frmdescr.hxx @@ -66,7 +66,7 @@ class SFX2_DLLPUBLIC SfxFrameDescriptor ScrollingMode eScroll; bool bHasBorder; bool bHasBorderSet; - std::unique_ptr< SfxFrameDescriptor_Impl > pImpl; + std::unique_ptr<SfxItemSet> m_pArgs; public: SfxFrameDescriptor(); 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: */ |