diff options
| author | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-06 13:32:29 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@collabora.com> | 2014-12-06 14:41:26 -0500 |
| commit | 5ae4cc92bd6660ccf36ff6cc45f96fa267514f1b (patch) | |
| tree | 06430d84c813749bbdb72273b979d7311a9063d8 /include/sfx2 | |
| parent | 9fb6174bb177ede8d393349a4e74d1dca953ad67 (diff) | |
Forward-declare SfxInPlaceClientList and remove <vector> include.
Change-Id: I4e611820a4dae4341f971a545578048b52d7e37c
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/viewsh.hxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 20114cfac991..77353f6a62cd 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -35,7 +35,6 @@ #include <tools/gen.hxx> #include <tools/errcode.hxx> #include <vcl/jobset.hxx> -#include <vector> class SfxBaseController; class Size; @@ -122,8 +121,7 @@ public: \ DocClass::Factory().RegisterViewFactory( *Factory() ) class SfxInPlaceClient; -typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList; - +class SfxInPlaceClientList; class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener { @@ -169,6 +167,8 @@ private: /// SfxInterface initializer. static void InitInterface_Impl(); + SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( bool bCreate = true ) const; + public: SfxViewShell( SfxViewFrame *pFrame, sal_uInt16 nFlags = 0 ); @@ -284,10 +284,8 @@ public: SAL_DLLPRIVATE void RemoveContextMenuInterceptor_Impl( const ::com::sun::star::uno::Reference < ::com::sun::star::ui::XContextMenuInterceptor >& xInterceptor ); SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); - SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) - { GetIPClientList_Impl(true)->push_back(pIPClient); } + SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ); SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient ); - SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( bool bCreate = true ) const; SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP ); SAL_DLLPRIVATE void DiscardClients_Impl(); |