compilerplugins/clang/unusedenumconstants.readonly.results | 8 --------
sw/source/filter/html/css1atr.cxx | 12 ++++--------
sw/source/uibase/inc/numberingtypelistbox.hxx | 7 ++-----
sw/source/uibase/misc/numberingtypelistbox.cxx | 6 +++---
4 files changed, 9 insertions(+), 24 deletions(-)
New commits:
commit 0742d5d3ec630c5237eb2bee28d926fb90bef706
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 22 13:04:04 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 24 11:19:10 2018 +0100
remove unused VarHeight from Css1FrameSize
Change-Id: I3ac901a6eaa733a0a8b85a9e8ed8b71ff6ff8f96
Reviewed-on: https://gerrit.libreoffice.org/63921
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 7f1b510b2bcc..74a84edad117 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
diff --git a/sw/source/filter/html/css1atr.cxx
b/sw/source/filter/html/css1atr.cxx
index 630f3d611221..09302c33651a 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;
commit 6b8cd04144cbafd32450e9ab98a7b25d816cf6e2
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Nov 22 12:56:56 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Nov 24 11:19:04 2018 +0100
remove unused SwInsertNumTypes
Change-Id: Iede167882414e77f54218e8458f5315c1e16f245
Reviewed-on: https://gerrit.libreoffice.org/63912
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results
b/compilerplugins/clang/unusedenumconstants.readonly.results
index 46d07937c843..7f1b510b2bcc 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1490,12 +1490,6 @@ sw/source/uibase/inc/envimg.hxx:33
enum SwEnvAlign ENV_VER_LEFT
sw/source/uibase/inc/envimg.hxx:34
enum SwEnvAlign ENV_VER_CNTR
-sw/source/uibase/inc/numberingtypelistbox.hxx:32
- enum SwInsertNumTypes PageStyleNumbering
-sw/source/uibase/inc/numberingtypelistbox.hxx:33
- enum SwInsertNumTypes Bitmap
-sw/source/uibase/inc/numberingtypelistbox.hxx:34
- enum SwInsertNumTypes Bullet
tools/source/generic/poly.cxx:1122
enum (anonymous at /home/noel/libo2/tools/source/generic/poly.cxx:1122:5)
maxRecursionDepth
ucbhelper/source/client/proxydecider.cxx:119
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx
b/sw/source/uibase/inc/numberingtypelistbox.hxx
index 6ceec6355c2a..593185708d9c 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.hxx
@@ -29,14 +29,11 @@
enum class SwInsertNumTypes
{
NoNumbering = 0x01,
- PageStyleNumbering = 0x02,
- Bitmap = 0x04,
- Bullet = 0x08,
- Extended = 0x10
+ Extended = 0x02
};
namespace o3tl {
- template<> struct typed_flags<SwInsertNumTypes> :
is_typed_flags<SwInsertNumTypes, 0x1f> {};
+ template<> struct typed_flags<SwInsertNumTypes> :
is_typed_flags<SwInsertNumTypes, 0x03> {};
};
struct SwNumberingTypeListBox_Impl;
diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx
b/sw/source/uibase/misc/numberingtypelistbox.cxx
index f51f735822e6..83aa07940e71 100644
--- a/sw/source/uibase/misc/numberingtypelistbox.cxx
+++ b/sw/source/uibase/misc/numberingtypelistbox.cxx
@@ -79,15 +79,15 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes
nTypeFlags)
break;
case style::NumberingType::CHAR_SPECIAL:
- bInsert = bool(nTypeFlags & SwInsertNumTypes::Bullet);
+ bInsert = false;
break;
case style::NumberingType::PAGE_DESCRIPTOR:
- bInsert = bool(nTypeFlags &
SwInsertNumTypes::PageStyleNumbering);
+ bInsert = false;
break;
case style::NumberingType::BITMAP:
- bInsert = bool(nTypeFlags & SwInsertNumTypes::Bitmap );
+ bInsert = false;
break;
case style::NumberingType::BITMAP | LINK_TOKEN:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
