diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-03 15:39:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:01 +0200 |
| commit | 2ebd79b3d214c62c0997606115ebc50700d6a760 (patch) | |
| tree | dc2e6bb49d8089e507fe846406d10828af7330cb /svl/source/items | |
| parent | 02cb0ba6b565597d6da23cbf211e959c448b3261 (diff) | |
loplugin:constantfunction: svl
Change-Id: I6504e354cfb381cc00ea837f959e2e18e5fc596c
Diffstat (limited to 'svl/source/items')
| -rw-r--r-- | svl/source/items/itemprop.cxx | 17 | ||||
| -rw-r--r-- | svl/source/items/macitem.cxx | 2 |
2 files changed, 2 insertions, 17 deletions
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 7428925c9525..f17d15eb9b19 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -173,11 +173,6 @@ SfxItemPropertySet::~SfxItemPropertySet() { } -bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, bool) const -{ - return false; -} - void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet, Any& rAny ) const throw(RuntimeException) @@ -195,12 +190,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn else { SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID); - if(FillItem(aSet, rEntry.nWID, true)) - { - const SfxPoolItem& rItem = aSet.Get(rEntry.nWID); - rItem.QueryValue( rAny, rEntry.nMemberId ); - } - else if(0 == (rEntry.nFlags & PropertyAttribute::MAYBEVOID)) + if(0 == (rEntry.nFlags & PropertyAttribute::MAYBEVOID)) throw RuntimeException( "Property not found in ItemSet but not MAYBEVOID?", 0); } @@ -251,11 +241,6 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn if(eState < SfxItemState::DEFAULT) { SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID); - if(FillItem(aSet, rEntry.nWID, false)) - { - const SfxPoolItem &rItem = aSet.Get(rEntry.nWID); - pNewItem.reset(rItem.Clone()); - } } if(!pNewItem && pItem) { diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 29d274039d52..73bd8783cb5f 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -279,7 +279,7 @@ void SvxMacroItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ) sal_uInt16 SvxMacroItem::GetVersion( sal_uInt16 nFileFormatVersion ) const { return SOFFICE_FILEFORMAT_31 == nFileFormatVersion - ? 0 : aMacroTable.GetVersion(); + ? 0 : SvxMacroTableDtor::GetVersion(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |