diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:27:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 11:27:17 +0000 |
| commit | 073d815edf3debe9059d421d21b42c62adb211c0 (patch) | |
| tree | f4546472cfa153ac7a19a986d7e2e39745362f36 /svx | |
| parent | c47078fa82b31e369eaab3369b220ad996879f2b (diff) | |
INTEGRATION: CWS rptchart02 (1.5.188); FILE MERGED
2008/04/16 12:24:54 oj 1.5.188.3: resolve move problems
2008/04/16 06:35:39 oj 1.5.188.2: RESYNC: (1.5-1.8); FILE MERGED
2008/04/03 13:22:50 oj 1.5.188.1: export SvxOle2Shape
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/inc/svx/unoshape.hxx | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 2ef98c148682..61d691984079 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoshape.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.9 $ * * This file is part of OpenOffice.org. * @@ -481,7 +481,7 @@ public: /*********************************************************************** * * ***********************************************************************/ -class SvxShapeControl : public ::com::sun::star::drawing::XControlShape, public SvxShapeText +class SVX_DLLPUBLIC SvxShapeControl : public ::com::sun::star::drawing::XControlShape, public SvxShapeText { private: void convertPropertyName( const rtl::OUString& rApiName, rtl::OUString& rInternalName ); @@ -557,6 +557,35 @@ public: // XServiceInfo virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException); }; + +/*********************************************************************** +* * +***********************************************************************/ + +class SVX_DLLPUBLIC SvxOle2Shape : public SvxShape +{ +protected: +// overide these for special property handling in subcasses. Return true if property is handled + virtual bool setPropertyValueImpl( const SfxItemPropertyMap* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual bool getPropertyValueImpl( const SfxItemPropertyMap* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + + void resetModifiedState(); + + const SvGlobalName GetClassName_Impl(rtl::OUString& rHexCLSID); +public: + SvxOle2Shape( SdrObject* pObj ) throw(); + SvxOle2Shape( SdrObject* pObject, const SfxItemPropertyMap* pPropertySet ) throw (); + virtual ~SvxOle2Shape() throw(); + + sal_Bool createObject( const SvGlobalName &aClassName ); + + sal_Bool createLink( const ::rtl::OUString& aLinkURL ); + + // XInterface + virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); +}; + + #include <basegfx/polygon/b2dpolypolygon.hxx> /*********************************************************************** @@ -781,7 +810,7 @@ typedef ::cppu::WeakAggImplHelper1< ::com::sun::star::drawing::XEnhancedCustomShapeDefaulter > SvxShape_UnoImplHelper1; -class SvxCustomShape : public SvxShapeText, public SvxShape_UnoImplHelper1 +class SVX_DLLPUBLIC SvxCustomShape : public SvxShapeText, public SvxShape_UnoImplHelper1 { private: rtl::Reference< SvxDrawPage > mxPage; |