ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

oox: create QuickDiagrammingImport instances with an uno constructor

Browse Source 
This is effectively dead code as commit
547217ecf2 (Document seemingly dead
QuickDiagrammingImport, QuickDiagrammingLayout, 2013-06-03) found, so
the primary motivation is to just get this out of
oox_component_getFactory().

Change-Id: If0a585c2fc4b87ceb00e6f772fef2ac65d10dc67
Reviewed-on: https://gerrit.libreoffice.org/60470
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
This commit is contained in:
Miklos Vajna
2018-09-14 09:05:07 +02:00
parent 7fb70e419d
commit 515f97e3dd
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oox/inc/services.hxx
-7
View File
@@ -23,13 +23,6 @@
#include <sal/config.h>
namespace oox {
namespace ppt {
extern OUString QuickDiagrammingImport_getImplementationName();
extern css::uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames();
/// @throws css::uno::Exception
extern css::uno::Reference< css::uno::XInterface > QuickDiagrammingImport_createInstance(
const css::uno::Reference< css::uno::XComponentContext >& rxContext );
}
namespace ppt {
extern OUString QuickDiagrammingLayout_getImplementationName();
extern css::uno::Sequence< OUString > QuickDiagrammingLayout_getSupportedServiceNames();
oox/source/core/services.cxx
-1
View File
@@ -35,7 +35,6 @@ namespace {
// Impress" would actually want to make use of them:
static ::cppu::ImplementationEntry const spServices[] =
{
IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingImport ),
IMPLEMENTATION_ENTRY( ::oox::ppt::QuickDiagrammingLayout ),
IMPLEMENTATION_ENTRY( ::oox::shape::ShapeContextHandler ),
{ nullptr, nullptr, nullptr, nullptr, nullptr, 0 }
oox/source/ppt/dgmimport.cxx
+8 -18
View File
@@ -36,23 +36,6 @@ using namespace oox::core;
namespace oox { namespace ppt {
OUString QuickDiagrammingImport_getImplementationName()
{
return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
}
uno::Sequence< OUString > QuickDiagrammingImport_getSupportedServiceNames()
{
const OUString aServiceName = "com.sun.star.comp.ooxpptx.dgm.import";
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
uno::Reference< uno::XInterface > QuickDiagrammingImport_createInstance( const Reference< XComponentContext >& rxContext )
{
return static_cast<cppu::OWeakObject*>(new QuickDiagrammingImport( rxContext ));
}
QuickDiagrammingImport::QuickDiagrammingImport( const css::uno::Reference< css::uno::XComponentContext >& rxContext )
: XmlFilterBase( rxContext )
{}
@@ -115,7 +98,7 @@ oox::drawingml::chart::ChartConverter* QuickDiagrammingImport::getChartConverter
OUString QuickDiagrammingImport::getImplementationName()
{
return QuickDiagrammingImport_getImplementationName();
return OUString( "com.sun.star.comp.Impress.oox.QuickDiagrammingImport" );
}
::oox::ole::VbaProject* QuickDiagrammingImport::implCreateVbaProject() const
@@ -125,4 +108,11 @@ OUString QuickDiagrammingImport::getImplementationName()
}}
extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
com_sun_star_comp_oox_ppt_QuickDiagrammingImport_get_implementation(
uno::XComponentContext* pCtx, uno::Sequence<uno::Any> const& /*rSeq*/)
{
return cppu::acquire(new oox::ppt::QuickDiagrammingImport(pCtx));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */