From 4bba4b193feca178c8ec67bab5d7beee2cbe91c1 Mon Sep 17 00:00:00 2001 From: Aron Budea Date: Wed, 11 Apr 2018 05:46:44 +0200 Subject: Fix building with DBG_ANIM_LOG defined Partial regression from 6ca16a4cad999dbb0296ea64db2263a26e52f36c Change-Id: Ie9eded8673131e19428411e430951feaf33218bb Reviewed-on: https://gerrit.libreoffice.org/52701 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sd/source/filter/ppt/pptinanimations.cxx | 6 +++--- sd/source/filter/ppt/pptinanimations.hxx | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 033dd1a155b7..1a8ab6ea6ebf 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -1227,7 +1227,7 @@ int AnimationImporter::importTimeContainer( const Atom* pAtom, const Reference< { #ifdef DBG_ANIM_LOG sal_uInt32 nU1, nU2; - mrStCtrl >> nU1 >> nU2; + mrStCtrl.ReadUInt32(nU1).ReadUInt32(nU2); fprintf( mpFile, "\n", nU1, nU2 ); #endif @@ -2932,11 +2932,11 @@ void AnimationImporter::dump( sal_uInt32 nLen, bool bNewLine ) sal_uInt32 i = 0; int b = 0; - sal_Int8 nData; + char nData; for( i = 0; i < nLen; i++ ) { - mrStCtrl >> nData; + mrStCtrl.ReadChar(nData); fprintf( mpFile, "%c%c ", faul[ (nData >> 4) & 0x0f ], faul[ nData & 0x0f ] ); diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 5cbb40592862..7a237fc14cee 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -78,7 +78,7 @@ private: static css::uno::Reference< css::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode ); bool convertAnimationNode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const css::uno::Reference< css::animations::XAnimationNode >& xParent ); - static bool convertAnimationValue( oox::ppt::MS_AttributeNames eAttribute, css::uno::Any& rValue ); + bool convertAnimationValue( oox::ppt::MS_AttributeNames eAttribute, css::uno::Any& rValue ); css::uno::Any implGetColorAny( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); static sal_Int16 implGetColorSpace( sal_Int32 nMode, sal_Int32 nA, sal_Int32 nB, sal_Int32 nC ); @@ -98,18 +98,18 @@ private: void dump( sal_uInt32 nLen, bool bNewLine = true ); #endif - static void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); - static void dump_atom( const Atom* pAtom, bool bNewLine = true ); - static void dump_target( css::uno::Any& rAny ); - static void dump( css::uno::Any& rAny ); - static void dump( const PropertySet& rSet ); - static void dump( const AnimationNode& rNode ); - static void dump( const char * pText ); - static void dump( const char * pText, sal_Int32 nInt ); + void dump_atom_header( const Atom* pAtom, bool bOpen, bool bAppend ); + void dump_atom( const Atom* pAtom, bool bNewLine = true ); + void dump_target( css::uno::Any& rAny ); + void dump( css::uno::Any& rAny ); + void dump( const PropertySet& rSet ); + void dump( const AnimationNode& rNode ); + void dump( const char * pText ); + void dump( const char * pText, sal_Int32 nInt ); void dump( const char * pText, sal_Int64 nInt ); - static void dump( const char * pText, double fDouble ); - static void dump( const char * pText, const char * pText2 ); - static void dump( const char * pText, const OUString& rString ); + void dump( const char * pText, double fDouble ); + void dump( const char * pText, const char * pText2 ); + void dump( const char * pText, const OUString& rString ); }; } // namespace ppt -- cgit