diff options
author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-20 21:52:46 -0500 |
---|---|---|
committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-11-20 22:47:23 -0500 |
commit | 5314ece79ef8abd7d48b9e030d0a73ffac782da1 (patch) | |
tree | dcc913e270654806e5cabc6dc5ee0e58e3573096 | |
parent | 01e14bd403e749116844b6ab0b0a7afc66347e90 (diff) |
Make the ctor and dtor bodies non-inline.
Change-Id: Ie36e3dfa808aec96c080f981a5ad9f09a0720c2c
-rw-r--r-- | include/sfx2/childwin.hxx | 17 | ||||
-rw-r--r-- | sfx2/source/appl/childwin.cxx | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 4fe4c008ee6a..683ebd5e3519 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -94,7 +94,7 @@ struct SfxChildWinContextFactory typedef boost::ptr_vector<SfxChildWinContextFactory> SfxChildWinContextArr_Impl; -struct SfxChildWinFactory +struct SFX2_DLLPUBLIC SfxChildWinFactory { SfxChildWinCtor pCtor; // Factory method sal_uInt16 nId; // ChildWindow-Id ( SlotId ) @@ -102,19 +102,8 @@ struct SfxChildWinFactory sal_uInt16 nPos; // Position in UI SfxChildWinContextArr_Impl *pArr; // Array for Contexts - SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, - sal_uInt16 n ) - : pCtor(pTheCtor) - , nId( nID ) - , nPos(n) - , pArr( NULL ) - {} - - ~SfxChildWinFactory() - { - delete pArr; - } - + SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, sal_uInt16 n ); + ~SfxChildWinFactory(); }; class FloatingWindow; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 66d2bb39a53c..d4821d2d92e2 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -40,6 +40,19 @@ static const sal_uInt16 nVersion = 2; +SfxChildWinFactory::SfxChildWinFactory( SfxChildWinCtor pTheCtor, sal_uInt16 nID, + sal_uInt16 n ) + : pCtor(pTheCtor) + , nId( nID ) + , nPos(n) + , pArr( NULL ) +{} + +SfxChildWinFactory::~SfxChildWinFactory() +{ + delete pArr; +} + struct SfxChildWindow_Impl { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; |