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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 54a890cb1154..699f87103281 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -556,7 +556,7 @@ sal_uInt32 SwMSDffManager::GetFilterFlags() * native nonOLE Form Control Objects. */ // #i32596# - consider new parameter <_nCalledByGroup> -SdrObject* SwMSDffManager::ImportOLE( long nOLEId, +SdrObject* SwMSDffManager::ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, const Rectangle& rBoundRect, const Rectangle& rVisArea, @@ -6345,7 +6345,7 @@ bool WW8Reader::ReadGlossaries(SwTextBlocks& rBlocks, bool bSaveRelFiles) const return bRet; } -bool SwMSDffManager::GetOLEStorageName(long nOLEId, OUString& rStorageName, +bool SwMSDffManager::GetOLEStorageName(sal_uInt32 nOLEId, OUString& rStorageName, tools::SvRef<SotStorage>& rSrcStorage, uno::Reference < embed::XStorage >& rDestStorage) const { bool bRet = false; diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 0e35089a8eb7..4ed2ce372cf6 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -740,12 +740,12 @@ private: SvStream *pFallbackStream; std::map<sal_uInt32,OString> aOldEscherBlipCache; - virtual bool GetOLEStorageName( long nOLEId, OUString& rStorageName, + virtual bool GetOLEStorageName( sal_uInt32 nOLEId, OUString& rStorageName, tools::SvRef<SotStorage>& rSrcStorage, css::uno::Reference < css::embed::XStorage >& rDestStorage ) const override; virtual bool ShapeHasText( sal_uLong nShapeId, sal_uLong nFilePos ) const override; // #i32596# - new parameter <_nCalledByGroup>, which // indicates, if the OLE object is imported inside a group object - virtual SdrObject* ImportOLE( long nOLEId, + virtual SdrObject* ImportOLE( sal_uInt32 nOLEId, const Graphic& rGrf, const Rectangle& rBoundRect, const Rectangle& rVisArea, |