diff options
-rw-r--r-- | xmloff/source/core/xmltoken.cxx | 9 | ||||
-rw-r--r-- | xmloff/source/draw/animexp.cxx | 14 | ||||
-rw-r--r-- | xmloff/source/draw/shapeimport.cxx | 2 |
3 files changed, 16 insertions, 9 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index f2f3495671f7..1e682a39fcb1 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -33,12 +33,19 @@ namespace xmloff::token { { struct XMLTokenEntry { - sal_Int32 nLength; const char* pChar; std::optional<OUString> xOUString; + sal_Int32 nLength; #if OSL_DEBUG_LEVEL > 0 XMLTokenEnum eToken; #endif +#if OSL_DEBUG_LEVEL > 0 + XMLTokenEntry(sal_Int32 nLen, const char* p, std::optional<OUString> xStr, XMLTokenEnum eTok) + : pChar(p), xOUString(std::move(xStr)), nLength(nLen), eToken(eTok) {} +#else + XMLTokenEntry(sal_Int32 nLen, const char* p, std::optional<OUString> xStr) + : pChar(p), xOUString(std::move(xStr)), nLength(nLen) {} +#endif }; } diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index 65b791e2455e..f839506dbdd4 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -192,7 +192,7 @@ void SdXMLImplSetEffect( AnimationEffect eEffect, XMLEffect& eKind, XMLEffectDir namespace { -enum XMLActionKind +enum XMLActionKind : sal_Int8 { XMLE_SHOW, XMLE_HIDE, @@ -202,27 +202,27 @@ enum XMLActionKind struct XMLEffectHint { - XMLActionKind meKind; - bool mbTextEffect; Reference<XShape> mxShape; + XMLActionKind meKind; + bool mbTextEffect; XMLEffect meEffect; XMLEffectDirection meDirection; sal_Int16 mnStartScale; AnimationSpeed meSpeed; - sal_Int32 maDimColor; OUString maSoundURL; - bool mbPlayFull; + sal_Int32 maDimColor; sal_Int32 mnPresId; + bool mbPlayFull; bool operator<(const XMLEffectHint& rComp) const { return mnPresId < rComp.mnPresId; } XMLEffectHint() : meKind( XMLE_SHOW ), mbTextEffect( false ), meEffect( EK_none ), meDirection( ED_none ), mnStartScale( -1 ), - meSpeed( AnimationSpeed_SLOW ), maDimColor(0), mbPlayFull( false ), - mnPresId( 0 ) + meSpeed( AnimationSpeed_SLOW ), maDimColor(0), + mnPresId( 0 ), mbPlayFull( false ) {} }; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index cc114a8f636b..c338c15c724a 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -64,9 +64,9 @@ namespace { struct ConnectionHint { css::uno::Reference< css::drawing::XShape > mxConnector; - bool bStart; OUString aDestShapeId; sal_Int32 nDestGlueId; + bool bStart; }; } |