sw/source/core/docnode/swthreadmanager.cxx | 2 +-
sw/source/core/docnode/threadlistener.cxx | 2 +-
sw/source/core/docnode/threadmanager.cxx | 2 +-
sw/source/core/docnode/threadmanager.hxx | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b085d3561a84d2590ec52bec4a020566955c9689
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Wed Nov 1 18:13:54 2017 +0100
threadmanager.hxx is only included from sw/source/core/docnode
...but itself includes sw/source/core/docnode/cancellablejob.hxx, which only
happens to work because of -I$(dir $(3)) in gb_CObject__command_pattern (in
solenv/gbuild/platform/com_{GCC,MSC}_class.mk). Clean that up by moving the
file.
Change-Id: I69dfb80460edc66309cdb6f08427a47cc2420f34
Reviewed-on: https://gerrit.libreoffice.org/44173
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sw/source/core/docnode/swthreadmanager.cxx
b/sw/source/core/docnode/swthreadmanager.cxx
index 365a8f6f3584..cadbfda29887 100644
--- a/sw/source/core/docnode/swthreadmanager.cxx
+++ b/sw/source/core/docnode/swthreadmanager.cxx
@@ -20,7 +20,7 @@
#include <swthreadmanager.hxx>
#include <swthreadjoiner.hxx>
#include <observablethread.hxx>
-#include <threadmanager.hxx>
+#include "threadmanager.hxx"
/** class to manage threads in Writer - it conforms the singleton pattern
diff --git a/sw/source/core/docnode/threadlistener.cxx
b/sw/source/core/docnode/threadlistener.cxx
index 8ba757283896..5ace4c00231a 100644
--- a/sw/source/core/docnode/threadlistener.cxx
+++ b/sw/source/core/docnode/threadlistener.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <threadlistener.hxx>
-#include <threadmanager.hxx>
+#include "threadmanager.hxx"
/** helper class to observe threads
diff --git a/sw/source/core/docnode/threadmanager.cxx
b/sw/source/core/docnode/threadmanager.cxx
index e6b2b70d3034..46a75c490fb7 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <threadmanager.hxx>
+#include "threadmanager.hxx"
#include <osl/diagnose.h>
diff --git a/sw/source/core/inc/threadmanager.hxx
b/sw/source/core/docnode/threadmanager.hxx
similarity index 94%
rename from sw/source/core/inc/threadmanager.hxx
rename to sw/source/core/docnode/threadmanager.hxx
index 6705def95dde..fa648292de8f 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/docnode/threadmanager.hxx
@@ -16,8 +16,8 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_THREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOCNODE_THREADMANAGER_HXX
#include <vcl/timer.hxx>
#include <vcl/idle.hxx>
@@ -28,12 +28,12 @@
#include <deque>
#include <cppuhelper/weak.hxx>
#include <com/sun/star/util/XJobManager.hpp>
-#include "observablethread.hxx"
-#include <cancellablejob.hxx>
-#include "threadlistener.hxx"
+#include <observablethread.hxx>
+#include "cancellablejob.hxx"
+#include <threadlistener.hxx>
#include <memory>
-#include "ifinishedthreadlistener.hxx"
+#include <ifinishedthreadlistener.hxx>
/** class to manage threads
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
