diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-25 19:56:36 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-25 20:03:48 +0200 |
| commit | 3b2ec44912ca2e0548d8078d2edf17fa10856553 (patch) | |
| tree | d90a1f26a3a85799a9cfeef3167a98e7b3afa819 /include/svx/unopage.hxx | |
| parent | 12ace5060dbef6add5521fb932d78e7807c793be (diff) | |
the chart root shape has to be at the bottom, fdo#74333, cp#1000057
Change-Id: Ic99fec987f290e94e4b45f4d193406daa2de4740
Diffstat (limited to 'include/svx/unopage.hxx')
| -rw-r--r-- | include/svx/unopage.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx index a5a37d565bb6..515074c0ef81 100644 --- a/include/svx/unopage.hxx +++ b/include/svx/unopage.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/drawing/XShapes2.hpp> #include <com/sun/star/drawing/XShapeGrouper.hpp> #include <com/sun/star/drawing/XShapeCombiner.hpp> #include <com/sun/star/drawing/XShapeBinder.hpp> @@ -35,7 +36,7 @@ #include <editeng/mutxhelp.hxx> #include <svx/svxdllapi.h> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase6.hxx> #include <comphelper/servicehelper.hxx> #include <svx/unoprov.hxx> @@ -55,8 +56,9 @@ class SvxShapeConnector; #define TWIPS_TO_MM(val) ((val * 127 + 36) / 72) #define MM_TO_TWIPS(val) ((val * 72 + 63) / 127) -class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun::star::drawing::XDrawPage, +class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun::star::drawing::XDrawPage, ::com::sun::star::drawing::XShapeGrouper, + ::com::sun::star::drawing::XShapes2, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XUnoTunnel, ::com::sun::star::lang::XComponent>, @@ -84,7 +86,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: void ChangeModel( SdrModel* pNewModel ); // Creation of a SdrObject and insertion into the SdrPage - SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape ) throw(); + SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bBeginning = false ) throw(); // Determine Type and Inventor void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw(); @@ -115,6 +117,10 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper5< ::com::sun: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XShapes2 + virtual void SAL_CALL addTop( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + virtual void SAL_CALL addBottom( const ::com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& xShape ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; + // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual sal_Bool SAL_CALL hasElements() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; |