summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-10 14:12:10 +0200
committerNoel Grandin <noel@peralex.com>2015-04-13 09:37:13 +0200
commit593515e529d75f08f4d3766dac78b1792aea4be4 (patch)
treea82b7d8b52106727304b092273e3b8cc7c9175d0 /svx
parentee094bd46f55118993c72af719dc046476f9f311 (diff)
loplugin:staticmethods
Change-Id: I332d3b3158b46cf130540c6e1479dd01cb457d03
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdetc.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx2
-rw-r--r--svx/source/table/cell.cxx4
-rw-r--r--svx/source/unodraw/unoshape.cxx14
4 files changed, 11 insertions, 11 deletions
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index a4c62ebda45e..32e8b24389cd 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -412,7 +412,7 @@ SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& rModel)
pOutl->SetEditTextObjectPool( pPool );
pOutl->SetStyleSheetPool( static_cast<SfxStyleSheetPool*>(rModel.GetStyleSheetPool()));
pOutl->SetDefTab(rModel.GetDefaultTabulator());
- pOutl->SetForbiddenCharsTable(rModel.GetForbiddenCharsTable());
+ Outliner::SetForbiddenCharsTable(rModel.GetForbiddenCharsTable());
pOutl->SetAsianCompressionMode(rModel.GetCharCompressType());
pOutl->SetKernAsianPunctuation(rModel.IsKernAsianPunctuation());
pOutl->SetAddExtLeading(rModel.IsAddExtLeading());
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 2f7366b6933a..0ae5ea568f38 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -778,7 +778,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit )
}
pOutliner->SetRefDevice(GetRefDevice());
- pOutliner->SetForbiddenCharsTable(GetForbiddenCharsTable());
+ Outliner::SetForbiddenCharsTable(GetForbiddenCharsTable());
pOutliner->SetAsianCompressionMode( mnCharCompressType );
pOutliner->SetKernAsianPunctuation( IsKernAsianPunctuation() );
pOutliner->SetAddExtLeading( IsAddExtLeading() );
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index c88b4bd2005d..11aedb88cacf 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -994,7 +994,7 @@ sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception)
Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap )
{
- Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) );
+ Any aAny( SvxItemPropertySet_getPropertyValue( pMap, aSet ) );
if( pMap->aType != aAny.getValueType() )
{
@@ -1150,7 +1150,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any&
if( aSet.GetItemState( pMap->nWID ) == SfxItemState::SET )
{
- SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rValue, aSet );
+ SvxItemPropertySet_setPropertyValue( pMap, rValue, aSet );
}
}
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 58a3e7d14ff4..ce5c75e22124 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -632,7 +632,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet&
if(SfxItemPool::IsWhich(pEntry->nWID))
rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID));
// set
- SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet);
+ SvxItemPropertySet_setPropertyValue(pEntry, *pUsrAny, rSet);
}
}
}
@@ -1725,7 +1725,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const
if( pSet->GetItemState( pMap->nWID ) == SfxItemState::SET )
{
- SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rVal, *pSet );
+ SvxItemPropertySet_setPropertyValue( pMap, rVal, *pSet );
}
}
@@ -2007,7 +2007,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE
default:
{
// get value form ItemSet
- aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet );
+ aAny = SvxItemPropertySet_getPropertyValue( pMap, aSet );
if( pMap->aType != aAny.getValueType() )
{
@@ -4210,23 +4210,23 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer
return pSvxShape ? pSvxShape->GetSdrObject() : 0;
}
-uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet )
+uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet )
{
if(!pMap || !pMap->nWID)
return uno::Any();
// Check is for items that store either metric values if thei are positiv or percentage if thei are negativ.
bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY );
- return rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues );
+ return SvxItemPropertySet::getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues );
}
-void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet )
+void SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet )
{
if(!pMap || !pMap->nWID)
return;
bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY );
- rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
+ SvxItemPropertySet::setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */