diff options
Diffstat (limited to 'svx/source/tbxctrls/tbunocontroller.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index c7277546c075..c34384466b6e 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -39,7 +39,8 @@ using namespace ::com::sun::star; -namespace { +namespace svx +{ class FontHeightToolBoxControl; class SvxFontSizeBox_Impl : public FontSizeBox @@ -283,12 +284,18 @@ throw(uno::RuntimeException) OUString SAL_CALL FontHeightToolBoxControl::getImplementationName() throw( uno::RuntimeException ) { - return OUString("com.sun.star.svx.FontHeightToolBoxController"); + return getImplementationName_Static(); } uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( ) throw( uno::RuntimeException ) { + return getSupportedServiceNames_Static(); +} + +uno::Sequence< OUString > FontHeightToolBoxControl::getSupportedServiceNames_Static() +throw() +{ uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = "com.sun.star.frame.ToolbarController"; return aSNS; @@ -397,18 +404,12 @@ void FontHeightToolBoxControl::dispatchCommand( } } +uno::Reference< uno::XInterface > SAL_CALL FontHeightToolBoxControl_createInstance( + const uno::Reference< lang::XMultiServiceFactory >& rSMgr ) +{ + return *new FontHeightToolBoxControl( comphelper::getComponentContext(rSMgr) ); } -extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL -com_sun_star_svx_FontHeightToolBoxController_implementation_getFactory( - css::uno::XComponentContext *rxContext, - uno_Sequence * arguments) -{ - assert(arguments != 0 && arguments->nElements == 0); (void) arguments; - css::uno::Reference<css::uno::XInterface> x( - static_cast<cppu::OWeakObject *>(new FontHeightToolBoxControl(rxContext))); - x->acquire(); - return x.get(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |