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, 72 insertions, 0 deletions

diff --git a/sc/xml/ScTableConditionalEntry.xml b/sc/xml/ScTableConditionalEntry.xml
new file mode 100644
index 000000000000..b3b266314bfb
--- /dev/null
+++ b/sc/xml/ScTableConditionalEntry.xml
@@ -0,0 +1,72 @@
+<?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>sc</module-name>
+    <component-description>
+        <author>Niklas Nebel</author>
+        <name>com.sun.star.comp.office.ScTableConditionalEntry</name>
+        <description>
+    This component provides access to a single entry in a TableConditionalFormat object.
+</description>
+        <loader-name>com.sun.star.loader.SharedLibrary</loader-name>
+        <language>c++</language>
+        <status value="final"/>
+        <supported-service>com.sun.star.sheet.TableConditionalEntry</supported-service>
+        <type>com.sun.star.beans.Property</type>
+        <type>com.sun.star.beans.PropertyChangeEvent</type>
+        <type>com.sun.star.beans.PropertyState</type>
+        <type>com.sun.star.beans.PropertyValue</type>
+        <type>com.sun.star.beans.PropertyVetoException</type>
+        <type>com.sun.star.beans.UnknownPropertyException</type>
+        <type>com.sun.star.beans.XPropertyChangeListener</type>
+        <type>com.sun.star.beans.XPropertySet</type>
+        <type>com.sun.star.beans.XPropertySetInfo</type>
+        <type>com.sun.star.beans.XVetoableChangeListener</type>
+        <type>com.sun.star.container.NoSuchElementException</type>
+        <type>com.sun.star.container.XElementAccess</type>
+        <type>com.sun.star.container.XEnumeration</type>
+        <type>com.sun.star.container.XEnumerationAccess</type>
+        <type>com.sun.star.container.XIndexAccess</type>
+        <type>com.sun.star.container.XNameAccess</type>
+        <type>com.sun.star.lang.EventObject</type>
+        <type>com.sun.star.lang.IllegalArgumentException</type>
+        <type>com.sun.star.lang.IndexOutOfBoundsException</type>
+        <type>com.sun.star.lang.WrappedTargetException</type>
+        <type>com.sun.star.lang.XEventListener</type>
+        <type>com.sun.star.lang.XMultiServiceFactory</type>
+        <type>com.sun.star.lang.XServiceInfo</type>
+        <type>com.sun.star.lang.XTypeProvider</type>
+        <type>com.sun.star.lang.XUnoTunnel</type>
+        <type>com.sun.star.sheet.ConditionOperator</type>
+        <type>com.sun.star.sheet.ValidationAlertStyle</type>
+        <type>com.sun.star.sheet.ValidationType</type>
+        <type>com.sun.star.sheet.XSheetCondition</type>
+        <type>com.sun.star.sheet.XSheetConditionalEntries</type>
+        <type>com.sun.star.sheet.XSheetConditionalEntry</type>
+        <type>com.sun.star.table.CellAddress</type>
+        <type>com.sun.star.uno.Any</type>
+        <type>com.sun.star.uno.Exception</type>
+        <type>com.sun.star.uno.Reference</type>
+        <type>com.sun.star.uno.RuntimeException</type>
+        <type>com.sun.star.uno.Sequence</type>
+        <type>com.sun.star.uno.Type</type>
+        <type>com.sun.star.uno.TypeClass</type>
+        <type>com.sun.star.uno.XAdapter</type>
+        <type>com.sun.star.uno.XAggregation</type>
+        <type>com.sun.star.uno.XInterface</type>
+        <type>com.sun.star.uno.XReference</type>
+        <type>com.sun.star.uno.XWeak</type>
+        <type>com.sun.star.uno.genfunc</type>
+    </component-description>
+    <project-build-dependency>cppu</project-build-dependency>
+    <project-build-dependency>cppuhelper</project-build-dependency>
+    <project-build-dependency>osl</project-build-dependency>
+    <project-build-dependency>rtl</project-build-dependency>
+    <project-build-dependency>sal</project-build-dependency>
+    <project-build-dependency>stl</project-build-dependency>
+    <project-build-dependency>svtools</project-build-dependency>
+    <project-build-dependency>tools</project-build-dependency>
+    <project-build-dependency>typelib</project-build-dependency>
+    <project-build-dependency>uno</project-build-dependency>
+    <project-build-dependency>vcl</project-build-dependency>
+</module-description>