diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:21:15 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:21:15 +0000 |
| commit | c9fef8f10b267c0e4be16e61b8fdc78fdfa150bb (patch) | |
| tree | f2aa97c34b5cfe23de260cbba39fb15f3bb721eb /framework/source | |
| parent | f2c1093b03e526d8bd7ecef3ab8e9a1f5acb4d6c (diff) | |
INTEGRATION: CWS binfilter (1.2.124); FILE MERGED
2004/04/19 09:46:26 aw 1.2.124.2: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
2003/07/18 12:22:53 aw 1.2.124.1: #110897#
See the task. All changes to avoid usage of getProcessServiceManager().
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/helper/actiontriggerhelper.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx index 2b7058a7969d..7e745ed1c759 100644 --- a/framework/source/helper/actiontriggerhelper.cxx +++ b/framework/source/helper/actiontriggerhelper.cxx @@ -2,9 +2,9 @@ * * $RCSfile: actiontriggerhelper.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2002-06-27 07:28:56 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:21:15 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -453,9 +453,12 @@ void ActionTriggerHelper::FillActionTriggerContainerFromMenu( FillActionTriggerContainerWithMenu( pMenu, xActionTriggerContainer ); } -Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( const Menu* pMenu ) +Reference< XIndexContainer > ActionTriggerHelper::CreateActionTriggerContainerFromMenu( + // #110897# + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + const Menu* pMenu ) { - return new RootActionTriggerContainer( pMenu, ::comphelper::getProcessServiceFactory() ); + return new RootActionTriggerContainer( pMenu, xServiceFactory ); } } |