diff options
| -rw-r--r-- | compilerplugins/clang/unusedenumconstants.readonly.results | 2 | ||||
| -rw-r--r-- | starmath/inc/node.hxx | 5 | ||||
| -rw-r--r-- | starmath/source/node.cxx | 3 |
3 files changed, 3 insertions, 7 deletions
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);}); |