diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-23 19:52:28 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-23 19:57:22 +0100 |
| commit | d2d6e7dc90afb7a062165036c6e9c4ca62ef6aea (patch) | |
| tree | 365401fc6129fc6a011f173c39c4e098bd573df2 /filter | |
| parent | f0a6f3549e7fd6a91037b6edc661740058754579 (diff) | |
Change SvxMSDffManager::ImportOLE nOLEId parameter from long to sal_uInt32
The only place this function is called (SvxMSDffManager::ImportGraphic,
filter/source/msfilter/msdffimp.cxx) it is passed the sal_uInt32 return value
from a call to DffPropSet::GetPropertyValue, so that seems a better type.
(SvxMSDffManager::ImportOLE used long at least since
d2000efb31f864e912c6cf52760eea0e602b6893 "#i106421#: move msfilter to filter";
DffPropSet::GetPropertyValue used UINT32 back then, changed to sal_uInt32 with
e8c2c1daae9008d383288f94600b1d34d2059fb1 "removetooltypes01: #i112600# remove
tooltypes from filter". Unclear if those had ever had more compatible types in
the distant past.)
Change-Id: Ia486d169cd2cc0e73042e72fd4476cc2ae0e8cc5
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index bfefea1d16c7..8c83f7f88cce 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -6540,7 +6540,7 @@ void SvxMSDffManager::ProcessClientAnchor2( SvStream& /* rSt */, DffRecordHeader return; // will be overridden by SJ in Draw } -bool SvxMSDffManager::GetOLEStorageName( long /* nOLEId */, OUString&, tools::SvRef<SotStorage>&, uno::Reference < embed::XStorage >& ) const +bool SvxMSDffManager::GetOLEStorageName( sal_uInt32, OUString&, tools::SvRef<SotStorage>&, uno::Reference < embed::XStorage >& ) const { return false; } @@ -6551,7 +6551,7 @@ bool SvxMSDffManager::ShapeHasText( sal_uLong /* nShapeId */, sal_uLong /* nFile } // #i32596# - add new parameter <_nCalledByGroup> -SdrObject* SvxMSDffManager::ImportOLE( long nOLEId, +SdrObject* SvxMSDffManager::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, const Rectangle& rBoundRect, const Rectangle& rVisArea, diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index d6fb2f6cc3c0..cac4f5b44066 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -1780,7 +1780,7 @@ bool SdrPowerPointOLEDecompress( SvStream& rOutput, SvStream& rInput, sal_uInt32 } // #i32596# - add new parameter <_nCalledByGroup> -SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, +SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGraf, const Rectangle& rBoundRect, const Rectangle& rVisArea, @@ -1817,7 +1817,7 @@ SdrObject* SdrPowerPointImport::ImportOLE( long nOLEId, for (PPTOleEntry* pOe : const_cast<SdrPowerPointImport*>(this)->aOleObjectList) { - if ( pOe->nId != (sal_uInt32)nOLEId ) + if ( pOe->nId != nOLEId ) continue; rStCtrl.Seek( pOe->nRecHdOfs ); |