svx/source/inc/cell.hxx | 1 -
svx/source/table/cell.cxx | 6 ------
2 files changed, 7 deletions(-)
New commits:
commit d99c2dad7f8479bbbef2a1c1883fadf580200d6a
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Sat Dec 14 20:21:41 2019 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon Dec 16 16:05:42 2019 +0100
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.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 4ddd76a7324c8b035e60a12ac06cf08339f6e366)
Reviewed-on: https://gerrit.libreoffice.org/85210
Tested-by: Jenkins
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
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 )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
