commit 0742d5d3ec630c5237eb2bee28d926fb90bef706
author Noel Grandin <noel.grandin@collabora.co.uk> Thu Nov 22 13:04:04 2018 +0200
committer Noel Grandin <noel.grandin@collabora.co.uk> Sat Nov 24 11:19:10 2018 +0100
tree bd2e4ffe2014df3fc33e2b8dd57b2566da5b8ec3
parent 6b8cd04144cbafd32450e9ab98a7b25d816cf6e2

remove unused VarHeight from Css1FrameSize

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

compilerplugins/clang/unusedenumconstants.readonly.results

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 7f1b510..74a84ed 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1476,8 +1476,6 @@ sw/source/core/unocore/unosett.cxx:1580
    enum (anonymous at /home/noel/libo2/sw/source/core/unocore/unosett.cxx:1577:5) InChapterFirst
sw/source/core/unocore/unosett.cxx:1581
    enum (anonymous at /home/noel/libo2/sw/source/core/unocore/unosett.cxx:1577:5) InChapterLast
sw/source/filter/html/css1atr.cxx:114
    enum Css1FrameSize VarHeight
sw/source/filter/html/css1atr.cxx:117
    enum Css1FrameSize AnyHeight
sw/source/filter/ww8/ww8scan.hxx:604

sw/source/filter/html/css1atr.cxx

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 630f3d6..09302c3 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -111,14 +111,13 @@ enum class Css1Background {
enum class Css1FrameSize {
    NONE       = 0x00,
    Width      = 0x01,
    VarHeight  = 0x02,
    MinHeight  = 0x04,
    FixHeight  = 0x08,
    AnyHeight  = 0x0e,
    MinHeight  = 0x02,
    FixHeight  = 0x04,
    AnyHeight  = 0x06,
    Pixel      = 0x10,
};
namespace o3tl {
    template<> struct typed_flags<Css1FrameSize> : is_typed_flags<Css1FrameSize, 0x1f> {};
    template<> struct typed_flags<Css1FrameSize> : is_typed_flags<Css1FrameSize, 0x17> {};
}

#define DOT_LEADERS_MAX_WIDTH   18
@@ -2884,9 +2883,6 @@ static Writer& OutCSS1_SwFormatFrameSize( Writer& rWrt, const SfxPoolItem& rHt,
        case ATT_MIN_SIZE:
            bOutHeight = bool(nMode & Css1FrameSize::MinHeight);
            break;
        case ATT_VAR_SIZE:
            bOutHeight = bool(nMode & Css1FrameSize::VarHeight);
            break;
        default:
            OSL_ENSURE( bOutHeight, "Height will not be exported" );
            break;