summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-25 11:55:27 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-02-25 15:34:56 +0000
commit84e8e9f178308f082b0c51c3e33655e3a082c057 (patch)
treea55eba69118181afa3ee7b40be3d637503c396c2 /writerfilter
parentc1bbe64bead02e4f525f0fcfe169ab4a54a89fe4 (diff)
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 <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx3
1 files changed, 2 insertions, 1 deletions
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<beans::XPropertySet> xPropertySet, sal_Int32 nZOrder)
{
- writerfilter::dmapper::DomainMapper& rMapper = (writerfilter::dmapper::DomainMapper&)m_rImport.Mapper();
+ writerfilter::dmapper::DomainMapper& rMapper =
+ dynamic_cast<writerfilter::dmapper::DomainMapper&>(m_rImport.Mapper());
writerfilter::dmapper::GraphicZOrderHelper* pHelper = rMapper.graphicZOrderHelper();
xPropertySet->setPropertyValue("ZOrder", uno::makeAny(pHelper->findZOrder(nZOrder)));
pHelper->addItem(xPropertySet, nZOrder);