diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2014-09-26 11:59:04 +0900 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-26 08:20:19 +0000 |
| commit | b75b473e2ce6120d58023ee740b41cda35299d00 (patch) | |
| tree | 0ecae82a867fc2cffb35ccb3c695028a6a7dcb6e /include | |
| parent | 22730b9f485fe23266d6d5e789dbc00c4f4cc5e4 (diff) | |
fdo#75757: remove inheritance to std::vector
from SfxFoundCacheArr_Impl, by typedef'ing it as
boost::ptr_vector<SfxFoundCache_Impl>.
Change-Id: Id0e50370b440fb53dbb56dabca9743b27a08b90d
Reviewed-on: https://gerrit.libreoffice.org/11650
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/bindings.hxx | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index b1f1f0a21084..0bccd70bb78b 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <vector> +#include <boost/ptr_container/ptr_vector.hpp> // some other includes @@ -50,8 +51,6 @@ class SfxDispatcher; class SfxBindings; class SfxBindings_Impl; class Timer; -struct SfxFoundCache_Impl; -class SfxFoundCacheArr_Impl; class SfxWorkWindow; class SfxUnoControllerItem; @@ -74,6 +73,22 @@ enum SfxPopupAction SFX_POPUP_SHOW }; +struct SfxFoundCache_Impl +{ + sal_uInt16 nSlotId; // the Slot-Id + sal_uInt16 nWhichId; // If available: Which-Id, else: nSlotId + const SfxSlot* pSlot; // Pointer to <Master-Slot> + SfxStateCache* pCache; // Pointer to StatusCache, if possible NULL + + SfxFoundCache_Impl(sal_uInt16 nS, sal_uInt16 nW, const SfxSlot *pS, SfxStateCache *pC ): + nSlotId(nS), + nWhichId(nW), + pSlot(pS), + pCache(pC) + {} +}; + +typedef boost::ptr_vector<SfxFoundCache_Impl> SfxFoundCacheArr_Impl; class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster @@ -117,7 +132,7 @@ private: SAL_DLLPRIVATE void Update_Impl( SfxStateCache* pCache ); SAL_DLLPRIVATE void UpdateControllers_Impl( const SfxInterface* pIF, - const SfxFoundCache_Impl* pFound, + const SfxFoundCache_Impl& rFound, const SfxPoolItem *pItem, SfxItemState eItemState ); SAL_DLLPRIVATE SfxStateCache* GetStateCache( sal_uInt16 nId, sal_uInt16 *pPos); |