diff -pur extensions/source/xmlextract/xmxtrct.cxx extensions/source/xmlextract/xmxtrct.cxx
--- extensions/source/xmlextract/xmxtrct.cxx	2006-09-16 15:31:04.000000000 +0200
+++ extensions/source/xmlextract/xmxtrct.cxx	2007-03-08 20:26:23.000000000 +0100
@@ -59,10 +59,10 @@ public:
 									XMXLockBytes( const REF( NMSP_IO::XInputStream )& rxIStm );
 	virtual							~XMXLockBytes();
 
-	virtual ErrCode					ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const;
-	virtual ErrCode					WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* 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;
 };
 
@@ -101,9 +101,9 @@ XMXLockBytes::~XMXLockBytes()
 
 // ------------------------------------------------------------------------
 
-ErrCode XMXLockBytes::ReadAt( sal_uInt32 nPos, void* pBuffer, sal_uInt32 nCount, sal_uInt32* pRead ) const
+ErrCode XMXLockBytes::ReadAt( sal_Size nPos, void* pBuffer, sal_Size nCount, sal_Size* pRead ) const
 {
-	const sal_uInt32	nSeqLen = maSeq.getLength();
+	const sal_Size		nSeqLen = maSeq.getLength();
 	ErrCode				nErr = ERRCODE_NONE;
 
 	if( nPos < nSeqLen )
@@ -122,7 +122,7 @@ ErrCode XMXLockBytes::ReadAt( sal_uInt32
 
 // ------------------------------------------------------------------------
 
-ErrCode XMXLockBytes::WriteAt( sal_uInt32 nPos, const void* pBuffer, sal_uInt32 nCount, sal_uInt32* pWritten )
+ErrCode XMXLockBytes::WriteAt( sal_Size nPos, const void* pBuffer, sal_Size nCount, sal_Size* pWritten )
 {
 	return ERRCODE_IO_CANTWRITE;
 }
@@ -136,7 +136,7 @@ ErrCode XMXLockBytes::Flush() const
 
 // ------------------------------------------------------------------------
 
-ErrCode XMXLockBytes::SetSize( sal_uInt32 nSize )
+ErrCode XMXLockBytes::SetSize( sal_Size nSize )
 {
 	return ERRCODE_IO_CANTWRITE;
 }
diff -pur forms/source/component/imgprod.cxx forms/source/component/imgprod.cxx
--- forms/source/component/imgprod.cxx	2006-10-12 13:13:26.000000000 +0200
+++ forms/source/component/imgprod.cxx	2007-03-08 20:30:00.000000000 +0100
@@ -73,10 +73,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;
 };
 
@@ -122,7 +122,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() )
 	{
@@ -133,7 +133,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 )
@@ -153,7 +153,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 );
@@ -173,7 +173,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 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
--- sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx	2006-12-19 14:25:59.000000000 +0100
+++ sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx	2007-03-09 11:04:22.000000000 +0100
@@ -1769,7 +1769,7 @@ sal_Int32 SAL_CALL ScAccessibleDocumentP
 	return nRet;
 }
 
-uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(long nIndex)
+uno::Reference<XAccessible> SAL_CALL ScAccessibleDocumentPagePreview::getAccessibleChild(sal_Int32 nIndex)
 			    throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
 {
 	ScUnoGuard aGuard;
diff -pur sc/source/ui/inc/AccessibleDocumentPagePreview.hxx sc/source/ui/inc/AccessibleDocumentPagePreview.hxx
--- sc/source/ui/inc/AccessibleDocumentPagePreview.hxx	2006-03-31 11:31:54.000000000 +0200
+++ sc/source/ui/inc/AccessibleDocumentPagePreview.hxx	2007-03-09 11:03:38.000000000 +0100
@@ -85,7 +85,7 @@ public:
 
     ///	Return the specified child or NULL if index is invalid.
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
-    	getAccessibleChild(long nIndex)
+    	getAccessibleChild(sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException,
 				::com::sun::star::lang::IndexOutOfBoundsException);
 
diff -pur sc/source/ui/inc/csvruler.hxx sc/source/ui/inc/csvruler.hxx
--- sc/source/ui/inc/csvruler.hxx	2007-03-12 13:55:20.000000000 +0100
+++ sc/source/ui/inc/csvruler.hxx	2007-03-12 13:56:09.000000000 +0100
@@ -92,9 +92,9 @@ public:
 public:
     /** Sets position and size of the ruler. The height is calculated internally. */
     virtual void                SetPosSizePixel(
-                                    sal_Int32 nX, sal_Int32 nY,
-                                    sal_Int32 nWidth, sal_Int32 nHeight,
-                                    sal_uInt16 nFlags = WINDOW_POSSIZE_ALL );
+                                    long nX, long nY,
+                                    long nWidth, long nHeight,
+                                    USHORT nFlags = WINDOW_POSSIZE_ALL );
 
     /** Apply current layout data to the ruler. */
     void                        ApplyLayout( const ScCsvLayoutData& rOldData );
