Kaydet (Commit) 065852f4 authored tarafından Noel Grandin's avatar Noel Grandin

sal_uIntPtr->SfxItemPropertyMapEntry* in SdExtPropertySetInfoCache

Change-Id: I65d284cc1fbc013a17d4bb2f0dd7d7d8d3ccf56f
Reviewed-on: https://gerrit.libreoffice.org/46507Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 610d98bd
...@@ -41,6 +41,7 @@ class SdTransferable; ...@@ -41,6 +41,7 @@ class SdTransferable;
class SvNumberFormatter; class SvNumberFormatter;
class SfxErrorHandler; class SfxErrorHandler;
class SfxFrame; class SfxFrame;
struct SfxItemPropertyMapEntry;
namespace svtools { class ColorConfig; } namespace svtools { class ColorConfig; }
namespace com { namespace sun { namespace star { namespace frame { namespace com { namespace sun { namespace star { namespace frame {
...@@ -53,7 +54,7 @@ enum SdOptionStreamMode ...@@ -53,7 +54,7 @@ enum SdOptionStreamMode
SD_OPTION_STORE = 1 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; typedef std::map< sal_uInt32, css::uno::Sequence< css::uno::Type> > SdTypesCache;
/* /*
......
...@@ -406,7 +406,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) ...@@ -406,7 +406,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName )
//XPropertySet //XPropertySet
css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL SdXShape::getPropertySetInfo() 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; css::uno::Reference<css::beans::XPropertySetInfo> pInfo;
SdExtPropertySetInfoCache& rCache = (mpModel && mpModel->IsImpressDocument()) ? SdExtPropertySetInfoCache& rCache = (mpModel && mpModel->IsImpressDocument()) ?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment