[Libreoffice-commits] core.git: sd/inc sd/source

[Stephan Bergmann]

 sd/inc/sdmod.hxx               |    3 +--
 sd/source/ui/unoidl/unoobj.cxx |    4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 32632975a3d88b6a8d6fad31f541b41527abe141
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 5 13:58:35 2015 +0100

    No need for rtl::Reference here
    
    Change-Id: I9c31d91dab2bc47148c0439947c331e411159891

diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index d3ae1b2..758578b 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 59aeaa2..efb6f2c 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 )