summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/sdr/properties/emptyproperties.cxx29
-rw-r--r--svx/source/sdr/properties/pageproperties.cxx31
2 files changed, 1 insertions, 59 deletions
diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx
index 42af61012a8a..d8e13d47a410 100644
--- a/svx/source/sdr/properties/emptyproperties.cxx
+++ b/svx/source/sdr/properties/emptyproperties.cxx
@@ -26,14 +26,6 @@
namespace sdr::properties
{
- // create a new itemset
- SfxItemSet EmptyProperties::CreateObjectSpecificItemSet(SfxItemPool& )
- {
- // Basic implementation; Basic object has NO attributes
- assert(!"EmptyProperties::CreateObjectSpecificItemSet() should never be called");
- abort();
- }
-
EmptyProperties::EmptyProperties(SdrObject& rObj)
: BaseProperties(rObj)
{
@@ -75,27 +67,6 @@ namespace sdr::properties
assert(!"EmptyProperties::SetObjectItemSet() should never be called");
}
- void EmptyProperties::ItemSetChanged(const SfxItemSet* /*pSet*/)
- {
- assert(!"EmptyProperties::ItemSetChanged() should never be called");
- }
-
- bool EmptyProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
- {
- assert(!"EmptyProperties::AllowItemChange() should never be called");
- return true;
- }
-
- void EmptyProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
- {
- assert(!"EmptyProperties::ItemChange() should never be called");
- }
-
- void EmptyProperties::PostItemChange(const sal_uInt16 /*nWhich*/)
- {
- assert(!"EmptyProperties::PostItemChange() should never be called");
- }
-
void EmptyProperties::SetStyleSheet(SfxStyleSheet* /*pNewStyleSheet*/, bool /*bDontRemoveHardAttr*/)
{
assert(!"EmptyProperties::SetStyleSheet() should never be called");
diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx
index 8ae0cda8d2ed..63d35f4a75a7 100644
--- a/svx/source/sdr/properties/pageproperties.cxx
+++ b/svx/source/sdr/properties/pageproperties.cxx
@@ -28,13 +28,6 @@
namespace sdr::properties
{
- // create a new itemset
- SfxItemSet PageProperties::CreateObjectSpecificItemSet(SfxItemPool& rPool)
- {
- // override to legally return a valid ItemSet
- return SfxItemSet(rPool);
- }
-
PageProperties::PageProperties(SdrObject& rObj)
: BaseProperties(rObj)
{
@@ -60,7 +53,7 @@ namespace sdr::properties
{
if(!mxEmptyItemSet)
{
- mxEmptyItemSet.emplace(const_cast<PageProperties*>(this)->CreateObjectSpecificItemSet(GetSdrObject().GetObjectItemPool()));
+ mxEmptyItemSet.emplace(GetSdrObject().GetObjectItemPool());
}
DBG_ASSERT(mxEmptyItemSet, "Could not create an SfxItemSet(!)");
@@ -68,11 +61,6 @@ namespace sdr::properties
return *mxEmptyItemSet;
}
- void PageProperties::ItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/)
- {
- // #86481# simply ignore item setting on page objects
- }
-
SfxStyleSheet* PageProperties::GetStyleSheet() const
{
// override to legally return a 0L pointer here
@@ -84,28 +72,11 @@ namespace sdr::properties
// override to legally ignore the StyleSheet here
}
- void PageProperties::PostItemChange(const sal_uInt16 nWhich )
- {
- if( (nWhich == XATTR_FILLSTYLE) && mxEmptyItemSet )
- CleanupFillProperties(*mxEmptyItemSet);
- }
-
void PageProperties::ClearObjectItem(const sal_uInt16 /*nWhich*/)
{
// simply ignore item clearing on page objects
}
- bool PageProperties::AllowItemChange(const sal_uInt16 /*nWhich*/, const SfxPoolItem* /*pNewItem*/) const
- {
- assert(!"PageProperties::AllowItemChange() should never be called");
- return true;
- }
-
- void PageProperties::ItemSetChanged(const SfxItemSet* /*pSet*/)
- {
- assert(!"PageProperties::ItemSetChanged() should never be called");
- }
-
void PageProperties::SetObjectItem(const SfxPoolItem& /*rItem*/)
{
assert(!"PageProperties::SetObjectItem() should never be called");