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 /include/filter/msfilter/msdffimp.hxx | |
| 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 'include/filter/msfilter/msdffimp.hxx')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index c8349f9663cc..9b810357450e 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -472,7 +472,7 @@ protected: // #i32596# - pass <nCalledByGroup> to method // Needed in Writer's Microsoft Word import to avoid import of OLE objects // inside groups. Instead a graphic object is created. - virtual SdrObject* ImportOLE( long nOLEId, + virtual SdrObject* ImportOLE( sal_uInt32 nOLEId, const Graphic& rGraf, const Rectangle& rBoundRect, const Rectangle& rVisArea, @@ -516,7 +516,7 @@ protected: static void ReadObjText( const OUString& rText, SdrObject* pObj ); // the following method needs to be overridden for the import of OLE objects - virtual bool GetOLEStorageName( long nOLEId, + virtual bool GetOLEStorageName( sal_uInt32 nOLEId, OUString& rStorageName, tools::SvRef<SotStorage>& rSrcStorage, css::uno::Reference < css::embed::XStorage >& xDestStg |