n#820077: Import images with duotone filter.

Also, contains implementation for a simple duotone filter.

1 files changed, 25 insertions, 0 deletions

diff --git a/oox/source/drawingml/fillpropertiesgroupcontext.cxx b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
index 0d84d3a6bb90..8483e81b9b8d 100644
--- a/oox/source/drawingml/fillpropertiesgroupcontext.cxx
+++ b/oox/source/drawingml/fillpropertiesgroupcontext.cxx
@@ -179,6 +179,9 @@ ContextHandlerRef BlipContext::onCreateContext(
         case A_TOKEN( clrChange ):
             return new ColorChangeContext( *this, rAttribs, mrBlipProps );
 
+        case A_TOKEN( duotone ):
+            return new DuotoneContext( *this, rAttribs, mrBlipProps );
+
         case A_TOKEN( lum ):
             mrBlipProps.moBrightness = rAttribs.getInteger( XML_bright );
             mrBlipProps.moContrast = rAttribs.getInteger( XML_contrast );
@@ -187,6 +190,28 @@ ContextHandlerRef BlipContext::onCreateContext(
     return 0;
 }
 
+DuotoneContext::DuotoneContext( ContextHandler2Helper& rParent,
+        const AttributeList& /*rAttribs*/, BlipFillProperties& rBlipProps ) :
+    ContextHandler2( rParent ),
+    mrBlipProps( rBlipProps ),
+    mnColorIndex( 0 )
+{
+    mrBlipProps.maDuotoneColors[0].setUnused();
+    mrBlipProps.maDuotoneColors[1].setUnused();
+}
+
+DuotoneContext::~DuotoneContext()
+{
+}
+
+::oox::core::ContextHandlerRef DuotoneContext::onCreateContext(
+        sal_Int32 /*nElement*/, const AttributeList& /*rAttribs*/ )
+{
+    if( mnColorIndex < 2 )
+        return new ColorValueContext( *this, mrBlipProps.maDuotoneColors[mnColorIndex++] );
+    return 0;
+}
+
 BlipFillContext::BlipFillContext( ContextHandler2Helper& rParent,
         const AttributeList& rAttribs, BlipFillProperties& rBlipProps ) :
     ContextHandler2( rParent ),