sc/inc/scitems.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 658ace95837d49a21e2788e5dcc534a08198dc12
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Dec 11 23:47:31 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Thu Dec 12 07:41:11 2019 +0100
Fix UBSan dynamic-type-mismatch
...as seen after 331cafb1484597544bd94fa3f0e0a45b3328a4d8 "Related:
tdf#129300
add ScLineBreakCell to provide a description" during CppunitTest_sc_ucalc:
> sc/inc/patattr.hxx:76:14: runtime error: downcast of address
0x60200056aaf0 which does not point to an object of type 'const
ScShrinkToFitCell'
> 0x60200056aaf0: note: object is of type 'ScVerticalStackCell'
> 6f 00 00 60 70 7b f7 16 b0 7f 00 00 ff ff ff ff 86 00 02 00 02 00 00
00 ff ff ff 04 10 00 00 00
> ^~~~~~~~~~~~~~~~~~~~~~~
> vptr for 'ScVerticalStackCell'
> #0 in ScShrinkToFitCell const&
ScPatternAttr::GetItem<ScShrinkToFitCell>(TypedWhichId<ScShrinkToFitCell>,
SfxItemSet const&, SfxItemSet const*) at sc/inc/patattr.hxx:76:14
> #1 in ScPatternAttr::GetCellOrientation(SfxItemSet const&, SfxItemSet
const*) at sc/source/core/data/patattr.cxx:152:9
> #2 in ScPatternAttr::GetCellOrientation(SfxItemSet const*) const at
sc/source/core/data/patattr.cxx:170:12
> #3 in ScColumn::GetOptimalHeight(sc::RowHeightContext&, int, int,
unsigned short, int) at sc/source/core/data/column2.cxx:809:43
> #4 in (anonymous
namespace)::GetOptimalHeightsInColumn(sc::RowHeightContext&, ScColContainer&,
int, int, ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:92:17
> #5 in ScTable::SetOptimalHeight(sc::RowHeightContext&, int, int,
ScProgress*, unsigned long) at sc/source/core/data/table1.cxx:466:5
> #6 in ScDocument::SetOptimalHeight(sc::RowHeightContext&, int, int,
short) at sc/source/core/data/document.cxx:4274:18
> #7 in ScDocFunc::AdjustRowHeight(ScRange const&, bool) at
sc/source/ui/docshell/docfunc.cxx:156:26
> #8 in ScDocFunc::InsertCells(ScRange const&, ScMarkData const*,
InsCellCmd, bool, bool, bool) at sc/source/ui/docshell/docfunc.cxx:2146:25
> #9 in Test::testFormulaRefUpdateInsertRows() at
sc/qa/unit/ucalc_formula.cxx:2247:11
Change-Id: I12b95a8229bac8d67d85f2a5a90a5e2e286a6981
Reviewed-on: https://gerrit.libreoffice.org/84996
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/sc/inc/scitems.hxx b/sc/inc/scitems.hxx
index 6e5054d7757d..9e22a0415aeb 100644
--- a/sc/inc/scitems.hxx
+++ b/sc/inc/scitems.hxx
@@ -52,7 +52,7 @@ class SvxBoxItem;
class ScCondFormatItem;
class ScLineBreakCell;
class ScRotateValueItem;
-class ScShrinkToFitCell;
+class ScVerticalStackCell;
class SvxLineItem;
class SvxRotateModeItem;
class SfxStringItem;
@@ -120,7 +120,7 @@ class SvxSizeItem;
#define ATTR_INDENT TypedWhichId<ScIndentItem>(131)
#define ATTR_VER_JUSTIFY TypedWhichId<SvxVerJustifyItem>(132)
#define ATTR_VER_JUSTIFY_METHOD TypedWhichId<SvxJustifyMethodItem>(133)
-#define ATTR_STACKED TypedWhichId<ScShrinkToFitCell>(134)
+#define ATTR_STACKED TypedWhichId<ScVerticalStackCell>(134)
#define ATTR_ROTATE_VALUE TypedWhichId<ScRotateValueItem>(135)
#define ATTR_ROTATE_MODE TypedWhichId<SvxRotateModeItem>(136)
#define ATTR_VERTICAL_ASIAN TypedWhichId<SfxBoolItem>(137)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
