summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-14 20:21:41 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2019-12-15 21:08:16 +0100
commit4ddd76a7324c8b035e60a12ac06cf08339f6e366 (patch)
tree85298f9f4c86e339ddeff2577965c5e02d349b9b /svx
parent38eadf6d562dc0d964fce66aff021f6c99081d2f (diff)
tdf#127481 don't override SdrText::GetItemSet() for cells
No point in overriding GetItemSet() with behaviour similar to parent class (but less robustly so). Change-Id: I2bdff44bfded0a5fa272964b4e0671cacb125f06 Reviewed-on: https://gerrit.libreoffice.org/85148 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/inc/cell.hxx1
-rw-r--r--svx/source/table/cell.cxx6
2 files changed, 0 insertions, 7 deletions
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index b0819469714c..0eb09149ffcb 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -76,7 +76,6 @@ public:
SVX_DLLPRIVATE virtual SfxStyleSheet* GetStyleSheet() const override;
SVX_DLLPRIVATE void TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const;
- SVX_DLLPRIVATE virtual const SfxItemSet& GetItemSet() const override;
SVX_DLLPRIVATE void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems);
void SetMergedItem(const SfxPoolItem& rItem);
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index f16b5a414ae6..9a752e00599c 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -698,12 +698,6 @@ void Cell::TakeTextAnchorRect(tools::Rectangle& rAnchorRect) const
}
-const SfxItemSet& Cell::GetItemSet() const
-{
- return mpProperties->GetObjectItemSet();
-}
-
-
void Cell::SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, bool bClearAllItems)
{
if( mpProperties )