From 2edad6fc6154fbe0df00f426a6d1a84cb0a49c64 Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 10 Sep 2010 13:10:07 +0200
Subject: sb129: #i113189# change UNO components to use passive registration

---
 animations/source/animcore/animcore.component | 67 +++++++++++++++++++++++++++
 animations/source/animcore/factreg.cxx        |  6 ---
 animations/source/animcore/makefile.mk        |  8 ++++
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 animations/source/animcore/animcore.component

(limited to 'animations/source')

diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
new file mode 100644
index 000000000..1a9a390fb
--- /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 3dbdf5b10..060ef6823 100644
--- a/animations/source/animcore/factreg.cxx
+++ b/animations/source/animcore/factreg.cxx
@@ -85,12 +85,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 b78460ada..674858cd5 100644
--- a/animations/source/animcore/makefile.mk
+++ b/animations/source/animcore/makefile.mk
@@ -68,3 +68,11 @@ DEF1NAME=		$(SHL1TARGET)
 # --- 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
-- 
cgit v1.2.3


From 5d55caa304d95e44f74be3ff0401dc9627f9886c Mon Sep 17 00:00:00 2001
From: "Frank Schoenheit [fs]" <frank.schoenheit@sun.com>
Date: Fri, 17 Sep 2010 08:23:35 +0200
Subject: dba34a: remove comphelper/optionalvalue.hxx, and the only client it
 had (replaced with boost/optional.hpp)

---
 animations/source/animcore/targetpropertiescreator.cxx | 1 -
 1 file changed, 1 deletion(-)

(limited to 'animations/source')

diff --git a/animations/source/animcore/targetpropertiescreator.cxx b/animations/source/animcore/targetpropertiescreator.cxx
index 160a084fd..181d2c628 100644
--- a/animations/source/animcore/targetpropertiescreator.cxx
+++ b/animations/source/animcore/targetpropertiescreator.cxx
@@ -42,7 +42,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>
 
-- 
cgit v1.2.3