diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 14:35:31 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-01 14:35:31 +0000 |
| commit | 426c15b8371f2e8076a52100542bf946dfd41dc7 (patch) | |
| tree | 936a2659e1b8c7fe55cd6f6ce6fa06cd67543c10 /svx | |
| parent | 728c9b82447d2e23f3399e02d49d2d405590c3af (diff) | |
INTEGRATION: CWS impress131_SRC680 (1.65.82); FILE MERGED
2007/10/19 10:39:43 sj 1.65.82.3: #i81609# fixed fontwork display
2007/10/18 12:27:10 cl 1.65.82.2: added missing throw clause
2007/09/20 11:42:47 sj 1.65.82.1: #i81609# fixed fontwork display
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index c9522a60e712..81a8b756b34b 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshap2.cxx,v $ * - * $Revision: 1.65 $ + * $Revision: 1.66 $ * - * last change: $Author: obo $ $Date: 2007-07-18 10:58:28 $ + * last change: $Author: hr $ $Date: 2007-11-01 15:35:31 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,6 +50,9 @@ #ifndef _COM_SUN_STAR_DRAWING_TEXTVERTICALADJUST_HPP_ #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #endif +#ifndef _COM_SUN_STAR_DRAWING_XENHANCEDCUSTOMSHAPEDEFAULTER_HPP_ +#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#endif #ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ #include <com/sun/star/awt/TextAlign.hpp> //added by BerryJia for fixing Bug102407 2002-11-4 #endif @@ -1997,6 +2000,33 @@ void SvxCustomShape::Create( SdrObject* pNewObj, SvxDrawPage* pNewPage ) throw() //---------------------------------------------------------------------- +uno::Any SAL_CALL SvxCustomShape::queryInterface( const uno::Type & rType ) + throw(uno::RuntimeException) +{ + return SvxShapeText::queryInterface( rType ); +} + +uno::Any SAL_CALL SvxCustomShape::queryAggregation( const uno::Type & rType ) + throw(uno::RuntimeException) +{ + ::com::sun::star::uno::Any aReturn = SvxShapeText::queryAggregation( rType ); + if ( !aReturn.hasValue() ) + aReturn = ::cppu::queryInterface(rType, static_cast<drawing::XEnhancedCustomShapeDefaulter*>(this) ); + return aReturn; +} + +void SAL_CALL SvxCustomShape::acquire() throw ( ) +{ + SvxShapeText::acquire(); +} + +void SAL_CALL SvxCustomShape::release() throw ( ) +{ + SvxShapeText::release(); +} + +//---------------------------------------------------------------------- + uno::Sequence< uno::Type > SAL_CALL SvxCustomShape::getTypes() throw (uno::RuntimeException) { @@ -2217,3 +2247,9 @@ uno::Any SAL_CALL SvxCustomShape::getPropertyValue( const OUString& aPropertyNam } +//---------------------------------------------------------------------- + +void SvxCustomShape::createCustomShapeDefaults( const rtl::OUString& rValueType ) throw (::com::sun::star::uno::RuntimeException) +{ + ((SdrObjCustomShape*)mpObj.get())->MergeDefaultAttributes( &rValueType ); +} |