slideshow/source/engine/animationnodes/basenode.cxx | 10 +++++----- sw/source/core/doc/doctxm.cxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 8991c3ddb7590263dad03e39d222bd2dd9f5fed0 Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Nov 26 21:00:32 2019 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed Nov 27 08:56:47 2019 +0100 struct GlobalNameIds doesn't need a name (found by upcoming loplugin:unusedmember) Change-Id: I3ee03d5c98e5f4de1891852ab07af999911d3e8a Reviewed-on: https://gerrit.libreoffice.org/83828 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx index 1526f0bd347e..c5e9aa42cf8c 100644 --- a/sw/source/core/doc/doctxm.cxx +++ b/sw/source/core/doc/doctxm.cxx @@ -1395,7 +1395,7 @@ static SwTOOElements lcl_IsSOObject( const SvGlobalName& rFactoryNm ) static const struct SoObjType { SwTOOElements const nFlag; // GlobalNameId - struct GlobalNameIds { + struct { sal_uInt32 n1; sal_uInt16 n2, n3; sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; commit 6109589065b61807d8d802329d872a019540e4ac Author: Stephan Bergmann <sberg...@redhat.com> AuthorDate: Tue Nov 26 20:00:09 2019 +0100 Commit: Stephan Bergmann <sberg...@redhat.com> CommitDate: Wed Nov 27 08:56:16 2019 +0100 Turn StateTransition::Options into scoped enum (the enum type itself was identified as unused by upcoming loplugin:unusedmember and is put into use this way) Change-Id: Ic63931d17b512d675a0182cb9045aad5d0e9e835 Reviewed-on: https://gerrit.libreoffice.org/83824 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sberg...@redhat.com> diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index afe0a0111e50..dee7b862b8fd 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -263,7 +263,7 @@ bool isMainSequenceRootNode_( class BaseNode::StateTransition { public: - enum Options { NONE, FORCE }; + enum class Options { NONE, FORCE }; explicit StateTransition( BaseNode * pNode ) : mpNode(pNode), meToState(INVALID) {} @@ -275,13 +275,13 @@ public: StateTransition(const StateTransition&) = delete; StateTransition& operator=(const StateTransition&) = delete; - bool enter( NodeState eToState, int options = NONE ) + bool enter( NodeState eToState, Options options = Options::NONE ) { OSL_ENSURE( meToState == INVALID, "### commit() before enter()ing again!" ); if (meToState != INVALID) return false; - bool const bForce = ((options & FORCE) != 0); + bool const bForce = options == Options::FORCE; if (!bForce && !mpNode->isTransition( mpNode->meCurrState, eToState )) return false; // recursion detection: @@ -570,7 +570,7 @@ void BaseNode::deactivate() if (isTransition( meCurrState, FROZEN, false /* no OSL_ASSERT */ )) { // do transition to FROZEN: StateTransition st(this); - if (st.enter( FROZEN, StateTransition::FORCE )) { + if (st.enter( FROZEN, StateTransition::Options::FORCE )) { deactivate_st( FROZEN ); st.commit(); @@ -607,7 +607,7 @@ void BaseNode::end() "end state not reachable in transition table" ); StateTransition st(this); - if (!st.enter( ENDED, StateTransition::FORCE )) + if (!st.enter( ENDED, StateTransition::Options::FORCE )) return; deactivate_st( ENDED ); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits