From 84e8e9f178308f082b0c51c3e33655e3a082c057 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 25 Feb 2014 11:55:27 +0100 Subject: RTFSdrImport::resolveDhgt(): fix crashing C-cast Inside DomainMapper::graphicZOrderHelper() this is offset by 0x40 so whatever that cast does, it's doing it wrong. Change-Id: Ie48467c12828137a521cba47c2e04cac65201d1d (cherry picked from commit 8dcb56fdcea455012ef010c343ab036955678f4d) Reviewed-on: https://gerrit.libreoffice.org/8222 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- writerfilter/source/rtftok/rtfsdrimport.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 8cbdc1b3e6e5..14e2df2dfa56 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -121,7 +121,8 @@ void RTFSdrImport::popParent() void RTFSdrImport::resolveDhgt(uno::Reference xPropertySet, sal_Int32 nZOrder) { - writerfilter::dmapper::DomainMapper& rMapper = (writerfilter::dmapper::DomainMapper&)m_rImport.Mapper(); + writerfilter::dmapper::DomainMapper& rMapper = + dynamic_cast(m_rImport.Mapper()); writerfilter::dmapper::GraphicZOrderHelper* pHelper = rMapper.graphicZOrderHelper(); xPropertySet->setPropertyValue("ZOrder", uno::makeAny(pHelper->findZOrder(nZOrder))); pHelper->addItem(xPropertySet, nZOrder); -- cgit