diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:16 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:17:16 +0000 |
| commit | a5a36bf1759ab610165d15da5244333cb5e27955 (patch) | |
| tree | 5c257a63b03c7a55d4165492fbda690560726b1b /framework | |
| parent | 96ae619c1aa0d86487e685b6b55ada4adc851f27 (diff) | |
INTEGRATION: CWS binfilter (1.6.124); FILE MERGED
2004/04/19 09:46:21 aw 1.6.124.3: #110098#
Necessary adaptions to framework after resynching binfilter to SRC680m33
2004/02/05 13:27:49 aw 1.6.124.2: RESYNC: (1.6-1.7); FILE MERGED
2003/07/18 12:22:43 aw 1.6.124.1: #110897#
See the task. All changes to avoid usage of getProcessServiceManager().
Diffstat (limited to 'framework')
| -rwxr-xr-x | framework/inc/classes/toolboxconfiguration.hxx | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/framework/inc/classes/toolboxconfiguration.hxx b/framework/inc/classes/toolboxconfiguration.hxx index b92a3a239747..94e2b698c9ff 100755 --- a/framework/inc/classes/toolboxconfiguration.hxx +++ b/framework/inc/classes/toolboxconfiguration.hxx @@ -20,6 +20,10 @@ #include <vcl/toolbox.hxx> #endif +// #110897# +#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#endif namespace framework { @@ -78,10 +82,25 @@ SV_DECL_PTRARR_DEL( ToolBoxLayoutDescriptor, ToolBoxLayoutItemDescriptorPtr, 10, class ToolBoxConfiguration { public: - static sal_Bool LoadToolBox( SvStream& rInStream, ToolBoxDescriptor& aItems ); - static sal_Bool StoreToolBox( SvStream& rOutStream, const ToolBoxDescriptor& aItems ); - static sal_Bool LoadToolBoxLayout( SvStream& rInStream, ToolBoxLayoutDescriptor& aItems ); - static sal_Bool StoreToolBoxLayout( SvStream& rOutStream, ToolBoxLayoutDescriptor& aItems ); + // #110897# + static sal_Bool LoadToolBox( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + SvStream& rInStream, ToolBoxDescriptor& aItems ); + + // #110897# + static sal_Bool StoreToolBox( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + SvStream& rOutStream, const ToolBoxDescriptor& aItems ); + + // #110897# + static sal_Bool LoadToolBoxLayout( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + SvStream& rInStream, ToolBoxLayoutDescriptor& aItems ); + + // #110897# + static sal_Bool StoreToolBoxLayout( + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, + SvStream& rOutStream, ToolBoxLayoutDescriptor& aItems ); }; } // namespace framework |