summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/colorwindow.hxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-06 12:17:51 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-06 12:17:51 +0000
commitd294b6f2b1f96fbd9874d246ff4b26e112e120d6 (patch)
treec0a4aa539d9a95d91e7de5efc000cc08b4ed3e32 /svx/source/tbxctrls/colorwindow.hxx
parent0d295e1c78c7697e18a5e3401a3c64e43565fe23 (diff)
INTEGRATION: CWS docking1 (1.2.60); FILE MERGED
2004/06/05 18:34:34 cd 1.2.60.3: #i26252# Adapt controller to support life-time management of floating window of base class 2004/05/29 21:37:23 cd 1.2.60.2: RESYNC: (1.2-1.3); FILE MERGED 2004/05/03 12:50:02 cd 1.2.60.1: #i26252# Make changes for new toolbar controller
Diffstat (limited to 'svx/source/tbxctrls/colorwindow.hxx')
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx35
1 files changed, 24 insertions, 11 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 83cddfe92a7f..2699c8d7b908 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -13,12 +13,22 @@
#ifndef _SFXLSTNER_HXX
#include <svtools/lstner.hxx>
#endif
+#include <rtl/ustring.hxx>
-class SvxColorWindow_Impl : public SfxPopupWindow, public SfxListener
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#include <com/sun/star/frame/XFrame.hpp>
+#endif
+
+//========================================================================
+// class SvxColorWindow_Impl --------------------------------------------------
+//========================================================================
+
+class SvxColorWindow_Impl : public SfxPopupWindow
{
private:
- const USHORT theSlotId;
- ValueSet aColorSet;
+ const USHORT theSlotId;
+ ValueSet aColorSet;
+ rtl::OUString maCommand;
#if _SOLAR__PRIVATE
DECL_LINK( SelectHdl, void * );
@@ -29,15 +39,15 @@ protected:
virtual BOOL Close();
public:
- SvxColorWindow_Impl( USHORT nId, USHORT nSlotId,
- const String& rWndTitle,
- SfxBindings& rBindings );
+ SvxColorWindow_Impl( const rtl::OUString& rCommand,
+ USHORT nSlotId,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+ const String& rWndTitle );
~SvxColorWindow_Impl();
- void StartSelection();
+ void StartSelection();
- virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType,
- const SfxHint& rHint, const TypeId& rHintType );
virtual void KeyInput( const KeyEvent& rKEvt );
+ virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual SfxPopupWindow* Clone() const;
};
@@ -53,8 +63,10 @@ public:
class SvxTbxButtonColorUpdater_Impl
{
public:
- SvxTbxButtonColorUpdater_Impl( USHORT nTbxBtnId,
- ToolBox* ptrTbx, USHORT nMode = 0 );
+ SvxTbxButtonColorUpdater_Impl( USHORT nSlotId,
+ USHORT nTbxBtnId,
+ ToolBox* ptrTbx,
+ USHORT nMode = 0 );
~SvxTbxButtonColorUpdater_Impl();
void Update( const Color& rColor );
@@ -65,6 +77,7 @@ protected:
private:
USHORT mnDrawMode;
USHORT mnBtnId;
+ USHORT mnSlotId;
ToolBox* mpTbx;
Color maCurColor;
Rectangle maUpdRect;