diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:02:59 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-07-06 12:02:59 +0000 |
| commit | 18d1e5d40512d5fbc5465b3fac83ce4f41cf723b (patch) | |
| tree | 3278a2be80862faa23e4d2dd2c3e6c9a5415c2c1 /svx/inc | |
| parent | c4e7d4805464e6c014b394b90f733e64e595dda4 (diff) | |
INTEGRATION: CWS docking1 (1.2.654); FILE MERGED
2004/04/25 05:40:27 cd 1.2.654.1: #i26252# Transition of toolbar controllers
Diffstat (limited to 'svx/inc')
| -rw-r--r-- | svx/inc/clipboardctl.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/clipboardctl.hxx index 6b84ed1eaaad..2f12f0bb4658 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/clipboardctl.hxx @@ -2,9 +2,9 @@ * * $RCSfile: clipboardctl.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2002-09-20 13:06:57 $ + * last change: $Author: obo $ $Date: 2004-07-06 13:02:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,7 +79,7 @@ class SvxClipboardFmtItem; class SvxClipBoardControl : public SfxToolBoxControl { - SfxStatusForwarder aForwarder; +// SfxStatusForwarder aForwarder; SfxPoolItem* pClipboardFmtItem; PopupMenu* pPopup; USHORT nItemId; @@ -89,7 +89,7 @@ class SvxClipBoardControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxClipBoardControl( USHORT nId, ToolBox& rTbx, SfxBindings& rBind ); + SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); ~SvxClipBoardControl(); virtual SfxPopupWindowType GetPopupWindowType() const; |