summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-06 11:19:41 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-06 11:19:41 +0000
commitb3a53f6d9504c16ea1682b606338f023ba25465c (patch)
tree825e18c380dfcfa5ae42baa5b76b8019d872c471
parent9a6ce4e8d6e9d10d6c5398a4aa13afdc14cf3205 (diff)
INTEGRATION: CWS docking1 (1.2.40); FILE MERGED
2004/04/25 05:42:52 cd 1.2.40.1: #i26252# Transition of toolbar controllers
-rw-r--r--basctl/source/basicide/tbxctl.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index 7e25b1ccd7e2..c359aa07ef5e 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tbxctl.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: vg $ $Date: 2004-01-06 17:14:21 $
+ * last change: $Author: obo $ $Date: 2004-07-06 12:19:41 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -69,7 +69,7 @@
#ifndef _SFXTBXMGR_HXX
#include <sfx2/tbxmgr.hxx>
#endif
-
+/*
#ifdef _BASIDE_POPUPWINDOWTBX
// class PopupWindowTbx --------------------------------------------------
@@ -95,7 +95,7 @@ public:
virtual void PopupModeEnd();
};
#endif
-
+*/
//-------------------
// class TbxControls
//-------------------
@@ -109,7 +109,7 @@ protected:
public:
SFX_DECL_TOOLBOX_CONTROL();
- TbxControls(USHORT nId, ToolBox& rTbx, SfxBindings& rBind );
+ TbxControls(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
~TbxControls() {}
virtual SfxPopupWindowType GetPopupWindowType() const;