summaryrefslogtreecommitdiff
path: root/writerfilter/source/dmapper/DomainMapper_Impl.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-12-21 11:12:40 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-12-21 19:13:47 +0100
commit44ea0b3a2550a79148fb86f3e7175fffe77674b4 (patch)
tree5c0207c67758e888f6a4ce8a49c62f1285600da8 /writerfilter/source/dmapper/DomainMapper_Impl.cxx
parent8870e068cc7368ffa14a6938836b370d2a188b64 (diff)
writerfilter: refactor to get rid of savedPositionOffset{V,H} statics
Which are extremely scary, allowing a shape position from one doc to appear in an other if two writerfilter import is in progress at the same time. This partially reverts 8fa1a0874765ea7db57e496f1d92731b9ab09280 (read wp:positionOffset, wp:alignV and wp:alignH properly (bnc#513579), 2011-05-04). Change-Id: I0fcddf88fa56f5f9288e47bcd100c38ee9cf2f13
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a3694bd9e660..4e0835f2099f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4557,7 +4557,7 @@ void DomainMapper_Impl::AddAnnotationPosition(
GraphicImportPtr DomainMapper_Impl::GetGraphicImport(GraphicImportType eGraphicImportType)
{
if(!m_pGraphicImport)
- m_pGraphicImport.reset( new GraphicImport( m_xComponentContext, m_xTextFactory, m_rDMapper, eGraphicImportType, m_aPositivePercentages ) );
+ m_pGraphicImport.reset( new GraphicImport( m_xComponentContext, m_xTextFactory, m_rDMapper, eGraphicImportType, m_aPositionOffsets, m_aPositivePercentages ) );
return m_pGraphicImport;
}
/*-------------------------------------------------------------------------