diff options
| author | Niklas Nebel <nn@openoffice.org> | 2001-12-19 10:36:01 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2001-12-19 10:36:01 +0000 |
| commit | 4652fb168d72496527493a3888bcd0db18507745 (patch) | |
| tree | 6bf723a5ebf25bf8cd411e61225ddce0a6adc672 /sc | |
| parent | 1337992aba288b6ccf2afeac5e59d2ddc4b50008 (diff) | |
#96117# GetSupportedMacroItems as public static method
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/inc/shapeuno.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/unoobj/shapeuno.cxx | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 2722eae198e8..86a28debcab1 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeuno.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: hr $ $Date: 2001-10-23 11:14:49 $ + * last change: $Author: nn $ $Date: 2001-12-19 11:35:20 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,6 +89,7 @@ namespace com { namespace sun { namespace star { }}} class SdrObject; +struct SvEventDescription; //------------------------------------------------------------------------ @@ -107,6 +108,8 @@ private: SdrObject* GetSdrObject() const throw(); public: + static const SvEventDescription* GetSupportedMacroItems(); + // ctor modifies xShape parameter ScShapeObj( ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xShape ); diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 4728bda7622b..3ce6dad3ceac 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: shapeuno.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2001-10-23 11:39:50 $ + * last change: $Author: nn $ $Date: 2001-12-19 11:36:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -97,7 +97,8 @@ const SfxItemPropertyMap* lcl_GetShapeMap() return aShapeMap_Impl; } -const SvEventDescription* lcl_GetSupportedMacroItems() +// static +const SvEventDescription* ScShapeObj::GetSupportedMacroItems() { static const SvEventDescription aMacroDescriptionsImpl[] = { @@ -273,10 +274,10 @@ uno::Any SAL_CALL ScShapeObj::getPropertyValue( const rtl::OUString& aPropertyNa if( pIMapInfo ) { const ImageMap& rIMap = pIMapInfo->GetImageMap(); - xImageMap = SvUnoImageMap_createInstance( rIMap, lcl_GetSupportedMacroItems() ); + xImageMap = SvUnoImageMap_createInstance( rIMap, GetSupportedMacroItems() ); } else - xImageMap = SvUnoImageMap_createInstance( lcl_GetSupportedMacroItems() ); + xImageMap = SvUnoImageMap_createInstance( GetSupportedMacroItems() ); } aAny <<= uno::Reference< container::XIndexContainer >::query( xImageMap ); } |