Merge remote-tracking branch 'origin/integration/dev300_m101'

Conflicts:
	sd/source/ui/func/fuinsfil.cxx
	sd/source/ui/func/fuprobjs.cxx
	sd/source/ui/slideshow/slideshowimpl.cxx
	sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
	sd/source/ui/toolpanel/ToolPanelViewShell.cxx
	sd/source/ui/view/drawview.cxx
	sd/source/ui/view/drtxtob.cxx
	sd/source/ui/view/outlnvsh.cxx
	sd/source/ui/view/outlview.cxx

6 files changed, 77 insertions, 9 deletions

diff --git a/animations/prj/build.lst b/animations/prj/build.lst
index 00a1eb69c743..276f25e46d9b 100644
--- a/animations/prj/build.lst
+++ b/animations/prj/build.lst
@@ -1,3 +1,3 @@
-animations	animations	:	cppuhelper comphelper offuh NULL
+animations	animations	:	cppuhelper comphelper offuh LIBXSLT:libxslt NULL
 animations	animations						usr1	-	all	animations_mkout NULL
 animations	animations\source\animcore		nmake	-	all	animations_animcore NULL
diff --git a/animations/prj/d.lst b/animations/prj/d.lst
index bdab238656c3..9a91b35b2f50 100644
--- a/animations/prj/d.lst
+++ b/animations/prj/d.lst
@@ -7,3 +7,4 @@
 
 mkdir: %_DEST%\inc%_EXT%\animations
 ..\inc\animations\animationnodehelper.hxx %_DEST%\inc%_EXT%\animations\animationnodehelper.hxx
+..\%__SRC%\misc\animcore.component %_DEST%\xml%_EXT%\animcore.component
diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
new file mode 100644
index 000000000000..1a9a390fb64b
--- /dev/null
+++ b/animations/source/animcore/animcore.component
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="animcore::Animate">
+    <service name="com.sun.star.animations.Animate"/>
+  </implementation>
+  <implementation name="animcore::AnimateColor">
+    <service name="com.sun.star.animations.AnimateColor"/>
+  </implementation>
+  <implementation name="animcore::AnimateMotion">
+    <service name="com.sun.star.animations.AnimateMotion"/>
+  </implementation>
+  <implementation name="animcore::AnimateSet">
+    <service name="com.sun.star.animations.AnimateSet"/>
+  </implementation>
+  <implementation name="animcore::AnimateTransform">
+    <service name="com.sun.star.animations.AnimateTransform"/>
+  </implementation>
+  <implementation name="animcore::Audio">
+    <service name="com.sun.star.animations.Audio"/>
+  </implementation>
+  <implementation name="animcore::Command">
+    <service name="com.sun.star.animations.Command"/>
+  </implementation>
+  <implementation name="animcore::IterateContainer">
+    <service name="com.sun.star.animations.IterateContainer"/>
+  </implementation>
+  <implementation name="animcore::ParallelTimeContainer">
+    <service name="com.sun.star.animations.ParallelTimeContainer"/>
+  </implementation>
+  <implementation name="animcore::SequenceTimeContainer">
+    <service name="com.sun.star.animations.SequenceTimeContainer"/>
+  </implementation>
+  <implementation name="animcore::TargetPropertiesCreator">
+    <service name="com.sun.star.animations.TargetPropertiesCreator"/>
+  </implementation>
+  <implementation name="animcore::TransitionFilter">
+    <service name="com.sun.star.animations.TransitionFilter"/>
+  </implementation>
+</component>
diff --git a/animations/source/animcore/factreg.cxx b/animations/source/animcore/factreg.cxx
index 63c2cacf516b..c79ac7d7852b 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -86,12 +86,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    return component_writeInfoHelper( pServiceManager, pRegistryKey, g_entries );
-}
-//==================================================================================================
 void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/animations/source/animcore/makefile.mk b/animations/source/animcore/makefile.mk
index c2a10716b844..9c6b4a2cdead 100644
--- a/animations/source/animcore/makefile.mk
+++ b/animations/source/animcore/makefile.mk
@@ -63,5 +63,12 @@ DEF1NAME=		$(SHL1TARGET)
 .ENDIF # L10N_framework
 
 # --- Targets ------------------------------------------------------
-
 .INCLUDE :	target.mk
+
+ALLTAR : $(MISC)/animcore.component
+
+$(MISC)/animcore.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        animcore.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt animcore.component
diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index f35151d6cac7..fb953ee67f37 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -43,7 +43,6 @@
 #include <cppuhelper/compbase3.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <comphelper/optionalvalue.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/sequence.hxx>