svx/source/tbxctrls/grafctrl.cxx | 2 +-
svx/source/unodraw/unopage.cxx | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 4f849cc13862350b71142efecfe3a5f2f2acb899
Author: Julien Nabet <serval2...@yahoo.fr>
Date: Tue Apr 12 11:26:47 2016 +0200
Remove INTERFACE_TYPE macro in svx + 1 OUString ctr call
Change-Id: I25a189fb7fa4271fb12d7a2e35f9a0989087bf5d
Reviewed-on: https://gerrit.libreoffice.org/24018
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index fe478d6..ba66a9d 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 c662014..3c104a9 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()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
