diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 11:01:48 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-07-24 11:01:48 +0000 |
| commit | b4f6d9f60f3873549617a5bce287903bb05e72b2 (patch) | |
| tree | 52c1502d1d46fd5f4b71679e8bc7e0abe910dc8d /svx | |
| parent | a76f92f49944fcd723ff2b8355ccb66902bec0b8 (diff) | |
INTEGRATION: CWS dba23b (1.9.322); FILE MERGED
2007/07/11 11:49:53 fs 1.9.322.2: RESYNC: (1.9-1.10); FILE MERGED
2007/06/04 11:45:58 fs 1.9.322.1: ControlShape instead of ShapeControl
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmdpage.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 50c7223e14a8..df9e40091dce 100644 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fmdpage.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: hr $ $Date: 2007-06-27 18:12:06 $ + * last change: $Author: rt $ $Date: 2007-07-24 12:01:48 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -122,8 +122,10 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen { ::rtl::OUString aShapeType( xDescr->getShapeType() ); - if (aShapeType == ::rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeControl")) - return new FmFormObj(OBJ_FM_CONTROL); + if ( aShapeType.equalsAscii( "com.sun.star.drawing.ShapeControl" ) // compatibility + || aShapeType.equalsAscii( "com.sun.star.drawing.ControlShape" ) + ) + return new FmFormObj( OBJ_FM_CONTROL ); else return SvxDrawPage::_CreateSdrObject( xDescr ); |