strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwk29 (1.34.66); FILE MERGED

Browse source 
2005/12/12 09:41:58 as 1.34.66.1: #120310# use right TransactionManager instance ... and use it right
This commit is contained in:
Rüdiger Timm 2006-02-07 09:23:32 +00:00
parent b4a275335b
commit 2157d6b494
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
framework/inc/services/frame.hxx
View file

@ -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
{
//-------------------------------------------------------------------------------------------------------------