diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 13:58:35 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 13:58:35 +0100 |
| commit | 32632975a3d88b6a8d6fad31f541b41527abe141 (patch) | |
| tree | 2b982f360e8db5e6b3c19745278e2854746a008f | |
| parent | 7078f667a3e39601c6d135e311de67fbab289a2b (diff) | |
No need for rtl::Reference here
Change-Id: I9c31d91dab2bc47148c0439947c331e411159891
| -rw-r--r-- | sd/inc/sdmod.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unoobj.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index d3ae1b2882e1..758578b8dbaa 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -23,7 +23,6 @@ #include "glob.hxx" #include "pres.hxx" -#include <rtl/ref.hxx> #include <sot/storage.hxx> #include <tools/shl.hxx> #include "sddllapi.h" @@ -61,7 +60,7 @@ enum SdOptionStreamMode SD_OPTION_STORE = 1 }; -typedef std::map< sal_uIntPtr, rtl::Reference<SfxExtItemPropertySetInfo> > SdExtPropertySetInfoCache; +typedef std::map< sal_uIntPtr, 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 59aeaa2d29e9..efb6f2cd8149 100644 --- a/sd/source/ui/unoidl/unoobj.cxx +++ b/sd/source/ui/unoidl/unoobj.cxx @@ -422,7 +422,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) throw(::com::sun::star::uno::RuntimeException) { sal_uIntPtr nObjId = reinterpret_cast<sal_uIntPtr>(mpShape->getPropertyMapEntries()); - rtl::Reference<SfxExtItemPropertySetInfo> pInfo; + css::uno::Reference<css::beans::XPropertySetInfo> pInfo; SdExtPropertySetInfoCache& rCache = (mpModel && mpModel->IsImpressDocument()) ? SD_MOD()->gImplImpressPropertySetInfoCache : SD_MOD()->gImplDrawPropertySetInfoCache; @@ -441,7 +441,7 @@ uno::Any SAL_CALL SdXShape::getPropertyDefault( const OUString& aPropertyName ) pInfo = (*aIter).second; } - return pInfo.get(); + return pInfo; } void SAL_CALL SdXShape::setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) |