chart2/Library_chartcontroller.mk | 1
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 7
chart2/source/controller/chartcontroller.component | 20 +-
chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx | 7
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 7
chart2/source/controller/main/ChartController.cxx | 8
chart2/source/controller/main/ChartFrameloader.cxx | 7
chart2/source/controller/main/ShapeToolbarController.cxx | 7
chart2/source/controller/main/_serviceregistration_controller.cxx | 94
----------
9 files changed, 56 insertions(+), 102 deletions(-)
New commits:
commit 38b9fe826903e661238388a93c9a283467e2d9f7
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 10:41:08 2014 +0200
chart2: use constructor feature for WizardDialog
Change-Id: Ifcaae6401f1ad5069248111b568a1cf5c033f5ab
diff --git a/chart2/Library_chartcontroller.mk
b/chart2/Library_chartcontroller.mk
index b32d840..abc9e58 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -182,7 +182,6 @@ $(eval $(call
gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/main/ObjectHierarchy \
chart2/source/controller/main/PositionAndSizeHelper \
chart2/source/controller/main/SelectionHelper \
- chart2/source/controller/main/_serviceregistration_controller \
chart2/source/controller/main/ShapeController \
chart2/source/controller/main/ShapeToolbarController \
chart2/source/controller/main/StatusBarCommandDispatch \
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index b21a901..396656d 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -18,7 +18,7 @@
-->
<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@"
- prefix="chartcontroller" xmlns="http://openoffice.org/2010/uno-components";>
+ xmlns="http://openoffice.org/2010/uno-components";>
<implementation
name="com.sun.star.comp.chart.ElementSelectorToolbarController"
constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>
@@ -47,7 +47,8 @@
constructor="com_sun_star_comp_chart2_ShapeToolbarController_get_implementation">
<service name="com.sun.star.chart2.ShapeToolbarController"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.WizardDialog">
+ <implementation name="com.sun.star.comp.chart2.WizardDialog"
+ constructor="com_sun_star_comp_chart2_WizardDialog_get_implementation">
<service name="com.sun.star.chart2.WizardDialog"/>
</implementation>
</component>
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 45d1e01..dc3bc33 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -382,4 +382,11 @@ void SAL_CALL
CreationWizardUnoDlg::removeVetoableChangeListener( const OUString
} //namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_WizardDialog_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::CreationWizardUnoDlg(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
deleted file mode 100644
index eb5e06e..0000000
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ /dev/null
@@ -1,54 +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 "ChartController.hxx"
-#include "ChartFrameloader.hxx"
-#include "dlg_CreationWizard_UNO.hxx"
-#include "dlg_ChartType_UNO.hxx"
-#include "ChartDocumentWrapper.hxx"
-#include "AccessibleChartView.hxx"
-#include "ElementSelector.hxx"
-#include "ShapeToolbarController.hxx"
-#include <cppuhelper/implementationentry.hxx>
-
-static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
-{
- {
- ::chart::CreationWizardUnoDlg::create
- , ::chart::CreationWizardUnoDlg::getImplementationName_Static
- , ::chart::CreationWizardUnoDlg::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{ 0, 0, 0, 0, 0, 0 }
-};
-
-// component exports
-extern "C"
-{
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcontroller_component_getFactory(
- const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-{
- return ::cppu::component_getFactoryHelper(
- pImplName, pServiceManager, pRegistryKey , g_entries_chart2_controller
);
-}
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit f7731b7301a057d7a7b12f69779e1a184e1ec174
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 10:27:29 2014 +0200
chart2: use constructor feature for ShapeToolbarController
Change-Id: Ic0a9dc23ddfde00cbb2bfa7cf3983ff0c6276654
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index dc2c001..b21a901 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -43,7 +43,8 @@
constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation">
<service name="com.sun.star.chart2.ChartTypeDialog"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ShapeToolbarController">
+ <implementation name="com.sun.star.comp.chart2.ShapeToolbarController"
+
constructor="com_sun_star_comp_chart2_ShapeToolbarController_get_implementation">
<service name="com.sun.star.chart2.ShapeToolbarController"/>
</implementation>
<implementation name="com.sun.star.comp.chart2.WizardDialog">
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx
b/chart2/source/controller/main/ShapeToolbarController.cxx
index 946dcba..acdc983 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -281,4 +281,11 @@ void ShapeToolbarController::updateImage() throw
(uno::RuntimeException, std::ex
} // namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ShapeToolbarController_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::ShapeToolbarController(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
index 6889e9a..eb5e06e 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -37,14 +37,6 @@ static const struct ::cppu::ImplementationEntry
g_entries_chart2_controller[] =
, 0
, 0
}
- ,{
- ::chart::ShapeToolbarController::create
- , ::chart::ShapeToolbarController::getImplementationName_Static
- , ::chart::ShapeToolbarController::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
,{ 0, 0, 0, 0, 0, 0 }
};
commit 50634a20d35d34ddebf74d4f0b99c305a38e7915
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 10:23:18 2014 +0200
chart2: use constructor feature for ChartTypeDialog
Change-Id: I5efc89d8d0139216c1ae92aa692704f9f58915ca
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index a739622..dc2c001 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -39,7 +39,8 @@
constructor="com_sun_star_comp_chart2_ChartFrameLoader_get_implementation">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartTypeDialog">
+ <implementation name="com.sun.star.comp.chart2.ChartTypeDialog"
+
constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation">
<service name="com.sun.star.chart2.ChartTypeDialog"/>
</implementation>
<implementation name="com.sun.star.comp.chart2.ShapeToolbarController">
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index 1850294..3ca294a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -107,4 +107,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL
ChartTypeUnoDlg::getPropertySe
} //namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartTypeDialog_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::ChartTypeUnoDlg(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
index bcc32c1..6889e9a 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -38,14 +38,6 @@ static const struct ::cppu::ImplementationEntry
g_entries_chart2_controller[] =
, 0
}
,{
- ::chart::ChartTypeUnoDlg::Create
- , ::chart::ChartTypeUnoDlg::getImplementationName_Static
- , ::chart::ChartTypeUnoDlg::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{
::chart::ShapeToolbarController::create
, ::chart::ShapeToolbarController::getImplementationName_Static
, ::chart::ShapeToolbarController::getSupportedServiceNames_Static
commit 167cd680848a55d726c1278f025987a2532767a1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 10:16:18 2014 +0200
chart2: use constructor feature for ChartFrameLoader
Change-Id: Ibbbd41a30cd240250720aac7b45d0a394be5230b
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index ac4d1ae..a739622 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -35,7 +35,8 @@
<service name="com.sun.star.chart2.ChartDocumentWrapper"/>
<service name="com.sun.star.xml.UserDefinedAttributesSupplier"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartFrameLoader">
+ <implementation name="com.sun.star.comp.chart2.ChartFrameLoader"
+
constructor="com_sun_star_comp_chart2_ChartFrameLoader_get_implementation">
<service name="com.sun.star.frame.SynchronousFrameLoader"/>
</implementation>
<implementation name="com.sun.star.comp.chart2.ChartTypeDialog">
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx
b/chart2/source/controller/main/ChartFrameloader.cxx
index dd424a5..e914355 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -187,4 +187,11 @@
APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
} //namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartFrameLoader_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::ChartFrameLoader(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
index da08560..bcc32c1 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -30,14 +30,6 @@
static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
{
{
- ::chart::ChartFrameLoader::create
- , ::chart::ChartFrameLoader::getImplementationName_Static
- , ::chart::ChartFrameLoader::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{
::chart::CreationWizardUnoDlg::create
, ::chart::CreationWizardUnoDlg::getImplementationName_Static
, ::chart::CreationWizardUnoDlg::getSupportedServiceNames_Static
commit b038c4ecdc4569f76ecacacc336be0b30d5fdfbf
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 10:09:54 2014 +0200
chart2: use constructor feature for ChartDocumentWrapper
Change-Id: I5b99d64be17a0e7d3c1bb630e1f35afe0eb62c81
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 169c5d9..f68cd67 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -1564,4 +1564,11 @@ APPHELPER_XSERVICEINFO_IMPL( ChartDocumentWrapper,
CHART_CHARTAPIWRAPPER_IMPLEME
} // namespace wrapper
} // namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new ::chart::wrapper::ChartDocumentWrapper(context));
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index 616b57c..ac4d1ae 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -28,7 +28,8 @@
<service name="com.sun.star.chart2.ChartController"/>
<service name="com.sun.star.frame.Controller"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper">
+ <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper"
+
constructor="com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation">
<service name="com.sun.star.beans.PropertySet"/>
<service name="com.sun.star.chart.ChartDocument"/>
<service name="com.sun.star.chart2.ChartDocumentWrapper"/>
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
index 34710bc..da08560 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -54,14 +54,6 @@ static const struct ::cppu::ImplementationEntry
g_entries_chart2_controller[] =
, 0
}
,{
- ::chart::wrapper::ChartDocumentWrapper::create
- , ::chart::wrapper::ChartDocumentWrapper::getImplementationName_Static
- ,
::chart::wrapper::ChartDocumentWrapper::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{
::chart::ShapeToolbarController::create
, ::chart::ShapeToolbarController::getImplementationName_Static
, ::chart::ShapeToolbarController::getSupportedServiceNames_Static
commit 899c018a2fc586c6e4763b242dff92d1f47bf5b8
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Fri Apr 25 09:50:43 2014 +0200
chart2: use constructor feature for ChartController
Change-Id: Ie6c5c0e20ae2b2f38f176dee90c33e5baba100a5
diff --git a/chart2/source/controller/chartcontroller.component
b/chart2/source/controller/chartcontroller.component
index c315a61..616b57c 100644
--- a/chart2/source/controller/chartcontroller.component
+++ b/chart2/source/controller/chartcontroller.component
@@ -23,7 +23,8 @@
constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation">
<service name="com.sun.star.frame.ToolbarController"/>
</implementation>
- <implementation name="com.sun.star.comp.chart2.ChartController">
+ <implementation name="com.sun.star.comp.chart2.ChartController"
+
constructor="com_sun_star_comp_chart2_ChartController_get_implementation">
<service name="com.sun.star.chart2.ChartController"/>
<service name="com.sun.star.frame.Controller"/>
</implementation>
diff --git a/chart2/source/controller/main/ChartController.cxx
b/chart2/source/controller/main/ChartController.cxx
index aaf3223..db433bc 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1555,4 +1555,12 @@ void ChartController::impl_initializeAccessible( const
uno::Reference< lang::XIn
} //namespace chart
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartController_get_implementation(css::uno::XComponentContext
*context,
+
css::uno::Sequence<css::uno::Any> const &)
+{
+ return cppu::acquire(new chart::ChartController(context));
+}
+
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/main/_serviceregistration_controller.cxx
b/chart2/source/controller/main/_serviceregistration_controller.cxx
index ffadb56..34710bc 100644
--- a/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -30,14 +30,6 @@
static const struct ::cppu::ImplementationEntry g_entries_chart2_controller[] =
{
{
- ::chart::ChartController::create
- , ::chart::ChartController::getImplementationName_Static
- , ::chart::ChartController::getSupportedServiceNames_Static
- , ::cppu::createSingleComponentFactory
- , 0
- , 0
- }
- ,{
::chart::ChartFrameLoader::create
, ::chart::ChartFrameLoader::getImplementationName_Static
, ::chart::ChartFrameLoader::getSupportedServiceNames_Static
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
