diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:28 +0000 |
| commit | 70a9a71efa55b50062a6237f0dbaf64dbb8e6c74 (patch) | |
| tree | f73d364c99365a279ab677ecfcdf31a31bd0cebb /framework | |
| parent | a5a36bf1759ab610165d15da5244333cb5e27955 (diff) | |
INTEGRATION: CWS binfilter (1.1.136); FILE MERGED
2004/04/19 09:46:21 aw 1.1.136.2: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
2003/07/18 12:22:46 aw 1.1.136.1: #110897#
See the task. All changes to avoid usage of getProcessServiceManager().
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/helper/actiontriggerhelper.hxx | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/helper/actiontriggerhelper.hxx index abe79d9e5fad..a3891649842f 100644 --- a/framework/inc/helper/actiontriggerhelper.hxx +++ b/framework/inc/helper/actiontriggerhelper.hxx @@ -2,9 +2,9 @@ * * $RCSfile: actiontriggerhelper.hxx,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: cd $ $Date: 2001-12-04 07:41:59 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:17:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,11 @@ #include <com/sun/star/container/XIndexContainer.hpp> #endif +// #110897# +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif + #ifndef _SV_MENU_HXX #include <vcl/menu.hxx> #endif @@ -93,8 +98,11 @@ namespace framework // // @param pNewMenu = Must be a valid menu. Please be aware that this implementation is based on // the above mentioned restriction!!! + + // #110897# static com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > CreateActionTriggerContainerFromMenu( - const Menu* pMenu ); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const Menu* pMenu ); // Fills the submitted rActionTriggerContainer with the structure of the menu // provided as the second parameter |