no use is made of FmFormObj::m_nType

5 files changed, 8 insertions, 21 deletions

diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index fbc4b5a53607..86ee670152e1 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -46,7 +46,7 @@ using namespace ::svxform;
     }
     else if ( ServiceSpecifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.ControlShape")) )
     {
-        SdrObject* pObj = new FmFormObj(OBJ_FM_CONTROL);
+        SdrObject* pObj = new FmFormObj();
         xRet = static_cast<cppu::OWeakObject*>(static_cast<SvxShape_UnoImplHelper*>(new SvxShapeControl(pObj)));
     }
     if (!xRet.is())
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 450d85c07871..5b8791978a74 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -97,7 +97,7 @@ SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Referen
     if  (   aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ShapeControl" ) )   // compatibility
         ||  aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) )
         )
-        return new FmFormObj( OBJ_FM_CONTROL );
+        return new FmFormObj();
     else
         return SvxDrawPage::_CreateSdrObject( xDescr );
 
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index 1610bb1c815f..c8e8689a6192 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -69,10 +69,9 @@ using namespace ::svxform;
 TYPEINIT1(FmFormObj, SdrUnoObj);
 DBG_NAME(FmFormObj);
 //------------------------------------------------------------------
-FmFormObj::FmFormObj(const ::rtl::OUString& rModelName,sal_Int32 _nType)
+FmFormObj::FmFormObj(const ::rtl::OUString& rModelName)
           :SdrUnoObj                ( rModelName    )
           ,m_nPos                   ( -1            )
-          ,m_nType                  ( _nType        )
           ,m_pLastKnownRefDevice    ( NULL          )
 {
     DBG_CTOR(FmFormObj, NULL);
@@ -83,10 +82,9 @@ FmFormObj::FmFormObj(const ::rtl::OUString& rModelName,sal_Int32 _nType)
 }
 
 //------------------------------------------------------------------
-FmFormObj::FmFormObj( sal_Int32 _nType )
+FmFormObj::FmFormObj()
           :SdrUnoObj                ( String()  )
           ,m_nPos                   ( -1        )
-          ,m_nType                  ( _nType    )
           ,m_pLastKnownRefDevice    ( NULL      )
 {
     DBG_CTOR(FmFormObj, NULL);
@@ -706,12 +704,6 @@ void FmFormObj::BrkCreate( SdrDragStat& rStat )
 }
 
 // -----------------------------------------------------------------------------
-sal_Int32 FmFormObj::getType() const
-{
-    return m_nType;
-}
-
-// -----------------------------------------------------------------------------
 // #i70852# overload Layer interface to force to FormColtrol layer
 
 SdrLayerID FmFormObj::GetLayer() const
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index a2b692572082..37afeecd23f9 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -237,9 +237,9 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
 
         // create the actual object
         if ( !sServiceSpecifier.isEmpty() )
-            pObjFactory->pNewObj = new FmFormObj( sServiceSpecifier, pObjFactory->nIdentifier );
+            pObjFactory->pNewObj = new FmFormObj(sServiceSpecifier);
         else
-            pObjFactory->pNewObj = new FmFormObj( pObjFactory->nIdentifier );
+            pObjFactory->pNewObj = new FmFormObj();
 
         // initialize some properties which we want to differ from the defaults
         for (   PropertyValueArray::const_iterator aInitProp = aInitialProperties.begin();
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 35297c2ad013..b86b8ef908f2 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -53,15 +53,14 @@ class FmFormObj: public SdrUnoObj
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer>     m_xParent;
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer >    m_xEnvironmentHistory;
     sal_Int32           m_nPos;
-    sal_Int32           m_nType;
 
     OutputDevice*       m_pLastKnownRefDevice;
                             // the last ref device we know, as set at the model
                             // only to be used for comparison with the current ref device!
 
 public:
-    SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName,sal_Int32 _nType);
-    SVX_DLLPUBLIC FmFormObj(sal_Int32 _nType);
+    SVX_DLLPUBLIC FmFormObj(const ::rtl::OUString& rModelName);
+    SVX_DLLPUBLIC FmFormObj();
 
     TYPEINFO();
 
@@ -105,10 +104,6 @@ public:
     static       FmFormObj* GetFormObject( SdrObject* _pSdrObject );
     static const FmFormObj* GetFormObject( const SdrObject* _pSdrObject );
 
-    /** returns the type of this form object. See fmglob.hxx
-    */
-    sal_Int32   getType() const;
-
     virtual void SetUnoControlModel( const ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel >& _rxModel );
 
 protected: