summaryrefslogtreecommitdiff
path: root/svx/inc
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2005-03-08 14:08:27 +0000
committerVladimir Glazounov <vg@openoffice.org>2005-03-08 14:08:27 +0000
commit13db37c381318571c54f6e1fdb2d2b28cc76573a (patch)
tree1d2fa963b8e65da372f21ad4380dd6deb3d37307 /svx/inc
parent474ed58a6cae03024580f1bc5240fa4c6a83a5ce (diff)
INTEGRATION: CWS iha07 (1.3.30); FILE MERGED
2005/02/18 14:16:12 iha 1.3.30.1: #i41753# custom shapes toolboxes are not highlighted in action mode
Diffstat (limited to 'svx/inc')
-rw-r--r--svx/inc/tbxcustomshapes.hxx21
1 files changed, 12 insertions, 9 deletions
diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/tbxcustomshapes.hxx
index c1ba832c30ef..48df2c07b0e1 100644
--- a/svx/inc/tbxcustomshapes.hxx
+++ b/svx/inc/tbxcustomshapes.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: tbxcustomshapes.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: kz $ $Date: 2005-01-21 15:39:31 $
+ * last change: $Author: vg $ $Date: 2005-03-08 15:08:27 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -77,12 +77,6 @@
class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{
-private:
-
- const sal_uInt16 nSlotId;
- rtl::OUString aLastAction;
- rtl::OUString aSubTbxResName;
-
public:
virtual void Select( BOOL bMod1 = FALSE );
virtual void StateChanged( USHORT nSID, SfxItemState eState,
@@ -95,7 +89,16 @@ public:
SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
~SvxTbxCtlCustomShapes() {}
- void SetLastAction( const rtl::OUString& rAction ) { aLastAction = rAction; }
+ //interface XSubToolbarController:
+ virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException);
+
+private:
+ rtl::OUString m_aSubTbName;
+ rtl::OUString m_aSubTbxResName;
+ rtl::OUString m_aCommand;
};