diff -pur sc/source/ui/dbgui/csvruler.cxx sc/source/ui/dbgui/csvruler.cxx
--- sc/source/ui/dbgui/csvruler.cxx	2007-03-12 13:59:42.000000000 +0100
+++ sc/source/ui/dbgui/csvruler.cxx	2007-03-12 14:00:12.000000000 +0100
@@ -140,7 +140,7 @@ ScCsvRuler::~ScCsvRuler()
 // common ruler handling ------------------------------------------------------
 
 void ScCsvRuler::SetPosSizePixel(
-        sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_uInt16 nFlags )
+        long nX, long nY, long nWidth, long nHeight, USHORT nFlags )
 {
     if( nFlags & WINDOW_POSSIZE_HEIGHT )
         nHeight = GetTextHeight() + mnSplitSize + 2;
--- sc/source/ui/dbgui/csvtablebox.cxx	2007-03-12 14:45:29.000000000 +0100
+++ sc/source/ui/dbgui/csvtablebox.cxx	2007-03-12 14:45:33.000000000 +0100
@@ -148,10 +148,10 @@ void ScCsvTableBox::InitControls()
 {
     maGrid.UpdateLayoutData();
 
-    sal_Int32 nScrollBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();
+    long nScrollBarSize = GetSettings().GetStyleSettings().GetScrollBarSize();
     Size aWinSize = CalcOutputSize( GetSizePixel() );
-    sal_Int32 nDataWidth = aWinSize.Width() - nScrollBarSize;
-    sal_Int32 nDataHeight = aWinSize.Height() - nScrollBarSize;
+    long nDataWidth = aWinSize.Width() - nScrollBarSize;
+    long nDataHeight = aWinSize.Height() - nScrollBarSize;
 
     maData.mnWinWidth = nDataWidth;
     maData.mnWinHeight = nDataHeight;
diff -pur sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
--- sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	2006-12-12 17:47:49.000000000 +0100
+++ sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx	2007-03-09 16:22:48.000000000 +0100
@@ -311,7 +311,7 @@ sal_Int32 SAL_CALL
 
 
 Reference<XAccessible> SAL_CALL
-    AccessibleDocumentViewBase::getAccessibleChild (long nIndex)
+    AccessibleDocumentViewBase::getAccessibleChild (sal_Int32 nIndex)
     throw (uno::RuntimeException)
 {
     ::osl::MutexGuard aGuard (maMutex);
diff -pur sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
--- sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	2006-11-14 15:23:19.000000000 +0100
+++ sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx	2007-03-09 16:23:05.000000000 +0100
@@ -276,7 +276,7 @@ sal_Int32 SAL_CALL
 
 
 uno::Reference<XAccessible> SAL_CALL
-    AccessibleDrawDocumentView::getAccessibleChild (long nIndex)
+    AccessibleDrawDocumentView::getAccessibleChild (sal_Int32 nIndex)
     throw (::com::sun::star::uno::RuntimeException)
 {
     ::osl::ClearableMutexGuard aGuard (maMutex);
diff -pur sd/source/ui/accessibility/AccessibleOutlineView.cxx sd/source/ui/accessibility/AccessibleOutlineView.cxx
--- sd/source/ui/accessibility/AccessibleOutlineView.cxx	2006-12-12 17:48:28.000000000 +0100
+++ sd/source/ui/accessibility/AccessibleOutlineView.cxx	2007-03-09 16:23:27.000000000 +0100
@@ -192,7 +192,7 @@ sal_Int32 SAL_CALL
 
 
 uno::Reference<XAccessible> SAL_CALL
-    AccessibleOutlineView::getAccessibleChild (long nIndex)
+    AccessibleOutlineView::getAccessibleChild (sal_Int32 nIndex)
     throw (::com::sun::star::uno::RuntimeException)
 {
     // Forward request to children manager.
diff -pur sd/source/ui/accessibility/AccessiblePageShape.cxx sd/source/ui/accessibility/AccessiblePageShape.cxx
--- sd/source/ui/accessibility/AccessiblePageShape.cxx	2006-12-12 17:48:43.000000000 +0100
+++ sd/source/ui/accessibility/AccessiblePageShape.cxx	2007-03-09 16:23:49.000000000 +0100
@@ -125,7 +125,7 @@ sal_Int32 SAL_CALL
     an exception for a wrong index.
 */
 uno::Reference<XAccessible> SAL_CALL 
-    AccessiblePageShape::getAccessibleChild(long )
+    AccessiblePageShape::getAccessibleChild( sal_Int32 )
     throw (::com::sun::star::uno::RuntimeException)
 {
     throw lang::IndexOutOfBoundsException (
diff -pur sd/source/ui/inc/AccessibleDocumentViewBase.hxx sd/source/ui/inc/AccessibleDocumentViewBase.hxx
--- sd/source/ui/inc/AccessibleDocumentViewBase.hxx	2005-09-09 06:57:44.000000000 +0200
+++ sd/source/ui/inc/AccessibleDocumentViewBase.hxx	2007-03-09 16:20:53.000000000 +0100
@@ -189,7 +189,7 @@ public:
     */
     virtual ::com::sun::star::uno::Reference<
         ::com::sun::star::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (long nIndex)
+        getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException);
 
 
diff -pur sd/source/ui/inc/AccessibleDrawDocumentView.hxx sd/source/ui/inc/AccessibleDrawDocumentView.hxx
--- sd/source/ui/inc/AccessibleDrawDocumentView.hxx	2005-09-09 06:58:01.000000000 +0200
+++ sd/source/ui/inc/AccessibleDrawDocumentView.hxx	2007-03-09 16:24:04.000000000 +0100
@@ -84,7 +84,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (long nIndex)
+        getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException);
 
 
diff -pur sd/source/ui/inc/AccessibleOutlineView.hxx sd/source/ui/inc/AccessibleOutlineView.hxx
--- sd/source/ui/inc/AccessibleOutlineView.hxx	2006-12-12 18:30:24.000000000 +0100
+++ sd/source/ui/inc/AccessibleOutlineView.hxx	2007-03-09 16:24:14.000000000 +0100
@@ -90,7 +90,7 @@ public:
         throw (::com::sun::star::uno::RuntimeException);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL
-        getAccessibleChild (long nIndex)
+        getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException);
 
     //=====  XAccessibleEventBroadcaster  ========================================
diff -pur sd/source/ui/inc/AccessiblePageShape.hxx sd/source/ui/inc/AccessiblePageShape.hxx
--- sd/source/ui/inc/AccessiblePageShape.hxx	2006-12-12 18:30:39.000000000 +0100
+++ sd/source/ui/inc/AccessiblePageShape.hxx	2007-03-09 16:24:24.000000000 +0100
@@ -128,7 +128,7 @@ public:
     */
     virtual ::com::sun::star::uno::Reference<
             ::com::sun::star::accessibility::XAccessible> SAL_CALL 
-    	getAccessibleChild (long nIndex)
+    	getAccessibleChild (sal_Int32 nIndex)
         throw (::com::sun::star::uno::RuntimeException);
 
 
diff -pur sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx
--- sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx	2007-03-12 14:07:00.000000000 +0100
+++ sd/source/ui/toolpanel/SimpleLayoutWrapper.hxx	2007-03-12 14:08:11.000000000 +0100
@@ -59,8 +59,8 @@ public:
     virtual ~SimpleLayoutWrapper (void);
 
     virtual Size GetPreferredSize (void);
-    virtual int GetPreferredWidth (int nHeight);
-    virtual int GetPreferredHeight (int nWidth);
+    virtual sal_Int32 GetPreferredWidth (sal_Int32 nHeight);
+    virtual sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
     virtual bool IsResizable (void);
     virtual ::Window* GetWindow (void);
 
diff -pur sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx
--- sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx	2007-03-12 14:11:01.000000000 +0100
+++ sd/source/ui/toolpanel/SimpleLayoutWrapper.cxx	2007-03-12 14:11:51.000000000 +0100
@@ -72,7 +72,7 @@ Size SimpleLayoutWrapper::GetPreferredSi
 
 
 
-int SimpleLayoutWrapper::GetPreferredWidth (int )
+sal_Int32 SimpleLayoutWrapper::GetPreferredWidth (sal_Int32)
 {
     return mnPreferredWidth;
 }
@@ -80,7 +80,7 @@ int SimpleLayoutWrapper::GetPreferredWid
 
 
 
-int SimpleLayoutWrapper::GetPreferredHeight (int )
+sal_Int32 SimpleLayoutWrapper::GetPreferredHeight (sal_Int32)
 {
     return mnPreferredHeight;
 }
diff -pur svx/inc/fmgridif.hxx svx/inc/fmgridif.hxx
--- svx/inc/fmgridif.hxx	2007-03-12 12:19:17.000000000 +0100
+++ svx/inc/fmgridif.hxx	2007-03-12 12:19:57.000000000 +0100
@@ -288,7 +288,7 @@ public:
 	virtual void SAL_CALL setDesignMode(sal_Bool bOn) throw(::com::sun::star::uno::RuntimeException);
 
 // ::com::sun::star::awt::XView
-	virtual void SAL_CALL draw( long x, long y ) throw(::com::sun::star::uno::RuntimeException);
+	virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException);
 
 // ::com::sun::star::form::XBoundComponent
 	virtual void SAL_CALL addUpdateListener(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XUpdateListener >& l) throw(::com::sun::star::uno::RuntimeException);
@@ -527,7 +527,7 @@ public:
 	void columnHidden(DbGridColumn* pColumn);
 
 // ::com::sun::star::awt::XView
-	virtual void SAL_CALL draw( long x, long y ) throw(::com::sun::star::uno::RuntimeException);
+	virtual void SAL_CALL draw( sal_Int32 x, sal_Int32 y ) throw(::com::sun::star::uno::RuntimeException);
 
 // ::com::sun::star::frame::XDispatchProvider
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >  SAL_CALL queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw(::com::sun::star::uno::RuntimeException);
diff -pur svx/inc/fmpage.hxx svx/inc/fmpage.hxx
--- svx/inc/fmpage.hxx	2006-11-14 13:37:34.000000000 +0100
+++ svx/inc/fmpage.hxx	2007-03-09 16:15:03.000000000 +0100
@@ -58,12 +58,7 @@ class SdrView;
 class SfxJSArray;
 class HelpEvent;
 
-class SVX_DLLPUBLIC FmFormPage :
-#if SUPD < 396
-	public VCDrawPage
-#else
-	public SdrPage
-#endif
+class SVX_DLLPUBLIC FmFormPage : public SdrPage
 {
 	friend class FmFormObj;
 	FmFormPageImpl*     m_pImpl;
@@ -77,21 +72,19 @@ public:
 	FmFormPage(const FmFormPage& rPage);
 	~FmFormPage();
 
+	using SdrPage::NbcInsertObject;
+	using SdrPage::NbcRemoveObject;
+	using SdrPage::NbcReplaceObject;
+	using SdrPage::ReplaceObject;
+
 	virtual void  	SetModel(SdrModel* pNewModel);
 
 	virtual SdrPage* Clone() const;
-    using SdrPage::Clone;
 
-	virtual void	NbcInsertObject(SdrObject* pObj, sal_uInt32 nPos=CONTAINER_APPEND,
-									const SdrInsertReason* pReason=NULL);
-	virtual void	InsertObject(SdrObject* pObj, sal_uInt32 nPos=CONTAINER_APPEND,
+	virtual void	InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND,
 									const SdrInsertReason* pReason=NULL);
 
-	virtual SdrObject* NbcRemoveObject(sal_uInt32 nObjNum);
-	virtual SdrObject* RemoveObject(sal_uInt32 nObjNum);
-
-	virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum);
-	virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum);
+	virtual SdrObject* RemoveObject(ULONG nObjNum);
 
 	// Zugriff auf alle Formulare
 	const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const;
diff -pur svx/source/fmcomp/fmgridif.cxx svx/source/fmcomp/fmgridif.cxx
--- svx/source/fmcomp/fmgridif.cxx	2007-03-12 12:20:43.000000000 +0100
+++ svx/source/fmcomp/fmgridif.cxx	2007-03-12 12:21:22.000000000 +0100
@@ -781,7 +781,7 @@ void SAL_CALL FmXGridControl::removeModi
 }
 
 //------------------------------------------------------------------------------
-void SAL_CALL FmXGridControl::draw( long x, long y ) throw( RuntimeException )
+void SAL_CALL FmXGridControl::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
 {
     ::vos::OGuard aGuard( Application::GetSolarMutex() );
 	m_bInDraw = sal_True;
@@ -2507,7 +2507,7 @@ void FmXGridPeer::columnHidden(DbGridCol
 }
 
 //------------------------------------------------------------------------------
-void FmXGridPeer::draw( long x, long y ) throw( RuntimeException )
+void FmXGridPeer::draw( sal_Int32 x, sal_Int32 y ) throw( RuntimeException )
 {
 	FmGridControl* pGrid = (FmGridControl*) GetWindow();
 	sal_Int32 nOldFlags = pGrid->GetBrowserFlags();
diff -pur svx/source/form/fmpage.cxx svx/source/form/fmpage.cxx
--- svx/source/form/fmpage.cxx	2006-09-17 07:07:59.000000000 +0200
+++ svx/source/form/fmpage.cxx	2007-03-09 16:09:40.000000000 +0100
@@ -209,15 +209,7 @@ SdrPage* FmFormPage::Clone() const
 }
 
 //------------------------------------------------------------------
-void FmFormPage::NbcInsertObject(SdrObject* pObj,
-								 sal_uInt32 nPos,
-								 const SdrInsertReason* pReason)
-{
-	SdrPage::NbcInsertObject(pObj, nPos, pReason);
-}
-
-//------------------------------------------------------------------
-void FmFormPage::InsertObject(SdrObject* pObj, sal_uInt32 nPos,
+void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos,
 							  const SdrInsertReason* pReason)
 {
 	SdrPage::InsertObject( pObj, nPos, pReason );
@@ -308,13 +300,7 @@ sal_Bool FmFormPage::RequestHelp( Window
 }
 
 //------------------------------------------------------------------
-SdrObject* FmFormPage::NbcRemoveObject(sal_uInt32 nObjNum)
-{
-	return SdrPage::NbcRemoveObject(nObjNum);
-}
-
-//------------------------------------------------------------------
-SdrObject* FmFormPage::RemoveObject(sal_uInt32 nObjNum)
+SdrObject* FmFormPage::RemoveObject(ULONG nObjNum)
 {
 	SdrObject* pObj = SdrPage::RemoveObject(nObjNum);
 #ifndef SVX_LIGHT
@@ -323,16 +309,3 @@ SdrObject* FmFormPage::RemoveObject(sal_
 #endif
 	return pObj;
 }
-
-//------------------------------------------------------------------
-SdrObject* FmFormPage::NbcReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum)
-{
-	return SdrPage::NbcReplaceObject(pNewObj, nObjNum);
-}
-
-//------------------------------------------------------------------
-SdrObject* FmFormPage::ReplaceObject(SdrObject* pNewObj, sal_uInt32 nObjNum)
-{
-	return SdrPage::ReplaceObject(pNewObj, nObjNum);
-}
-
diff -pur sw/source/ui/inc/glossary.hxx sw/source/ui/inc/glossary.hxx
--- sw/source/ui/inc/glossary.hxx	2006-08-14 19:41:51.000000000 +0200
+++ sw/source/ui/inc/glossary.hxx	2007-03-09 16:39:41.000000000 +0100
@@ -115,12 +115,12 @@ class SwGlTreeListBox : public SvTreeLis
 	virtual sal_Bool    NotifyMoving(   SvLBoxEntry*  pTarget,
 									SvLBoxEntry*  pEntry,
 									SvLBoxEntry*& rpNewParent,
-									sal_uInt32&        rNewChildPos
+									ULONG&        rNewChildPos
 								);
 	virtual sal_Bool	NotifyCopying(	SvLBoxEntry*  pTarget,
 									SvLBoxEntry*  pEntry,
 									SvLBoxEntry*& rpNewParent,
-									sal_uInt32&		  rNewChildPos);
+									ULONG&		  rNewChildPos);
 public:
 	SwGlTreeListBox(Window* pParent, const ResId& rResId);
 
diff -pur sw/source/ui/misc/glossary.cxx sw/source/ui/misc/glossary.cxx
--- sw/source/ui/misc/glossary.cxx	2006-09-17 01:07:03.000000000 +0200
+++ sw/source/ui/misc/glossary.cxx	2007-03-09 16:40:55.000000000 +0100
@@ -1176,7 +1176,7 @@ sal_Bool    SwGlTreeListBox::NotifyAccep
 sal_Bool  SwGlTreeListBox::NotifyMoving(   SvLBoxEntry*  pTarget,
 									SvLBoxEntry*  pEntry,
 									SvLBoxEntry*& rpNewParent,
-									sal_uInt32&        rNewChildPos
+									ULONG&        rNewChildPos
 								)
 {
 	pDragEntry = 0;
@@ -1224,7 +1224,7 @@ sal_Bool  SwGlTreeListBox::NotifyMoving(
 sal_Bool  SwGlTreeListBox::NotifyCopying(   SvLBoxEntry*  pTarget,
 									SvLBoxEntry*  pEntry,
 									SvLBoxEntry*& rpNewParent,
-									sal_uInt32&        rNewChildPos
+									ULONG&        rNewChildPos
 								)
 {
 	pDragEntry = 0;
diff -pur tools/inc/contnr.hxx tools/inc/contnr.hxx
--- tools/inc/contnr.hxx	2006-06-19 15:23:55.000000000 +0200
+++ tools/inc/contnr.hxx	2007-03-09 13:59:30.000000000 +0100
@@ -43,6 +43,8 @@
 #include <solar.h>
 #endif
 
+#include <limits.h>
+
 class CBlock;
 
 // -------------
@@ -52,8 +54,8 @@ class CBlock;
 // Maximale Blockgroesse
 #define CONTAINER_MAXBLOCKSIZE      ((USHORT)0x3FF0)
 
-#define CONTAINER_APPEND            ((ULONG)0xFFFFFFFF)
-#define CONTAINER_ENTRY_NOTFOUND    ((ULONG)0xFFFFFFFF)
+#define CONTAINER_APPEND            ULONG_MAX
+#define CONTAINER_ENTRY_NOTFOUND    ULONG_MAX
 
 class TOOLS_DLLPUBLIC Container
 {
