diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:18:29 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-05 21:18:29 +0000 |
| commit | f2c18e0e6892da4e5a6fc80dc56b2ed74f3b617f (patch) | |
| tree | f8de7f96638b4b077cc4e2f231ba9cfa72ce371f /svx | |
| parent | 2f3ae6ce3e43cbc2d22902dfe5825344d0a5d7b8 (diff) | |
INTEGRATION: CWS impresssavegraphic (1.51.338); FILE MERGED
2006/06/27 10:59:28 cl 1.51.338.5: fixed merge problem
2006/06/26 22:28:42 cl 1.51.338.4: RESYNC: (1.52-1.53); FILE MERGED
2006/05/30 16:49:51 cl 1.51.338.3: fixed merge problem
2006/05/29 09:49:09 cl 1.51.338.2: RESYNC: (1.51-1.52); FILE MERGED
2006/04/03 15:32:40 cl 1.51.338.1: #i13816# added GraphicStream property
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/unodraw/unoshap2.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index bed207d0ac7e..259584ff0cb0 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -4,9 +4,9 @@ * * $RCSfile: unoshap2.cxx,v $ * - * $Revision: 1.53 $ + * $Revision: 1.54 $ * - * last change: $Author: hr $ $Date: 2006-06-19 16:56:30 $ + * last change: $Author: kz $ $Date: 2006-07-05 22:18:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1838,6 +1838,10 @@ uno::Any SAL_CALL SvxGraphicObject::getPropertyValue( const OUString& aPropertyN Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() ); return uno::Any( xGraphic ); } + else if( mpObj.is() && aPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("GraphicStream" ) ) ) + { + return Any( static_cast< SdrGrafObj* >( mpObj.get() )->getInputStream() ); + } else { return SvxShape::getPropertyValue(aPropertyName); |