[Libreoffice-commits] core.git: Branch 'distro/collabora/viewer' - 2 commits - chart2/source

[Stephan Bergmann]

 chart2/source/chartcore.component                           |    3 -
 chart2/source/inc/charttoolsdllapi.hxx                      |    3 -
 chart2/source/model/inc/_serviceregistration_charttypes.hxx |   34 ------------
 chart2/source/view/main/ChartView.cxx                       |    8 ++
 4 files changed, 10 insertions(+), 38 deletions(-)

New commits:
commit fec50706e86fc5292d3b1c875a8b5f7de7743493
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 19 11:04:39 2015 +0100

    Missing constructor
    
    ...the implementation in ChartView.cxx oddly got removed from
    <https://gerrit.libreoffice.org/#/c/14431/1> to
    <https://gerrit.libreoffice.org/#/c/14431/2>, but the declaration in
    chartcore.component was missing from the start
    
    Change-Id: I71699ee74278f7e419eca63c5784b46efc42d96b

diff --git a/chart2/source/chartcore.component b/chart2/source/chartcore.component
index 5928fb1..f7a1783 100644
--- a/chart2/source/chartcore.component
+++ b/chart2/source/chartcore.component
@@ -256,7 +256,8 @@
     <service name="com.sun.star.document.ExportFilter"/>
     <service name="com.sun.star.document.ImportFilter"/>
   </implementation>
-  <implementation name="com.sun.star.comp.chart2.ChartView">
+  <implementation name="com.sun.star.comp.chart2.ChartView"
+    constructor="com_sun_star_comp_chart2_ChartView_get_implementation">
     <service name="com.sun.star.chart2.ChartView"/>
   </implementation>
 </component>
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index ce183f9..c32d9e4 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -3370,4 +3370,12 @@ void ChartView::updateOpenGLWindow()
 
 } //namespace chart
 
+extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
+com_sun_star_comp_chart2_ChartView_get_implementation(css::uno::XComponentContext *context,
+                                                         css::uno::Sequence<css::uno::Any> const &)
+{
+    ::chart::ChartModel *pChartModel = new ::chart::ChartModel(context);
+    return cppu::acquire(new ::chart::ChartView(context, *pChartModel));
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 465dcb0e3ed604b380f0a3536dab429330120283
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 19 09:46:40 2015 +0100

    Clean up
    
    Change-Id: Id91be8ec8a97d8fad398d798cd2a9b77773a39e2

diff --git a/chart2/source/inc/charttoolsdllapi.hxx b/chart2/source/inc/charttoolsdllapi.hxx
index 0ae3cc4..570e92b 100644
--- a/chart2/source/inc/charttoolsdllapi.hxx
+++ b/chart2/source/inc/charttoolsdllapi.hxx
@@ -30,9 +30,6 @@
 #define OOO_DLLPUBLIC_CHARTTOOLS SAL_DLLPUBLIC_IMPORT
 #endif
 
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory(
-    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/inc/_serviceregistration_charttypes.hxx b/chart2/source/model/inc/_serviceregistration_charttypes.hxx
deleted file mode 100644
index c713baa..0000000
--- a/chart2/source/model/inc/_serviceregistration_charttypes.hxx
+++ /dev/null
@@ -1,34 +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_CHART2_SOURCE_MODEL_INC__SERVICEREGISTRATION_CHARTTYPES_HXX
-#define INCLUDED_CHART2_SOURCE_MODEL_INC__SERVICEREGISTRATION_CHARTTYPES_HXX
-
-#include <cppuhelper/implementationentry.hxx>
-
-class ChartTypeEntriesForServiceRegistration
-{
-public:
-    static const struct ::cppu::ImplementationEntry*
-        getImplementationEntries();
-};
-
-// INCLUDED_CHART2_SOURCE_MODEL_INC__SERVICEREGISTRATION_CHARTTYPES_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */