include/svx/unoshape.hxx | 4 +++-
offapi/com/sun/star/drawing/XShapes2.idl | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 054b968c63b90a49025c29c7c14da913d2ac4021
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Apr 25 20:36:26 2014 +0200
quick fix for inheritance problems
Change-Id: I41c5c937d62d6ba0b3df2d4a0101319f272495a7
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 937ecce..92106f9 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -33,6 +33,7 @@
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/drawing/PolygonKind.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XShapes2.hpp>
#include <com/sun/star/drawing/XShapeGroup.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
@@ -385,7 +386,8 @@ public:
***********************************************************************/
class SvxShapeGroup : public SvxShape,
public ::com::sun::star::drawing::XShapeGroup,
- public ::com::sun::star::drawing::XShapes2
+ public ::com::sun::star::drawing::XShapes2,
+ public ::com::sun::star::drawing::XShapes
{
private:
rtl::Reference< SvxDrawPage> mxPage;
diff --git a/offapi/com/sun/star/drawing/XShapes2.idl
b/offapi/com/sun/star/drawing/XShapes2.idl
index 80b9936..52909ce 100644
--- a/offapi/com/sun/star/drawing/XShapes2.idl
+++ b/offapi/com/sun/star/drawing/XShapes2.idl
@@ -15,11 +15,11 @@
module com { module sun { module star { module drawing {
/**
- * Extend XShapes to allow insertion of shapes at different positions.
+ * Allows insertion of shapes at different positions.
*
* @since LibreOffice 4.2
*/
-interface XShapes2 : com::sun::star::drawing::XShapes
+interface XShapes2
{
/**
* Insert a new shape to the top of the stack.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
