[ooo-build-commit] patches/dev300

[Radek Doulík]

 patches/dev300/apply                                          |    1 
 patches/dev300/oox-pptx-export-fix-action-button-presets.diff |   15 ++++++++++
 2 files changed, 16 insertions(+)

New commits:
commit c070de2c1f6f6f1ff7acfebe8f242420fcb8790e
Author: Radek Doulik <rodo at novell.com>
Date:   Mon Jul 13 18:31:21 2009 +0200

    fixes part of n#497570 problems, action buttons export
    
    * mso doesn't like adjustment values on action buttons
    
    * patches/dev300/apply:
    * patches/dev300/oox-pptx-export-fix-action-button-presets.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3f2f828..8106083 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3267,6 +3267,7 @@ oox-pptx-import-fix-text-body-properties-priority.diff, n#403402, rodo
 oox-pptx-export-hyperlinks.diff, n#499124, rodo
 oox-pptx-export-vertical-text.diff, n#498737, rodo
 oox-pptx-export-para-linespacing.diff, n#498737, rodo
+oox-pptx-export-fix-action-button-presets.diff, n#497570, rodo
 
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32
diff --git a/patches/dev300/oox-pptx-export-fix-action-button-presets.diff b/patches/dev300/oox-pptx-export-fix-action-button-presets.diff
new file mode 100644
index 0000000..b20edb2
--- /dev/null
+++ b/patches/dev300/oox-pptx-export-fix-action-button-presets.diff
@@ -0,0 +1,15 @@
+diff -rup oox-orig/source/export/drawingml.cxx oox/source/export/drawingml.cxx
+--- oox-orig/source/export/drawingml.cxx	2009-07-09 12:24:09.000000000 +0200
++++ oox/source/export/drawingml.cxx	2009-07-13 17:07:04.000000000 +0200
+@@ -1329,7 +1213,10 @@ void DrawingML::WritePresetShape( const
+     mpFS->startElementNS( XML_a, XML_avLst, FSEND );
+ 
+     Sequence< drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
+-    if ( rProp.Value >>= aAdjustmentSeq ) {
++    if ( ( rProp.Value >>= aAdjustmentSeq )
++	 && eShapeType != mso_sptActionButtonForwardNext  // we have adjustments values for these type of shape, but MSO doesn't like them
++	 && eShapeType != mso_sptActionButtonBackPrevious // so they are now disabled
++	) {
+         DBG(printf("adj seq len: %d\n", int( aAdjustmentSeq.getLength() )));
+         if ( bPredefinedHandlesUsed )
+             EscherPropertyContainer::LookForPolarHandles( eShapeType, nAdjustmentsWhichNeedsToBeConverted );