diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-14 20:21:41 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-12-17 13:46:59 +0100 |
| commit | 65eed7dec08f7ae35906a329e8011a40e194399e (patch) | |
| tree | fd82abb8e76c33bba2711958e0ec984bd4002e59 /svx | |
| parent | 8a7e25d1320f5ea25e74af440810e10f8c02f65a (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>
(cherry picked from commit 4ddd76a7324c8b035e60a12ac06cf08339f6e366)
Reviewed-on: https://gerrit.libreoffice.org/85210
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
(cherry picked from commit d99c2dad7f8479bbbef2a1c1883fadf580200d6a)
Reviewed-on: https://gerrit.libreoffice.org/85226
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/inc/cell.hxx | 1 | ||||
| -rw-r--r-- | svx/source/table/cell.cxx | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx index c17d878b5812..4480129c5dba 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 10b5a9d073a3..7809d3789b2e 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -693,12 +693,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 ) |