[Libreoffice-commits] .: 2 commits - editeng/source linguistic/source sc/inc sc/source sfx2/source svl/inc svl/source sw/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jan 5 14:42:36 PST 2012
editeng/source/editeng/impedit3.cxx | 3 -
editeng/source/uno/unofield.cxx | 4 -
editeng/source/uno/unoipset.cxx | 2
editeng/source/uno/unotext.cxx | 2
linguistic/source/lngopt.cxx | 2
sc/inc/cellsuno.hxx | 14 +++---
sc/source/ui/unoobj/afmtuno.cxx | 4 -
sc/source/ui/unoobj/cellsuno.cxx | 59 ++++++++++++++---------------
sc/source/ui/unoobj/defltuno.cxx | 2
sc/source/ui/unoobj/docuno.cxx | 4 -
sc/source/ui/unoobj/funcuno.cxx | 2
sc/source/ui/unoobj/optuno.cxx | 4 -
sc/source/ui/unoobj/styleuno.cxx | 16 +++----
sc/source/ui/view/viewfunc.cxx | 4 -
sfx2/source/doc/iframe.cxx | 2
sfx2/source/doc/plugin.cxx | 2
svl/inc/svl/itemprop.hxx | 8 +--
svl/source/items/itemprop.cxx | 11 ++---
sw/source/core/access/accpara.cxx | 8 +--
sw/source/core/unocore/SwXTextDefaults.cxx | 10 ++--
sw/source/core/unocore/unodraw.cxx | 10 ++--
sw/source/core/unocore/unofield.cxx | 8 +--
sw/source/core/unocore/unoframe.cxx | 10 ++--
sw/source/core/unocore/unoidx.cxx | 8 +--
sw/source/core/unocore/unoobj.cxx | 16 +++----
sw/source/core/unocore/unoparagraph.cxx | 26 ++++++------
sw/source/core/unocore/unoport.cxx | 16 +++----
sw/source/core/unocore/unosect.cxx | 10 ++--
sw/source/core/unocore/unosett.cxx | 16 +++----
sw/source/core/unocore/unosrch.cxx | 6 +-
sw/source/core/unocore/unostyle.cxx | 46 +++++++++++-----------
sw/source/core/unocore/unotbl.cxx | 20 ++++-----
sw/source/core/unocore/unotext.cxx | 10 ++--
sw/source/ui/uno/unoatxt.cxx | 4 -
sw/source/ui/uno/unomailmerge.cxx | 8 +--
sw/source/ui/uno/unotxdoc.cxx | 10 ++--
sw/source/ui/uno/unotxvw.cxx | 4 -
37 files changed, 196 insertions(+), 195 deletions(-)
New commits:
commit d6aa26c8a20e6634b0cc6e1dac6f09d3f2824919
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 5 21:44:15 2012 +0000
tweak this a little
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index c964aeb..757db0c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3291,7 +3291,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRec, Point aSta
aTmpFont.SetEscapement( 0 );
aTmpFont.SetPropr( 100 );
aTmpFont.SetPhysFont( pOutDev );
- rtl::OUStringBuffer aBlanks = comphelper::string::padToLength( aBlanks, (sal_Int32) nTextLen, ' ' );
+ rtl::OUStringBuffer aBlanks;
+ comphelper::string::padToLength( aBlanks, (sal_Int32) nTextLen, ' ' );
Point aUnderlinePos( aOutPos );
if ( nOrientation )
aUnderlinePos = lcl_ImplCalcRotatedPos( aTmpPos, aOrigin, nSin, nCos );
commit 9999eab5fe5e92118574468905cae0e3c8982c7f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jan 5 21:30:06 2012 +0000
getPropertyMap can return a reference instead of a pointer
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 1798b07..8621dc1 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -669,7 +669,7 @@ void SAL_CALL SvxUnoTextField::setPropertyValue( const OUString& aPropertyName,
if( mpImpl == NULL )
throw uno::RuntimeException();
- const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap()->getByName( aPropertyName );
+ const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( aPropertyName );
if ( !pMap )
throw beans::UnknownPropertyException();
@@ -838,7 +838,7 @@ uno::Any SAL_CALL SvxUnoTextField::getPropertyValue( const OUString& PropertyNam
uno::Any aValue;
- const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap()->getByName( PropertyName );
+ const SfxItemPropertySimpleEntry* pMap = mpPropSet->getPropertyMap().getByName( PropertyName );
if ( !pMap )
throw beans::UnknownPropertyException();
diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx
index a6b79e3..a99ee1a 100644
--- a/editeng/source/uno/unoipset.cxx
+++ b/editeng/source/uno/unoipset.cxx
@@ -290,7 +290,7 @@ const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const
uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInfo() const
{
if( !m_xInfo.is() )
- m_xInfo = new SfxItemPropertySetInfo( &m_aPropertyMap );
+ m_xInfo = new SfxItemPropertySetInfo( m_aPropertyMap );
return m_xInfo;
}
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index ff9cbf4..6559282 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1919,7 +1919,7 @@ void SvxPropertyValuesToItemSet(
const beans::PropertyValue *pProps = rPropertyVaules.getConstArray();
for (sal_Int32 i = 0; i < nProps; ++i)
{
- const SfxItemPropertySimpleEntry *pEntry = pPropSet->getPropertyMap()->getByName( pProps[i].Name );
+ const SfxItemPropertySimpleEntry *pEntry = pPropSet->getPropertyMap().getByName( pProps[i].Name );
if (pEntry)
{
// Note: there is no need to take special care of the properties
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 280882c..da17ba1 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -237,7 +237,7 @@ Reference< XPropertySetInfo > SAL_CALL LinguProps::getPropertySetInfo()
MutexGuard aGuard( GetLinguMutex() );
static Reference< XPropertySetInfo > aRef =
- new SfxItemPropertySetInfo( &aPropertyMap );
+ new SfxItemPropertySetInfo( aPropertyMap );
return aRef;
}
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index 7c45810..24dcb85 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 e8f9493..f9dc03d 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 7e75ea8..cb836d7 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 e9586d9..a2d1643 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 b9be493..71c1a07 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 4145399..cbf4b1d 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 85e119f..f5fe4d0 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 45737dc..c35d31c 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 382a691..9bd0d9e 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;
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index d9c169e..69f740c 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -206,7 +206,7 @@ void SAL_CALL IFrameObject::disposing( const com::sun::star::lang::EventObject&
uno::Reference< beans::XPropertySetInfo > SAL_CALL IFrameObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException )
{
- static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap );
+ static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap );
return xInfo;
}
diff --git a/sfx2/source/doc/plugin.cxx b/sfx2/source/doc/plugin.cxx
index 2e817a8..26fb1b3 100644
--- a/sfx2/source/doc/plugin.cxx
+++ b/sfx2/source/doc/plugin.cxx
@@ -196,7 +196,7 @@ void SAL_CALL PluginObject::disposing( const com::sun::star::lang::EventObject&
uno::Reference< beans::XPropertySetInfo > SAL_CALL PluginObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException )
{
- static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap );
+ static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( maPropMap );
return xInfo;
}
diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index aeaa9e2..09dfadc 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/svl/inc/svl/itemprop.hxx
@@ -94,7 +94,7 @@ class SVL_DLLPUBLIC SfxItemPropertyMap
SfxItemPropertyMap_Impl* m_pImpl;
public:
SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries );
- SfxItemPropertyMap( const SfxItemPropertyMap* pSource );
+ SfxItemPropertyMap( const SfxItemPropertyMap& rSource );
~SfxItemPropertyMap();
const SfxItemPropertySimpleEntry* getByName( const ::rtl::OUString &rName ) const;
@@ -156,9 +156,7 @@ public:
com::sun::star::uno::Reference<com::sun::star::beans::XPropertySetInfo>
getPropertySetInfo() const;
- const SfxItemPropertyMap*
- getPropertyMap() const {return &m_aMap;}
-
+ const SfxItemPropertyMap& getPropertyMap() const {return m_aMap;}
};
struct SfxItemPropertySetInfo_Impl;
@@ -168,7 +166,7 @@ class SVL_DLLPUBLIC SfxItemPropertySetInfo : public
SfxItemPropertySetInfo_Impl* m_pImpl;
public:
- SfxItemPropertySetInfo(const SfxItemPropertyMap *pMap );
+ SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap );
SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries );
virtual ~SfxItemPropertySetInfo();
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 536eed6..ec6629b 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -61,6 +61,7 @@ public:
SfxItemPropertyMap_Impl(){}
SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl* pSource );
};
+
SfxItemPropertyMap_Impl::SfxItemPropertyMap_Impl( const SfxItemPropertyMap_Impl* pSource )
{
this->SfxItemPropertyHashMap_t::operator=( *pSource );
@@ -78,8 +79,8 @@ SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMapEntry* pEntries
}
}
-SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMap* pSource ) :
- m_pImpl( new SfxItemPropertyMap_Impl( pSource->m_pImpl ) )
+SfxItemPropertyMap::SfxItemPropertyMap( const SfxItemPropertyMap& rSource ) :
+ m_pImpl( new SfxItemPropertyMap_Impl( rSource.m_pImpl ) )
{
}
@@ -344,7 +345,7 @@ Reference<XPropertySetInfo>
SfxItemPropertySet::getPropertySetInfo() const
{
if( !m_xInfo.is() )
- m_xInfo = new SfxItemPropertySetInfo( &m_aMap );
+ m_xInfo = new SfxItemPropertySetInfo( m_aMap );
return m_xInfo;
}
@@ -353,10 +354,10 @@ struct SfxItemPropertySetInfo_Impl
SfxItemPropertyMap* m_pOwnMap;
};
-SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMap *pMap ) :
+SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMap &rMap ) :
m_pImpl( new SfxItemPropertySetInfo_Impl )
{
- m_pImpl->m_pOwnMap = new SfxItemPropertyMap( pMap );
+ m_pImpl->m_pOwnMap = new SfxItemPropertyMap( rMap );
}
SfxItemPropertySetInfo::SfxItemPropertySetInfo(const SfxItemPropertyMapEntry *pEntries ) :
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 1133da6..30c3165 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1274,9 +1274,9 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
// build-up sequence containing the run attributes <rDefAttrSeq>
tAccParaPropValMap aDefAttrSeq;
{
- const SfxItemPropertyMap* pPropMap =
+ const SfxItemPropertyMap& rPropMap =
aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_CURSOR )->getPropertyMap();
- PropertyEntryVector_t aPropertyEntries = pPropMap->getPropertyEntries();
+ PropertyEntryVector_t aPropertyEntries = rPropMap.getPropertyEntries();
PropertyEntryVector_t::const_iterator aPropIt = aPropertyEntries.begin();
while ( aPropIt != aPropertyEntries.end() )
{
@@ -1505,9 +1505,9 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
uno::Sequence< ::rtl::OUString > aDummy;
_getDefaultAttributesImpl( aDummy, aDefAttrSeq, true ); // #i82637#
- const SfxItemPropertyMap* pPropMap =
+ const SfxItemPropertyMap& rPropMap =
aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_CURSOR )->getPropertyMap();
- PropertyEntryVector_t aPropertyEntries = pPropMap->getPropertyEntries();
+ PropertyEntryVector_t aPropertyEntries = rPropMap.getPropertyEntries();
PropertyEntryVector_t::const_iterator aPropIt = aPropertyEntries.begin();
while ( aPropIt != aPropertyEntries.end() )
{
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 2dbfec6..35c6f89 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -80,7 +80,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName,
SolarMutexGuard aGuard;
if (!m_pDoc)
throw RuntimeException();
- const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pMap->nFlags & PropertyAttribute::READONLY)
@@ -146,7 +146,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName )
SolarMutexGuard aGuard;
if (!m_pDoc)
throw RuntimeException();
- const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
Any aRet;
@@ -192,7 +192,7 @@ PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPrope
PropertyState eRet = PropertyState_DIRECT_VALUE;
if (!m_pDoc)
throw RuntimeException();
- const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -223,7 +223,7 @@ void SAL_CALL SwXTextDefaults::setPropertyToDefault( const OUString& rPropertyNa
{
if (!m_pDoc)
throw RuntimeException();
- const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pMap->nFlags & PropertyAttribute::READONLY)
@@ -238,7 +238,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
{
if (!m_pDoc)
throw RuntimeException();
- const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pMap)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
Any aRet;
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 3746ed1..834d14d 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -1129,7 +1129,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if(xShapeAgg.is())
{
if(pEntry)
@@ -1471,7 +1471,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName)
SwFrmFmt* pFmt = GetFrmFmt();
if(xShapeAgg.is())
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if(pFmt)
@@ -1736,7 +1736,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates(
uno::Reference< XPropertyState > xShapePrState;
for(sal_Int32 nProperty = 0; nProperty < aPropertyNames.getLength(); nProperty++)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( pNames[nProperty] );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( pNames[nProperty] );
if(pEntry)
{
if(RES_OPAQUE == pEntry->nWID)
@@ -1822,7 +1822,7 @@ void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName )
SwFrmFmt* pFmt = GetFrmFmt();
if(xShapeAgg.is())
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -1886,7 +1886,7 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName )
uno::Any aRet;
if(xShapeAgg.is())
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if(pEntry->nWID < RES_FRMATR_END && pFmt)
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 113cbca..0b2a6fd 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -306,7 +306,7 @@ sal_uInt16 GetFieldTypeMId( const OUString& rProperty, const SwFieldType& rTyp )
nId = USHRT_MAX;
else
{
- const SfxItemPropertySimpleEntry* pEntry = pSet->getPropertyMap()->getByName(rProperty);
+ const SfxItemPropertySimpleEntry* pEntry = pSet->getPropertyMap().getByName(rProperty);
nId = pEntry ? pEntry->nWID : USHRT_MAX;
}
return nId;
@@ -1869,7 +1869,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An
SwField* pField = (SwField*)GetField();
const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet(
lcl_GetPropertyMapOfService( m_nServiceId));
- const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -2028,11 +2028,11 @@ uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName)
const SwField* pField = GetField();
const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet(
lcl_GetPropertyMapOfService( m_nServiceId));
- const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = _pPropSet->getPropertyMap().getByName(rPropertyName);
if(!pEntry )
{
const SfxItemPropertySet* _pParaPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH_EXTENSIONS);
- pEntry = _pParaPropSet->getPropertyMap()->getByName(rPropertyName);
+ pEntry = _pParaPropSet->getPropertyMap().getByName(rPropertyName);
}
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 517ed01..ebf73ac 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -935,7 +935,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
{
SolarMutexGuard aGuard;
SwFrmFmt* pFmt = GetFrmFmt();
- const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1403,7 +1403,7 @@ uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName)
SolarMutexGuard aGuard;
uno::Any aAny;
SwFrmFmt* pFmt = GetFrmFmt();
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1738,7 +1738,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates(
const SwAttrSet& rFmtSet = pFmt->GetAttrSet();
for(int i = 0; i < aPropertyNames.getLength(); i++)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(pNames[i]);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(pNames[i]);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
@@ -1795,7 +1795,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName )
SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -1892,7 +1892,7 @@ uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName )
SwFrmFmt* pFmt = GetFrmFmt();
if(pFmt)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
if ( pEntry->nWID < RES_FRMATR_END )
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 50e7f59..f4fd5d7 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -578,7 +578,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
SolarMutexGuard aGuard;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -894,7 +894,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::Any aRet;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -2094,7 +2094,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
SolarMutexGuard aGuard;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -2219,7 +2219,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::Any aRet;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 604a5dd..b4ea3fc 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -1853,7 +1853,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
{
uno::Any aAny;
SfxItemPropertySimpleEntry const*const pEntry =
- rPropSet.getPropertyMap()->getByName(rPropertyName);
+ rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
@@ -1892,7 +1892,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
{
SwDoc *const pDoc = rPaM.GetDoc();
SfxItemPropertySimpleEntry const*const pEntry =
- rPropSet.getPropertyMap()->getByName(rPropertyName);
+ rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -1930,7 +1930,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
const OUString* pNames = rPropertyNames.getConstArray();
uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength());
beans::PropertyState* pStates = aRet.getArray();
- SfxItemPropertyMap const*const pMap = rPropSet.getPropertyMap();
+ const SfxItemPropertyMap &rMap = rPropSet.getPropertyMap();
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<SfxItemSet> pSet;
::std::auto_ptr<SfxItemSet> pSetParent;
@@ -1939,7 +1939,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
for (sal_Int32 i = 0, nEnd = rPropertyNames.getLength(); i < nEnd; i++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- pMap->getByName( pNames[i] );
+ rMap.getByName( pNames[i] );
if(!pEntry)
{
if (pNames[i].equalsAsciiL( SW_PROP_NAME(UNO_NAME_IS_SKIP_HIDDEN_TEXT)) ||
@@ -2078,7 +2078,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
SwDoc & rDoc = *rPaM.GetDoc();
SfxItemPropertySimpleEntry const*const pEntry =
- rPropSet.getPropertyMap()->getByName(rPropertyName);
+ rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -2119,7 +2119,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::RuntimeException)
{
SfxItemPropertySimpleEntry const*const pEntry =
- rPropSet.getPropertyMap()->getByName(rPropertyName);
+ rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -2389,7 +2389,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
for (sal_Int32 i = 0; i < nCount; i++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName( pNames[i] );
+ m_pImpl->m_rPropSet.getPropertyMap().getByName( pNames[i] );
if (!pEntry)
{
if (pNames[i].equalsAsciiL(
@@ -2461,7 +2461,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
for (sal_Int32 i = 0; i < nCount; i++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName( pNames[i] );
+ m_pImpl->m_rPropSet.getPropertyMap().getByName( pNames[i] );
if (!pEntry)
{
if (pNames[i].equalsAsciiL(
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index dfdc194..930eaf9 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -394,12 +394,12 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
SwCursor aCursor( aPos, 0, false );
const OUString* pPropertyNames = rPropertyNames.getConstArray();
const uno::Any* pValues = rValues.getConstArray();
- SfxItemPropertyMap const*const pMap = m_rPropSet.getPropertyMap();
+ const SfxItemPropertyMap &rMap = m_rPropSet.getPropertyMap();
SwParaSelection aParaSel( aCursor );
for (sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- pMap->getByName( pPropertyNames[nProp] );
+ rMap.getByName( pPropertyNames[nProp] );
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -454,12 +454,12 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
SwPaM aPam( aPos );
uno::Any* pValues = aValues.getArray();
const OUString* pPropertyNames = rPropertyNames.getConstArray();
- SfxItemPropertyMap const*const pMap = m_rPropSet.getPropertyMap();
+ const SfxItemPropertyMap &rMap = m_rPropSet.getPropertyMap();
const SwAttrSet& rAttrSet( rTxtNode.GetSwAttrSet() );
for (sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- pMap->getByName( pPropertyNames[nProp] );
+ rMap.getByName( pPropertyNames[nProp] );
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -566,7 +566,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
beans::SetPropertyTolerantFailed *pFailed = aFailed.getArray();
// get entry to start with
- SfxItemPropertyMap const*const pPropMap =
+ const SfxItemPropertyMap &rPropMap =
m_pImpl->m_rPropSet.getPropertyMap();
OUString sTmp;
@@ -580,7 +580,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
pFailed[ nFailed ].Name = pProp[i];
SfxItemPropertySimpleEntry const*const pEntry =
- pPropMap->getByName( pProp[i] );
+ rPropMap.getByName( pProp[i] );
if (!pEntry)
{
pFailed[ nFailed++ ].Result =
@@ -687,7 +687,7 @@ throw (uno::RuntimeException)
sal_Int32 nIdx = 0;
// get entry to start with
- SfxItemPropertyMap const*const pPropMap = m_rPropSet.getPropertyMap();
+ const SfxItemPropertyMap &rPropMap = m_rPropSet.getPropertyMap();
for (sal_Int32 i = 0; i < nProps; ++i)
{
@@ -699,7 +699,7 @@ throw (uno::RuntimeException)
rResult.Name = pProp[i];
SfxItemPropertySimpleEntry const*const pEntry =
- pPropMap->getByName( pProp[i] );
+ rPropMap.getByName( pProp[i] );
if (!pEntry) // property available?
{
rResult.Result =
@@ -922,7 +922,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
const SwAttrSet* pSet = 0;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -948,7 +948,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
const OUString* pNames = PropertyNames.getConstArray();
uno::Sequence< beans::PropertyState > aRet(PropertyNames.getLength());
beans::PropertyState* pStates = aRet.getArray();
- SfxItemPropertyMap const*const pMap = m_pImpl->m_rPropSet.getPropertyMap();
+ const SfxItemPropertyMap &rMap = m_pImpl->m_rPropSet.getPropertyMap();
const SwAttrSet* pSet = 0;
sal_Bool bAttrSetFetched = sal_False;
@@ -956,7 +956,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
++i, ++pStates, ++pNames)
{
SfxItemPropertySimpleEntry const*const pEntry =
- pMap->getByName( *pNames );
+ rMap.getByName( *pNames );
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -999,7 +999,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
// select paragraph
SwParaSelection aParaSel( aCursor );
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName( rPropertyName );
+ m_pImpl->m_rPropSet.getPropertyMap().getByName( rPropertyName );
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -1069,7 +1069,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index e427fe7..57ee034 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -416,10 +416,10 @@ uno::Sequence< uno::Any > SAL_CALL SwXTextPortion::GetPropertyValues_Impl(
SfxItemSet *pSet = 0;
// get startting pount fo the look-up, either the provided one or else
// from the beginning of the map
- const SfxItemPropertyMap* pMap = m_pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = m_pPropSet->getPropertyMap();
for(sal_Int32 nProp = 0; nProp < nLength; nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName(pPropertyNames[nProp]);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]);
if(pEntry)
{
GetPropertyValue( pValues[nProp], *pEntry, pUnoCrsr, pSet );
@@ -455,10 +455,10 @@ void SAL_CALL SwXTextPortion::SetPropertyValues_Impl(
{
const OUString* pPropertyNames = rPropertyNames.getConstArray();
const uno::Any* pValues = rValues.getConstArray();
- const SfxItemPropertyMap* pMap = m_pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = m_pPropSet->getPropertyMap();
for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName(pPropertyNames[nProp]);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(pPropertyNames[nProp]);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pPropertyNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -541,7 +541,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
uno::Sequence< beans::SetPropertyTolerantFailed > aFailed( nProps );
beans::SetPropertyTolerantFailed *pFailed = aFailed.getArray();
- const SfxItemPropertyMap* pPropMap = m_pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rPropMap = m_pPropSet->getPropertyMap();
OUString sTmp;
for (sal_Int32 i = 0; i < nProps; ++i)
@@ -550,7 +550,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr
{
pFailed[ nFailed ].Name = pProp[i];
- const SfxItemPropertySimpleEntry* pEntry = pPropMap->getByName( pProp[i] );
+ const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( pProp[i] );
if (!pEntry)
pFailed[ nFailed++ ].Result = beans::TolerantPropertySetResultType::UNKNOWN_PROPERTY;
else
@@ -633,7 +633,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
SfxItemSet *pSet = 0;
- const SfxItemPropertyMap* pPropMap = m_pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rPropMap = m_pPropSet->getPropertyMap();
uno::Sequence< beans::PropertyState > aPropertyStates =
SwUnoCursorHelper::GetPropertyStates(
@@ -658,7 +658,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion:
}
else
{
- const SfxItemPropertySimpleEntry* pEntry = pPropMap->getByName( pProp[i] );
+ const SfxItemPropertySimpleEntry* pEntry = rPropMap.getByName( pProp[i] );
aResult.State = pPropertyStates[i];
aResult.Result = beans::TolerantPropertySetResultType::UNKNOWN_FAILURE;
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 916607f..535ff04 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -588,7 +588,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException,
nProperty++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- m_rPropSet.getPropertyMap()->getByName(pPropertyNames[nProperty]);
+ m_rPropSet.getPropertyMap().getByName(pPropertyNames[nProperty]);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -992,7 +992,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
nProperty++)
{
SfxItemPropertySimpleEntry const*const pEntry =
- m_rPropSet.getPropertyMap()->getByName(pPropertyNames[nProperty]);
+ m_rPropSet.getPropertyMap().getByName(pPropertyNames[nProperty]);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -1419,7 +1419,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
{
pStates[i] = beans::PropertyState_DEFAULT_VALUE;
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName( pNames[i]);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName( pNames[i]);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -1495,7 +1495,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException)
}
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
@@ -1639,7 +1639,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
uno::Any aRet;
SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt();
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
throw beans::UnknownPropertyException(
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 03f46e4..76cf9c8 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -341,7 +341,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
SolarMutexGuard aGuard;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
@@ -464,7 +464,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
uno::Any aRet;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
const SwFtnInfo& rFtnInfo = pDoc->GetFtnInfo();
@@ -652,7 +652,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
SolarMutexGuard aGuard;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
@@ -730,7 +730,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
uno::Any aRet;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
const SwEndNoteInfo& rEndInfo = pDoc->GetEndNoteInfo();
@@ -884,7 +884,7 @@ void SwXLineNumberingProperties::setPropertyValue(
SolarMutexGuard aGuard;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
if ( pEntry->nFlags & PropertyAttribute::READONLY)
@@ -1003,7 +1003,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
Any aRet;
if(pDoc)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap().getByName( rPropertyName );
if(pEntry)
{
const SwLineNumberInfo& rInfo = pDoc->GetLineNumberInfo();
@@ -2483,7 +2483,7 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any&
throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException,
WrappedTargetException, RuntimeException)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & PropertyAttribute::READONLY)
@@ -2558,7 +2558,7 @@ void SwXTextColumns::setPropertyValue( const OUString& rPropertyName, const Any&
Any SwXTextColumns::getPropertyValue( const OUString& rPropertyName )
throw(UnknownPropertyException, WrappedTargetException, RuntimeException)
{
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
throw UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index bd1d4ce..9ad8a5f 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -65,7 +65,7 @@ public:
SwSearchProperties_Impl::SwSearchProperties_Impl() :
nArrLen(0),
- aPropertyEntries( aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)->getPropertyMap()->getPropertyEntries())
+ aPropertyEntries( aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)->getPropertyMap().getPropertyEntries())
{
nArrLen = aPropertyEntries.size();
pValueArr = new beans::PropertyValue*[nArrLen];
@@ -555,7 +555,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A
lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -588,7 +588,7 @@ uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( b
SolarMutexGuard aGuard;
uno::Any aRet;
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName(rPropertyName);
sal_Bool bSet = sal_False;
if(pEntry)
{
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 5b924bf..c5cb4c5 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -1064,7 +1064,7 @@ class SwStyleProperties_Impl
sal_uInt32 nArrLen;
public:
- SwStyleProperties_Impl(const SfxItemPropertyMap* _pMap);
+ SwStyleProperties_Impl(const SfxItemPropertyMap& rMap);
~SwStyleProperties_Impl();
sal_Bool SetProperty(const ::rtl::OUString& rName, uno::Any aVal);
@@ -1077,8 +1077,8 @@ public:
};
-SwStyleProperties_Impl::SwStyleProperties_Impl(const SfxItemPropertyMap* pMap) :
- aPropertyEntries( pMap->getPropertyEntries() ),
+SwStyleProperties_Impl::SwStyleProperties_Impl(const SfxItemPropertyMap& rMap) :
+ aPropertyEntries( rMap.getPropertyEntries() ),
nArrLen(0)
{
nArrLen = aPropertyEntries.size();
@@ -2092,7 +2092,7 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
;
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
if(rPropertyNames.getLength() != rValues.getLength())
throw lang::IllegalArgumentException();
@@ -2116,7 +2116,7 @@ void SAL_CALL SwXStyle::SetPropertyValues_Impl(
for(sal_Int16 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[nProp]);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp]);
if(!pEntry ||
(!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS))))
@@ -2366,7 +2366,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
;
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
const OUString* pNames = rPropertyNames.getConstArray();
uno::Sequence< uno::Any > aRet(rPropertyNames.getLength());
@@ -2375,7 +2375,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl(
SfxStyleSheetBase* pBase = 0;
for(sal_Int32 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[nProp]);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp]);
if(!pEntry ||
(!bIsConditional && pNames[nProp].equalsAsciiL(SW_PROP_NAME(UNO_NAME_PARA_STYLE_CONDITIONS))))
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
@@ -2577,13 +2577,13 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates(
;
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
SfxItemSet aSet = xStyle->GetItemSet();
for(sal_Int32 i = 0; i < rPropertyNames.getLength(); i++)
{
const String& rPropName = pNames[i];
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( rPropName);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( rPropName);
if(!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
if( FN_UNO_NUM_RULES == pEntry->nWID ||
@@ -2696,7 +2696,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
;
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
const OUString* pNames = aPropertyNames.getConstArray();
@@ -2704,7 +2704,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >&
{
for( sal_Int32 nProp = 0, nEnd = aPropertyNames.getLength(); nProp < nEnd; nProp++ )
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[nProp] );
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if( !pEntry )
throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Property is unknown: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nWID == FN_UNO_FOLLOW_STYLE || pEntry->nWID == FN_UNO_NUM_RULES )
@@ -2862,14 +2862,14 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::getPropertyDefaults( const uno::Seq
;
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap* pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
const SfxItemSet &rSet = xStyle->GetItemSet(), *pParentSet = rSet.GetParent();
const OUString *pNames = aPropertyNames.getConstArray();
uno::Any *pRet = aRet.getArray();
for ( sal_Int32 i = 0 ; i < nCount; i++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[i] );
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[i] );
if ( !pEntry )
throw beans::UnknownPropertyException ( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[i], static_cast < cppu::OWeakObject * > ( this ) );
@@ -2968,7 +2968,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
const OUString* pNames = rPropertyNames.getConstArray();
const uno::Any* pValues = rValues.getConstArray();
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
- const SfxItemPropertyMap* pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
SwStyleBase_Impl aBaseImpl(*GetDoc(), GetStyleName());
if(GetBasePool())
{
@@ -2985,7 +2985,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
for(sal_Int16 nProp = 0; nProp < rPropertyNames.getLength(); nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[nProp] );
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -3227,12 +3227,12 @@ uno::Sequence< uno::Any > SAL_CALL SwXPageStyle::GetPropertyValues_Impl(
uno::Any* pRet = aRet.getArray();
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PAGE_STYLE);
- const SfxItemPropertyMap* pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
SwStyleBase_Impl aBase(*GetDoc(), GetStyleName());
SfxStyleSheetBase* pBase = 0;
for(sal_Int32 nProp = 0; nProp < nLength; nProp++)
{
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName( pNames[nProp] );
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName( pNames[nProp] );
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + pNames[nProp], static_cast < cppu::OWeakObject * > ( this ) );
@@ -3915,7 +3915,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
const OUString* pNames = rPropertyNames.getConstArray();
sal_Int32 nLen = rPropertyNames.getLength();
@@ -3927,7 +3927,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::GetPropertyValues_Impl(
for( sal_Int32 i = 0; i < nLen; ++i )
{
const String& rPropName = pNames[i];
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName(rPropName);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
if(!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
else if ( RES_TXTATR_AUTOFMT == pEntry->nWID || RES_AUTO_STYLE == pEntry->nWID )
@@ -4035,12 +4035,12 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates(
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
+ const SfxItemPropertyMap& rMap = pPropSet->getPropertyMap();
SfxItemSet& rSet = *pSet.get();
for(sal_Int32 i = 0; i < rPropertyNames.getLength(); i++)
{
const String& rPropName = pNames[i];
- const SfxItemPropertySimpleEntry* pEntry = pMap->getByName(rPropName);
+ const SfxItemPropertySimpleEntry* pEntry = rMap.getByName(rPropName);
if(!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropName, static_cast < cppu::OWeakObject * > ( this ) );
pStates[i] = pPropSet->getPropertyState(*pEntry, rSet );
@@ -4086,8 +4086,8 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() throw (uno::
}
const SfxItemPropertySet* pPropSet = aSwMapProvider.GetPropertySet(nPropSetId);
- const SfxItemPropertyMap *pMap = pPropSet->getPropertyMap();
- PropertyEntryVector_t aPropVector = pMap->getPropertyEntries();
+ const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
+ PropertyEntryVector_t aPropVector = rMap.getPropertyEntries();
SfxItemSet& rSet = *pSet.get();
SfxItemIter aIter(rSet);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index f6632ea..42cf9b2 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -1073,7 +1073,7 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV
else
{
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if( !pEntry )
{
beans::UnknownPropertyException aEx;
@@ -1105,7 +1105,7 @@ uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName)
if(IsValid())
{
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if( !pEntry )
{
beans::UnknownPropertyException aEx;
@@ -1340,7 +1340,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName,
if(pLn)
{
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
SwDoc* pDoc = pFmt->GetDoc();
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1400,7 +1400,7 @@ uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw(
if(pLn)
{
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if (!pEntry)
throw beans::UnknownPropertyException(OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Unknown property: " ) ) + rPropertyName, static_cast < cppu::OWeakObject * > ( this ) );
@@ -1755,7 +1755,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName,
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -1817,7 +1817,7 @@ uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName)
lcl_FormatTable((SwFrmFmt*)pTblNode->GetTable().GetFrmFmt());
SwUnoTableCrsr* pTblCrsr = dynamic_cast<SwUnoTableCrsr*>(pUnoCrsr);
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
pTblCrsr->MakeBoxSels();
@@ -3001,7 +3001,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName,
if(!aValue.hasValue())
throw lang::IllegalArgumentException();
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if( !pEntry )
throw lang::IllegalArgumentException();
if(pFmt)
@@ -3207,7 +3207,7 @@ uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( be
uno::Any aRet;
SwFrmFmt* pFmt = GetFrmFmt();
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pFmt)
{
if (!pEntry)
@@ -3773,7 +3773,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName,
/* ASK OLIVER
lcl_FormatTable(pFmt);*/
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
if ( pEntry->nFlags & beans::PropertyAttribute::READONLY)
@@ -3898,7 +3898,7 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be
/* ASK OLIVER
lcl_FormatTable(pFmt);*/
const SfxItemPropertySimpleEntry* pEntry =
- m_pPropSet->getPropertyMap()->getByName(rPropertyName);
+ m_pPropSet->getPropertyMap().getByName(rPropertyName);
if(pEntry)
{
switch(pEntry->nWID )
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 820239f..180dd37 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1147,7 +1147,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException,
}
SfxItemPropertySimpleEntry const*const pEntry =
- m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName);
+ m_pImpl->m_rPropSet.getPropertyMap().getByName(rPropertyName);
if (!pEntry)
{
beans::UnknownPropertyException aExcept;
@@ -1308,14 +1308,14 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
// now set the properties
SfxItemPropertySet const*const pParaPropSet =
aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH);
- SfxItemPropertyMap const*const pParagraphMap =
+ const SfxItemPropertyMap &rParagraphMap =
pParaPropSet->getPropertyMap();
const beans::PropertyValue* pValues = rProperties.getConstArray();
for (sal_Int32 nProp = 0; nProp < rProperties.getLength(); ++nProp)
{
- if (!pParagraphMap->getByName(pValues[nProp].Name))
+ if (!rParagraphMap.getByName(pValues[nProp].Name))
{
bIllegalException = true;
break;
@@ -1415,7 +1415,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
if (rCharacterAndParagraphProperties.getLength())
{
- SfxItemPropertyMap const*const pCursorMap =
+ const SfxItemPropertyMap &rCursorMap =
aSwMapProvider.GetPropertySet(PROPERTY_MAP_TEXT_CURSOR)
->getPropertyMap();
beans::PropertyValue const*const pValues =
@@ -1425,7 +1425,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
const sal_Int32 nLen(rCharacterAndParagraphProperties.getLength());
for (sal_Int32 nProp = 0; nProp < nLen; ++nProp)
{
- if (!pCursorMap->getByName( pValues[nProp].Name ))
+ if (!rCursorMap.getByName( pValues[nProp].Name ))
{
bIllegalException = true;
break;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 413bac6..40bd990 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -644,7 +644,7 @@ void SwXAutoTextGroup::setPropertyValue(
lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName );
if(!pEntry)
throw beans::UnknownPropertyException();
@@ -674,7 +674,7 @@ uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName)
throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException )
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw beans::UnknownPropertyException();
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index d0852a1..4b6a8a1 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -882,7 +882,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pCur)
throw UnknownPropertyException();
else if (pCur->nFlags & PropertyAttribute::READONLY)
@@ -1039,7 +1039,7 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue(
Any aRet;
- const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pCur)
throw UnknownPropertyException();
else
@@ -1093,7 +1093,7 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener(
SolarMutexGuard aGuard;
if (!bDisposing && rListener.is())
{
- const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap().getByName( rPropertyName );
if (pCur)
aPropListeners.addInterface( pCur->nWID, rListener );
else
@@ -1109,7 +1109,7 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener(
SolarMutexGuard aGuard;
if (!bDisposing && rListener.is())
{
- const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap().getByName( rPropertyName );
if (pCur)
aPropListeners.removeInterface( pCur->nWID, rListener );
else
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index f27d9c8..77d399d 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1837,7 +1837,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName,
SolarMutexGuard aGuard;
if(!IsValid())
throw RuntimeException();
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw UnknownPropertyException();
@@ -2009,7 +2009,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
SolarMutexGuard aGuard;
if(!IsValid())
throw RuntimeException();
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw UnknownPropertyException();
@@ -2259,7 +2259,7 @@ PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPrope
PropertyState eRet = PropertyState_DIRECT_VALUE;
if(!IsValid())
throw RuntimeException();
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw UnknownPropertyException();
@@ -2291,7 +2291,7 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa
SolarMutexGuard aGuard;
if(!IsValid())
throw RuntimeException();
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw UnknownPropertyException();
switch(pEntry->nWID)
@@ -2306,7 +2306,7 @@ Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName
SolarMutexGuard aGuard;
if(!IsValid())
throw RuntimeException();
- const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName);
+ const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap().getByName( rPropertyName);
if(!pEntry)
throw UnknownPropertyException();
Any aAny;
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index c055826..8660f18 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -921,7 +921,7 @@ void SAL_CALL SwXTextView::setPropertyValue(
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
throw UnknownPropertyException();
else if (pEntry->nFlags & PropertyAttribute::READONLY)
@@ -959,7 +959,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
Any aRet;
- const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName );
+ const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap().getByName( rPropertyName );
if (!pEntry)
throw UnknownPropertyException();
else
More information about the Libreoffice-commits
mailing list