diff options
| author | Daniel Rentz [dr] <daniel.rentz@oracle.com> | 2011-01-05 20:06:03 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-12-04 07:17:06 +0000 |
| commit | 1b39a9b8dc6023b50f266a4ab07ed43ebee16ea2 (patch) | |
| tree | 6ae3c952cbc2b57f5fe680c3b9b3fc8a2db8a578 /sc/inc/shapeuno.hxx | |
| parent | c40fa0a254530945db54bac192c7a52400238988 (diff) | |
dr78: #i96587# remove ScAnnotationShapeObj class, use generic ScShapeObj
for note captions.
Conflicts:
sc/inc/notesuno.hxx
sc/inc/shapeuno.hxx
sc/source/ui/unoobj/notesuno.cxx
sc/source/ui/unoobj/shapeuno.cxx
Diffstat (limited to 'sc/inc/shapeuno.hxx')
| -rw-r--r-- | sc/inc/shapeuno.hxx | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index c376f14e2f53..53f3902a072e 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> +#include <com/sun/star/container/XChild.hpp> #include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase1.hxx> @@ -68,8 +69,11 @@ typedef ::cppu::WeakImplHelper5 < ::com::sun::star::beans::XPropertySet > ScShapeObj_Base; typedef ::cppu::ImplHelper1 < ::com::sun::star::text::XText > ScShapeObj_TextBase; +typedef ::cppu::ImplHelper1 < ::com::sun::star::container::XChild + > ScShapeObj_ChildBase; class ScShapeObj :public ScShapeObj_Base ,public ScShapeObj_TextBase + ,public ScShapeObj_ChildBase { private: friend ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCreate ); @@ -79,7 +83,8 @@ private: ::com::sun::star::beans::XPropertyState* pShapePropertyState; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > mxPropSetInfo; com::sun::star::uno::Sequence< sal_Int8 >* pImplementationId; - sal_Bool bIsTextShape; + bool bIsTextShape; + bool bIsNoteCaption; bool bInitializedNotifier; SdrObject* GetSdrObject() const throw(); @@ -222,6 +227,12 @@ public: virtual void SAL_CALL setString( const ::rtl::OUString& aString ) throw(::com::sun::star::uno::RuntimeException); + // XChild + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent() + throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) + throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); |