#i10000#ooo/DEV300_m89

8 files changed, 206 insertions, 20 deletions

diff --git a/reportdesign/prj/d.lst b/reportdesign/prj/d.lst
index b531c0eed..d7cc5fad6 100644
--- a/reportdesign/prj/d.lst
+++ b/reportdesign/prj/d.lst
@@ -19,3 +19,6 @@ dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib;
 ..\uiconfig\dbreport\statusbar\*.xml         %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\statusbar\*.xml
 ..\uiconfig\dbreport\toolbar\*.xml           %_DEST%\xml%_EXT%\uiconfig\modules\dbreport\toolbar\*.xml
 
+..\%__SRC%\misc\rpt.component %_DEST%\xml%_EXT%\rpt.component
+..\%__SRC%\misc\rptui.component %_DEST%\xml%_EXT%\rptui.component
+..\%__SRC%\misc\rptxml.component %_DEST%\xml%_EXT%\rptxml.component
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
index 7877ac94b..738185549 100644
--- a/reportdesign/source/core/api/services.cxx
+++ b/reportdesign/source/core/api/services.cxx
@@ -90,10 +90,4 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 
-SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return cppu::component_writeInfoHelper(
-        serviceManager, registryKey, entries);
-}
 } // extern "C"
diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx
index 1e9bd244a..9218c32bd 100644
--- a/reportdesign/source/filter/xml/xmlservices.cxx
+++ b/reportdesign/source/filter/xml/xmlservices.cxx
@@ -92,10 +92,3 @@ extern "C" void SAL_CALL component_getImplementationEnvironment(
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
-
-extern "C" sal_Bool SAL_CALL component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return cppu::component_writeInfoHelper(
-        serviceManager, registryKey, entries);
-}
diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx
index 98c483a65..7eef147e8 100644
--- a/reportdesign/source/ui/misc/rptuiservices.cxx
+++ b/reportdesign/source/ui/misc/rptuiservices.cxx
@@ -80,10 +80,3 @@ extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnviron
 {
     *envTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
-
-extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
-    void * serviceManager, void * registryKey)
-{
-    return cppu::component_writeInfoHelper(
-        serviceManager, registryKey, entries);
-}
diff --git a/reportdesign/util/makefile.mk b/reportdesign/util/makefile.mk
index 32fe4eb2a..4f0901843 100644
--- a/reportdesign/util/makefile.mk
+++ b/reportdesign/util/makefile.mk
@@ -231,3 +231,23 @@ DEF3NAME=$(SHL3TARGET)
 .INCLUDE : target.mk
 
 
+
+ALLTAR : $(MISC)/rpt.component $(MISC)/rptui.component $(MISC)/rptxml.component
+
+$(MISC)/rpt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        rpt.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt rpt.component
+
+$(MISC)/rptui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        rptui.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt rptui.component
+
+$(MISC)/rptxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        rptxml.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt rptxml.component
diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component
new file mode 100644
index 000000000..ef5b2cc4c
--- /dev/null
+++ b/reportdesign/util/rpt.component
@@ -0,0 +1,58 @@
+<?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.report.OFixedLine">
+    <service name="com.sun.star.report.FixedLine"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OFixedText">
+    <service name="com.sun.star.report.FixedText"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OFormatCondition">
+    <service name="com.sun.star.report.FormatCondition"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OFormattedField">
+    <service name="com.sun.star.report.FormattedField"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OFunction">
+    <service name="com.sun.star.report.Function"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OImageControl">
+    <service name="com.sun.star.report.ImageControl"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OReportDefinition">
+    <service name="com.sun.star.report.ReportDefinition"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OReportEngineJFree">
+    <service name="com.sun.star.report.ReportEngine"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.Shape">
+    <service name="com.sun.star.report.Shape"/>
+  </implementation>
+</component>
diff --git a/reportdesign/util/rptui.component b/reportdesign/util/rptui.component
new file mode 100644
index 000000000..593f06d0b
--- /dev/null
+++ b/reportdesign/util/rptui.component
@@ -0,0 +1,52 @@
+<?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.report.DataProviderHandler">
+    <service name="com.sun.star.report.inspection.DataProviderHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.DefaultComponentInspectorModel">
+    <service name="com.sun.star.report.inspection.DefaultComponentInspectorModel"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.GeometryHandler">
+    <service name="com.sun.star.report.inspection.GeometryHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ReportComponentHandler">
+    <service name="com.sun.star.report.inspection.ReportComponentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.report.comp.ReportDesign">
+    <service name="com.sun.star.sdb.ReportDesign"/>
+  </implementation>
+  <implementation name="com.sun.star.report.comp.ReportToolboxController">
+    <service name="com.sun.star.report.ReportToolboxController"/>
+  </implementation>
+  <implementation name="com.sun.star.report.comp.StatusbarController">
+    <service name="com.sun.star.frame.StatusbarController"/>
+  </implementation>
+</component>
diff --git a/reportdesign/util/rptxml.component b/reportdesign/util/rptxml.component
new file mode 100644
index 000000000..8a0021ecd
--- /dev/null
+++ b/reportdesign/util/rptxml.component
@@ -0,0 +1,73 @@
+<?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.Report.XMLOasisContentImporter">
+    <service name="com.sun.star.comp.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisMetaImporter">
+    <service name="com.sun.star.comp.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisSettingsImporter">
+    <service name="com.sun.star.comp.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Report.XMLOasisStylesImporter">
+    <service name="com.sun.star.comp.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ExportDocumentHandler">
+    <service name="com.sun.star.report.ExportDocumentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ExportFilter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ImportDocumentHandler">
+    <service name="com.sun.star.report.ImportDocumentHandler"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.OReportFilter">
+    <service name="com.sun.star.comp.document.ImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.ORptTypeDetection">
+    <service name="com.sun.star.document.ExtendedTypeDetection"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLContentExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLFullExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLMetaExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLSettingsExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.report.XMLStylesExporter">
+    <service name="com.sun.star.document.ExportFilter"/>
+  </implementation>
+</component>