diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 09:37:08 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-04 12:52:15 +0100 |
commit | 0f89d964b272c2087dbc865bc0a60edfdde8551f (patch) | |
tree | 3e3d074d02e93ade639ae0beb143294fe433dc2c /sw/inc | |
parent | c4dba436df42cef4f0048994c38dc137266ebaf9 (diff) |
coverity#1403732 Mixing enum types
and
coverity#1403735 Mixing enum types
coverity#1403737 Mixing enum types
Change-Id: I278b7d5116d4157e6aa4483d8eef42325e4bc03b
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/swtypes.hxx | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 0e986947c28f..b1aadec9bebd 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -28,6 +28,7 @@ #include "swdllapi.h" #include <i18nlangtag/languagetag.hxx> #include <o3tl/typed_flags_set.hxx> +#include <svx/swframetypes.hxx> namespace com { namespace sun { namespace star { namespace linguistic2{ @@ -133,30 +134,6 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm // fields before INIT_FLDTYPES. #define INIT_SEQ_FLDTYPES 4 -// 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 = 0, // Anchored at paragraph. - FLY_AS_CHAR, // Anchored as character. - FLY_AT_PAGE, // Anchored at page. - FLY_AT_FLY, // Anchored at frame. - FLY_AT_CHAR, // Anchored at character. - - HEADER, - FOOTER, - HEADERL, - HEADERR, - FOOTERL, - FOOTERR, - - DRAW_OBJECT // A draw-Object! For the SwDoc-interface only! -}; - extern ResMgr* pSwResMgr; // defined in sw/source/uibase/app/swmodule.cxx for the sw library and in // sw/source/ui/dialog/swdialmgr.cxx for the swui library |