Merge branch 'master' into feature/gsoc2011_wizards

Conflicts:
automation/source/inc/cmdbasestream.hxx
automation/source/server/cmdbasestream.cxx
automation/source/server/retstrm.hxx
automation/source/testtool/cmdstrm.cxx
automation/source/testtool/cmdstrm.hxx
automation/source/testtool/tcommuni.cxx
basctl/prj/d.lst
basctl/uiconfig/basicide/toolbar/findbar.xml
cui/source/dialogs/about.cxx
cui/source/dialogs/about.src
cui/source/inc/about.hxx
extensions/source/abpilot/abpservices.cxx
extensions/source/dbpilots/dbpservices.cxx
extensions/source/propctrlr/pcrservices.cxx
extensions/source/svg/makefile.mk
forms/Library_frm.mk
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
lingucomponent/source/spellcheck/spell/sspellimp.cxx
package/prj/d.lst
package/source/zipapi/XMemoryStream.cxx
package/source/zipapi/XMemoryStream.hxx
setup_native/prj/d.lst
setup_native/source/win32/customactions/relnotes/makefile.mk
tools/test/export.map
wizards/com/sun/star/wizards/common/ConfigGroup.py
wizards/com/sun/star/wizards/common/ConfigNode.py
wizards/com/sun/star/wizards/common/Configuration.py
wizards/com/sun/star/wizards/common/Desktop.py
wizards/com/sun/star/wizards/common/FileAccess.py
wizards/com/sun/star/wizards/common/Helper.py
wizards/com/sun/star/wizards/common/SystemDialog.py
wizards/com/sun/star/wizards/document/OfficeDocument.py
wizards/com/sun/star/wizards/fax/FaxDocument.py
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
wizards/com/sun/star/wizards/fax/FaxWizardDialogResources.py
wizards/com/sun/star/wizards/letter/LetterDocument.py
wizards/com/sun/star/wizards/letter/LetterWizardDialog.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogConst.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.py
wizards/com/sun/star/wizards/letter/LetterWizardDialogResources.py
wizards/com/sun/star/wizards/text/TextDocument.py
wizards/com/sun/star/wizards/text/TextFieldHandler.py
wizards/com/sun/star/wizards/text/TextSectionHandler.py
wizards/com/sun/star/wizards/text/ViewHandler.py
wizards/com/sun/star/wizards/ui/UnoDialog.py
wizards/com/sun/star/wizards/ui/UnoDialog2.py
wizards/com/sun/star/wizards/ui/WizardDialog.py
wizards/com/sun/star/wizards/ui/event/CommonListener.py
wizards/com/sun/star/wizards/ui/event/DataAware.py
wizards/com/sun/star/wizards/ui/event/RadioDataAware.py
wizards/com/sun/star/wizards/ui/event/UnoDataAware.py
wizards/util/helpids.h
wizards/util/hidother.src
xmlsecurity/prj/build.lst
xmlsecurity/prj/d.lst
xmlsecurity/qa/certext/SanCertExt.cxx

1 files changed, 92 insertions, 0 deletions

diff --git a/starmath/xml/math.xml b/starmath/xml/math.xml
new file mode 100644
index 000000000000..99f2576c0d80
--- /dev/null
+++ b/starmath/xml/math.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module-description PUBLIC "-//StarOffice//DTD ComponentDescription 1.0//EN" "module-description.dtd">
+<module-description xmlns:xlink="http://www.w3.org/1999/xlink">
+    <module-name>sm</module-name>
+    <component-description>
+        <author>Oliver Specht</author>
+        <name>math.SmModel</name>
+        <description>This component provides access to various settings of a formula.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.formula.FormulaProperties</supported-service>
+    </component-description>
+    <!-- XML-based filter: Math import components
+       (full, styles, content, meta, settings)
+    -->
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLMetaImporter</name>
+        <description>This component imports the meta.xml stream into a math document.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
+    </component-description>
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLImporter</name>
+        <description>This component imports a single XML document stream into a math document.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
+    </component-description>
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLSettingsImporter</name>
+        <description>This component imports the settings.xml stream into a math document.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLImportFilter</supported-service>
+    </component-description>
+    <!-- XML-based filter: Math export components
+       (full, styles, content, meta, settings)
+    -->
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLMetaExporter</name>
+        <description>This component exports the meta of a math document.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
+    </component-description>
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLExporter</name>
+        <description>This component exports a math document into a single XML document stream.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
+    </component-description>
+    <component-description>
+        <author>xmloff development team</author>
+        <name>com.sun.star.comp.Math.XMLSettingsExporter</name>
+        <description>This component exports a the settings of a math document.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+        <supported-service>com.sun.star.xml.XMLExportFilter</supported-service>
+    </component-description>
+    <component-description>
+                <author>TL</author>
+                <name>SmGraphicAccessible</name>
+                <description>The accessible view of a formula documents visual representation.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+                <supported-service>com.sun.star.formula.AccessibleFormulaView</supported-service>
+    </component-description>
+    <component-description>
+                <author>TL</author>
+                <name>SmEditAccessible</name>
+                <description>The accessible view of a formula documents command text.</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="beta"/>
+                <supported-service>com.sun.star.formula.AccessibleFormulaText</supported-service>
+    </component-description>
+</module-description>