diff options
| author | Joren De Cuyper <jorendc@libreoffice.org> | 2015-06-02 22:26:29 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2015-07-15 23:44:01 +0000 |
| commit | d151ed35ad4c4e7aa9fbb807930fcf91dea2eba7 (patch) | |
| tree | cc1c0e8d966608ee2b0581d8d2854f88fa54995d /writerfilter | |
| parent | e51fa143587d018b75db08e60cf27ff932b1cf8d (diff) | |
tdf#87539 map MSO washout filter to LO's watermark colormode
Change-Id: Id28e301a74a729245b20ba6cd2adecf203633f0e
Reviewed-on: https://gerrit.libreoffice.org/16048
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/GraphicImport.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 154b9e2bb137..1d9078d53270 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -1286,14 +1286,13 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b m_pImpl->applyMargins(xGraphicObjectProperties); } - if( m_pImpl->eColorMode == drawing::ColorMode_STANDARD && + if( m_pImpl->eColorMode == drawing::ColorMode_WATERMARK && m_pImpl->nContrast == -70 && m_pImpl->nBrightness == 70 ) { - // strange definition of WATERMARK! + // watermark filter is already applied at this point, so reset Contrast and Brightness m_pImpl->nContrast = 0; m_pImpl->nBrightness = 0; - m_pImpl->eColorMode = drawing::ColorMode_WATERMARK; } xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName( PROP_ADJUST_CONTRAST ), |