summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/itemprop.cxx17
-rw-r--r--svl/source/items/macitem.cxx2
-rw-r--r--svl/source/misc/inethist.cxx2
-rw-r--r--svl/source/numbers/numfmuno.cxx3
-rw-r--r--svl/source/numbers/numuno.cxx10
5 files changed, 3 insertions, 31 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: */
diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index ab7e4e3bb2cf..4d531c931a58 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.cxx
@@ -123,7 +123,7 @@ class INetURLHistory_Impl: private boost::noncopyable
*/
void initialize (void);
- sal_uInt16 capacity (void) const
+ static sal_uInt16 capacity()
{
return (sal_uInt16)(INETHIST_SIZE_LIMIT);
}
diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index f486ed7a0071..683505538a5c 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -536,7 +536,6 @@ void SAL_CALL SvNumberFormatsObj::removeByKey( sal_Int32 nKey ) throw(uno::Runti
if (pFormatter)
{
pFormatter->DeleteEntry(nKey);
- rSupplier.NumberFormatDeleted(nKey); // Notification for the Document
}
}
@@ -994,8 +993,6 @@ void SAL_CALL SvNumberFormatSettingsObj::setPropertyValue( const OUString& aProp
}
else
throw beans::UnknownPropertyException();
-
- rSupplier.SettingsChanged();
}
else
throw uno::RuntimeException();
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 0ad66dcdb485..efcdc2af0bb2 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -70,16 +70,6 @@ void SvNumberFormatsSupplierObj::SetNumberFormatter(SvNumberFormatter* pNew)
pImpl->pFormatter = pNew;
}
-void SvNumberFormatsSupplierObj::NumberFormatDeleted(sal_uInt32)
-{
- // Base implementation; does nothing
-}
-
-void SvNumberFormatsSupplierObj::SettingsChanged()
-{
- // Base implementation; does nothing
-}
-
// XNumberFormatsSupplier
uno::Reference<beans::XPropertySet> SAL_CALL SvNumberFormatsSupplierObj::getNumberFormatSettings()