getPropertyMap can return a reference instead of a pointer

9 files changed, 55 insertions, 54 deletions

diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 7c458105080f..24dcb850881d 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -223,7 +223,7 @@ protected:
     const ScMarkData*       GetMarkData();
 
     // GetItemPropertyMap for derived classes must contain all entries, including base class
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual ::com::sun::star::beans::PropertyState GetOnePropertyState(
                                 sal_uInt16 nItemWhich, const SfxItemPropertySimpleEntry* pEntry );
     virtual void            GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
@@ -618,7 +618,7 @@ private:
 
 protected:
     const ScRange&          GetRange() const    { return aRange; }
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
@@ -840,7 +840,7 @@ private:
     com::sun::star::table::CellContentType GetResultType_Impl();
 
 protected:
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
@@ -851,7 +851,7 @@ protected:
 
 public:
     static const SvxItemPropertySet* GetEditPropertySet();
-    static const SfxItemPropertyMap* GetCellPropertyMap();
+    static const SfxItemPropertyMap& GetCellPropertyMap();
 
                             ScCellObj(ScDocShell* pDocSh, const ScAddress& rP);
     virtual                 ~ScCellObj();
@@ -1021,7 +1021,7 @@ private:
     void                    PrintAreaUndo_Impl( ScPrintRangeSaver* pOldRanges );
 
 protected:
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
@@ -1256,7 +1256,7 @@ private:
     const SfxItemPropertySet*       pColPropSet;
 
 protected:
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
@@ -1307,7 +1307,7 @@ private:
     const SfxItemPropertySet*       pRowPropSet;
 
 protected:
