sd/inc/sdmod.hxx | 3 ++- sd/source/ui/unoidl/unoobj.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit 065852f4eb5943074749ffb06c3d21e2f8931f98 Author: Noel Grandin <noel.gran...@collabora.co.uk> Date: Fri Dec 15 11:11:16 2017 +0200 sal_uIntPtr->SfxItemPropertyMapEntry* in SdExtPropertySetInfoCache Change-Id: I65d284cc1fbc013a17d4bb2f0dd7d7d8d3ccf56f Reviewed-on: https://gerrit.libreoffice.org/46507 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index fa13ef05032b..409745422ddf 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -41,6 +41,7 @@ class SdTransferable; class SvNumberFormatter; class SfxErrorHandler; class SfxFrame; +struct SfxItemPropertyMapEntry; namespace svtools { class ColorConfig; } namespace com { namespace sun { namespace star { namespace frame { @@ -53,7 +54,7 @@ enum SdOptionStreamMode SD_OPTION_STORE = 1 }; -typedef std::map< sal_uIntPtr, css::uno::Reference<css::beans::XPropertySetInfo> > SdExtPropertySetInfoCache; +typedef std::map< SfxItemPropertyMapEntry const * , css::uno::Reference<css::beans::XPropertySetInfo> > SdExtPropertySetInfoCache; typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache; /* diff --git a/sd/source/ui/unoidl/unoobj.cxx b/sd/source/ui/unoidl/unoobj.cxx index d85ac8a473f6..754aa3782080 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -406,7 +406,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) //XPropertySet css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() { - sal_uIntPtr nObjId = reinterpret_cast<sal_uIntPtr>(mpShape->getPropertyMapEntries()); + SfxItemPropertyMapEntry const * nObjId = mpShape->getPropertyMapEntries(); css::uno::Reference<css::beans::XPropertySetInfo> pInfo; SdExtPropertySetInfoCache& rCache = (mpModel && mpModel->IsImpressDocument()) ? _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits