Clean up previous commit

...and fix AnimationNode::getSupportedServiceNames

Change-Id: I199bc5a58174873794f082b149352359918bfc6b

3 files changed, 3 insertions, 65 deletions

diff --git a/animations/source/animcore/animcore.component b/animations/source/animcore/animcore.component
index 4ec3d12a04bc..c6c4cce72eb1 100644
--- a/animations/source/animcore/animcore.component
+++ b/animations/source/animcore/animcore.component
@@ -18,7 +18,7 @@
  -->
 
 <component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
-    prefix="animcore" xmlns="http://openoffice.org/2010/uno-components">
+    xmlns="http://openoffice.org/2010/uno-components">
   <implementation name="animcore::Animate"
       constructor="com_sun_star_animations_Animate_get_implementation">>
     <service name="com.sun.star.animations.Animate"/>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index 1f6d43d2817a..9b804a929235 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -58,8 +58,6 @@
 #include <algorithm>
 #include <string.h>
 
-#include <factreg.hxx>
-
 using ::osl::Mutex;
 using ::osl::Guard;
 using ::cppu::OInterfaceContainerHelper;
@@ -901,6 +899,8 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames(void) throw(std::ex
         return getSupportedServiceNames_ANIMATEMOTION();
     case AnimationNodeType::TRANSITIONFILTER:
         return getSupportedServiceNames_TRANSITIONFILTER();
+    case AnimationNodeType::ANIMATETRANSFORM:
+        return getSupportedServiceNames_ANIMATETRANSFORM();
     case AnimationNodeType::AUDIO:
         return getSupportedServiceNames_AUDIO();
     case AnimationNodeType::COMMAND:
diff --git a/animations/source/animcore/factreg.hxx b/animations/source/animcore/factreg.hxx
deleted file mode 100644
index 152976c632b5..000000000000
--- a/animations/source/animcore/factreg.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
-#define INCLUDED_ANIMATIONS_SOURCE_ANIMCORE_FACTREG_HXX
-
-namespace animcore {
-
-extern OUString getImplementationName_PAR();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_PAR();
-
-extern OUString getImplementationName_SEQ();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_SEQ();
-
-extern OUString getImplementationName_ITERATE();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_ITERATE();
-
-extern OUString getImplementationName_ANIMATE();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_ANIMATE();
-
-extern OUString getImplementationName_SET();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_SET();
-
-extern OUString getImplementationName_ANIMATECOLOR();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_ANIMATECOLOR();
-
-extern OUString getImplementationName_ANIMATEMOTION();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_ANIMATEMOTION();
-
-extern OUString getImplementationName_ANIMATETRANSFORM();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_ANIMATETRANSFORM();
-
-extern OUString getImplementationName_TRANSITIONFILTER();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_TRANSITIONFILTER();
-
-extern OUString getImplementationName_AUDIO();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_AUDIO();
-
-extern OUString getImplementationName_COMMAND();
-extern ::com::sun::star::uno::Sequence< OUString> getSupportedServiceNames_COMMAND();
-
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */