diff -pur binfilter/bf_forms/source/component/forms_imgprod.cxx binfilter/bf_forms/source/component/forms_imgprod.cxx
--- binfilter/bf_forms/source/component/forms_imgprod.cxx	2007-01-02 17:46:09.000000000 +0100
+++ binfilter/bf_forms/source/component/forms_imgprod.cxx	2007-03-09 16:46:57.000000000 +0100
@@ -70,10 +70,10 @@ public:
 						ImgProdLockBytes( ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > & rStreamRef );
 	virtual				~ImgProdLockBytes();
 
-	virtual ErrCode		ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_Size* pRead ) const;
-	virtual ErrCode		WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_Size* pWritten );
+	virtual ErrCode		ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const;
+	virtual ErrCode		WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten );
 	virtual ErrCode		Flush() const;
-	virtual ErrCode		SetSize( sal_uInt32 nSize );
+	virtual ErrCode		SetSize( sal_Size nSize );
 	virtual ErrCode		Stat( SvLockBytesStat*, SvLockBytesStatFlag ) const;
 };
 
@@ -119,7 +119,7 @@ ImgProdLockBytes::~ImgProdLockBytes()
 
 // ------------------------------------------------------------------------
 
-ErrCode ImgProdLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_Size* pRead ) const
+ErrCode ImgProdLockBytes::ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const
 {
 	if( GetStream() )
 	{
@@ -130,7 +130,7 @@ ErrCode ImgProdLockBytes::ReadAt( sal_uI
 	}
 	else
 	{
-		const sal_uInt32 nSeqLen = maSeq.getLength();
+		const sal_Size nSeqLen = maSeq.getLength();
 		ErrCode nErr = ERRCODE_NONE;
 
 		if( nPos < nSeqLen )
@@ -150,7 +150,7 @@ ErrCode ImgProdLockBytes::ReadAt( sal_uI
 
 // ------------------------------------------------------------------------
 
-ErrCode ImgProdLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_Size* pWritten )
+ErrCode ImgProdLockBytes::WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten )
 {
 	if( GetStream() )
 		return SvLockBytes::WriteAt( nPos, pBuffer, nCount, pWritten );
@@ -170,7 +170,7 @@ ErrCode ImgProdLockBytes::Flush() const
 
 // ------------------------------------------------------------------------
 
-ErrCode ImgProdLockBytes::SetSize( sal_uInt32 nSize )
+ErrCode ImgProdLockBytes::SetSize( sal_Size nSize )
 {
 	if( GetStream() )
 		return SvLockBytes::SetSize( nSize );
diff -pur binfilter/bf_svx/source/form/svx_fmpage.cxx binfilter/bf_svx/source/form/svx_fmpage.cxx
--- binfilter/bf_svx/source/form/svx_fmpage.cxx	2006-10-27 22:56:08.000000000 +0200
+++ binfilter/bf_svx/source/form/svx_fmpage.cxx	2007-03-09 16:42:39.000000000 +0100
@@ -194,15 +194,7 @@ namespace binfilter {
 /*N*/ }
 
 //------------------------------------------------------------------
-/*N*/ void FmFormPage::NbcInsertObject(SdrObject* pObj,
-/*N*/ 								 sal_uInt32 nPos,
-/*N*/ 								 const SdrInsertReason* pReason)
-/*N*/ {
-/*N*/ 	SdrPage::NbcInsertObject(pObj, nPos, pReason);
-/*N*/ }
-
-//------------------------------------------------------------------
-/*N*/ void FmFormPage::InsertObject(SdrObject* pObj, sal_uInt32 nPos,
+/*N*/ void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
 /*N*/ 							  const SdrInsertReason* pReason)
 /*N*/ {
 /*N*/ 	SdrPage::InsertObject( pObj, nPos, pReason );
@@ -212,12 +204,6 @@ namespace binfilter {
 /*N*/ #endif
 /*N*/ }
 
-#ifndef SVX_LIGHT
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-#endif
-
 //------------------------------------------------------------------
 /*N*/ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > & FmFormPage::GetForms() const
 /*N*/ {
@@ -230,11 +216,7 @@ namespace binfilter {
 /*N*/ }
 
 //------------------------------------------------------------------
-
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-/*N*/ SdrObject* FmFormPage::RemoveObject(sal_uInt32 nObjNum)
+/*N*/ SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
 /*N*/ {
 /*N*/ 	SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
 /*N*/ #ifndef SVX_LIGHT
@@ -244,21 +226,4 @@ namespace binfilter {
 /*N*/ 	return pObj;
 /*N*/ }
 
-//------------------------------------------------------------------
-
-//------------------------------------------------------------------
-/*N*/ SdrObject* FmFormPage::ReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum)
-/*N*/ {
-/*N*/ 	return SdrPage::ReplaceObject(pNewObj, nObjNum);
-/*N*/ }
-
-
-//------------------------------------------------------------------
-
-
-
-
-
-
-
 }
diff -pur binfilter/inc/bf_svx/fmpage.hxx binfilter/inc/bf_svx/fmpage.hxx
--- binfilter/inc/bf_svx/fmpage.hxx	2006-10-28 05:33:18.000000000 +0200
+++ binfilter/inc/bf_svx/fmpage.hxx	2007-03-09 16:33:05.000000000 +0100
@@ -56,12 +56,7 @@ class FmFormPageImpl;	// haelt die Liste
 class SfxJSArray;
 class HelpEvent;
 
-class FmFormPage :
-#if SUPD < 396
-	public VCDrawPage
-#else
-	public SdrPage
-#endif
+class FmFormPage : public SdrPage
 {
 	friend class FmFormObj;
 	FmFormPageImpl* pImpl;
@@ -72,20 +67,19 @@ public:
 	FmFormPage(FmFormModel& rModel,StarBASIC*, FASTBOOL bMasterPage=sal_False);
 	~FmFormPage();
 
+	using SdrPage::NbcInsertObject;
+	using SdrPage::ReplaceObject;
+
 	virtual void  	WriteData(SvStream& rOut) const;
 	virtual void  	ReadData(const SdrIOHeader& rHead, SvStream& rIn);
 	virtual void  	SetModel(SdrModel* pNewModel);
 
 	virtual SdrPage* Clone() const;
 
-	virtual void	NbcInsertObject(SdrObject* pObj, sal_uInt32 nPos=CONTAINER_APPEND,
+	virtual void	InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND,
 									const SdrInsertReason* pReason=NULL);
-	virtual void	InsertObject(SdrObject* pObj, sal_uInt32 nPos=CONTAINER_APPEND,
-									const SdrInsertReason* pReason=NULL);
-
-	virtual SdrObject* RemoveObject(sal_uInt32 nObjNum);
 
-	virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum);
+	virtual SdrObject* RemoveObject(ULONG nObjNum);
 
 #ifndef SVX_LIGHT
 	/**	Insert _pClone into the page.
