From 02dcf4a9b7387f6675324245ab2fa5b7eabf0d12 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Wed, 30 Apr 2014 19:52:28 +0000 Subject: actually read brightness/contrast when reading docx (bnc#875713) It's read for the shape in oox/ , but it didn't make it any further apparently. Change-Id: I0885a675f72d63b3d262f1ef7e42f5d2e03588b6 (cherry picked from commit 804da2a977989ba1f046847b9e00f00c83749e30) Reviewed-on: https://gerrit.libreoffice.org/9216 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 304a3d2..607d92b 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -924,6 +924,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val) xShapeProps->getPropertyValue("ShadowTransparence") >>= m_pImpl->nShadowTransparence; } + xShapeProps->getPropertyValue("GraphicColorMode") >>= m_pImpl->eColorMode; + xShapeProps->getPropertyValue("AdjustLuminance") >>= m_pImpl->nBrightness; + xShapeProps->getPropertyValue("AdjustContrast") >>= m_pImpl->nContrast; + // fdo#70457: transform XShape into a SwXTextGraphicObject only if there's no rotation if ( nRotation == 0 ) m_xGraphicObject = createGraphicObject( aMediaProperties ); -- cgit v0.9.0.2-2-gbebe