CWS-TOOLING: integrate CWS sb129

3 files changed, 64 insertions, 7 deletions

diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component
new file mode 100644
index 000000000000..fc99913b5a74
--- /dev/null
+++ b/chart2/source/controller/chartcontroller.component
@@ -0,0 +1,56 @@
+<?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="com.sun.star.comp.chart.ElementSelectorToolbarController">
+    <service name="com.sun.star.frame.ToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.ChartController">
+    <service name="com.sun.star.chart2.ChartController"/>
+    <service name="com.sun.star.frame.Controller"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper">
+    <service name="com.sun.star.beans.PropertySet"/>
+    <service name="com.sun.star.chart.ChartDocument"/>
+    <service name="com.sun.star.chart2.ChartDocumentWrapper"/>
+    <service name="com.sun.star.xml.UserDefinedAttributeSupplier"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.ChartFrameLoader">
+    <service name="com.sun.star.frame.SynchronousFrameLoader"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.ChartTypeDialog">
+    <service name="com.sun.star.chart2.ChartTypeDialog"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.ShapeToolbarController">
+    <service name="com.sun.star.chart2.ShapeToolbarController"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.chart2.WizardDialog">
+    <service name="com.sun.star.chart2.WizardDialog"/>
+  </implementation>
+</component>
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx b/chart2/source/controller/main/_serviceregistration_controller.cxx
index cf8f5525e624..0371f50f9996 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -108,13 +108,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * pServiceManager, void * pRegistryKey )
-{
-    return ::cppu::component_writeInfoHelper(
-        pServiceManager, pRegistryKey, g_entries_chart2_controller );
-}
-//==================================================================================================
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
diff --git a/chart2/source/controller/makefile.mk b/chart2/source/controller/makefile.mk
index b8a256181045..fbc888f38c3f 100644
--- a/chart2/source/controller/makefile.mk
+++ b/chart2/source/controller/makefile.mk
@@ -126,3 +126,11 @@ RESLIB1DEPN=$(RESLIB1LIST)
 # --- Targets -----------------------------------------------------------------
 
 .INCLUDE: target.mk
+
+ALLTAR : $(MISC)/chartcontroller.component
+
+$(MISC)/chartcontroller.component .ERRREMOVE : \
+        $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt chartcontroller.component