diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-04-12 11:26:47 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-04-12 14:51:31 +0000 |
| commit | 4f849cc13862350b71142efecfe3a5f2f2acb899 (patch) | |
| tree | 0862dbbe9a1e02c42633538d42d2999e82085c34 | |
| parent | 5d3ac320eeb1c0eff6e8a0300ab3832f781ec177 (diff) | |
Remove INTERFACE_TYPE macro in svx + 1 OUString ctr call
Change-Id: I25a189fb7fa4271fb12d7a2e35f9a0989087bf5d
Reviewed-on: https://gerrit.libreoffice.org/24018
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | svx/source/tbxctrls/grafctrl.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unopage.cxx | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fe478d6ea1d4..ba66a9dad549 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star::lang; #define SYMBOL_TO_FIELD_OFFSET 4 #define ITEMVALUE(ItemSet,Id,Cast) static_cast<const Cast&>((ItemSet).Get(Id)).GetValue() -#define TOOLBOX_NAME OUString( "colorbar" ) +#define TOOLBOX_NAME "colorbar" TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) : diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index c66201482d40..3c104a95642e 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -58,9 +58,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; using namespace ::com::sun::star::drawing; -#define INTERFACE_TYPE( xint ) \ - cppu::UnoType<xint>::get() - UNO3_GETIMPLEMENTATION_IMPL( SvxDrawPage ); SvxDrawPage::SvxDrawPage( SdrPage* pInPage ) throw() : mrBHelper( getMutex() ) @@ -360,7 +357,7 @@ uno::Any SAL_CALL SvxDrawPage::getByIndex( sal_Int32 Index ) uno::Type SAL_CALL SvxDrawPage::getElementType() throw( uno::RuntimeException, std::exception ) { - return INTERFACE_TYPE( drawing::XShape ); + return cppu::UnoType<drawing::XShape>::get(); } sal_Bool SAL_CALL SvxDrawPage::hasElements() |