[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                               |    1 
 patches/dev300/oox-pptx-export-blip-luminance.diff |   66 +++++++++++++++++++++
 2 files changed, 67 insertions(+)

New commits:
commit 3efd002deebe8d5d59e2c444ec61bd0221abff64
Author: Radek Doulik <rodo at novell.com>
Date:   Wed Jul 29 16:20:36 2009 +0200

    export blip luminance to pptx
    
    * patches/dev300/apply: added new patch
    * patches/dev300/oox-pptx-export-blip-luminance.diff: export blip luminance tags

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ab2af78..42b9197 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3308,6 +3308,7 @@ oox-drawingml-fix-shapes-map-crash.diff, rodo
 oox-pptx-export-animations-filter.diff, n#497570, rodo
 oox-calc-export-export-pivot-content.diff, n#505917, janneke
 oox-pptx-export-animations-paragraph-target.diff, n#497570, rodo
+oox-pptx-export-blip-luminance.diff, n#497570, rodo
 
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32
diff --git a/patches/dev300/oox-pptx-export-blip-luminance.diff b/patches/dev300/oox-pptx-export-blip-luminance.diff
new file mode 100644
index 0000000..ae3fadc
--- /dev/null
+++ b/patches/dev300/oox-pptx-export-blip-luminance.diff
@@ -0,0 +1,66 @@
+diff -rup oox/source/export-orig/drawingml.cxx oox/source/export/drawingml.cxx
+--- oox/source/export-orig/drawingml.cxx	2009-07-29 14:40:11.000000000 +0200
++++ oox/source/export/drawingml.cxx	2009-07-29 15:47:21.000000000 +0200
+@@ -567,13 +567,25 @@ OUString DrawingML::WriteImage( const Gr
+     return sRelId;
+ }
+ 
+-OUString DrawingML::WriteBlip( OUString& rURL )
++OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL )
+ {
+         OUString sRelId = WriteImage( rURL );
++	sal_Int16 nBright = 0;
++	sal_Int32 nContrast = 0;
+ 
+-        mpFS->singleElementNS( XML_a, XML_blip,
+-                               FSNS( XML_r, XML_embed), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
+-                               FSEND );
++	GET( nBright, AdjustLuminance );
++	GET( nContrast, AdjustContrast );
++
++        mpFS->startElementNS( XML_a, XML_blip,
++			      FSNS( XML_r, XML_embed), OUStringToOString( sRelId, RTL_TEXTENCODING_UTF8 ).getStr(),
++			      FSEND );
++	if( nBright || nContrast )
++	    mpFS->singleElementNS( XML_a, XML_lum,
++				   XML_bright, nBright ? I32S( nBright*1000 ) : NULL,
++				   XML_contrast, nContrast ? I32S( nContrast*1000 ) : NULL,
++				   FSEND );
++	    
++        mpFS->endElementNS( XML_a, XML_blip );
+ 
+         return sRelId;
+ }
+@@ -613,7 +625,7 @@ void DrawingML::WriteBlipFill( Reference
+ 
+         mpFS->startElementNS( nXmlNamespace , XML_blipFill, FSEND );
+ 
+-        WriteBlip( aURL );
++        WriteBlip( rXPropSet, aURL );
+ 
+         if( sURLPropName == S( "FillBitmapURL" ) )
+             WriteBlipMode( rXPropSet );
+diff -rup oox/source/export-orig/shapes.cxx oox/source/export/shapes.cxx
+--- oox/source/export-orig/shapes.cxx	2009-07-29 14:40:12.000000000 +0200
++++ oox/source/export/shapes.cxx	2009-07-29 14:59:08.000000000 +0200
+@@ -652,7 +652,7 @@ ShapeExport& ShapeExport::WriteGraphicOb
+ 
+     pFS->startElementNS( mnXmlNamespace, XML_blipFill, FSEND );
+     
+-    WriteBlip( sGraphicURL );
++    WriteBlip( xShapeProps, sGraphicURL );
+ 
+     bool bStretch = false;
+     if( ( xShapeProps->getPropertyValue( S( "FillBitmapStretch" ) ) >>= bStretch ) && bStretch )
+diff -rup oox/inc/oox/export-orig/drawingml.hxx oox/inc/oox/export/drawingml.hxx
+--- oox/inc/oox/export-orig/drawingml.hxx	2009-07-29 14:56:39.000000000 +0200
++++ oox/inc/oox/export/drawingml.hxx	2009-07-29 14:57:36.000000000 +0200
+@@ -81,7 +81,7 @@ public:
+     void WriteStretch();
+     void WriteLinespacing( ::com::sun::star::style::LineSpacing& rLineSpacing );
+ 
+-    ::rtl::OUString WriteBlip( ::rtl::OUString& rURL );
++    ::rtl::OUString WriteBlip( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::rtl::OUString& rURL );
+     void WriteBlipMode( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet );
+ 
+     void WriteShapeTransformation( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > rXShape,