[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang slideshow/source starmath/inc starmath/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    4 ----
 slideshow/source/engine/shapes/drawshapesubsetting.cxx     |    2 --
 slideshow/source/inc/doctreenode.hxx                       |    2 --
 starmath/inc/node.hxx                                      |    5 ++---
 starmath/source/node.cxx                                   |    3 +--
 5 files changed, 3 insertions(+), 13 deletions(-)

New commits:
commit 8a629c1f9b143e6222c4711c4d296f5f51b3485d
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 22 15:18:58 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Nov 24 16:49:45 2018 +0100

    remove unused DocTreeNode::NodeType::Invalid
    
    Change-Id: I68dde9c81ac73875382cd09bf342340b6c144ee8
    Reviewed-on: https://gerrit.libreoffice.org/63935
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index d646e3e91cfe..2d3137a2774c 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1232,8 +1232,6 @@ slideshow/source/engine/slideview.cxx:249
     enum slideshow::internal::(anonymous namespace)::LayerSpriteContainer::(anonymous at /home/noel/libo2/slideshow/source/engine/slideview.cxx:249:5) SPRITE_ULLAGE
 slideshow/source/engine/slideview.cxx:729
     enum slideshow::internal::(anonymous namespace)::SlideView::(anonymous at /home/noel/libo2/slideshow/source/engine/slideview.cxx:729:5) LAYER_ULLAGE
-slideshow/source/inc/doctreenode.hxx:52
-    enum slideshow::internal::DocTreeNode::NodeType Invalid
 soltools/cpp/cpp.h:42
     int WS
 svgio/inc/svgstyleattributes.hxx:62
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index c7c9954316c1..5a0193e71928 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -604,8 +604,6 @@ namespace slideshow
             {
                 switch( eNodeType )
                 {
-                    case DocTreeNode::NodeType::Invalid:
-                        // FALLTHROUGH intended
                     default:
                         SAL_WARN( "slideshow", "DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
                         return DrawShapeSubsetting::CLASS_NOOP;
diff --git a/slideshow/source/inc/doctreenode.hxx b/slideshow/source/inc/doctreenode.hxx
index 008979651b8a..1bb4beda5ec9 100644
--- a/slideshow/source/inc/doctreenode.hxx
+++ b/slideshow/source/inc/doctreenode.hxx
@@ -49,8 +49,6 @@ namespace slideshow
             /// Type of shape entity represented by this node
             enum class NodeType
             {
-                Invalid=0,
-
                 /// This node represents a paragraph
                 LogicalParagraph=129,
                 /// This node represents a word
commit 9afa992b34fbe9285398c6ec88e94d961da4094e
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Nov 22 15:16:09 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Nov 24 16:49:32 2018 +0100

    remove unused FontChangeMask::HorAlign
    
    Change-Id: I9e38cf1d749aa78e5b3c32575b76a372ca25c7c8
    Reviewed-on: https://gerrit.libreoffice.org/63933
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index 282427e96af2..d646e3e91cfe 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1236,8 +1236,6 @@ slideshow/source/inc/doctreenode.hxx:52
     enum slideshow::internal::DocTreeNode::NodeType Invalid
 soltools/cpp/cpp.h:42
     int WS
-starmath/inc/node.hxx:62
-    enum FontChangeMask HorAlign
 svgio/inc/svgstyleattributes.hxx:62
     enum svgio::svgreader::FontSize FontSize_notset
 svl/source/numbers/zformat.cxx:358
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 9ee746d9d04c..640435a4101e 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -58,13 +58,12 @@ enum class FontChangeMask {
     Bold     = 0x0004,
     Italic   = 0x0008,
     Color    = 0x0010,
-    Phantom  = 0x0020,
-    HorAlign = 0x0040
+    Phantom  = 0x0020
 };
 
 namespace o3tl
 {
-    template<> struct typed_flags<FontChangeMask> : is_typed_flags<FontChangeMask, 0x007f> {};
+    template<> struct typed_flags<FontChangeMask> : is_typed_flags<FontChangeMask, 0x003f> {};
 }
 
 
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 2eba1f5c58f1..9e1ef9279997 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -204,8 +204,7 @@ void SmNode::SetSize(const Fraction &rSize)
 
 void SmNode::SetRectHorAlign(RectHorAlign eHorAlign, bool bApplyToSubTree )
 {
-    if (!(Flags() & FontChangeMask::HorAlign))
-        meRectHorAlign = eHorAlign;
+    meRectHorAlign = eHorAlign;
 
     if (bApplyToSubTree)
         ForEachNonNull(this, [eHorAlign](SmNode *pNode){pNode->SetRectHorAlign(eHorAlign);});