-    virtual const SfxItemPropertyMap* GetItemPropertyMap();
+    virtual const SfxItemPropertyMap& GetItemPropertyMap();
     virtual void GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
                                 ::com::sun::star::uno::Any& )
                                 throw(::com::sun::star::uno::RuntimeException);
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index e8f9493398ad..f9dc03db6f8c 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -726,7 +726,7 @@ void SAL_CALL ScAutoFormatFieldObj::setPropertyValue(
     SolarMutexGuard aGuard;
     ScAutoFormat* pFormats = ScGlobal::GetAutoFormat();
     const SfxItemPropertySimpleEntry* pEntry =
-            aPropSet.getPropertyMap()->getByName( aPropertyName );
+            aPropSet.getPropertyMap().getByName( aPropertyName );
 
     if ( pEntry && pEntry->nWID && pFormats && nFormatIndex < pFormats->GetCount() )
     {
@@ -816,7 +816,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const rtl::OUString& a
 
     ScAutoFormat* pFormats = ScGlobal::GetAutoFormat();
     const SfxItemPropertySimpleEntry* pEntry =
-            aPropSet.getPropertyMap()->getByName( aPropertyName );
+            aPropSet.getPropertyMap().getByName( aPropertyName );
 
     if ( pEntry && pEntry->nWID && pFormats && nFormatIndex < pFormats->GetCount() )
     {
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 7e75ea871507..cb836d7cb571 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1790,7 +1790,7 @@ void SAL_CALL ScCellRangesBase::clearContents( sal_Int32 nContentFlags ) throw(u
 
 // XPropertyState
 
-const SfxItemPropertyMap* ScCellRangesBase::GetItemPropertyMap()
+const SfxItemPropertyMap& ScCellRangesBase::GetItemPropertyMap()
 {
     return pPropSet->getPropertyMap();
 }
@@ -1880,9 +1880,9 @@ beans::PropertyState SAL_CALL ScCellRangesBase::getPropertyState( const rtl::OUS
     if ( aRanges.empty() )
         throw uno::RuntimeException();
 
-    const SfxItemPropertyMap* pMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertyMap& rMap = GetItemPropertyMap();     // from derived class
     sal_uInt16 nItemWhich = 0;
-    const SfxItemPropertySimpleEntry* pEntry  = pMap->getByName( aPropertyName );
+    const SfxItemPropertySimpleEntry* pEntry  = rMap.getByName( aPropertyName );
     lcl_GetPropertyWhich( pEntry, nItemWhich );
     return GetOnePropertyState( nItemWhich, pEntry );
 }
@@ -1893,14 +1893,14 @@ uno::Sequence<beans::PropertyState> SAL_CALL ScCellRangesBase::getPropertyStates
 {
     SolarMutexGuard aGuard;
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
 
     uno::Sequence<beans::PropertyState> aRet(aPropertyNames.getLength());
     beans::PropertyState* pStates = aRet.getArray();
     for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++)
     {
         sal_uInt16 nItemWhich = 0;
-        const SfxItemPropertySimpleEntry* pEntry  = pPropertyMap->getByName( aPropertyNames[i] );
+        const SfxItemPropertySimpleEntry* pEntry  = rPropertyMap.getByName( aPropertyNames[i] );
         lcl_GetPropertyWhich( pEntry, nItemWhich );
         pStates[i] = GetOnePropertyState(nItemWhich, pEntry);
     }
@@ -1913,9 +1913,9 @@ void SAL_CALL ScCellRangesBase::setPropertyToDefault( const rtl::OUString& aProp
     SolarMutexGuard aGuard;
     if ( pDocShell )
     {
-        const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+        const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
         sal_uInt16 nItemWhich = 0;
-        const SfxItemPropertySimpleEntry* pEntry  = pPropertyMap->getByName( aPropertyName );
+        const SfxItemPropertySimpleEntry* pEntry  = rPropertyMap.getByName( aPropertyName );
         lcl_GetPropertyWhich( pEntry, nItemWhich );
         if ( nItemWhich )               // item wid (from map or special case)
         {
@@ -1967,8 +1967,8 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyDefault( const rtl::OUString& aPr
     if ( pDocShell )
     {
         ScDocument* pDoc = pDocShell->GetDocument();
-        const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
-        const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyName );
+        const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
+        const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
         if ( pEntry )
         {
             if ( IsScItemWid( pEntry->nWID ) )
@@ -2189,8 +2189,8 @@ void SAL_CALL ScCellRangesBase::setPropertyValue(
     if ( !pDocShell || aRanges.empty() )
         throw uno::RuntimeException();
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
-    const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyName );
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
         throw beans::UnknownPropertyException();
 
@@ -2376,8 +2376,8 @@ uno::Any SAL_CALL ScCellRangesBase::getPropertyValue( const rtl::OUString& aProp
     if ( !pDocShell || aRanges.empty() )
         throw uno::RuntimeException();
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
-    const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyName );
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyName );
     if ( !pEntry )
         throw beans::UnknownPropertyException();
 
@@ -2582,7 +2582,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
 
     if ( pDocShell && nCount )
     {
-        const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();      // from derived class
+        const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();      // from derived class
         const rtl::OUString* pNames = aPropertyNames.getConstArray();
         const uno::Any* pValues = aValues.getConstArray();
 
@@ -2594,7 +2594,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const uno::Sequence< rtl::OUS
             // first loop: find all properties in map, but handle only CellStyle
             // (CellStyle must be set before any other cell properties)
 
-            const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( pNames[i] );
+            const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( pNames[i] );
             pEntryArray[i] = pEntry;
             if (pEntry)
             {
@@ -2669,13 +2669,13 @@ uno::Sequence<uno::Any> SAL_CALL ScCellRangesBase::getPropertyValues(
 {
     SolarMutexGuard aGuard;
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
 
     uno::Sequence<uno::Any> aRet(aPropertyNames.getLength());
     uno::Any* pProperties = aRet.getArray();
     for(sal_Int32 i = 0; i < aPropertyNames.getLength(); i++)
     {
-        const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
+        const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] );
         GetOnePropertyValue( pEntry, pProperties[i] );
     }
     return aRet;
@@ -2732,7 +2732,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
         uno::Sequence < beans::SetPropertyTolerantFailed > aReturns(nCount);
         beans::SetPropertyTolerantFailed* pReturns = aReturns.getArray();
 
-        const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+        const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
         const rtl::OUString* pNames = aPropertyNames.getConstArray();
         const uno::Any* pValues = aValues.getConstArray();
 
@@ -2744,7 +2744,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL ScCellRangesBase::set
             // first loop: find all properties in map, but handle only CellStyle
             // (CellStyle must be set before any other cell properties)
 
-            const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( pNames[i] );
+            const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( pNames[i] );
             pMapArray[i] = pEntry;
             if (pEntry)
             {
@@ -2852,11 +2852,11 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL ScCellRangesBase::get
     uno::Sequence < beans::GetPropertyTolerantResult > aReturns(nCount);
     beans::GetPropertyTolerantResult* pReturns = aReturns.getArray();
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
 
     for(sal_Int32 i = 0; i < nCount; i++)
     {
-        const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
+        const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] );
         if (!pEntry)
         {
             pReturns[i].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
@@ -2882,12 +2882,12 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL ScCellRangesBas
     uno::Sequence < beans::GetDirectPropertyTolerantResult > aReturns(nCount);
     beans::GetDirectPropertyTolerantResult* pReturns = aReturns.getArray();
 
-    const SfxItemPropertyMap* pPropertyMap = GetItemPropertyMap();     // from derived class
+    const SfxItemPropertyMap& rPropertyMap = GetItemPropertyMap();     // from derived class
 
     sal_Int32 j = 0;
     for(sal_Int32 i = 0; i < nCount; i++)
     {
-        const SfxItemPropertySimpleEntry* pEntry = pPropertyMap->getByName( aPropertyNames[i] );
+        const SfxItemPropertySimpleEntry* pEntry = rPropertyMap.getByName( aPropertyNames[i] );
         if (!pEntry)
         {
             pReturns[i].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
@@ -6010,7 +6010,7 @@ void ScCellRangeObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEnt
     }
 }
 
-const SfxItemPropertyMap* ScCellRangeObj::GetItemPropertyMap()
+const SfxItemPropertyMap& ScCellRangeObj::GetItemPropertyMap()
 {
     return pRangePropSet->getPropertyMap();
 }
@@ -6052,7 +6052,8 @@ const SvxItemPropertySet* ScCellObj::GetEditPropertySet()
 {
     return lcl_GetEditPropertySet();
 }
-const SfxItemPropertyMap* ScCellObj::GetCellPropertyMap()
+
+const SfxItemPropertyMap& ScCellObj::GetCellPropertyMap()
 {
     return lcl_GetCellPropertySet()->getPropertyMap();
 }
@@ -6762,7 +6763,7 @@ void ScCellObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntry,
     }
 }
 
-const SfxItemPropertyMap* ScCellObj::GetItemPropertyMap()
+const SfxItemPropertyMap& ScCellObj::GetItemPropertyMap()
 {
     return pCellPropSet->getPropertyMap();
 }
@@ -8682,7 +8683,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
     }
 }
 
-const SfxItemPropertyMap* ScTableSheetObj::GetItemPropertyMap()
+const SfxItemPropertyMap& ScTableSheetObj::GetItemPropertyMap()
 {
     return pSheetPropSet->getPropertyMap();
 }
@@ -8960,7 +8961,7 @@ void ScTableColumnObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pE
     }
 }
 
-const SfxItemPropertyMap* ScTableColumnObj::GetItemPropertyMap()
+const SfxItemPropertyMap& ScTableColumnObj::GetItemPropertyMap()
 {
     return pColPropSet->getPropertyMap();
 }
@@ -9117,7 +9118,7 @@ void ScTableRowObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEntr
     }
 }
 
-const SfxItemPropertyMap* ScTableRowObj::GetItemPropertyMap()
+const SfxItemPropertyMap& ScTableRowObj::GetItemPropertyMap()
 {
     return pRowPropSet->getPropertyMap();
 }
diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx
index e9586d97d302..a2d16432a899 100644
--- a/sc/source/ui/unoobj/defltuno.cxx
+++ b/sc/source/ui/unoobj/defltuno.cxx
@@ -129,7 +129,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDocDefaultsObj::getPropertySe
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef = new SfxItemPropertySetInfo(
-                                                                        &aPropertyMap );
+                                                                        aPropertyMap );
     return aRef;
 }
 
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index b9be4933ce9f..71c1a07ab7b0 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -1604,7 +1604,7 @@ void SAL_CALL ScModelObj::setPropertyValue(
         //  Recalculation after loading is handled separately.
         bool bHardRecalc = !pDoc->IsImportingXML();
 
-        sal_Bool bOpt = ScDocOptionsHelper::setPropertyValue( aNewOpt, *aPropSet.getPropertyMap(), aPropertyName, aValue );
+        sal_Bool bOpt = ScDocOptionsHelper::setPropertyValue( aNewOpt, aPropSet.getPropertyMap(), aPropertyName, aValue );
         if (bOpt)
         {
             // done...
@@ -1738,7 +1738,7 @@ uno::Any SAL_CALL ScModelObj::getPropertyValue( const rtl::OUString& aPropertyNa
     {
         ScDocument* pDoc = pDocShell->GetDocument();
         const ScDocOptions& rOpt = pDoc->GetDocOptions();
-        aRet = ScDocOptionsHelper::getPropertyValue( rOpt, *aPropSet.getPropertyMap(), aPropertyName );
+        aRet = ScDocOptionsHelper::getPropertyValue( rOpt, aPropSet.getPropertyMap(), aPropertyName );
         if ( aRet.hasValue() )
         {
             // done...
diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx
index 4145399ada26..cbf4b1d7fd26 100644
--- a/sc/source/ui/unoobj/funcuno.cxx
+++ b/sc/source/ui/unoobj/funcuno.cxx
@@ -301,7 +301,7 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScFunctionAccess::getPropertySe
 {
     SolarMutexGuard aGuard;
     static uno::Reference<beans::XPropertySetInfo> aRef(
-        new SfxItemPropertySetInfo( &aPropertyMap ));
+        new SfxItemPropertySetInfo( aPropertyMap ));
     return aRef;
 }
 
diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx
index 85e119f7bf11..f5fe4d09c3de 100644
--- a/sc/source/ui/unoobj/optuno.cxx
+++ b/sc/source/ui/unoobj/optuno.cxx
@@ -211,7 +211,7 @@ void SAL_CALL ScDocOptionsObj::setPropertyValue(
 {
     SolarMutexGuard aGuard;
 
-    sal_Bool bDone = ScDocOptionsHelper::setPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName, aValue );
+    sal_Bool bDone = ScDocOptionsHelper::setPropertyValue( aOptions, GetPropertySet().getPropertyMap(), aPropertyName, aValue );
 
     if (!bDone)
         ScModelObj::setPropertyValue( aPropertyName, aValue );
@@ -223,7 +223,7 @@ uno::Any SAL_CALL ScDocOptionsObj::getPropertyValue( const rtl::OUString& aPrope
 {
     SolarMutexGuard aGuard;
 
-    uno::Any aRet(ScDocOptionsHelper::getPropertyValue( aOptions, *GetPropertySet().getPropertyMap(), aPropertyName ));
+    uno::Any aRet(ScDocOptionsHelper::getPropertyValue( aOptions, GetPropertySet().getPropertyMap(), aPropertyName ));
     if ( !aRet.hasValue() )
         aRet =  ScModelObj::getPropertyValue( aPropertyName );
 
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index 45737dc35ad7..c35d31c4e327 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -1322,7 +1322,7 @@ const SfxItemSet* ScStyleObj::GetStyleItemSet_Impl( const ::rtl::OUString& rProp
                 return &((const SvxSetItem&)pStyle->GetItemSet().Get(ATTR_PAGE_FOOTERSET)).GetItemSet();
             }
         }
-        pEntry = pPropSet->getPropertyMap()->getByName( rPropName );
+        pEntry = pPropSet->getPropertyMap().getByName( rPropName );
         if ( pEntry )
         {
             rpResultEntry = pEntry;
@@ -1395,8 +1395,8 @@ void SAL_CALL ScStyleObj::setPropertyToDefault( const rtl::OUString& aPropertyNa
 {
     SolarMutexGuard aGuard;
 
-    const SfxItemPropertyMap* pMap = pPropSet->getPropertyMap();
-    const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( aPropertyName );
+    const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
+    const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( aPropertyName );
     if ( !pEntry )
         throw beans::UnknownPropertyException();
 
@@ -1512,10 +1512,10 @@ void SAL_CALL ScStyleObj::setPropertyValues( const uno::Sequence< rtl::OUString
         const rtl::OUString* pNames = aPropertyNames.getConstArray();
         const uno::Any* pValues = aValues.getConstArray();
 
-        const SfxItemPropertyMap* pPropertyMap = pPropSet->getPropertyMap();
+        const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap();
         for (sal_Int32 i = 0; i < nCount; i++)
         {
-            const SfxItemPropertySimpleEntry*  pEntry = pPropertyMap->getByName( pNames[i] );
+            const SfxItemPropertySimpleEntry*  pEntry = rPropertyMap.getByName( pNames[i] );
             SetOnePropertyValue( pNames[i], pEntry, &pValues[i] );
         }
     }
@@ -1620,10 +1620,10 @@ void SAL_CALL ScStyleObj::setPropertiesToDefault( const uno::Sequence<rtl::OUStr
     {
         const rtl::OUString* pNames = aPropertyNames.getConstArray();
 
-        const SfxItemPropertyMap* pPropertyMap = pPropSet->getPropertyMap();
+        const SfxItemPropertyMap& rPropertyMap = pPropSet->getPropertyMap();
         for (sal_Int32 i = 0; i < nCount; i++)
         {
-            const SfxItemPropertySimpleEntry*  pEntry = pPropertyMap->getByName( pNames[i] );
+            const SfxItemPropertySimpleEntry*  pEntry = rPropertyMap.getByName( pNames[i] );
             SetOnePropertyValue( pNames[i], pEntry, NULL );
         }
     }
@@ -1666,7 +1666,7 @@ void SAL_CALL ScStyleObj::setPropertyValue(
 {
     SolarMutexGuard aGuard;
 
-    const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap()->getByName( aPropertyName );
+    const SfxItemPropertySimpleEntry*  pEntry = pPropSet->getPropertyMap().getByName( aPropertyName );
     if ( !pEntry )
         throw beans::UnknownPropertyException();
 
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 382a6913f6b2..9bd0d9e52f54 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -1389,8 +1389,8 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr,
     {
         ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aProperties;
         sal_Int32 nCount = 0;
-        const SfxItemPropertyMap* pMap = ScCellObj::GetCellPropertyMap();
-        PropertyEntryVector_t aPropVector = pMap->getPropertyEntries();
+        const SfxItemPropertyMap& rMap = ScCellObj::GetCellPropertyMap();
+        PropertyEntryVector_t aPropVector = rMap.getPropertyEntries();
         for ( sal_uInt16 nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; ++nWhich )
         {
             const SfxPoolItem* pItem = 0;