diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/eppt/pptexanimations.hxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/ppt/pptatom.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/app/sdmod1.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx index adf8661a4125..30bb1a7276c4 100644 --- a/sd/source/filter/eppt/pptexanimations.cxx +++ b/sd/source/filter/eppt/pptexanimations.cxx @@ -876,7 +876,7 @@ void AnimationExporter::exportAnimNode( SvStream& rStrm, const Reference< XAnima WriteAnimationNode( rStrm, aAnim ); } -void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, const Any ** pAny, sal_Size nLen ) +void AnimationExporter::GetUserData( const Sequence< NamedValue >& rUserData, const Any ** pAny, std::size_t nLen ) { // storing user data into pAny, to allow direct access later memset( pAny, 0, nLen ); diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx index 441264a523fa..81eace5c933c 100644 --- a/sd/source/filter/eppt/pptexanimations.hxx +++ b/sd/source/filter/eppt/pptexanimations.hxx @@ -122,7 +122,7 @@ public: static css::uno::Any convertAnimateValue( const css::uno::Any& rSource, const OUString& rAttributeName ); static bool GetNodeType( const css::uno::Reference< css::animations::XAnimationNode >& xNode, sal_Int16& nType ); static sal_Int16 GetFillMode( const css::uno::Reference< css::animations::XAnimationNode >& xNode, const sal_Int16 nFillDefault ); - static void GetUserData( const css::uno::Sequence< css::beans::NamedValue >& rUserData, const css::uno::Any ** pAny, sal_Size nLen ); + static void GetUserData( const css::uno::Sequence< css::beans::NamedValue >& rUserData, const css::uno::Any ** pAny, std::size_t nLen ); static sal_uInt32 TranslatePresetSubType( const sal_uInt32 nPresetClass, const sal_uInt32 nPresetId, const OUString& rPresetSubType ); static sal_uInt32 GetPresetID( const OUString& rPreset, sal_uInt32 nAPIPresetClass, bool& bPresetId ); static sal_uInt32 GetValueTypeForAttributeName( const OUString& rAttributeName ); diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx index 5536d2a55d4a..786ba6d1ad78 100644 --- a/sd/source/filter/ppt/pptatom.cxx +++ b/sd/source/filter/ppt/pptatom.cxx @@ -37,9 +37,9 @@ Atom::Atom( const DffRecordHeader& rRecordHeader, SvStream& rStream ) Atom* pLastAtom = nullptr; // retrieve file size (to allow sanity checks) - const sal_Size nStreamPos = mrStream.Tell(); + sal_uInt64 const nStreamPos = mrStream.Tell(); mrStream.Seek( STREAM_SEEK_TO_END ); - const sal_Size nStreamSize = mrStream.Tell(); + sal_uInt64 const nStreamSize = mrStream.Tell(); mrStream.Seek( nStreamPos ); while( (mrStream.GetError() == 0 ) diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index d658a1a81656..b8872e307452 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -770,7 +770,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer ( // Create a memory stream and prepare to fill it with the content of // the original stream. mpStream.reset(new SvMemoryStream()); - static const sal_Size nBufferSize = 4096; + static const std::size_t nBufferSize = 4096; ::std::unique_ptr<sal_Int8[]> pBuffer (new sal_Int8[nBufferSize]); sal_uInt64 nReadPosition(0); @@ -778,7 +778,7 @@ OutlineToImpressFinalizer::OutlineToImpressFinalizer ( while (bLoop) { // Read the next part of the original stream. - sal_Size nReadByteCount (0); + std::size_t nReadByteCount (0); const ErrCode nErrorCode ( rBytes.ReadAt( nReadPosition, |