diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-02 10:03:24 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-12-02 13:36:19 +0100 |
| commit | c5f8cca27aedff9a936cdbd3e0d258f0bbf3f146 (patch) | |
| tree | a70bca467c2978c2ef701dc598c2200745502813 /framework/inc/services | |
| parent | a9e04c08b8b3baa943acf69e5456701dce78041c (diff) | |
loplugin:mergeclasses TransactionBase with Desktop
Change-Id: Ied33d099f89c767420f6fcb9342151d9a8356920
Reviewed-on: https://gerrit.libreoffice.org/84196
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
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! */ |