diff options
| author | obo <obo@openoffice.org> | 2010-06-15 10:26:12 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-15 10:26:12 +0200 |
| commit | 56f57bd9fe0ce39492edf1e9c26faa9fc2abce4d (patch) | |
| tree | 72c2f6e4450e4d34b1af4c9ee775d6846ba0d02c /framework/inc | |
| parent | 6093b32cbee907c6cc959b64f4e6f0bf0de8fc89 (diff) | |
| parent | 88d7f9fbe416d0f4c5edc4a9b5c9560d1d82167b (diff) | |
CWS-TOOLING: integrate CWS fwk139
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/classes/menumanager.hxx | 3 | ||||
| -rw-r--r-- | framework/inc/uielement/toolbarmanager.hxx | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx index 5c14edde9c03..8826716f1d6f 100644 --- a/framework/inc/classes/menumanager.hxx +++ b/framework/inc/classes/menumanager.hxx @@ -82,13 +82,14 @@ class MenuManager : public ThreadHelpBase , Menu* pMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); - +#if 0 MenuManager( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, REFERENCE< XFRAME >& rFrame, AddonMenu* pAddonMenu, sal_Bool bDelete, sal_Bool bDeleteChildren ); +#endif virtual ~MenuManager(); diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index e7d670e9559b..5e780edb366b 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -60,6 +60,9 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> +//shizhoubo +#include <com/sun/star/frame/XToolbarController.hpp> +//end //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ @@ -185,6 +188,9 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetPropsForCommand( const ::rtl::OUString& rCmdURL ); void CreateControllers(); void UpdateControllers(); + //for update controller via Support Visiable by shizhoubo + void UpdateController( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XToolbarController > xController); + //end void AddFrameActionListener(); void AddImageOrientationListener(); void UpdateImageOrientation(); |