basctl/source/basicide/sbxitem.cxx | 1 +
basctl/source/inc/sbxitem.hxx | 1 -
include/item/base/ItemAdministrator.hxx | 2 +-
include/item/base/ItemControlBlock.hxx | 1 +
include/svx/item/TransformAnchor.hxx | 1 +
item/test/ItemTest.cxx | 8 ++++----
svx/source/items/TransformAnchor.cxx | 1 +
7 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit c05419aa624b39dc008673d74ebecfa533441cfa
Author: Armin Le Grand <armin.le.gr...@me.com>
AuthorDate: Sat Apr 13 14:49:33 2019 +0200
Commit: Armin Le Grand <armin.le.gr...@me.com>
CommitDate: Sat Apr 13 14:49:33 2019 +0200
WIP: Changes 4 linux build
Change-Id: If8b0e0769ab1e41a9c4aab9b0259c38e79cc886b
diff --git a/basctl/source/basicide/sbxitem.cxx
b/basctl/source/basicide/sbxitem.cxx
index e4d7e0b5e84a..fc0e820e3aa9 100644
--- a/basctl/source/basicide/sbxitem.cxx
+++ b/basctl/source/basicide/sbxitem.cxx
@@ -20,6 +20,7 @@
#include <sbxitem.hxx>
#include <sal/log.hxx>
#include <item/base/ItemAdministrator.hxx>
+#include <item/base/ItemControlBlock.hxx>
namespace basctl
{
diff --git a/basctl/source/inc/sbxitem.hxx b/basctl/source/inc/sbxitem.hxx
index 56b62d3e4ed4..8e83dad12359 100644
--- a/basctl/source/inc/sbxitem.hxx
+++ b/basctl/source/inc/sbxitem.hxx
@@ -24,7 +24,6 @@
// I2TM
#include <item/base/ItemBase.hxx>
-//#include <item/base/ItemBaseStaticHelper.hxx>
// ~I2TM
namespace basctl
diff --git a/include/item/base/ItemAdministrator.hxx
b/include/item/base/ItemAdministrator.hxx
index e3e14aea126a..32c1b1e04f19 100644
--- a/include/item/base/ItemAdministrator.hxx
+++ b/include/item/base/ItemAdministrator.hxx
@@ -24,7 +24,7 @@
#include <set>
#include <unordered_set>
#include <cassert>
-//#include <item/base/ItemBase.hxx>
+#include <item/base/ItemBase.hxx>
///////////////////////////////////////////////////////////////////////////////
diff --git a/include/item/base/ItemControlBlock.hxx
b/include/item/base/ItemControlBlock.hxx
index 5f658e8c4b07..566c9c73c5a3 100755
--- a/include/item/base/ItemControlBlock.hxx
+++ b/include/item/base/ItemControlBlock.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_ITEM_BASE_ITEMCONTROLBLOCK_HXX
#include <functional>
+#include <item/base/ItemAdministrator.hxx>
///////////////////////////////////////////////////////////////////////////////
diff --git a/include/svx/item/TransformAnchor.hxx
b/include/svx/item/TransformAnchor.hxx
index 4a9175244daf..acb53e0c516b 100755
--- a/include/svx/item/TransformAnchor.hxx
+++ b/include/svx/item/TransformAnchor.hxx
@@ -12,6 +12,7 @@
#include <item/simple/CntInt16.hxx>
#include <svx/swframetypes.hxx>
+#include <svx/svxdllapi.h>
///////////////////////////////////////////////////////////////////////////////
diff --git a/item/test/ItemTest.cxx b/item/test/ItemTest.cxx
index 5cc0de4ce341..ea4b8f77a7f7 100644
--- a/item/test/ItemTest.cxx
+++ b/item/test/ItemTest.cxx
@@ -29,7 +29,7 @@ namespace Item
class MultiValueAB : public ItemBase
{
public:
- static ItemControlBlock& MultiValueAB::GetStaticItemControlBlock()
+ static ItemControlBlock& GetStaticItemControlBlock()
{
static ItemControlBlock aItemControlBlock(
std::shared_ptr<ItemAdministrator>(new
IAdministrator_vector()),
@@ -117,7 +117,7 @@ namespace Item
class MultiValueABC : public MultiValueAB
{
public:
- static ItemControlBlock& MultiValueABC::GetStaticItemControlBlock()
+ static ItemControlBlock& GetStaticItemControlBlock()
{
static ItemControlBlock aItemControlBlock(
std::shared_ptr<ItemAdministrator>(new
IAdministrator_vector()),
@@ -197,7 +197,7 @@ namespace Item
class MultiValueABD : public MultiValueAB
{
public:
- static ItemControlBlock& MultiValueABD::GetStaticItemControlBlock()
+ static ItemControlBlock& GetStaticItemControlBlock()
{
static ItemControlBlock aItemControlBlock(
std::shared_ptr<ItemAdministrator>(new
IAdministrator_vector()),
@@ -241,7 +241,7 @@ namespace Item
class MultiValueABCD : public MultiValueABC
{
public:
- static ItemControlBlock& MultiValueABCD::GetStaticItemControlBlock()
+ static ItemControlBlock& GetStaticItemControlBlock()
{
static ItemControlBlock aItemControlBlock(
std::shared_ptr<ItemAdministrator>(new
IAdministrator_vector()),
diff --git a/svx/source/items/TransformAnchor.cxx
b/svx/source/items/TransformAnchor.cxx
index 12cade78b1c9..92787903c390 100755
--- a/svx/source/items/TransformAnchor.cxx
+++ b/svx/source/items/TransformAnchor.cxx
@@ -10,6 +10,7 @@
#include <cassert>
#include <svx/item/TransformAnchor.hxx>
#include <item/base/ItemAdministrator.hxx>
+#include <item/base/ItemControlBlock.hxx>
///////////////////////////////////////////////////////////////////////////////
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
