coverity#1403732 Mixing enum types

and

coverity#1403735 Mixing enum types
coverity#1403737 Mixing enum types

Change-Id: I278b7d5116d4157e6aa4483d8eef42325e4bc03b

3 files changed, 57 insertions, 10 deletions

diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index a780f5770add..0453c252c637 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -24,7 +23,7 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 #include <svx/svxdllapi.h>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <svx/swframetypes.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
 // class SwFrmPagePreview -------------------------------------------------------
@@ -57,10 +56,8 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
     short       nVAlign;
     short       nVRel;
 
-    css::text::WrapTextMode
-                nWrap;
-    css::text::TextContentAnchorType
-                nAnchor;
+    css::text::WrapTextMode nWrap;
+    RndStdIds   nAnchor;
     bool        bTrans;
 
     Point       aRelPos;
@@ -87,7 +84,7 @@ public:
     void SetVertRel(short nR)         { nVRel     = nR; }
 
     void SetTransparent(bool bT)      { bTrans    = bT; }
-    void SetAnchor(css::text::TextContentAnchorType nA) { nAnchor   = nA; }
+    void SetAnchor(RndStdIds nA) { nAnchor   = nA; }
 
     void SetRelPos(const Point& rP);
 };
diff --git a/include/svx/swframetypes.hxx b/include/svx/swframetypes.hxx
new file mode 100644
index 000000000000..9aa2f8189b8a
--- /dev/null
+++ b/include/svx/swframetypes.hxx
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   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_SVX_INC_SWFRAMETYPES_HXX
+#define INCLUDED_SVX_INC_SWFRAMETYPES_HXX
+
+#include <com/sun/star/text/TextContentAnchorType.hpp>
+
+// The former Rendezvous-IDs live on:
+// There are IDs for the anchors (SwFormatAnchor) and some others
+// that are only of importance for interfaces (SwDoc).
+enum class RndStdIds
+{
+    UNKNOWN = -1,       // return value used by SwFEShell::GetAnchorId
+
+    // the following 5 values are deliberately the same as the values in css::text::TextContentAnchorType
+    FLY_AT_PARA = (int)css::text::TextContentAnchorType_AT_PARAGRAPH,  // Anchored at paragraph.
+    FLY_AS_CHAR = (int)css::text::TextContentAnchorType_AS_CHARACTER,  // Anchored as character.
+    FLY_AT_PAGE = (int)css::text::TextContentAnchorType_AT_PAGE,       // Anchored at page.
+    FLY_AT_FLY  = (int)css::text::TextContentAnchorType_AT_FRAME,      // Anchored at frame.
+    FLY_AT_CHAR = (int)css::text::TextContentAnchorType_AT_CHARACTER,  // Anchored at character.
+
+    HEADER,
+    FOOTER,
+    HEADERL,
+    HEADERR,
+    FOOTERL,
+    FOOTERR,
+
+    DRAW_OBJECT     // A draw-Object! For the SwDoc-interface only!
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx
index cb75145937c8..ab112e3fcee7 100644
--- a/include/svx/swframevalidation.hxx
+++ b/include/svx/swframevalidation.hxx
@@ -22,14 +22,14 @@
 #include <sal/types.h>
 #include <tools/gen.hxx>
 #include <limits.h>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
+#include <svx/swframetypes.hxx>
 
 /*
   struct to determine min/max values for fly frame positioning in Writer
  */
 struct SvxSwFrameValidation
 {
-    css::text::TextContentAnchorType nAnchorType;
+    RndStdIds           nAnchorType;
     sal_Int16           nHoriOrient; //css::text::HoriOrientation
     sal_Int16           nVertOrient; //css::text::VertOrientation
     sal_Int16           nHRelOrient; //css::text::RelOrientation
@@ -58,7 +58,7 @@ struct SvxSwFrameValidation
     Size    aPercentSize;   // Size for 100% value
 
     SvxSwFrameValidation() :
-        nAnchorType(css::text::TextContentAnchorType_AT_PARAGRAPH),
+        nAnchorType(RndStdIds::FLY_AT_PARA),
         nHoriOrient(0),
         nVertOrient(0),
         nHRelOrient(0),