mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: Use constructor feature for PrimitiveFactory2D.

Browse Source 
Change-Id: I331602561b865a6ceb6971d0990565e5a84bb0d5
This commit is contained in:
Matúš Kukan
2013-12-30 10:31:10 +01:00
parent 6d564bac02
commit 32b64a0ff6
5 changed files with 62 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
include/svx/sdr/primitive2d/primitiveFactory2d.hxx
View File

@@ -1,76 +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_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
#define INCLUDED_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
#include <cppuhelper/compbase1.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <svx/svxdllapi.h>
//////////////////////////////////////////////////////////////////////////////
// UNO API helper methods
namespace drawinglayer
{
namespace primitive2d
{
SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL XPrimitiveFactory2DProvider_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
} // end of namespace primitive2d
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
// PrimitiveFactory2D class
namespace drawinglayer
{
namespace primitive2d
{
// typedef for PrimitiveFactory2DImplBase
typedef cppu::WeakComponentImplHelper1< ::com::sun::star::graphic::XPrimitiveFactory2D > PrimitiveFactory2DImplBase;
// base class for C++ implementation of com::sun::star::graphic::XPrimitiveFactory2D
class PrimitiveFactory2D
: protected comphelper::OBaseMutex,
public PrimitiveFactory2DImplBase
{
private:
protected:
public:
// constructor
PrimitiveFactory2D();
// Methods from XPrimitiveFactory2D
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException);
// UNO API helpers
SVX_DLLPUBLIC static OUString getImplementationName_Static();
SVX_DLLPUBLIC static com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static();
};
} // end of namespace primitive2d
} // end of namespace drawinglayer
//////////////////////////////////////////////////////////////////////////////
#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

68
svx/source/sdr/primitive2d/primitivefactory2d.cxx
View File

@@ -17,43 +17,32 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <svx/sdr/primitive2d/primitiveFactory2d.hxx>
#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdpage.hxx>
#include <svx/unoapi.hxx>
#include <svx/sdr/contact/viewcontact.hxx>
//////////////////////////////////////////////////////////////////////////////
using namespace com::sun::star;
//////////////////////////////////////////////////////////////////////////////
// UNO API helper methods
namespace {
namespace drawinglayer
{
namespace primitive2d
{
uno::Reference< uno::XInterface > SAL_CALL XPrimitiveFactory2DProvider_createInstance(
const uno::Reference< lang::XMultiServiceFactory >& /*rSMgr*/) throw( uno::Exception )
{
return *(new PrimitiveFactory2D());
}
} // end of namespace primitive2d
} // end of namespace drawinglayer
typedef cppu::WeakComponentImplHelper1< ::com::sun::star::graphic::XPrimitiveFactory2D > PrimitiveFactory2DImplBase;
//////////////////////////////////////////////////////////////////////////////
// UNO API helper methods
// base class for C++ implementation of com::sun::star::graphic::XPrimitiveFactory2D
class PrimitiveFactory2D
: protected comphelper::OBaseMutex,
public PrimitiveFactory2DImplBase
{
public:
PrimitiveFactory2D(): PrimitiveFactory2DImplBase(m_aMutex) {}
namespace drawinglayer
{
namespace primitive2d
{
PrimitiveFactory2D::PrimitiveFactory2D()
: PrimitiveFactory2DImplBase(m_aMutex)
{
}
// Methods from XPrimitiveFactory2D
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >& xDrawPage, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aParms ) throw (::com::sun::star::uno::RuntimeException);
};
Primitive2DSequence SAL_CALL PrimitiveFactory2D::createPrimitivesFromXShape(
const uno::Reference< drawing::XShape >& xShape,
@@ -96,27 +85,18 @@ namespace drawinglayer
return aRetval;
}
OUString PrimitiveFactory2D::getImplementationName_Static()
{
static OUString aRetval("com.sun.star.comp.graphic.PrimitiveFactory2D");
return aRetval;
}
uno::Sequence< OUString > PrimitiveFactory2D::getSupportedServiceNames_Static()
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL
com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory(
SAL_UNUSED_PARAMETER css::uno::XComponentContext *,
uno_Sequence * arguments)
{
static uno::Sequence< OUString > aSeq;
osl::Mutex aMutex;
osl::MutexGuard aGuard( aMutex );
if(!aSeq.getLength())
{
aSeq.realloc(1L);
aSeq[0] = "com.sun.star.graphic.PrimitiveFactory2D";
assert(arguments != 0 && arguments->nElements == 0); (void) arguments;
css::uno::Reference<css::uno::XInterface> x(
static_cast<cppu::OWeakObject *>(new PrimitiveFactory2D));
x->acquire();
return x.get();
}
return aSeq;
}
} // end of namespace primitive2d
} // end of namespace drawinglayer
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

9
svx/source/unodraw/unoctabl.cxx
View File

@@ -228,7 +228,6 @@ uno::Reference< uno::XInterface > SAL_CALL create_EnhancedCustomShapeEngine( con
#include "sal/types.h"
#include "osl/diagnose.h"
#include "cppuhelper/factory.hxx"
#include <svx/sdr/primitive2d/primitiveFactory2d.hxx>
extern "C"
{
@@ -339,14 +338,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL svx_component_getFactory (
::unogallery::GalleryThemeProvider_createInstance,
::unogallery::GalleryThemeProvider_getSupportedServiceNames() );
}
else if( drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static().equalsAscii( pImplName ) )
{
// XPrimitiveFactory2D
xFactory = ::cppu::createSingleFactory( reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(),
drawinglayer::primitive2d::XPrimitiveFactory2DProvider_createInstance,
drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() );
}
if( xFactory.is())
{

3
svx/util/svx.component
View File

@@ -25,9 +25,6 @@
<implementation name="com.sun.star.comp.gallery.GalleryThemeProvider">
<service name="com.sun.star.gallery.GalleryThemeProvider"/>
</implementation>
<implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D">
<service name="com.sun.star.graphic.PrimitiveFactory2D"/>
</implementation>
<implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher">
<service name="com.sun.star.comp.svx.FindbarDispatcher"/>
<service name="com.sun.star.frame.ProtocolHandler"/>

4
svx/util/svxcore.component
View File

@@ -46,4 +46,8 @@
<service name="com.sun.star.document.BinaryStreamResolver"/>
<service name="com.sun.star.document.GraphicObjectResolver"/>
</implementation>
<implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"
constructor="com_sun_star_comp_graphic_PrimitiveFactory2D_implementation_getFactory">
<service name="com.sun.star.graphic.PrimitiveFactory2D"/>
</implementation>
</component>