diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-07 09:23:32 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-07 09:23:32 +0000 |
| commit | 2157d6b494a8ae3222f6c61e38b488d7e78c08b3 (patch) | |
| tree | 44956a014931b80eccada92c01b8591acccc9d50 /framework | |
| parent | b4a275335b0e653469523e15d9be4702b3e75ca2 (diff) | |
INTEGRATION: CWS fwk29 (1.34.66); FILE MERGED
2005/12/12 09:41:58 as 1.34.66.1: #120310# use right TransactionManager instance ... and use it right
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services/frame.hxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx index 00fd8aab7b32..0a4ba0b017a9 100644 --- a/framework/inc/services/frame.hxx +++ b/framework/inc/services/frame.hxx @@ -4,9 +4,9 @@ * * $RCSfile: frame.hxx,v $ * - * $Revision: 1.34 $ + * $Revision: 1.35 $ * - * last change: $Author: rt $ $Date: 2005-09-09 00:30:32 $ + * last change: $Author: rt $ $Date: 2006-02-07 10:23:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,6 +60,14 @@ #include <threadhelp/readguard.hxx> #endif +#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ +#include <threadhelp/threadhelpbase.hxx> +#endif + +#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_HXX_ +#include <threadhelp/transactionbase.hxx> +#endif + #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_ #include <macros/generic.hxx> #endif @@ -279,7 +287,9 @@ class Frame : // interfaces public css::frame::XComponentLoader , // base classes // Order is neccessary for right initialization of this class! - public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo + public ThreadHelpBase , + public TransactionBase , + public PropertySetHelper , // helper implements ThreadHelpbase, TransactionBase, XPropertySet, XPropertySetInfo public ::cppu::OWeakObject // helper implements XInterface, XWeak { //------------------------------------------------------------------------------------------------------------- |