summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-18 15:14:32 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-18 15:14:32 +0000
commitdea38c89e1c507cd0cd23d83e6d5dc8daf0f5dba (patch)
tree42ba3cb8768616eb9bbde56898e7bbc99ff446f6 /sfx2
parent7d73999a7bec4e618e3c7e26bb115c3097d61e45 (diff)
INTEGRATION: CWS fwkbugfix04 (1.6.6); FILE MERGED
2004/12/02 16:43:25 mba 1.6.6.1: #118655#: support for internal dispatching in StateCache
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/inc/statcach.hxx17
1 files changed, 14 insertions, 3 deletions
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index 171cef132155..4aa09ebd5fa3 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: statcach.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: obo $ $Date: 2004-11-17 13:38:08 $
+ * last change: $Author: kz $ $Date: 2005-01-18 16:14:32 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -116,7 +116,7 @@ public:
BindDispatch_Impl(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp,
const ::com::sun::star::util::URL& rURL,
- SfxStateCache* pStateCache );
+ SfxStateCache* pStateCache, const SfxSlot* pSlot );
SFX_DECL_XINTERFACE_XTYPEPROVIDER
@@ -133,6 +133,8 @@ class SfxStateCache
friend class BindDispatch_Impl;
BindDispatch_Impl* pDispatch;
sal_uInt16 nId; // Slot-Id
+ SfxControllerItem* pInternalController;
+ com::sun::star::uno::Reference < com::sun::star::frame::XDispatch > xMyDispatch;
SfxControllerItem* pController; // Ptr auf 1. gebundenen Controller (untereinander verkettet)
SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> Nicht auf Stack
SfxPoolItem* pLastItem; // zuletzt verschicktes Item, nie -1
@@ -170,6 +172,15 @@ public:
SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewBinding );
SfxControllerItem* GetItemLink() const;
+ void SetInternalController( SfxControllerItem* pCtrl )
+ { DBG_ASSERT( !pInternalController, "Only one internal controller allowed!" ); pInternalController = pCtrl; }
+ void ReleaseInternalController() { pInternalController = 0; }
+ SfxControllerItem* GetInternalController() const { return pInternalController; }
+ com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >
+ GetInternalDispatch() const
+ { return xMyDispatch; }
+ void SetInternalDispatch( const com::sun::star::uno::Reference < com::sun::star::frame::XDispatch >& rDisp )
+ { xMyDispatch = rDisp; }
};
//--------------------------------------------------------------------