[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - patches/dev300

[Tor Lillqvist]

 patches/dev300/ooxml-filters.diff |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 838bfa4fab074246878ed832a3a655ffd96317a7
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue May 25 09:46:21 2010 +0300

    Set FileFormatVersion for the ISO/IEC OOXML presentation filters
    (cherry picked from commit 30eaed3a3e874198622737d86706798471d64ce9)

diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index 5c619d0..ae3c1a3 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -299,14 +299,15 @@ index 2e354c8..43447cb 100644
 +</node>
 --- /dev/null
 +++ filter/source/config/fragments/filters/impress_OOXML.xcu
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +<node oor:name="Impress Office Open XML" oor:op="replace">
 +    <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER PREFERRED</value></prop>
 +    <prop oor:name="UIComponent"/>
 +    <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
 +    <prop oor:name="UserData"><value>OOXML</value></prop>
 +    <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation</value></prop>
-+    <prop oor:name="FileFormatVersion"/>
++    <!-- ISO/IEC 29500:2008 -->
++    <prop oor:name="FileFormatVersion"><value>1</value></prop>
 +    <prop oor:name="Type"><value>Office Open XML Presentation</value></prop>
 +    <prop oor:name="TemplateName"/>
 +    <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
@@ -323,14 +324,15 @@ index 2e354c8..43447cb 100644
      <prop oor:name="TemplateName"/>
 --- /dev/null
 +++ filter/source/config/fragments/filters/impress_OOXML_Template.xcu
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +<node oor:name="Impress Office Open XML Template" oor:op="replace">
 +    <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE TEMPLATEPATH PREFERRED</value></prop>
 +    <prop oor:name="UIComponent"/>
 +    <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
 +    <prop oor:name="UserData"><value>OOXML</value></prop>
 +    <prop oor:name="UIName"><value xml:lang="x-default">Office Open XML Presentation Template</value></prop>
-+    <prop oor:name="FileFormatVersion"/>
++    <!-- ISO/IEC 29500:2008 -->
++    <prop oor:name="FileFormatVersion"><value>1</value></prop>
 +    <prop oor:name="Type"><value>Office Open XML Presentation Template</value></prop>
 +    <prop oor:name="TemplateName"/>
 +    <prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>