[ooo-build-commit] .: patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue May 11 05:24:17 PDT 2010
patches/dev300/ooxml-filters.diff | 141 ++++++++++++++++++++++++++++++--------
1 file changed, 115 insertions(+), 26 deletions(-)
New commits:
commit c684ed8728364b32cb682651a92695bc8769ce39
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue May 11 15:23:21 2010 +0300
Add OOXML type and filter fragments for presentations
* patches/dev300/ooxml-filters.diff: Add new .xcu files for Office
Open XML Presentation and Presentation Template.
M patches/dev300/ooxml-filters.diff
diff --git a/patches/dev300/ooxml-filters.diff b/patches/dev300/ooxml-filters.diff
index 07ec7cd..f0d1f71 100644
--- a/patches/dev300/ooxml-filters.diff
+++ b/patches/dev300/ooxml-filters.diff
@@ -1,28 +1,3 @@
-Adding ISO OOXML filters
-
-From: Cédric Bosdonnat <cedricbosdo at openoffice.org>
-
-
----
-
- filter/source/config/fragments/fcfg_writer.mk | 12 ++++++---
- .../source/config/fragments/filters/OOXML_Text.xcu | 14 ++++++++++
- .../fragments/filters/OOXML_Text_Template.xcu | 14 ++++++++++
- .../fragments/filters/OOXML_Text_Template_ui.xcu | 6 ++++
- .../config/fragments/filters/OOXML_Text_ui.xcu | 6 ++++
- .../source/config/fragments/types/writer_OOXML.xcu | 12 +++++++++
- .../fragments/types/writer_OOXML_Template.xcu | 12 +++++++++
- oox/inc/oox/core/filterbase.hxx | 7 +++++
- oox/source/core/filterbase.cxx | 28 ++++++++++++++++++++
- 9 files changed, 108 insertions(+), 3 deletions(-)
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_Template_ui.xcu
- create mode 100644 filter/source/config/fragments/filters/OOXML_Text_ui.xcu
- create mode 100644 filter/source/config/fragments/types/writer_OOXML.xcu
- create mode 100644 filter/source/config/fragments/types/writer_OOXML_Template.xcu
-
-
diff --git filter/source/config/fragments/fcfg_writer.mk filter/source/config/fragments/fcfg_writer.mk
index a10cefb..df4b7cf 100644
--- filter/source/config/fragments/fcfg_writer.mk
@@ -233,7 +208,7 @@ index 4dc3451..d360bda 100644
// ----------------------------------------------------------------------------
Any FilterBase::getArgument( const OUString& rArgName ) const
-@@ -675,6 +684,25 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
+@@ -675,6 +684,139 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
mxImpl->mxInteractionHandler = mxImpl->maMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >() );
mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault( CREATE_OUSTRING( "ParentShape" ), mxImpl->mxParentShape );
@@ -259,3 +234,117 @@ index 4dc3451..d360bda 100644
}
+--- filter/source/config/fragments/fcfg_impress.mk
++++ filter/source/config/fragments/fcfg_impress.mk
+@@ -17,7 +17,9 @@ T4_IMPRESS = \
+ impress8_template\
+ draw8\
+ MS_PowerPoint_2007_XML\
+- MS_PowerPoint_2007_XML_Template
++ MS_PowerPoint_2007_XML_Template\
++ impress_OOXML_Presentation\
++ impress_OOXML_Presentation_Template
+
+ # -----------------------------------------------
+ # count = 20
+@@ -35,7 +35,9 @@ F4_IMPRESS = \
+ impress8_template\
+ impress8_draw\
+ impress_MS_PowerPoint_2007_XML\
+- impress_MS_PowerPoint_2007_XML_Template
++ impress_MS_PowerPoint_2007_XML_Template\
++ impress_OOXML\
++ impress_OOXML_Template
+
+ # -----------------------------------------------
+ # count = 12
+@@ -48,7 +48,8 @@ F4_UI_IMPRESS = \
+ impress8_template_ui \
+ impress8_draw_ui \
+ impress_MS_PowerPoint_2007_XML_ui \
+- impress_MS_PowerPoint_2007_XML_Template_ui
++ impress_OOXML_ui\
++ impress_OOXML_Template_ui
+
+ # -----------------------------------------------
+ # count = 0
+--- /dev/null
++++ filter/source/config/fragments/types/impress_OOXML_Presentation.xcu
+@@ -0,0 +1,10 @@
++<node oor:name="Office Open XML Presentation" oor:op="replace">
++ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
++ <prop oor:name="URLPattern"/>
++ <prop oor:name="Extensions"><value>pptx pptm</value></prop>
++ <prop oor:name="MediaType"/>
++ <prop oor:name="Preferred"><value>true</value></prop>
++ <prop oor:name="PreferredFilter"><value>Impress Office Open XML</value></prop>
++ <prop oor:name="UIName"><value>Office Open XML Presentation</value></prop>
++ <prop oor:name="ClipboardFormat"/>
++</node>
+--- /dev/null
++++ filter/source/config/fragments/types/impress_OOXML_Presentation_Template.xcu
+@@ -0,0 +1,10 @@
++<node oor:name="Office Open XML Presentation Template" oor:op="replace">
++ <prop oor:name="DetectService"><value>com.sun.star.comp.oox.FormatDetector</value></prop>
++ <prop oor:name="URLPattern"/>
++ <prop oor:name="Extensions"><value>potm potx</value></prop>
++ <prop oor:name="MediaType"/>
++ <prop oor:name="Preferred"><value>true</value></prop>
++ <prop oor:name="PreferredFilter"><value>Impress Office Open XML Template</value></prop>
++ <prop oor:name="UIName"><value>Office Open XML Presentation Template</value></prop>
++ <prop oor:name="ClipboardFormat"/>
++</node>
+--- /dev/null
++++ filter/source/config/fragments/filters/impress_OOXML.xcu
+@@ -0,0 +1,11 @@
++<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"/>
++ <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>
++</node>
+--- filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
++++ filter/source/config/fragments/filters/impress_MS_PowerPoint_2007_XML_Template.xcu
+@@ -3,6 +3,7 @@
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Impress.oox.PowerPointImport</value></prop>
+ <prop oor:name="UserData"/>
++ <prop oor:name="UIName"><value xml:lang="x-default">Microsoft PowerPoint 2007 XML Template</value></prop>
+ <prop oor:name="FileFormatVersion"/>
+ <prop oor:name="Type"><value>MS PowerPoint 2007 XML Template</value></prop>
+ <prop oor:name="TemplateName"/>
+--- /dev/null
++++ filter/source/config/fragments/filters/impress_OOXML_Template.xcu
+@@ -0,0 +1,11 @@
++<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"/>
++ <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>
++</node>
+--- /dev/null
++++ filter/source/config/fragments/filters/impress_OOXML_ui.xcu
+@@ -0,0 +1,5 @@
++<node oor:name="Office Open XML Presentation">
++ <prop oor:name="UIName">
++ <value xml:lang="en-US">Office Open XML Presentation</value>
++ </prop>
++</node>
+--- /dev/null
++++ filter/source/config/fragments/filters/impress_OOXML_Template_ui.xcu
+@@ -0,0 +1,5 @@
++<node oor:name="Office Open XML Presentation Template">
++ <prop oor:name="UIName">
++ <value xml:lang="en-US">Office Open XML Presentation Template</value>
++ </prop>
++</node>
More information about the ooo-build-commit
mailing list