[Libreoffice-commits] core.git: reportdesign/inc reportdesign/Library_rpt.mk reportdesign/source reportdesign/util
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jul 25 14:29:47 UTC 2020
reportdesign/Library_rpt.mk | 1
reportdesign/inc/ReportDefinition.hxx | 7 -
reportdesign/source/core/api/FixedLine.cxx | 30 ++------
reportdesign/source/core/api/FixedText.cxx | 30 ++------
reportdesign/source/core/api/FormatCondition.cxx | 29 ++-----
reportdesign/source/core/api/FormattedField.cxx | 27 ++-----
reportdesign/source/core/api/Function.cxx | 29 ++-----
reportdesign/source/core/api/ImageControl.cxx | 30 ++------
reportdesign/source/core/api/ReportDefinition.cxx | 26 ++-----
reportdesign/source/core/api/ReportEngineJFree.cxx | 30 ++------
reportdesign/source/core/api/Shape.cxx | 27 ++-----
reportdesign/source/core/api/services.cxx | 78 ---------------------
reportdesign/source/core/inc/FixedLine.hxx | 6 -
reportdesign/source/core/inc/FixedText.hxx | 6 -
reportdesign/source/core/inc/FormatCondition.hxx | 6 -
reportdesign/source/core/inc/FormattedField.hxx | 6 -
reportdesign/source/core/inc/Function.hxx | 6 -
reportdesign/source/core/inc/ImageControl.hxx | 6 -
reportdesign/source/core/inc/ReportEngineJFree.hxx | 6 -
reportdesign/source/core/inc/Shape.hxx | 6 -
reportdesign/util/rpt.component | 29 +++++--
21 files changed, 98 insertions(+), 323 deletions(-)
New commits:
commit 79c1d1234bdac0d41109930529f42d39c70b0f7b
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 25 12:12:44 2020 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sat Jul 25 16:29:02 2020 +0200
reportdesign/core: create instances with uno constructors
See tdf#74608 for motivation.
Change-Id: I0b8197ca63afebef617b75ccc146af645c357902
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99426
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index fb846e09ee8a..0ea86b62f0db 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,rpt,\
reportdesign/source/core/api/ReportEngineJFree \
reportdesign/source/core/api/ReportVisitor \
reportdesign/source/core/api/Section \
- reportdesign/source/core/api/services \
reportdesign/source/core/api/Shape \
reportdesign/source/core/api/Tools \
reportdesign/source/core/misc/conditionalexpression \
diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index 50973000d493..eede1cd61090 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -173,13 +173,6 @@ namespace reportdesign
,const css::uno::Reference< css::lang::XMultiServiceFactory > & _xFactory
,css::uno::Reference< css::drawing::XShape >& _xShape);
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
-
css::uno::Reference< css::uno::XComponentContext > getContext();
private:
diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx
index b868febe7cdc..984bf7d26305 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -199,33 +199,14 @@ void SAL_CALL OFixedLine::dispose()
cppu::WeakComponentImplHelperBase::dispose();
}
-OUString OFixedLine::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OFixedLine";
-}
-
-
OUString SAL_CALL OFixedLine::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OFixedLine::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_FIXEDLINE };
-
- return aServices;
-}
-
-uno::Reference< uno::XInterface > OFixedLine::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OFixedLine(xContext));
+ return "com.sun.star.comp.report.OFixedLine";
}
-
uno::Sequence< OUString > SAL_CALL OFixedLine::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_FIXEDLINE };
}
sal_Bool SAL_CALL OFixedLine::supportsService(const OUString& ServiceName)
@@ -561,4 +542,11 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( sal_Bool /*_printrepeatedvalue
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OFixedLine_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OFixedLine(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx
index 5beaa5481667..589d68946406 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -88,33 +88,14 @@ void SAL_CALL OFixedText::dispose()
uno::Reference< report::XFixedText> xHoldAlive = this;
}
-OUString OFixedText::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OFixedText";
-}
-
-
OUString SAL_CALL OFixedText::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OFixedText::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_FIXEDTEXT };
-
- return aServices;
-}
-
-uno::Reference< uno::XInterface > OFixedText::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OFixedText(xContext));
+ return "com.sun.star.comp.report.OFixedText";
}
-
uno::Sequence< OUString > SAL_CALL OFixedText::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_FIXEDTEXT };
}
sal_Bool SAL_CALL OFixedText::supportsService(const OUString& ServiceName)
@@ -319,5 +300,12 @@ OUString SAL_CALL OFixedText::getShapeType( )
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OFixedText_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OFixedText(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx
index 04558f710ed9..a515b76d24d9 100644
--- a/reportdesign/source/core/api/FormatCondition.cxx
+++ b/reportdesign/source/core/api/FormatCondition.cxx
@@ -27,12 +27,6 @@ namespace reportdesign
using namespace com::sun::star;
-uno::Reference< uno::XInterface > OFormatCondition::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OFormatCondition(xContext));
-}
-
-
OFormatCondition::OFormatCondition(uno::Reference< uno::XComponentContext > const & _xContext)
:FormatConditionBase(m_aMutex)
,FormatConditionPropertySet(_xContext,IMPLEMENTS_PROPERTY_SET,uno::Sequence< OUString >())
@@ -52,27 +46,14 @@ void SAL_CALL OFormatCondition::dispose()
cppu::WeakComponentImplHelperBase::dispose();
}
-OUString OFormatCondition::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OFormatCondition";
-}
-
-
OUString SAL_CALL OFormatCondition::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OFormatCondition::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_FORMATCONDITION };
-
- return aServices;
+ return "com.sun.star.comp.report.OFormatCondition";
}
uno::Sequence< OUString > SAL_CALL OFormatCondition::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_FORMATCONDITION };
}
sal_Bool SAL_CALL OFormatCondition::supportsService(const OUString& ServiceName)
@@ -143,5 +124,11 @@ REPORTCONTROLFORMAT_IMPL(OFormatCondition,m_aFormatProperties)
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OFormatCondition_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OFormatCondition(context));
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx
index 9414e87e6424..81553f9d7672 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -35,11 +35,6 @@ namespace reportdesign
using namespace com::sun::star;
using namespace comphelper;
-uno::Reference< uno::XInterface > OFormattedField::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OFormattedField(xContext));
-}
-
static uno::Sequence< OUString > lcl_getFormattedFieldOptionals()
{
OUString pProps[] = { OUString(PROPERTY_MASTERFIELDS),OUString(PROPERTY_DETAILFIELDS) };
@@ -97,25 +92,14 @@ void SAL_CALL OFormattedField::dispose()
m_xFormatsSupplier.clear();
}
-OUString OFormattedField::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OFormattedField";
-}
-
-
OUString SAL_CALL OFormattedField::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OFormattedField::getSupportedServiceNames_Static( )
-{
- return { SERVICE_FORMATTEDFIELD, "com.sun.star.awt.UnoControlFormattedFieldModel" };
+ return "com.sun.star.comp.report.OFormattedField";
}
uno::Sequence< OUString > SAL_CALL OFormattedField::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_FORMATTEDFIELD, "com.sun.star.awt.UnoControlFormattedFieldModel" };
}
sal_Bool SAL_CALL OFormattedField::supportsService(const OUString& ServiceName)
@@ -357,5 +341,12 @@ OUString SAL_CALL OFormattedField::getShapeType( )
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OFormattedField_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OFormattedField(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx
index 55150a992bf3..61844eaad3bd 100644
--- a/reportdesign/source/core/api/Function.cxx
+++ b/reportdesign/source/core/api/Function.cxx
@@ -25,11 +25,6 @@ namespace reportdesign
using namespace com::sun::star;
-uno::Reference< uno::XInterface > OFunction::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OFunction(xContext));
-}
-
OFunction::OFunction(uno::Reference< uno::XComponentContext > const & _xContext)
:FunctionBase(m_aMutex)
@@ -52,27 +47,14 @@ void SAL_CALL OFunction::dispose()
cppu::WeakComponentImplHelperBase::dispose();
}
-OUString OFunction::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OFunction";
-}
-
-
OUString SAL_CALL OFunction::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OFunction::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_FUNCTION };
-
- return aServices;
+ return "com.sun.star.comp.report.OFunction";
}
uno::Sequence< OUString > SAL_CALL OFunction::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_FUNCTION };
}
sal_Bool SAL_CALL OFunction::supportsService(const OUString& ServiceName)
@@ -197,5 +179,12 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OFunction_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OFunction(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx
index 7c72b84fb50e..1d08baa1aa6a 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -161,33 +161,14 @@ void SAL_CALL OImageControl::dispose()
cppu::WeakComponentImplHelperBase::dispose();
}
-OUString OImageControl::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OImageControl";
-}
-
-
OUString SAL_CALL OImageControl::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OImageControl::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_IMAGECONTROL };
-
- return aServices;
-}
-
-uno::Reference< uno::XInterface > OImageControl::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OImageControl(xContext));
+ return "com.sun.star.comp.report.OImageControl";
}
-
uno::Sequence< OUString > SAL_CALL OImageControl::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_IMAGECONTROL };
}
sal_Bool SAL_CALL OImageControl::supportsService(const OUString& ServiceName)
@@ -478,5 +459,12 @@ void SAL_CALL OImageControl::setPreserveIRI( sal_Bool _preserveiri )
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OImageControl_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OImageControl(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 06fa6e4133fa..609e67a4d27c 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -672,21 +672,9 @@ void SAL_CALL OReportDefinition::disposing()
}
-OUString OReportDefinition::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OReportDefinition";
-}
-
OUString SAL_CALL OReportDefinition::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OReportDefinition::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { SERVICE_REPORTDEFINITION };
-
- return aServices;
+ return "com.sun.star.comp.report.OReportDefinition";
}
uno::Sequence< OUString > SAL_CALL OReportDefinition::getSupportedServiceNames( )
@@ -731,11 +719,6 @@ uno::Sequence< uno::Type > SAL_CALL OReportDefinition::getTypes( )
return ReportDefinitionBase::getTypes();
}
-uno::Reference< uno::XInterface > OReportDefinition::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OReportDefinition(xContext));
-}
-
// XReportDefinition
OUString SAL_CALL OReportDefinition::getCaption()
{
@@ -2671,4 +2654,11 @@ uno::Reference< document::XUndoManager > SAL_CALL OReportDefinition::getUndoMana
}// namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OReportDefinition_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OReportDefinition(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx
index ec92f26af23e..d8ead8f8eb88 100644
--- a/reportdesign/source/core/api/ReportEngineJFree.cxx
+++ b/reportdesign/source/core/api/ReportEngineJFree.cxx
@@ -73,33 +73,14 @@ void SAL_CALL OReportEngineJFree::dispose()
m_xActiveConnection.clear();
}
-OUString OReportEngineJFree::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.OReportEngineJFree";
-}
-
-
OUString SAL_CALL OReportEngineJFree::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OReportEngineJFree::getSupportedServiceNames_Static( )
-{
- uno::Sequence< OUString > aServices { "com.sun.star.report.ReportEngine" };
-
- return aServices;
-}
-
-uno::Reference< uno::XInterface > OReportEngineJFree::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OReportEngineJFree(xContext));
+ return "com.sun.star.comp.report.OReportEngineJFree";
}
-
uno::Sequence< OUString > SAL_CALL OReportEngineJFree::getSupportedServiceNames( )
{
- return getSupportedServiceNames_Static();
+ return { "com.sun.star.report.ReportEngine" };
}
sal_Bool SAL_CALL OReportEngineJFree::supportsService(const OUString& ServiceName)
@@ -379,4 +360,11 @@ void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 MaxRows )
} // namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OReportEngineJFree_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OReportEngineJFree(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx
index daafbd47ff0f..077031c5c9aa 100644
--- a/reportdesign/source/core/api/Shape.cxx
+++ b/reportdesign/source/core/api/Shape.cxx
@@ -107,33 +107,17 @@ void SAL_CALL OShape::dispose()
cppu::WeakComponentImplHelperBase::dispose();
}
-uno::Reference< uno::XInterface > OShape::create(uno::Reference< uno::XComponentContext > const & xContext)
-{
- return *(new OShape(xContext));
-}
-
-
-OUString OShape::getImplementationName_Static( )
-{
- return "com.sun.star.comp.report.Shape";
-}
-
OUString SAL_CALL OShape::getImplementationName( )
{
- return getImplementationName_Static();
-}
-
-uno::Sequence< OUString > OShape::getSupportedServiceNames_Static( )
-{
- return { SERVICE_SHAPE };
+ return "com.sun.star.comp.report.Shape";
}
uno::Sequence< OUString > SAL_CALL OShape::getSupportedServiceNames( )
{
if(m_sServiceName.isEmpty())
{
- return getSupportedServiceNames_Static();
+ return { SERVICE_SHAPE };
}
else
{
@@ -498,5 +482,12 @@ void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::Proper
}// namespace reportdesign
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
+reportdesign_OShape_get_implementation(
+ css::uno::XComponentContext* context, css::uno::Sequence<css::uno::Any> const&)
+{
+ return cppu::acquire(new reportdesign::OShape(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx
deleted file mode 100644
index a39c3644e047..000000000000
--- a/reportdesign/source/core/api/services.cxx
+++ /dev/null
@@ -1,78 +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 .
- */
-#include <sal/types.h>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <ReportDefinition.hxx>
-#include <FormattedField.hxx>
-#include <FixedText.hxx>
-#include <ImageControl.hxx>
-#include <FormatCondition.hxx>
-#include <ReportEngineJFree.hxx>
-#include <Function.hxx>
-#include <Shape.hxx>
-#include <FixedLine.hxx>
-
-/********************************************************************************************/
-
-using namespace ::reportdesign;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::registry;
-
-
-// registry functions
-namespace
-{
-
-cppu::ImplementationEntry const entries[] = {
- { &OReportDefinition::create, &OReportDefinition::getImplementationName_Static, &OReportDefinition::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OFormattedField::create, &OFormattedField::getImplementationName_Static, &OFormattedField::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OFixedText::create, &OFixedText::getImplementationName_Static, &OFixedText::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OImageControl::create, &OImageControl::getImplementationName_Static, &OImageControl::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OFormatCondition::create, &OFormatCondition::getImplementationName_Static, &OFormatCondition::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OReportEngineJFree::create, &OReportEngineJFree::getImplementationName_Static, &OReportEngineJFree::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OFunction::create, &OFunction::getImplementationName_Static, &OFunction::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OShape::create, &OShape::getImplementationName_Static, &OShape::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { &OFixedLine::create, &OFixedLine::getImplementationName_Static, &OFixedLine::getSupportedServiceNames_Static,
- &cppu::createSingleComponentFactory, nullptr, 0 },
- { nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
-};
-}
-
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * rpt_component_getFactory(
- char const * implName, void * serviceManager, void * registryKey)
-{
- return cppu::component_getFactoryHelper(
- implName, serviceManager, registryKey, entries);
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx
index 5d726a85ed97..f3f77a63704d 100644
--- a/reportdesign/source/core/inc/FixedLine.hxx
+++ b/reportdesign/source/core/inc/FixedLine.hxx
@@ -83,12 +83,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx
index 03126ab30e5f..396a0d145be2 100644
--- a/reportdesign/source/core/inc/FixedText.hxx
+++ b/reportdesign/source/core/inc/FixedText.hxx
@@ -111,12 +111,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx
index 409b1198f7ef..be1506f25ca1 100644
--- a/reportdesign/source/core/inc/FormatCondition.hxx
+++ b/reportdesign/source/core/inc/FormatCondition.hxx
@@ -107,12 +107,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx
index 040b6af2dfbb..6606c48108e4 100644
--- a/reportdesign/source/core/inc/FormattedField.hxx
+++ b/reportdesign/source/core/inc/FormattedField.hxx
@@ -114,12 +114,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx
index bf067c8068be..3a5be94effe4 100644
--- a/reportdesign/source/core/inc/Function.hxx
+++ b/reportdesign/source/core/inc/Function.hxx
@@ -86,12 +86,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx
index 63ed5468efc6..00a218515036 100644
--- a/reportdesign/source/core/inc/ImageControl.hxx
+++ b/reportdesign/source/core/inc/ImageControl.hxx
@@ -89,12 +89,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx
index 951dc93ce168..9816b551c44a 100644
--- a/reportdesign/source/core/inc/ReportEngineJFree.hxx
+++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx
@@ -79,12 +79,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
private:
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx
index b7c9e6d882f9..758d48ddf1c9 100644
--- a/reportdesign/source/core/inc/Shape.hxx
+++ b/reportdesign/source/core/inc/Shape.hxx
@@ -121,12 +121,6 @@ namespace reportdesign
virtual OUString SAL_CALL getImplementationName( ) override;
virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
- /// @throws css::uno::RuntimeException
- static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- /// @throws css::uno::RuntimeException
- static OUString getImplementationName_Static();
- static css::uno::Reference< css::uno::XInterface >
- create(css::uno::Reference< css::uno::XComponentContext > const & xContext);
// css::beans::XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
diff --git a/reportdesign/util/rpt.component b/reportdesign/util/rpt.component
index 7b3be6603471..a44b941216e7 100644
--- a/reportdesign/util/rpt.component
+++ b/reportdesign/util/rpt.component
@@ -18,32 +18,41 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="rpt" xmlns="http://openoffice.org/2010/uno-components">
- <implementation name="com.sun.star.comp.report.OFixedLine">
+ xmlns="http://openoffice.org/2010/uno-components">
+ <implementation name="com.sun.star.comp.report.OFixedLine"
+ constructor="reportdesign_OFixedLine_get_implementation">
<service name="com.sun.star.report.FixedLine"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OFixedText">
+ <implementation name="com.sun.star.comp.report.OFixedText"
+ constructor="reportdesign_OFixedText_get_implementation">
<service name="com.sun.star.report.FixedText"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OFormatCondition">
+ <implementation name="com.sun.star.comp.report.OFormatCondition"
+ constructor="reportdesign_OFormatCondition_get_implementation">
<service name="com.sun.star.report.FormatCondition"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OFormattedField">
+ <implementation name="com.sun.star.comp.report.OFormattedField"
+ constructor="reportdesign_OFormattedField_get_implementation">
<service name="com.sun.star.report.FormattedField"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OFunction">
+ <implementation name="com.sun.star.comp.report.OFunction"
+ constructor="reportdesign_OFunction_get_implementation">
<service name="com.sun.star.report.Function"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OImageControl">
+ <implementation name="com.sun.star.comp.report.OImageControl"
+ constructor="reportdesign_OImageControl_get_implementation">
<service name="com.sun.star.report.ImageControl"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OReportDefinition">
+ <implementation name="com.sun.star.comp.report.OReportDefinition"
+ constructor="reportdesign_OReportDefinition_get_implementation">
<service name="com.sun.star.report.ReportDefinition"/>
</implementation>
- <implementation name="com.sun.star.comp.report.OReportEngineJFree">
+ <implementation name="com.sun.star.comp.report.OReportEngineJFree"
+ constructor="reportdesign_OReportEngineJFree_get_implementation">
<service name="com.sun.star.report.ReportEngine"/>
</implementation>
- <implementation name="com.sun.star.comp.report.Shape">
+ <implementation name="com.sun.star.comp.report.Shape"
+ constructor="reportdesign_OShape_get_implementation">
<service name="com.sun.star.report.Shape"/>
</implementation>
</component>
More information about the Libreoffice-commits
mailing list