From 9176441f1cc21f7e5d07808b3dd86b726a645e84 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@libreoffice.org>
Date: Fri, 13 Sep 2019 11:31:22 +0200
Subject: dont define PROPERTY_NONE multiple times
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia4af4a281058131d41c2a65abbce58bf5f7a38b6
Reviewed-on: https://gerrit.libreoffice.org/78866
Tested-by: Jenkins
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
---
 include/svl/itemprop.hxx        |  3 +++
 starmath/source/unomodel.cxx    |  5 +----
 sw/inc/unomap.hxx               |  2 --
 sw/source/uibase/uno/unomod.cxx | 18 ++++++++++--------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx
index b0d94332f466..a173fcf06955 100644
--- a/include/svl/itemprop.hxx
+++ b/include/svl/itemprop.hxx
@@ -28,6 +28,9 @@
 #include <vector>
 #include <memory>
 
+// values from com/sun/star/beans/PropertyAttribute
+#define PROPERTY_NONE 0
+
 /// map a property between beans::XPropertySet and SfxPoolItem
 struct SfxItemPropertyMapEntry
 {
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index db7668ad08c6..823f864a458e 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -24,6 +24,7 @@
 
 #include <o3tl/any.hxx>
 #include <sfx2/printer.hxx>
+#include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -153,10 +154,6 @@ SmPrintUIOptions::SmPrintUIOptions()
 
 // class SmModel
 
-
-// values from com/sun/star/beans/PropertyAttribute
-#define PROPERTY_NONE        0
-
 enum SmModelPropertyHandles
 {
     HANDLE_FORMULA,
diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx
index f63f4ab8f168..36f8766e0e03 100644
--- a/sw/inc/unomap.hxx
+++ b/sw/inc/unomap.hxx
@@ -24,8 +24,6 @@
 class SfxItemPropertySet;
 struct SfxItemPropertyMapEntry;
 
-#define PROPERTY_NONE 0
-
 #define PROPERTY_MAP_TEXT_CURSOR            0
 #define PROPERTY_MAP_CHAR_STYLE             1
 #define PROPERTY_MAP_PARA_STYLE             2
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 674a62907cd8..393a7dd26dbf 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -17,9 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <swtypes.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/view/DocumentZoomType.hpp>
+#include <comphelper/ChainablePropertySetInfo.hxx>
+#include <cppuhelper/supportsservice.hxx>
 #include <o3tl/any.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ustrbuf.hxx>
+#include <svl/itemprop.hxx>
+#include <tools/urlobj.hxx>
+#include <vcl/svapp.hxx>
+
+#include <swtypes.hxx>
 #include <unomod.hxx>
 #include <unomid.h>
 #include <unoprnms.hxx>
@@ -31,16 +40,9 @@
 #include <docsh.hxx>
 #include <wrtsh.hxx>
 #include <viewopt.hxx>
-#include <vcl/svapp.hxx>
 #include <doc.hxx>
 #include <IDocumentDeviceAccess.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/view/DocumentZoomType.hpp>
-#include <comphelper/ChainablePropertySetInfo.hxx>
-#include <cppuhelper/supportsservice.hxx>
 #include <edtwin.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <tools/urlobj.hxx>
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
-- 
cgit