summaryrefslogtreecommitdiff
path: root/basctl/source/basicide/tbxctl.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-11-15 12:41:45 +0000
committerOliver Bolte <obo@openoffice.org>2004-11-15 12:41:45 +0000
commit3fb2302d99936270cd2dec4384b751bd9788e7a6 (patch)
tree18d958eb5b5df97f7e2635554738f768304141a8 /basctl/source/basicide/tbxctl.hxx
parent4a0e677df755793c95eed76aedbcc492b8e9c76e (diff)
INTEGRATION: CWS tbe13 (1.3.52); FILE MERGED
2004/11/03 17:03:34 tbe 1.3.52.1: #i36073# Insert Controls Toolbar disappears if Properties Window has been opened
Diffstat (limited to 'basctl/source/basicide/tbxctl.hxx')
-rw-r--r--basctl/source/basicide/tbxctl.hxx21
1 files changed, 17 insertions, 4 deletions
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index c359aa07ef5e..d878738fae5f 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tbxctl.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: obo $ $Date: 2004-07-06 12:19:41 $
+ * last change: $Author: obo $ $Date: 2004-11-15 13:41:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -61,14 +61,17 @@
#ifndef _BASIDE_TBXCTL_HXX
#define _BASIDE_TBXCTL_HXX
-
#ifndef _SFXTBXCTRL_HXX //autogen
#include <sfx2/tbxctrl.hxx>
#endif
-
#ifndef _SFXTBXMGR_HXX
#include <sfx2/tbxmgr.hxx>
#endif
+
+#ifndef _DRAFTS_COM_SUN_STAR_FRAME_XLAYOUTMANAGER_HPP_
+#include <drafts/com/sun/star/frame/XLayoutManager.hpp>
+#endif
+
/*
#ifdef _BASIDE_POPUPWINDOWTBX
@@ -101,8 +104,18 @@ public:
//-------------------
class TbxControls : public SfxToolBoxControl
{
+private:
+
+ struct StateChangedInfo
+ {
+ ::com::sun::star::uno::Reference< ::drafts::com::sun::star::frame::XLayoutManager > xLayoutManager;
+ bool bDisabled;
+ };
+
USHORT nLastSlot;
+ DECL_STATIC_LINK( TbxControls, StateChangedHdl_Impl, StateChangedInfo* );
+
protected:
virtual void StateChanged( USHORT nSID, SfxItemState eState,
const SfxPoolItem* pState );