From 054b968c63b90a49025c29c7c14da913d2ac4021 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Fri, 25 Apr 2014 20:36:26 +0200
Subject: quick fix for inheritance problems

Change-Id: I41c5c937d62d6ba0b3df2d4a0101319f272495a7
---
 include/svx/unoshape.hxx                 | 4 +++-
 offapi/com/sun/star/drawing/XShapes2.idl | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 937ecce8c32c..92106f9a1674 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 80b993644cbc..52909cec4db0 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.
-- 
cgit