diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-12-14 20:21:41 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2019-12-16 16:05:42 +0100 |
| commit | d99c2dad7f8479bbbef2a1c1883fadf580200d6a (patch) | |
| tree | 39c84e15c5116d34e935c0f81ea77acdb8b263ea /svx | |
| parent | ad0922143a2f8ae1ca8622580afd9c6c34f4173f (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>
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 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 8b01fa9edcec..03b52f66b953 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 ) |