#95788# set shape kind on creation at XServiceFactory

3 files changed, 17 insertions, 7 deletions

diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3ab2e734abed..44f575eccddc 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unopage.cxx,v $
  *
- *  $Revision: 1.19 $
+ *  $Revision: 1.20 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-05 08:58:08 $
+ *  last change: $Author: cl $ $Date: 2001-12-11 12:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -781,6 +781,7 @@ SvxShape* SvxDrawPage::CreateShapeByTypeAndInventor( sal_uInt16 nType, sal_uInt3
                 OUString aIdent( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.") );
                 aIdent += pMap->aIdentifier;
                 pRet->SetShapeType(aIdent);
+                pRet->setShapeKind(nObjId);
                 break ;
             }
             pMap++;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index d984cdbc6d5c..c6a0396b0b73 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshap2.cxx,v $
  *
- *  $Revision: 1.35 $
+ *  $Revision: 1.36 $
  *
- *  last change: $Author: cl $ $Date: 2001-12-04 15:58:02 $
+ *  last change: $Author: cl $ $Date: 2001-12-11 12:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -588,6 +588,7 @@ uno::Sequence< uno::Type > SvxShapeControl::maTypeSequence;
 SvxShapeControl::SvxShapeControl( SdrObject* pObj )  throw() :
     SvxShapeText( pObj, aSvxMapProvider.GetMap(SVXMAP_CONTROL) )
 {
+    setShapeKind( OBJ_UNO );
 }
 
 //----------------------------------------------------------------------
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 162798f5078f..4847a3bb220f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unoshape.cxx,v $
  *
- *  $Revision: 1.85 $
+ *  $Revision: 1.86 $
  *
- *  last change: $Author: hr $ $Date: 2001-12-10 18:33:19 $
+ *  last change: $Author: cl $ $Date: 2001-12-11 12:37:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -357,6 +357,14 @@ SvxShape::~SvxShape() throw()
 
 //----------------------------------------------------------------------
 
+void SvxShape::setShapeKind( sal_uInt32 nKind )
+{
+    if( mpImpl )
+        mpImpl->mnObjId = nKind;
+}
+
+//----------------------------------------------------------------------
+
 sal_uInt32 SvxShape::getShapeKind() const
 {
     return mpImpl ? mpImpl->mnObjId : OBJ_NONE;
@@ -729,7 +737,7 @@ uno::Sequence< uno::Type > SAL_CALL SvxShape::getTypes()
 //----------------------------------------------------------------------
 
 uno::Sequence< uno::Type > SAL_CALL SvxShape::_getTypes()
-    throw (uno::RuntimeException)
+    throw(uno::RuntimeException)
 {
     switch( mpImpl->mnObjId )
     {