elide the SwSurround enum

no point in redeclaring an existing enum exactly

Change-Id: I4fb367e4b27e36601f1f36b629097a87b5f00096
Reviewed-on: https://gerrit.libreoffice.org/34773
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 4 insertions, 41 deletions

diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index cc9bce7b6449..02bf0e0c7299 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -20,11 +20,11 @@
 #define INCLUDED_SW_INC_FMTSRND_HXX
 
 #include "swdllapi.h"
+#include <com/sun/star/text/WrapTextMode.hpp>
 #include <hintids.hxx>
 #include <format.hxx>
 #include <svl/eitem.hxx>
 
-#include <fmtsrndenum.hxx>
 class IntlWrapper;
 
 // SwFormatSurround: How document content under the frame shall behave.
@@ -34,7 +34,7 @@ class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
     bool    bContour    :1;
     bool    bOutside    :1;
 public:
-    SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL );
+    SwFormatSurround( css::text::WrapTextMode eNew = css::text::WrapTextMode_PARALLEL );
     SwFormatSurround( const SwFormatSurround & );
     inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
 
@@ -50,11 +50,11 @@ public:
     virtual bool             QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
     virtual bool             PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
 
-    SwSurround GetSurround()const { return SwSurround( GetValue() ); }
+    css::text::WrapTextMode GetSurround()const { return css::text::WrapTextMode( GetValue() ); }
     bool    IsAnchorOnly()  const { return bAnchorOnly; }
     bool    IsContour()     const { return bContour; }
     bool    IsOutside()     const { return bOutside; }
-    void    SetSurround  ( SwSurround eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); }
+    void    SetSurround  ( css::text::WrapTextMode eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); }
     void    SetAnchorOnly( bool bNew )      { bAnchorOnly = bNew; }
     void    SetContour( bool bNew )         { bContour = bNew; }
     void    SetOutside( bool bNew )         { bOutside = bNew; }
diff --git a/sw/inc/fmtsrndenum.hxx b/sw/inc/fmtsrndenum.hxx
deleted file mode 100644
index 82bbb53ee17b..000000000000
--- a/sw/inc/fmtsrndenum.hxx
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- 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_SW_INC_FMTSRNDENUM_HXX
-#define INCLUDED_SW_INC_FMTSRNDENUM_HXX
-
-#include <com/sun/star/text/WrapTextMode.hpp>
-
-enum SwSurround {
-    SURROUND_NONE = css::text::WrapTextMode_NONE,
-    SURROUND_BEGIN = SURROUND_NONE,
-    SURROUND_THROUGHT = css::text::WrapTextMode_THROUGHT,
-    SURROUND_PARALLEL = css::text::WrapTextMode_PARALLEL,
-    SURROUND_IDEAL = css::text::WrapTextMode_DYNAMIC,
-    SURROUND_LEFT = css::text::WrapTextMode_LEFT,
-    SURROUND_RIGHT = css::text::WrapTextMode_RIGHT,
-    SURROUND_END
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */