diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/editeng.hxx ooo_cws_src680_ooo20031216_src/svx/inc/editeng.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/editeng.hxx 2003-12-29 17:01:41.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/editeng.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -227,19 +227,19 @@ String GetText( LineEnd eEnd = LINEEND_LF ) const; String GetText( const ESelection& rSelection, const LineEnd eEnd = LINEEND_LF ) const; - ULONG GetTextLen() const; - ULONG GetTextHeight() const; - ULONG CalcTextWidth(); + sal_uInt32 GetTextLen() const; + sal_uInt32 GetTextHeight() const; + sal_uInt32 CalcTextWidth(); String GetText( USHORT nParagraph ) const; xub_StrLen GetTextLen( USHORT nParagraph ) const; - ULONG GetTextHeight( USHORT nParagraph ) const; + sal_uInt32 GetTextHeight( USHORT nParagraph ) const; USHORT GetParagraphCount() const; USHORT GetLineCount( USHORT nParagraph ) const; xub_StrLen GetLineLen( USHORT nParagraph, USHORT nLine ) const; - ULONG GetLineHeight( USHORT nParagraph, USHORT nLine = 0 ); + sal_uInt32 GetLineHeight( USHORT nParagraph, USHORT nLine = 0 ); USHORT GetFirstLineOffset( USHORT nParagraph ); ParagraphInfos GetParagraphInfos( USHORT nPara ); USHORT FindParagraph( long nDocPosY ); @@ -322,8 +322,8 @@ void Draw( OutputDevice* pOutDev, const Point& rStartPos, short nOrientation = 0 ); // ULONG: Fehlercode des Streams. - ULONG Read( SvStream& rInput, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat ); + sal_uInt32 Read( SvStream& rInput, EETextFormat, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uInt32 Write( SvStream& rOutput, EETextFormat ); void SetStatusEventHdl( const Link& rLink ); Link GetStatusEventHdl() const; @@ -338,8 +338,8 @@ BOOL IsFlatMode() const; void SetFlatMode( BOOL bFlat ); - void SetControlWord( ULONG nWord ); - ULONG GetControlWord() const; + void SetControlWord( sal_uInt32 nWord ); + sal_uInt32 GetControlWord() const; void QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel ); void QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); @@ -444,7 +444,7 @@ static void SetGetAutoCorrectHdl( const Link& rHdl ); static SfxItemPool* CreatePool( BOOL bLoadRefCounts = TRUE ); - static ULONG RegisterClipboardFormatName(); + static sal_uInt32 RegisterClipboardFormatName(); static BOOL DoesKeyChangeText( const KeyEvent& rKeyEvent ); static BOOL DoesKeyMoveCursor( const KeyEvent& rKeyEvent ); static BOOL IsSimpleCharInput( const KeyEvent& rKeyEvent ); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/editstat.hxx ooo_cws_src680_ooo20031216_src/svx/inc/editstat.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/editstat.hxx 2003-12-29 17:01:41.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/editstat.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -127,7 +127,7 @@ EE_STAT_CRSRLEFTPARA zur Zeit bei Cursorbewegungen und Return. */ -inline void SetFlags( ULONG& rBits, const ULONG nMask, FASTBOOL bOn ) +inline void SetFlags( sal_uInt32& rBits, const ULONG nMask, FASTBOOL bOn ) { if ( bOn ) rBits |= nMask; @@ -139,7 +139,7 @@ { protected: ULONG nStatusBits; - ULONG nControlBits; + sal_uInt32 nControlBits; USHORT nPrevPara; // fuer EE_STAT_CRSRLEFTPARA public: @@ -152,8 +152,8 @@ ULONG GetStatusWord() const { return nStatusBits; } ULONG& GetStatusWord() { return nStatusBits; } - ULONG GetControlWord() const { return nControlBits; } - ULONG& GetControlWord() { return nControlBits; } + sal_uInt32 GetControlWord() const { return nControlBits; } + sal_uInt32& GetControlWord() { return nControlBits; } USHORT GetPrevParagraph() const { return nPrevPara; } USHORT& GetPrevParagraph() { return nPrevPara; } diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/editview.hxx ooo_cws_src680_ooo20031216_src/svx/inc/editview.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/editview.hxx 2003-12-29 17:01:41.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/editview.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -221,14 +221,14 @@ void RemoveAttribs( BOOL bRemoveParaAttribs = FALSE, USHORT nWhich = 0 ); void RemoveCharAttribs( USHORT nPara, USHORT nWhich = 0 ); - ULONG Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); - ULONG Write( SvStream& rOutput, EETextFormat eFormat ); + sal_uInt32 Read( SvStream& rInput, EETextFormat eFormat, BOOL bSelect = FALSE, SvKeyValueIterator* pHTTPHeaderAttrs = NULL ); + sal_uInt32 Write( SvStream& rOutput, EETextFormat eFormat ); void SetBackgroundColor( const Color& rColor ); Color GetBackgroundColor() const; - void SetControlWord( ULONG nWord ); - ULONG GetControlWord() const; + void SetControlWord( sal_uInt32 nWord ); + sal_uInt32 GetControlWord() const; EditTextObject* CreateTextObject(); void InsertText( const EditTextObject& rTextObject ); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/msdffimp.hxx ooo_cws_src680_ooo20031216_src/svx/inc/msdffimp.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/msdffimp.hxx 2003-12-29 17:01:41.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/msdffimp.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -728,7 +728,7 @@ BYTE& rVer, USHORT& rInst, USHORT& rFbt, - ULONG& rLength ); + sal_uInt32& rLength ); /* Konstruktor =========== @@ -779,7 +779,7 @@ void Scale(PolyPolygon& rPoly) const; void Scale(XPolygon& rPoly) const; void Scale(XPolyPolygon& rPoly) const; - void ScaleEmu(long& rVal) const; + void ScaleEmu(sal_Int32& rVal) const; UINT32 ScalePt( UINT32 nPt ) const; INT32 ScalePoint( INT32 nVal ) const; diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/outliner.hxx ooo_cws_src680_ooo20031216_src/svx/inc/outliner.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/outliner.hxx 2003-12-29 17:01:41.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/outliner.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -428,7 +428,7 @@ const SvxFont& rFont; - const long* pDXArray; + const sal_Int32* pDXArray; // #101498# BiDi level needs to be transported, too. BYTE mnBiDiLevel; @@ -437,7 +437,7 @@ sal_Bool IsRTL() const; DrawPortionInfo( const Point& rPos, const String& rTxt, USHORT nTxtStart, USHORT nTxtLen, - const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const long* pDXArr, BYTE nBiDiLevel) + const SvxFont& rFnt, USHORT nPar, xub_StrLen nIdx, const sal_Int32* pDXArr, BYTE nBiDiLevel) : rStartPos(rPos), rText(rTxt), rFont(rFnt), nPara(nPar), nIndex(nIdx), pDXArray(pDXArr), mnBiDiLevel(nBiDiLevel) { @@ -816,7 +816,7 @@ // #101498# virtual void DrawingText( const Point& rStartPos, const String& rText, USHORT nTextStart, USHORT nTextLen, - const long* pDXArray, const SvxFont& rFont, + const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft); Size CalcTextSize(); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/inc/svdmodel.hxx ooo_cws_src680_ooo20031216_src/svx/inc/svdmodel.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/inc/svdmodel.hxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/inc/svdmodel.hxx 2003-12-29 17:02:09.000000000 +0100 @@ -397,7 +397,7 @@ void ImpReformatAllEdgeObjects(); // #103122# void ImpCreateTables(); void ImpCtor(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, - FASTBOOL bLoadRefCounts = TRUE); + bool bLoadRefCounts = TRUE); #endif // __PRIVATE @@ -421,10 +421,10 @@ // Zeichenobjekte verwenden moechte. Setzt man degegen nur vom abstrakten // Basisobjekt SdrObject abgeleitete Objekte ein, so ist man frei in der // Wahl des Pools. - SdrModel(SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, INT32 bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, INT32 bLoadRefCounts = LOADREFCOUNTS); - SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts = LOADREFCOUNTS); - SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool=NULL, SvPersist* pPers=NULL, bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS); + SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts = LOADREFCOUNTS); virtual ~SdrModel(); void Clear(); // Intern genutzt: diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/accessibility/AccessibleContextBase.cxx ooo_cws_src680_ooo20031216_src/svx/source/accessibility/AccessibleContextBase.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/accessibility/AccessibleContextBase.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/accessibility/AccessibleContextBase.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -287,7 +287,7 @@ an exception for a wrong index. */ uno::Reference SAL_CALL - AccessibleContextBase::getAccessibleChild (long nIndex) + AccessibleContextBase::getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { ThrowIfDisposed (); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/tpline.cxx ooo_cws_src680_ooo20031216_src/svx/source/dialog/tpline.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/tpline.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/dialog/tpline.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -939,7 +939,7 @@ #endif VirtualDevice aVDev; aVDev.SetMapMode(MapMode(MAP_100TH_MM)); - SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS); + SdrModel* pModel = new SdrModel(NULL, NULL, (INT32) LOADREFCOUNTS); pModel->GetItemPool().FreezeIdRanges(); SdrPage* pPage = new SdrPage( *pModel, FALSE ); pPage->SetSize(Size(1000,1000)); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/transfrm.cxx ooo_cws_src680_ooo20031216_src/svx/source/dialog/transfrm.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/dialog/transfrm.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/dialog/transfrm.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -959,8 +959,8 @@ { if ( maMtrPosX.IsValueModified() || maMtrPosY.IsValueModified() ) { - long lX = GetCoreValue( maMtrPosX, mePoolUnit ); - long lY = GetCoreValue( maMtrPosY, mePoolUnit ); + sal_Int32 lX = GetCoreValue( maMtrPosX, mePoolUnit ); + sal_Int32 lY = GetCoreValue( maMtrPosY, mePoolUnit ); // Altes Rechteck mit CoreUnit maRect = mpView->GetAllMarkedRect(); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit2.cxx ooo_cws_src680_ooo20031216_src/svx/source/editeng/impedit2.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit2.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/editeng/impedit2.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -2802,14 +2802,14 @@ return aPaM; } -ULONG ImpEditEngine::GetTextHeight() const +sal_uInt32 ImpEditEngine::GetTextHeight() const { DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: GetTextHeight" ); DBG_ASSERT( IsFormatted() || IsFormatting(), "GetTextHeight: Nicht formatiert" ); return nCurTextHeight; } -ULONG ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) +sal_uInt32 ImpEditEngine::CalcTextWidth( BOOL bIgnoreExtraSpace ) { // Wenn noch nicht formatiert und nicht gerade dabei. // Wird in der Formatierung bei AutoPageSize gerufen. @@ -2875,7 +2875,7 @@ return (ULONG)nMaxWidth; } -ULONG ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace ) +sal_uInt32 ImpEditEngine::CalcLineWidth( ParaPortion* pPortion, EditLine* pLine, BOOL bIgnoreExtraSpace ) { USHORT nPara = GetEditDoc().GetPos( pPortion->GetNode() ); ULONG nOldLayoutMode = GetRefDevice()->GetLayoutMode(); @@ -2923,7 +2923,7 @@ return nWidth; } -ULONG ImpEditEngine::CalcTextHeight() +sal_uInt32 ImpEditEngine::CalcTextHeight() { DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=FALSE nicht verwendet werden: CalcTextHeight" ); ULONG nY = 0; @@ -2973,7 +2973,7 @@ return 0xFFFF; } -ULONG ImpEditEngine::GetParaHeight( USHORT nParagraph ) +sal_uInt32 ImpEditEngine::GetParaHeight( USHORT nParagraph ) { ULONG nHeight = 0; diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit4.cxx ooo_cws_src680_ooo20031216_src/svx/source/editeng/impedit4.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/editeng/impedit4.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/editeng/impedit4.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -2155,7 +2155,7 @@ xub_StrLen nLen = nCurrentEnd - nCurrentStart; - Sequence aOffsets; + Sequence aOffsets; String aNewText( aTranslitarationWrapper.transliterate( *pNode, nLanguage, nCurrentStart, nLen, &aOffsets ) ); if( ( nLen != aNewText.Len() ) || !pNode->Equals( aNewText, nCurrentStart, nLen ) ) @@ -2180,7 +2180,7 @@ // Change text without loosing the attributes USHORT nCharsAfterTransliteration = aOffsets.getLength(); - const long* pOffsets = aOffsets.getConstArray(); + const sal_Int32* pOffsets = aOffsets.getConstArray(); short nDiffs = 0; for ( USHORT n = 0; n < nCharsAfterTransliteration; n++ ) { diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/engine3d/poly3d.cxx ooo_cws_src680_ooo20031216_src/svx/source/engine3d/poly3d.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/engine3d/poly3d.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/engine3d/poly3d.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -3024,7 +3024,7 @@ ImpPolygonCutter::~ImpPolygonCutter() { while(aPolyList.Count()) - delete aPolyList.Remove((UINT32)0L); + delete aPolyList.Remove(0UL); } void ImpPolygonCutter::RemoveIncludedPolygons(BOOL bUseOr) @@ -3062,7 +3062,7 @@ ImpExtraPolyInfo& rInfo = pInfos[a]; if((bUseOr && rInfo.GetDepth() != 0) || (!bUseOr && rInfo.GetDepth() < 1)) - DeletePoly(aPolyList.Remove((UINT32)b)); + DeletePoly(aPolyList.Remove(b)); else b++; } @@ -3081,7 +3081,7 @@ // solve cuts while(rCuts.Count()) { - ImpSimpleCut* pCut = rCuts.Remove((UINT32)0L); + ImpSimpleCut* pCut = rCuts.Remove(0UL); pCut->Solve(); delete pCut; } @@ -3109,7 +3109,7 @@ void ImpPolygonCutter::PolysToList(ImpPolyNode*& rpList) { while(aPolyList.Count()) - AddAllNodes(aPolyList.Remove((UINT32)0L), rpList); + AddAllNodes(aPolyList.Remove(0UL), rpList); } void ImpPolygonCutter::ListToPolys(ImpPolyNode*& rpList) @@ -3182,7 +3182,7 @@ { while(aPolyList.Count()) { - ImpPolyNode* pCand = aPolyList.Remove((UINT32)0L); + ImpPolyNode* pCand = aPolyList.Remove(0UL); ImpPolyNode* pAct = pCand; UINT16 nCount(0); @@ -3209,7 +3209,7 @@ } while(aNotClosedPolys.Count()) - rPoly.Insert(aNotClosedPolys.Remove(0L)); + rPoly.Insert(aNotClosedPolys.Remove(0UL)); } ImpSimpleCut* ImpPolygonCutter::GetExistingCut(ImpSimpleCutList& rTmpCuts, ImpPolyNode* pA, ImpPolyNode* pB) @@ -3230,7 +3230,7 @@ // remove all nodes of this poly from list ImpPolyNode* pAct = pStart; - UINT32 nNumNodes(0L); + UINT32 nNumNodes(0UL); do { pAct->RemFromList(rpList); pAct = pAct->GetNext(); @@ -3338,7 +3338,7 @@ // copy new cuts to cuts while(aNewCuts.Count()) - aCuts.Insert(aNewCuts.Remove((UINT32)0L)); + aCuts.Insert(aNewCuts.Remove(0UL)); } // second job: if there were cuts, split polys @@ -3595,7 +3595,7 @@ // this cuts enter/leave a common same-direction section between // polygons pCandA, pCandB. If it is a real crossover, a cutpoint // for it is needed, else it can be ignored. - ImpSimpleCut* pCutA = aTmpCuts.Remove((UINT32)0L); + ImpSimpleCut* pCutA = aTmpCuts.Remove(0UL); ImpPolyNode* pActA = pCutA->GetLeft(); ImpPolyNode* pActB = pCutA->GetRight(); BOOL bPrevSamePos(IsPrevSamePos(pActA, pActB)); @@ -3663,7 +3663,7 @@ // copy new cuts to all cuts while(aNewCuts.Count()) - aCuts.Insert(aNewCuts.Remove((UINT32)0L), LIST_APPEND); + aCuts.Insert(aNewCuts.Remove(0UL), LIST_APPEND); } } } diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/GraphCtlAccessibleContext.hxx ooo_cws_src680_ooo20031216_src/svx/source/inc/GraphCtlAccessibleContext.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/GraphCtlAccessibleContext.hxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/inc/GraphCtlAccessibleContext.hxx 2003-12-29 17:02:10.000000000 +0100 @@ -210,8 +210,8 @@ //===== XAccessibleContext ============================================== - virtual long SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (long nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); + virtual sal_Int32 SAL_CALL getAccessibleChildCount (void) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleChild (sal_Int32 nIndex) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL getAccessibleParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getAccessibleRole (void) throw (::com::sun::star::uno::RuntimeException); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/svxrectctaccessiblecontext.hxx ooo_cws_src680_ooo20031216_src/svx/source/inc/svxrectctaccessiblecontext.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/inc/svxrectctaccessiblecontext.hxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/inc/svxrectctaccessiblecontext.hxx 2003-12-29 17:02:10.000000000 +0100 @@ -225,11 +225,11 @@ //===== XAccessibleContext ============================================== - virtual long SAL_CALL + virtual sal_Int32 SAL_CALL getAccessibleChildCount( void ) 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, ::com::sun::star::lang::IndexOutOfBoundsException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible> SAL_CALL diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/msfilter/msdffimp.cxx ooo_cws_src680_ooo20031216_src/svx/source/msfilter/msdffimp.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/msfilter/msdffimp.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/msfilter/msdffimp.cxx 2003-12-29 17:02:10.000000000 +0100 @@ -1865,7 +1865,7 @@ Scale( rPoly[ nPolyNum ] ); } -void SvxMSDffManager::ScaleEmu( long& rVal ) const +void SvxMSDffManager::ScaleEmu( sal_Int32& rVal ) const { rVal = BigMulDiv( rVal, nEmuMul, nEmuDiv ); } @@ -2966,7 +2966,7 @@ aObjData.bChildAnchor = maShapeRecords.SeekToContent( rSt, DFF_msofbtChildAnchor, SEEK_FROM_CURRENT_AND_RESTART ); if ( aObjData.bChildAnchor ) { - INT32 l, o, r, u; + long l, o, r, u; rSt >> l >> o >> r >> u; Scale( l ); Scale( o ); @@ -4158,7 +4158,7 @@ BYTE nVer; USHORT nInst; USHORT nFbt; - ULONG nLength; + sal_uInt32 nLength; if( !this->ReadCommonRecordHeader( rStCtrl, nVer, nInst, nFbt, nLength ) ) return; BOOL bOk; @@ -4203,7 +4203,7 @@ BYTE nVer; USHORT nInst; USHORT nFbt; - ULONG nLength; + sal_uInt32 nLength; ULONG nLenBStoreCont = 0, nLenFBSE = 0, nRead = 0; @@ -4288,7 +4288,7 @@ // void SvxMSDffManager::GetDrawingContainerData( SvStream& rSt, ULONG nLenDg ) { - BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength; + BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength; ULONG nReadDg = 0; @@ -4321,7 +4321,7 @@ ULONG nLenShapeGroupCont, BOOL bPatriarch ) { - BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength; + BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength; long nStartShapeGroupCont = rSt.Tell(); // Wir stehen in einem Shape Group Container (ggfs. mehrere pro Seite) // und muessen nun @@ -4360,7 +4360,7 @@ BOOL SvxMSDffManager::GetShapeContainerData( SvStream& rSt, ULONG nLenShapeCont, ULONG nPosGroup ) { - BYTE nVer;USHORT nInst;USHORT nFbt;ULONG nLength; + BYTE nVer;USHORT nInst;USHORT nFbt;sal_uInt32 nLength; long nStartShapeCont = rSt.Tell(); // Wir stehen in einem Shape Container (ggfs. mehrere pro Sh. Group) // und muessen nun @@ -4725,7 +4725,7 @@ int nRes = GRFILTER_OPENERROR; // Fehlervariable initialisieren // nachschauen, ob es sich auch wirklich um ein BLIP handelt - ULONG nLength; + sal_uInt32 nLength; USHORT nInst, nFbt; BYTE nVer; if( ReadCommonRecordHeader( rBLIPStream, nVer, nInst, nFbt, nLength) && ( 0xF018 <= nFbt ) && ( 0xF117 >= nFbt ) ) @@ -4926,7 +4926,7 @@ BYTE& rVer, USHORT& rInst, USHORT& rFbt, - ULONG& rLength ) + sal_uInt32& rLength ) { sal_uInt16 nTmp; rSt >> nTmp >> rFbt >> rLength; diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.cxx ooo_cws_src680_ooo20031216_src/svx/source/outliner/outleeng.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/outliner/outleeng.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -169,7 +169,7 @@ } // #101498# -void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft) +void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft) { if ( nIndex == 0 ) { diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.hxx ooo_cws_src680_ooo20031216_src/svx/source/outliner/outleeng.hxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outleeng.hxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/outliner/outleeng.hxx 2003-12-29 17:02:11.000000000 +0100 @@ -86,7 +86,7 @@ virtual void ParagraphDeleted( USHORT nDeletedParagraph ); // #101498# - virtual void DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft); + virtual void DrawingText(const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft); virtual void StyleSheetChanged( SfxStyleSheet* pStyle ); virtual void ParaAttribsChanged( USHORT nPara ); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outliner.cxx ooo_cws_src680_ooo20031216_src/svx/source/outliner/outliner.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/outliner/outliner.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/outliner/outliner.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -1195,7 +1195,7 @@ else { Font aSvxFont( aBulletFont ); - long* pBuf = new long[ pPara->GetText().Len() ]; + sal_Int32* pBuf = new sal_Int32[ pPara->GetText().Len() ]; pOutDev->GetTextArray( pPara->GetText(), pBuf ); // aTextPos ist Bottom, jetzt die Baseline liefern: FontMetric aMetric( pOutDev->GetFontMetric() ); @@ -2039,7 +2039,7 @@ } // #101498# -void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const long* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft) +void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft) { DBG_CHKTHIS(Outliner,0); diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdedtv2.cxx ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdedtv2.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdedtv2.cxx 2003-12-29 17:01:42.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdedtv2.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -847,7 +847,7 @@ // clear list while(aEntryList.Count()) - delete aEntryList.Remove((UINT32)0L); + delete aEntryList.Remove(0UL); } if(eVer != SvxDistributeVerticalNone) @@ -935,7 +935,7 @@ // clear list while(aEntryList.Count()) - delete aEntryList.Remove((UINT32)0L); + delete aEntryList.Remove(0UL); } // UNDO-Comment and end of UNDO diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdmodel.cxx ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdmodel.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdmodel.cxx 2003-12-29 17:01:43.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdmodel.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -336,7 +336,7 @@ TYPEINIT1(SdrModel,SfxBroadcaster); void SdrModel::ImpCtor(SfxItemPool* pPool, SvPersist* pPers, - FASTBOOL bUseExtColorTable, FASTBOOL bLoadRefCounts) + FASTBOOL bUseExtColorTable, bool bLoadRefCounts) { mbInDestruction=false; aObjUnit=SdrEngineDefaults::GetMapFraction(); @@ -451,7 +451,7 @@ ImpCreateTables(); } -SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts): aInfo(TRUE), maPages(1024,32,32), maMaPag(1024,32,32) @@ -464,7 +464,7 @@ ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts); } -SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, INT32 bLoadRefCounts): +SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, bool bLoadRefCounts): aInfo(TRUE), maPages(1024,32,32), maMaPag(1024,32,32), @@ -478,7 +478,7 @@ ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts); } -SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts): +SdrModel::SdrModel(SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts): aInfo(TRUE), maPages(1024,32,32), maMaPag(1024,32,32) @@ -491,7 +491,7 @@ ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts); } -SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, INT32 bLoadRefCounts): +SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, SvPersist* pPers, FASTBOOL bUseExtColorTable, bool bLoadRefCounts): aInfo(TRUE), maPages(1024,32,32), maMaPag(1024,32,32), diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdoattr.cxx ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdoattr.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdoattr.cxx 2003-12-29 17:01:43.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdoattr.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -561,11 +561,11 @@ nSttWdt /= 2; // Lieber etwas mehr, dafuer keine Wurzel ziehen - long nSttAdd = Max(nSttWdt, nSttHgt); + sal_Int32 nSttAdd = Max(nSttWdt, nSttHgt); nSttAdd *= 3; nSttAdd /= 2; - long nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue(); + sal_Int32 nEndWdt = ((const XLineEndWidthItem&)(rSet.Get(XATTR_LINEENDWIDTH))).GetValue(); if(nEndWdt < 0) nEndWdt = -nLineWdt * nEndWdt / 100; // <0 = relativ diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdobj.cxx ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdobj.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdobj.cxx 2003-12-29 17:01:43.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdobj.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -2168,7 +2168,7 @@ ImpSkeleton::~ImpSkeleton() { while(maList.Count()) - delete maList.Remove((UINT32)0L); + delete maList.Remove(0UL); } BOOL ImpSkeleton::ImpSimpleFindCutPoint( diff -urN ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdopath.cxx ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdopath.cxx --- ooo_cws_src680_ooo20031216_src.orig/svx/source/svdraw/svdopath.cxx 2003-12-29 17:01:43.000000000 +0100 +++ ooo_cws_src680_ooo20031216_src/svx/source/svdraw/svdopath.cxx 2003-12-29 17:02:11.000000000 +0100 @@ -3330,8 +3330,8 @@ XPolygon& rPoly = rPolyPolygon[a]; for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++) { - rPoly[b].X() = ImplTwipsToMM(rPoly[b].X()); - rPoly[b].Y() = ImplTwipsToMM(rPoly[b].Y()); + rPoly[b].X() = ImplTwipsToMM((double)rPoly[b].X()); + rPoly[b].Y() = ImplTwipsToMM((double)rPoly[b].Y()); } } @@ -3401,8 +3401,8 @@ XPolygon& rPoly = aNewPolyPolygon[a]; for(sal_uInt16 b(0); b < rPoly.GetPointCount(); b++) { - rPoly[b].X() = ImplMMToTwips(rPoly[b].X()); - rPoly[b].Y() = ImplMMToTwips(rPoly[b].Y()); + rPoly[b].X() = ImplMMToTwips((double)rPoly[b].X()); + rPoly[b].Y() = ImplMMToTwips((double)rPoly[b].Y()); } }