From a2b5ead0dc86516edd5008d5aaca862eaf611667 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 23 Oct 2014 16:43:30 +0200 Subject: writerfilter: avoid copy&paste Change-Id: I72057875cf2803008f63a85fee2be477598d8aff --- writerfilter/source/dmapper/GraphicImport.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index bbedad3fbd47..995a7a401069 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1159,9 +1159,10 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b { if( m_pImpl->eGraphicImportType == IMPORT_AS_GRAPHIC || !nBorder ) { - aBorderLine.Color = m_pImpl->aBorders[m_pImpl->eGraphicImportType == IMPORT_AS_SHAPE ? BORDER_TOP : static_cast(nBorder) ].nLineColor; + GraphicBorderLine& rBorderLine = m_pImpl->aBorders[m_pImpl->eGraphicImportType == IMPORT_AS_SHAPE ? BORDER_TOP : static_cast(nBorder)]; + aBorderLine.Color = rBorderLine.nLineColor; aBorderLine.InnerLineWidth = 0; - aBorderLine.OuterLineWidth = (sal_Int16)m_pImpl->aBorders[m_pImpl->eGraphicImportType == IMPORT_AS_SHAPE ? BORDER_TOP : static_cast(nBorder) ].nLineWidth; + aBorderLine.OuterLineWidth = (sal_Int16)rBorderLine.nLineWidth; aBorderLine.LineDistance = 0; } PropertyIds aBorderProps[4] = -- cgit