diff options
Diffstat (limited to 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/desktop.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index c49b62f4cf14..68dc24da2abd 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -26,7 +26,6 @@ #include <vector> #include <classes/framecontainer.hxx> -#include <threadhelp/transactionbase.hxx> #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> @@ -49,6 +48,7 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/propshlp.hxx> +#include <threadhelp/transactionmanager.hxx> #include <unotools/cmdoptions.hxx> namespace framework{ @@ -95,7 +95,6 @@ typedef cppu::WeakComponentImplHelper< css::frame::XUntitledNumbers > Desktop_BASE; class Desktop : private cppu::BaseMutex, - private TransactionBase, public Desktop_BASE, public cppu::OPropertySetHelper { @@ -377,6 +376,8 @@ class Desktop : private cppu::BaseMutex, private: + mutable TransactionManager m_aTransactionManager; + /** check flag to protect us against dispose before terminate! * see dispose() for further information! */ |