[Libreoffice-commits] core.git: filter/source include/filter sw/source
Stephan Bergmann
sbergman at redhat.com
Thu Mar 23 18:57:45 UTC 2017
filter/source/msfilter/msdffimp.cxx | 4 ++--
filter/source/msfilter/svdfppt.cxx | 4 ++--
include/filter/msfilter/msdffimp.hxx | 4 ++--
include/filter/msfilter/svdfppt.hxx | 2 +-
sw/source/filter/ww8/ww8par.cxx | 4 ++--
sw/source/filter/ww8/ww8par.hxx | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit d2d6e7dc90afb7a062165036c6e9c4ca62ef6aea
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Mar 23 19:52:28 2017 +0100
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
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 );
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
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index f6f1c493e822..8a77b3d4d444 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -576,7 +576,7 @@ protected:
// #i32596# - new parameter <_nCalledByGroup>, which
// indicates, if the OLE object is imported inside a group object.
virtual SdrObject* ImportOLE(
- long nOLEId,
+ sal_uInt32 nOLEId,
const Graphic& rGraf,
const Rectangle& rBoundRect,
const Rectangle& rVisArea,
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,
More information about the Libreoffice-commits
mailing list