diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-12 15:56:50 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-12 15:56:50 +0100 |
| commit | 1c90aa6d259d8ae21552856c1407ff6f1b3a13a1 (patch) | |
| tree | 6390d42b808cbd3dc65dba8dde031b0342126563 | |
| parent | b7f5f44df674c7e47a8c1597bf082a8292b14efd (diff) | |
removetooltypes01: Exchange misleading type sal_uIntPtr with sal_uLong
130 files changed, 1221 insertions, 1225 deletions
diff --git a/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx index 6b28af103717..ee836cc4a5e5 100644 --- a/svtools/bmpmaker/bmpcore.hxx +++ b/svtools/bmpmaker/bmpcore.hxx @@ -71,7 +71,7 @@ private: Size aTotSize; Point aPos; SvFileStream* pSRS; - sal_uIntPtr nTotCount; + sal_uLong nTotCount; sal_uInt16 nPos; void ImplCreate( const ::std::vector< DirEntry >& rInDirs, diff --git a/svtools/inc/svtools/asynclink.hxx b/svtools/inc/svtools/asynclink.hxx index efc8afac1064..d5aebd370966 100644 --- a/svtools/inc/svtools/asynclink.hxx +++ b/svtools/inc/svtools/asynclink.hxx @@ -44,7 +44,7 @@ namespace svtools { class SVT_DLLPUBLIC AsynchronLink { Link _aLink; - sal_uIntPtr _nEventId; + sal_uLong _nEventId; Timer* _pTimer; sal_Bool _bInCall; sal_Bool* _pDeleted; diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx index 699890d02e5b..80717947912a 100644 --- a/svtools/inc/svtools/brwbox.hxx +++ b/svtools/inc/svtools/brwbox.hxx @@ -67,7 +67,7 @@ namespace utl { #define BROWSER_INVALIDID USHRT_MAX #define BROWSER_ENDOFSELECTION (long)(SFX_ENDOFSELECTION) -typedef sal_uIntPtr BrowserMode; +typedef sal_uLong BrowserMode; #define BROWSER_COLUMNSELECTION 0x0001 #define BROWSER_MULTISELECTION 0x0002 @@ -254,7 +254,7 @@ class SVT_DLLPUBLIC BrowseBox long nDataRowHeight; // height of a single data-row sal_uInt16 nTitleLines; // number of lines in title row - sal_uIntPtr nControlAreaWidth; // width of fixed area beneeth hscroll + sal_uLong nControlAreaWidth; // width of fixed area beneeth hscroll sal_Bool bThumbDragging; // handle thumb dragging sal_Bool bColumnCursor; // single columns and fields selectable sal_Bool bMultiSelection;// allow multiple selected rows @@ -452,7 +452,7 @@ public: virtual void GetFocus(); virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Command( const CommandEvent& rEvt ); virtual void StartDrag( sal_Int8 _nAction, const Point& _rPosPixel ); @@ -495,7 +495,7 @@ public: const Color& GetGridLineColor() const {return aGridLineColor;} // inserting, changing, removing and freezing of columns - void InsertHandleColumn( sal_uIntPtr nWidth ); + void InsertHandleColumn( sal_uLong nWidth ); void InsertDataColumn( sal_uInt16 nItemId, const Image& rImage, long nSize, HeaderBarItemBits nBits = HIB_STDSTYLE, sal_uInt16 nPos = HEADERBAR_APPEND ); @@ -510,7 +510,7 @@ public: const String* pHelpText = 0 ); void SetColumnTitle( sal_uInt16 nColumnId, const String &rTitle ); void SetColumnMode( sal_uInt16 nColumnId, BrowserColumnMode nFlags ); - void SetColumnWidth( sal_uInt16 nColumnId, sal_uIntPtr nWidth ); + void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth ); void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ); void FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True ); void UnfreezeColumns(); @@ -528,7 +528,7 @@ public: String GetColumnTitle( sal_uInt16 nColumnId ) const; BrowserColumnMode GetColumnMode( sal_uInt16 nColumnId ) const; Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; - sal_uIntPtr GetColumnWidth( sal_uInt16 nColumnId ) const; + sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const; sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; sal_Bool IsFrozen( sal_uInt16 nColumnId ) const; @@ -628,7 +628,7 @@ public: The width is calculated so that the text fits completely, plus som margin. */ - sal_uIntPtr GetDefaultColumnWidth( const String& _rText ) const; + sal_uLong GetDefaultColumnWidth( const String& _rText ) const; /** GetCellText returns the text at the given position @param _nRow diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx index 1fe0013e055e..61e75705ba01 100644 --- a/svtools/inc/svtools/calendar.hxx +++ b/svtools/inc/svtools/calendar.hxx @@ -203,7 +203,7 @@ private: Color* mpStandardColor; Color* mpSaturdayColor; Color* mpSundayColor; - sal_uIntPtr mnDayCount; + sal_uLong mnDayCount; long mnDaysOffX; long mnWeekDayOffY; long mnDaysOffY; @@ -261,7 +261,7 @@ private: sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, sal_Bool bBack = sal_True, sal_Bool bOther = sal_False, - sal_uIntPtr nToday = 0 ); + sal_uLong nToday = 0 ); SVT_DLLPRIVATE void ImplDraw( sal_Bool bPaint = sal_False ); SVT_DLLPRIVATE void ImplUpdateDate( const Date& rDate ); SVT_DLLPRIVATE void ImplUpdateSelection( Table* pOld ); @@ -321,8 +321,8 @@ public: sal_Bool bSelect = sal_True ); void SetNoSelection(); sal_Bool IsDateSelected( const Date& rDate ) const; - sal_uIntPtr GetSelectDateCount() const; - Date GetSelectDate( sal_uIntPtr nIndex = 0 ) const; + sal_uLong GetSelectDateCount() const; + Date GetSelectDate( sal_uLong nIndex = 0 ) const; void EnableCallEverySelect( sal_Bool bEvery = sal_True ) { mbAllSel = bEvery; } sal_Bool IsCallEverySelectEnabled() const { return mbAllSel; } @@ -332,7 +332,7 @@ public: void SetFirstDate( const Date& rNewFirstDate ); Date GetFirstDate() const { return maFirstDate; } Date GetLastDate() const { return GetFirstDate() + mnDayCount; } - sal_uIntPtr GetDayCount() const { return mnDayCount; } + sal_uLong GetDayCount() const { return mnDayCount; } Date GetFirstMonth() const; Date GetLastMonth() const; sal_uInt16 GetMonthCount() const; diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx index 91587bef7f28..8444951a8623 100644 --- a/svtools/inc/svtools/ctrltool.hxx +++ b/svtools/inc/svtools/ctrltool.hxx @@ -175,7 +175,7 @@ private: OutputDevice* mpDev2; #ifdef CTRLTOOL_CXX - SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uIntPtr* pIndex ) const; + SVT_DLLPRIVATE ImplFontListNameInfo* ImplFind( const XubString& rSearchName, sal_uLong* pIndex ) const; SVT_DLLPRIVATE ImplFontListNameInfo* ImplFindByName( const XubString& rStr ) const; SVT_DLLPRIVATE void ImplInsertFonts( OutputDevice* pDev, sal_Bool bAll, sal_Bool bInsertData ); @@ -233,19 +233,19 @@ class SVT_DLLPUBLIC FontSizeNames { private: struct ImplFSNameItem* mpArray; - sal_uIntPtr mnElem; + sal_uLong mnElem; public: FontSizeNames( LanguageType eLanguage /* = LANGUAGE_DONTKNOW */ ); - sal_uIntPtr Count() const { return mnElem; } + sal_uLong Count() const { return mnElem; } sal_Bool IsEmpty() const { return !mnElem; } long Name2Size( const String& ) const; String Size2Name( long ) const; - String GetIndexName( sal_uIntPtr nIndex ) const; - long GetIndexSize( sal_uIntPtr nIndex ) const; + String GetIndexName( sal_uLong nIndex ) const; + long GetIndexSize( sal_uLong nIndex ) const; }; #endif // _CTRLTOOL_HXX diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx index 5bc2d14f752c..24a8baa8ac4b 100644 --- a/svtools/inc/svtools/editbrowsebox.hxx +++ b/svtools/inc/svtools/editbrowsebox.hxx @@ -302,7 +302,7 @@ namespace svt virtual void GetFocus(); virtual long PreNotify(NotifyEvent& rEvt); virtual void Paint(const Rectangle& rClientRect); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& _rEvent ); virtual void Resize(); @@ -487,7 +487,7 @@ namespace svt CellControllerRef aController, aOldController; - sal_uIntPtr nStartEvent, nEndEvent, nCellModifiedEvent; // event ids + sal_uLong nStartEvent, nEndEvent, nCellModifiedEvent; // event ids Window* m_pFocusWhileRequest; // In ActivateCell, we grab the focus asynchronously, but if between requesting activation // and the asynchornous event the focus has changed, we won't grab it for ourself. diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx index 88ea6cf9ef70..56255f48f2f2 100644 --- a/svtools/inc/svtools/ehdl.hxx +++ b/svtools/inc/svtools/ehdl.hxx @@ -48,7 +48,7 @@ public: SfxErrorContext( sal_uInt16 nCtxIdP, const String &aArg1, Window *pWin=0, sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=0); - virtual sal_Bool GetString(sal_uIntPtr nErrId, String &rStr); + virtual sal_Bool GetString(sal_uLong nErrId, String &rStr); private: sal_uInt16 nCtxId; @@ -60,23 +60,23 @@ private: class SVT_DLLPUBLIC SfxErrorHandler : private ErrorHandler { public: - SfxErrorHandler(sal_uInt16 nId, sal_uIntPtr lStart, sal_uIntPtr lEnd, ResMgr *pMgr=0); + SfxErrorHandler(sal_uInt16 nId, sal_uLong lStart, sal_uLong lEnd, ResMgr *pMgr=0); ~SfxErrorHandler(); protected: - virtual sal_Bool GetErrorString(sal_uIntPtr lErrId, String &, sal_uInt16&) const; - virtual sal_Bool GetMessageString(sal_uIntPtr lErrId, String &, sal_uInt16&) const; + virtual sal_Bool GetErrorString(sal_uLong lErrId, String &, sal_uInt16&) const; + virtual sal_Bool GetMessageString(sal_uLong lErrId, String &, sal_uInt16&) const; private: - sal_uIntPtr lStart; - sal_uIntPtr lEnd; + sal_uLong lStart; + sal_uLong lEnd; sal_uInt16 nId; ResMgr *pMgr; ResMgr *pFreeMgr; //#if 0 // _SOLAR__PRIVATE - SVT_DLLPRIVATE sal_Bool GetClassString(sal_uIntPtr lErrId, String &) const; + SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, String &) const; //#endif virtual sal_Bool CreateString( const ErrorInfo *, String &, sal_uInt16 &) const; diff --git a/svtools/inc/svtools/filectrl.hxx b/svtools/inc/svtools/filectrl.hxx index c88689ea0338..97475c8b38ca 100644 --- a/svtools/inc/svtools/filectrl.hxx +++ b/svtools/inc/svtools/filectrl.hxx @@ -80,7 +80,7 @@ public: Edit& GetEdit() { return maEdit; } PushButton& GetButton() { return maButton; } - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); void SetOpenDialog( sal_Bool bOpen ) { mbOpenDlg = bOpen; } sal_Bool IsOpenDialog() const { return mbOpenDlg; } diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx index cf1c624a2488..a88009ffa7c3 100644 --- a/svtools/inc/svtools/fileview.hxx +++ b/svtools/inc/svtools/fileview.hxx @@ -189,7 +189,7 @@ public: void SetDoubleClickHdl( const Link& rHdl ); void SetOpenDoneHdl( const Link& rHdl ); - sal_uIntPtr GetSelectionCount() const; + sal_uLong GetSelectionCount() const; SvLBoxEntry* FirstSelected() const; SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const; void EnableAutoResize(); diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx index b5c380b8651c..66c80dde2d79 100644 --- a/svtools/inc/svtools/filter.hxx +++ b/svtools/inc/svtools/filter.hxx @@ -236,8 +236,8 @@ public: struct FilterErrorEx { - sal_uIntPtr nFilterError; - sal_uIntPtr nStreamError; + sal_uLong nFilterError; + sal_uLong nStreamError; long nDummy1; long nDummy2; long nDummy3; @@ -257,7 +257,7 @@ class SVT_DLLPUBLIC GraphicFilter private: void ImplInit(); - sal_uIntPtr ImplSetError( sal_uIntPtr nError, const SvStream* pStm = NULL ); + sal_uLong ImplSetError( sal_uLong nError, const SvStream* pStm = NULL ); sal_uInt16 ImpTestOrFindFormat( const String& rPath, SvStream& rStream, sal_uInt16& rFormat ); DECL_LINK( FilterCallback, ConvertData* pData ); diff --git a/svtools/inc/svtools/fltdefs.hxx b/svtools/inc/svtools/fltdefs.hxx index ee76739fb8c7..fa987d912588 100644 --- a/svtools/inc/svtools/fltdefs.hxx +++ b/svtools/inc/svtools/fltdefs.hxx @@ -72,7 +72,7 @@ typedef sal_uInt8* PDIBBYTE; #if defined ( OS2 ) || defined ( UNX ) -void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uIntPtr nOffBits = 0 ); +void ReadBitmap( SvStream& rIStream, Bitmap& rBmp, sal_uInt16 nDefaultHeight = 0, sal_uLong nOffBits = 0 ); void ReplaceInfoHeader( SvStream& rStm, sal_uInt8* pBuffer ); #ifdef OS2 diff --git a/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx index c6caf4e89d42..77c00a805602 100644 --- a/svtools/inc/svtools/fmtfield.hxx +++ b/svtools/inc/svtools/fmtfield.hxx @@ -60,7 +60,7 @@ private: class StaticFormatter { static SvNumberFormatter* s_cFormatter; - static sal_uIntPtr s_nReferences; + static sal_uLong s_nReferences; public: StaticFormatter(); ~StaticFormatter(); @@ -89,7 +89,7 @@ protected: double m_dCurrentValue; double m_dDefaultValue; - sal_uIntPtr m_nFormatKey; + sal_uLong m_nFormatKey; SvNumberFormatter* m_pFormatter; StaticFormatter m_aStaticFormatter; @@ -146,8 +146,8 @@ public: double GetDefaultValue() const { return m_dDefaultValue; } // Einstellungen fuer das Format - sal_uIntPtr GetFormatKey() const { return m_nFormatKey; } - void SetFormatKey(sal_uIntPtr nFormatKey); + sal_uLong GetFormatKey() const { return m_nFormatKey; } + void SetFormatKey(sal_uLong nFormatKey); SvNumberFormatter* GetFormatter() const { return m_pFormatter; } void SetFormatter(SvNumberFormatter* pFormatter, sal_Bool bResetFormat = sal_True); @@ -267,7 +267,7 @@ protected: void ImplSetValue(double dValue, sal_Bool bForce); sal_Bool ImplGetValue(double& dNewVal); - void ImplSetFormatKey(sal_uIntPtr nFormatKey); + void ImplSetFormatKey(sal_uLong nFormatKey); // SetFormatKey without FormatChanged notification virtual SvNumberFormatter* CreateFormatter() { SetFormatter(StandardFormatter()); return m_pFormatter; } diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx index e0f2edbe5994..9841d4e312ef 100644 --- a/svtools/inc/svtools/grfmgr.hxx +++ b/svtools/inc/svtools/grfmgr.hxx @@ -127,8 +127,8 @@ public: void SetDrawMode( GraphicDrawMode eDrawMode ) { meDrawMode = eDrawMode; } GraphicDrawMode GetDrawMode() const { return meDrawMode; } - void SetMirrorFlags( sal_uIntPtr nMirrFlags ) { mnMirrFlags = nMirrFlags; } - sal_uIntPtr GetMirrorFlags() const { return mnMirrFlags; } + void SetMirrorFlags( sal_uLong nMirrFlags ) { mnMirrFlags = nMirrFlags; } + sal_uLong GetMirrorFlags() const { return mnMirrFlags; } void SetCrop( long nLeft_100TH_MM, long nTop_100TH_MM, long nRight_100TH_MM, long nBottom_100TH_MM ) { @@ -202,7 +202,7 @@ private: GraphicAttr maAttr; Size maPrefSize; MapMode maPrefMapMode; - sal_uIntPtr mnSizeBytes; + sal_uLong mnSizeBytes; GraphicType meType; GraphicManager* mpMgr; String* mpLink; @@ -210,7 +210,7 @@ private: String* mpUserData; Timer* mpSwapOutTimer; GrfSimpleCacheObj* mpSimpleCache; - sal_uIntPtr mnAnimationLoopCount; + sal_uLong mnAnimationLoopCount; void* mpDummy1; void* mpDummy2; sal_Bool mbAutoSwapped : 1; @@ -276,22 +276,22 @@ private: bool SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, - const GraphicAttr* pAttr, sal_uIntPtr nFlags ); + const GraphicAttr* pAttr, sal_uLong nFlags ); /// internally called by ImplRenderTempTile() bool SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor, int nNumOrigTilesX, int nNumOrigTilesY, int nRemainderTilesX, int nRemainderTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, - sal_uIntPtr nFlags, ImplTileInfo& rTileInfo ); + sal_uLong nFlags, ImplTileInfo& rTileInfo ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, - const Size& rOffset, const GraphicAttr* pAttr, sal_uIntPtr nFlags, int nTileCacheSize1D ); + const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ); bool SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos, int nNumTilesX, int nNumTilesY, const Size& rTileSize, - const GraphicAttr* pAttr, sal_uIntPtr nFlags ); + const GraphicAttr* pAttr, sal_uLong nFlags ); void SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx& rBmpEx, const GraphicAttr& rAttr, @@ -309,7 +309,7 @@ protected: virtual SvStream* GetSwapStream() const; // !!! to be removed - virtual sal_uIntPtr GetReleaseFromCache() const; + virtual sal_uLong GetReleaseFromCache() const; virtual void Load( SvStream& ); virtual void Save( SvStream& ); @@ -332,9 +332,9 @@ public: sal_Bool HasSwapStreamHdl() const { return( mpSwapStreamHdl != NULL && mpSwapStreamHdl->IsSet() ); } void SetSwapStreamHdl(); - void SetSwapStreamHdl( const Link& rHdl, const sal_uIntPtr nSwapOutTimeout = 0UL ); + void SetSwapStreamHdl( const Link& rHdl, const sal_uLong nSwapOutTimeout = 0UL ); Link GetSwapStreamHdl() const; - sal_uIntPtr GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } + sal_uLong GetSwapOutTimeout() const { return( mpSwapOutTimer ? mpSwapOutTimer->GetTimeout() : 0 ); } void FireSwapInRequest(); void FireSwapOutRequest(); @@ -343,7 +343,7 @@ public: GraphicManager& GetGraphicManager() const { return *mpMgr; } sal_Bool IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD) const; + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD) const; void ReleaseFromCache(); const Graphic& GetGraphic() const; @@ -396,8 +396,8 @@ public: GraphicType GetType() const { return meType; } const Size& GetPrefSize() const { return maPrefSize; } const MapMode& GetPrefMapMode() const { return maPrefMapMode; } - sal_uIntPtr GetSizeBytes() const { return mnSizeBytes; } - sal_uIntPtr GetChecksum() const; + sal_uLong GetSizeBytes() const { return mnSizeBytes; } + sal_uLong GetChecksum() const; sal_Bool IsTransparent() const { return mbTransparent; } sal_Bool IsAlpha() const { return mbAlpha; } sal_Bool IsAnimated() const { return mbAnimated; } @@ -420,12 +420,12 @@ public: void SetSwapState(); sal_Bool Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD ); + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD ); sal_Bool DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr = NULL, - const sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD ); + const sal_uLong nFlags = GRFMGR_DRAW_STANDARD ); /** Draw the graphic repeatedly into the given output rectangle @@ -462,10 +462,10 @@ public: */ sal_Bool DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, const Size& rOffset, const GraphicAttr* pAttr = NULL, - sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); + sal_uLong nFlags = GRFMGR_DRAW_STANDARD, int nTileCacheSize1D=128 ); sal_Bool StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, long nExtraData = 0L, - const GraphicAttr* pAttr = NULL, sal_uIntPtr nFlags = GRFMGR_DRAW_STANDARD, + const GraphicAttr* pAttr = NULL, sal_uLong nFlags = GRFMGR_DRAW_STANDARD, OutputDevice* pFirstFrameOutDev = NULL ); void StopAnimation( OutputDevice* pOut = NULL, long nExtraData = 0L ); @@ -496,15 +496,15 @@ private: sal_Bool SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, sal_Bool& rCached ); + const sal_uLong nFlags, sal_Bool& rCached ); sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, BitmapEx* pBmpEx = NULL ); + const sal_uLong nFlags, BitmapEx* pBmpEx = NULL ); sal_Bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); + const sal_uLong nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ); sal_Bool SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx, long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY, @@ -517,9 +517,9 @@ private: long nStartX, long nEndX, long nStartY, long nEndY, BitmapEx& rOutBmpEx ); - static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); - static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); + static void SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ); static void SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr ); @@ -540,20 +540,20 @@ private: public: - GraphicManager( sal_uIntPtr nCacheSize = 10000000UL, sal_uIntPtr nMaxObjCacheSize = 2400000UL ); + GraphicManager( sal_uLong nCacheSize = 10000000UL, sal_uLong nMaxObjCacheSize = 2400000UL ); ~GraphicManager(); - void SetMaxCacheSize( sal_uIntPtr nNewCacheSize ); - sal_uIntPtr GetMaxCacheSize() const; + void SetMaxCacheSize( sal_uLong nNewCacheSize ); + sal_uLong GetMaxCacheSize() const; - void SetMaxObjCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); - sal_uIntPtr GetMaxObjCacheSize() const; + void SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); + sal_uLong GetMaxObjCacheSize() const; - sal_uIntPtr GetUsedCacheSize() const; - sal_uIntPtr GetFreeCacheSize() const; + sal_uLong GetUsedCacheSize() const; + sal_uLong GetFreeCacheSize() const; - void SetCacheTimeout( sal_uIntPtr nTimeoutSeconds ); - sal_uIntPtr GetCacheTimeout() const; + void SetCacheTimeout( sal_uLong nTimeoutSeconds ); + sal_uLong GetCacheTimeout() const; void ClearCache(); @@ -564,7 +564,7 @@ public: sal_Bool DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, sal_Bool& rCached ); + const sal_uLong nFlags, sal_Bool& rCached ); }; #endif // _GRFMGR_HXX diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index dfb4f9ffc927..106184e040f6 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -282,7 +282,7 @@ private: sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, const Rectangle& rItemRect, const Rectangle* pRect, - sal_uIntPtr nFlags ); + sal_uLong nFlags ); SVT_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHigh = sal_False, sal_Bool bDrag = sal_False, const Rectangle* pRect = NULL ); @@ -302,7 +302,7 @@ public: virtual void MouseMove( const MouseEvent& rMEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx index fd96d0547240..dbb8d63914a2 100644 --- a/svtools/inc/svtools/htmlout.hxx +++ b/svtools/inc/svtools/htmlout.hxx @@ -79,7 +79,7 @@ struct HTMLOutFuncs SVT_DLLPUBLIC static SvStream& Out_String( SvStream&, const String&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); - SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uIntPtr nHex, sal_uInt8 nLen, + SVT_DLLPUBLIC static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); SVT_DLLPUBLIC static SvStream& Out_Color( SvStream&, const Color&, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252 ); @@ -113,7 +113,7 @@ struct HTMLOutFuncs // <TD SDVAL="..." SDNUM="..."> SVT_DLLPUBLIC static ByteString& CreateTableDataOptionsValNum( ByteString& aStrTD, - sal_Bool bValue, double fVal, sal_uIntPtr nFormat, + sal_Bool bValue, double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, String *pNonConvertableChars = 0 ); diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx index 6e3093cb3b57..e43d97eef9b9 100644 --- a/svtools/inc/svtools/imap.hxx +++ b/svtools/inc/svtools/imap.hxx @@ -58,8 +58,8 @@ protected: // Im-/Export void ImpWriteCERN( SvStream& rOStm, const String& rBaseURL ) const; void ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const; - sal_uIntPtr ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); - sal_uIntPtr ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); + sal_uLong ImpReadCERN( SvStream& rOStm, const String& rBaseURL ); + sal_uLong ImpReadNCSA( SvStream& rOStm, const String& rBaseURL ); void ImpReadCERNLine( const ByteString& rLine, const String& rBaseURL ); Point ImpReadCERNCoords( const char** ppStr ); @@ -70,7 +70,7 @@ protected: String ImpReadNCSAURL( const char** ppStr, const String& rBaseURL ); Point ImpReadNCSACoords( const char** ppStr ); - sal_uIntPtr ImpDetectFormat( SvStream& rIStm ); + sal_uLong ImpDetectFormat( SvStream& rIStm ); public: @@ -112,7 +112,7 @@ public: IMapObject* GetHitIMapObject( const Size& rOriginalSize, const Size& rDisplaySize, const Point& rRelHitPoint, - sal_uIntPtr nFlags = 0 ); + sal_uLong nFlags = 0 ); // Gibt die Gesamtanzahl der IMap-Objekte zurueck sal_uInt16 GetIMapObjectCount() const { return (sal_uInt16) maList.Count(); } @@ -137,8 +137,8 @@ public: void Write ( SvStream& rOStm, const String& rBaseURL ) const; void Read( SvStream& rIStm, const String& rBaseURL ); - void Write( SvStream& rOStm, sal_uIntPtr nFormat, const String& rBaseURL ) const; - sal_uIntPtr Read( SvStream& rIStm, sal_uIntPtr nFormat, const String& rBaseURL ); + void Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const; + sal_uLong Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL ); }; /****************************************************************************** @@ -152,8 +152,8 @@ public: class IMapCompat { SvStream* pRWStm; - sal_uIntPtr nCompatPos; - sal_uIntPtr nTotalSize; + sal_uLong nCompatPos; + sal_uLong nTotalSize; sal_uInt16 nStmMode; IMapCompat() {} diff --git a/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx index 82afdb217490..88f7fffa8d22 100644 --- a/svtools/inc/svtools/imapcirc.hxx +++ b/svtools/inc/svtools/imapcirc.hxx @@ -42,9 +42,9 @@ class Fraction; class SVT_DLLPUBLIC IMapCircleObject : public IMapObject { Point aCenter; - sal_uIntPtr nRadius; + sal_uLong nRadius; - void ImpConstruct( const Point& rCenter, sal_uIntPtr nRad, sal_Bool bPixel ); + void ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel ); protected: @@ -55,7 +55,7 @@ protected: public: IMapCircleObject() {}; - IMapCircleObject( const Point& rCenter, sal_uIntPtr nRad, + IMapCircleObject( const Point& rCenter, sal_uLong nRad, const String& rURL, const String& rAltText, const String& rDesc, @@ -69,7 +69,7 @@ public: virtual sal_Bool IsHit( const Point& rPoint ) const; Point GetCenter( sal_Bool bPixelCoords = sal_True ) const; - sal_uIntPtr GetRadius( sal_Bool bPixelCoords = sal_True ) const; + sal_uLong GetRadius( sal_Bool bPixelCoords = sal_True ) const; // liefert das BoundRect des Kreis-Objektes in 1/100mm virtual Rectangle GetBoundRect() const; diff --git a/svtools/inc/svtools/inetimg.hxx b/svtools/inc/svtools/inetimg.hxx index 093263e82da3..61204e9d0935 100644 --- a/svtools/inc/svtools/inetimg.hxx +++ b/svtools/inc/svtools/inetimg.hxx @@ -77,8 +77,8 @@ public: const Size& GetSizePixel() const { return aSizePixel; } // Im-/Export - sal_Bool Write( SvStream& rOStm, sal_uIntPtr nFormat ) const; - sal_Bool Read( SvStream& rIStm, sal_uIntPtr nFormat ); + sal_Bool Write( SvStream& rOStm, sal_uLong nFormat ) const; + sal_Bool Read( SvStream& rIStm, sal_uLong nFormat ); }; #endif // #ifndef _INETIMG_HXX diff --git a/svtools/inc/svtools/ivctrl.hxx b/svtools/inc/svtools/ivctrl.hxx index bbc93a7530ff..9e42f12dffb1 100644 --- a/svtools/inc/svtools/ivctrl.hxx +++ b/svtools/inc/svtools/ivctrl.hxx @@ -85,7 +85,7 @@ class SvxIconChoiceCtrlEntry Rectangle aRect; // Bounding-Rect des Entries Rectangle aGridRect; // nur gesetzt im Grid-Modus - sal_uIntPtr nPos; + sal_uLong nPos; // die Eintragsposition in der Eintragsliste entspricht der beim Insert vorgegebenen // [Sortier-]Reihenfolge (->Reihenfolge der Anker in der Ankerliste!). Im AutoArrange-Modus @@ -273,7 +273,7 @@ protected: virtual void FillLayoutData() const; - void CallImplEventListeners(sal_uIntPtr nEvent, void* pData); + void CallImplEventListeners(sal_uLong nEvent, void* pData); public: @@ -299,15 +299,15 @@ public: void ArrangeIcons(); - SvxIconChoiceCtrlEntry* InsertEntry( sal_uIntPtr nPos = LIST_APPEND, + SvxIconChoiceCtrlEntry* InsertEntry( sal_uLong nPos = LIST_APPEND, const Point* pPos = 0, sal_uInt16 nFlags = 0 ); SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, - sal_uIntPtr nPos = LIST_APPEND, + sal_uLong nPos = LIST_APPEND, const Point* pPos = 0, sal_uInt16 nFlags = 0 ); SvxIconChoiceCtrlEntry* InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, - sal_uIntPtr nPos = LIST_APPEND, + sal_uLong nPos = LIST_APPEND, const Point* pPos = 0, sal_uInt16 nFlags = 0 ); @@ -331,9 +331,9 @@ public: sal_Bool IsEntryEditing() const; void Clear(); - sal_uIntPtr GetEntryCount() const; - SvxIconChoiceCtrlEntry* GetEntry( sal_uIntPtr nPos ) const; - sal_uIntPtr GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; + sal_uLong GetEntryCount() const; + SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const; + sal_uLong GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const; using Window::SetCursor; void SetCursor( SvxIconChoiceCtrlEntry* pEntry ); SvxIconChoiceCtrlEntry* GetCursor() const; @@ -349,8 +349,8 @@ public: // Gibt den naechsten unter pCurEntry liegenden Eintrag (ZOrder) SvxIconChoiceCtrlEntry* GetPrevEntry( const Point& rPosPixel, SvxIconChoiceCtrlEntry* pCurEntry, sal_Bool ) const; - // in dem sal_uIntPtr wird die Position in der Liste des gefunden Eintrags zurueckgegeben - SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uIntPtr& rPos ) const; + // in dem sal_uLong wird die Position in der Liste des gefunden Eintrags zurueckgegeben + SvxIconChoiceCtrlEntry* GetSelectedEntry( sal_uLong& rPos ) const; void SetEntryTextMode( SvxIconChoiceCtrlTextMode eMode, SvxIconChoiceCtrlEntry* pEntry = 0 ); SvxIconChoiceCtrlTextMode GetEntryTextMode( const SvxIconChoiceCtrlEntry* pEntry = 0 ) const; diff --git a/svtools/inc/svtools/rtfout.hxx b/svtools/inc/svtools/rtfout.hxx index 2b34ccb5971b..72e488353b72 100644 --- a/svtools/inc/svtools/rtfout.hxx +++ b/svtools/inc/svtools/rtfout.hxx @@ -58,7 +58,7 @@ public: rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252, sal_Bool bWriteHelpFile = sal_False ); - static SvStream& Out_Hex( SvStream&, sal_uIntPtr nHex, sal_uInt8 nLen ); + static SvStream& Out_Hex( SvStream&, sal_uLong nHex, sal_uInt8 nLen ); }; diff --git a/svtools/inc/svtools/ruler.hxx b/svtools/inc/svtools/ruler.hxx index 028d67c20877..6ad47779e1d9 100644 --- a/svtools/inc/svtools/ruler.hxx +++ b/svtools/inc/svtools/ruler.hxx @@ -676,7 +676,7 @@ private: long mnBorderWidth; long mnStartDragPos; long mnDragPos; - sal_uIntPtr mnUpdateEvtId; + sal_uLong mnUpdateEvtId; ImplRulerData* mpSaveData; ImplRulerData* mpData; ImplRulerData* mpDragData; diff --git a/svtools/inc/svtools/scrwin.hxx b/svtools/inc/svtools/scrwin.hxx index c3e3729b2734..deeab0ee3fd9 100644 --- a/svtools/inc/svtools/scrwin.hxx +++ b/svtools/inc/svtools/scrwin.hxx @@ -97,12 +97,12 @@ public: sal_Bool MakeVisible( const Rectangle& rTarget, sal_Bool bSloppy = sal_False ); Rectangle GetVisibleArea() const; - void SetLineSize( sal_uIntPtr nHorz, sal_uIntPtr nVert ); + void SetLineSize( sal_uLong nHorz, sal_uLong nVert ); using Window::Scroll; virtual void Scroll( long nDeltaX, long nDeltaY, sal_uInt16 nFlags = 0 ); void ScrollLines( long nLinesX, long nLinesY ); - void ScrollPages( long nPagesX, sal_uIntPtr nOverlapX, - long nPagesY, sal_uIntPtr nOverlapY ); + void ScrollPages( long nPagesX, sal_uLong nOverlapX, + long nPagesY, sal_uLong nOverlapY ); private: SVT_DLLPRIVATE Size GetOutputSizePixel() const; diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx index f25a5f3b80ba..6aab24a32d70 100644 --- a/svtools/inc/svtools/svicnvw.hxx +++ b/svtools/inc/svtools/svicnvw.hxx @@ -122,14 +122,14 @@ public: SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos=LIST_APPEND ); + sal_uLong nPos=LIST_APPEND ); SvLBoxEntry* InsertEntry( const XubString& rText, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos = LIST_APPEND ); + sal_uLong nPos = LIST_APPEND ); const Image& GetDefaultExpandedEntryBmp() const { return aExpandedEntryBmp;} const Image& GetDefaultCollapsedEntryBmp() const { return aCollapsedEntryBmp;} @@ -166,7 +166,7 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving(SvListEntry* pSource, - SvListEntry* pTargetParent, sal_uIntPtr nChildPos ); + SvListEntry* pTargetParent, sal_uLong nChildPos ); virtual void ModelHasMoved(SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); @@ -180,9 +180,9 @@ public: // einen "magic pointer" zurueckgeben, falls in einen leeren // Bereich auf der IconView gedroppt wird. virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos); + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos); virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos); + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos); // gibt TopLeft des BoundingRects zurueck // Konvertierung in Fensterposition: MapMode.Origin addieren @@ -227,7 +227,7 @@ public: // wird bei bAdd == sal_False ignoriert SvPtrarr* pOtherRects = 0, short nBorderOffs = -5 ); - sal_uIntPtr GetSelectionCount() const; + sal_uLong GetSelectionCount() const; virtual void Arrange(); void SetSpaceBetweenEntries( long nHor, long Ver ); @@ -243,7 +243,7 @@ public: SvLBoxEntry* GetCurParent() const; virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ); + SvListEntry* pEntry2, sal_uLong nPos ); // 0,0: Grid-Modus ausschalten void SetGrid( long nDX, long nDY ); diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx index 7882224cbebe..d19a48a8ef0b 100644 --- a/svtools/inc/svtools/svlbox.hxx +++ b/svtools/inc/svtools/svlbox.hxx @@ -331,8 +331,8 @@ protected: // invalidate children on enable/disable virtual void StateChanged( StateChangedType ); - virtual sal_uIntPtr Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uIntPtr nPos=LIST_APPEND); - virtual sal_uIntPtr Insert( SvLBoxEntry* pEntry,sal_uIntPtr nRootPos = LIST_APPEND ); + virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ); void InsertTree( SvLBoxEntry* pTree, SvLBoxEntry* pTarget) {pModel->InsertTree( pTree, pTarget ); } // Inplace-Editing @@ -404,7 +404,7 @@ public: void DisconnectFromModel(); virtual sal_uInt16 IsA(); - sal_uIntPtr GetEntryCount() const {return pModel->GetEntryCount();} + sal_uLong GetEntryCount() const {return pModel->GetEntryCount();} SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); } SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));} SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));} @@ -432,8 +432,8 @@ public: virtual void SetSelectionMode( SelectionMode ); // pParent==0 -> Root-Ebene - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } - SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); } + SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); } SvLBoxEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const; void FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const; @@ -444,8 +444,8 @@ public: SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));} using Window::GetChildCount; - sal_uIntPtr GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); } - sal_uIntPtr GetLevelChildCount( SvLBoxEntry* pParent ) const; + sal_uLong GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); } + sal_uLong GetLevelChildCount( SvLBoxEntry* pParent ) const; SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); } SvViewDataItem* GetViewDataItem( SvListEntry*, SvLBoxItem* ) const; @@ -491,7 +491,7 @@ public: virtual sal_Bool Expand( SvLBoxEntry* pParent ); virtual sal_Bool Collapse( SvLBoxEntry* pParent ); virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_uIntPtr SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); + virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint=sal_True ); virtual void SetCurEntry( SvLBoxEntry* _pEntry ) = 0; @@ -555,7 +555,7 @@ public: SvLBoxEntry* pEntry, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - sal_uIntPtr& rNewChildPos); // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents // Rueckgabe: sal_True==Ok, sal_False==Abbrechen virtual sal_Bool NotifyCopying( @@ -563,7 +563,7 @@ public: SvLBoxEntry* pEntry, // Zu kopierender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - sal_uIntPtr& rNewChildPos); // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents // ACCESSIBILITY ========================================================== @@ -596,7 +596,7 @@ struct SvLBoxDDInfo SvLBoxEntry* pDDStartEntry; // relative Position im Eintrag bei Drag-Beginn (IconView) long nMouseRelX,nMouseRelY; - sal_uIntPtr nRes1,nRes2,nRes3,nRes4; + sal_uLong nRes1,nRes2,nRes3,nRes4; }; class SvInplaceEdit : public Edit diff --git a/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx index 2a6b0f6fdc2f..9505ea900365 100644 --- a/svtools/inc/svtools/svmedit.hxx +++ b/svtools/inc/svtools/svmedit.hxx @@ -80,9 +80,9 @@ public: virtual void ClearModifyFlag(); virtual sal_Bool IsModified() const; - virtual void EnableUpdateData( sal_uIntPtr nTimeout = EDIT_UPDATEDATA_TIMEOUT ); + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); virtual void DisableUpdateData() { delete pUpdateDataTimer; pUpdateDataTimer = NULL; } - virtual sal_uIntPtr IsUpdateDataEnabled() const; + virtual sal_uLong IsUpdateDataEnabled() const; virtual void SetReadOnly( sal_Bool bReadOnly = sal_True ); virtual sal_Bool IsReadOnly() const; @@ -134,7 +134,7 @@ public: Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; - void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ); + void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); void SetLeftMargin( sal_uInt16 n ); sal_uInt16 GetLeftMargin() const; @@ -146,7 +146,7 @@ public: void DisableSelectionOnFocus(); }; -inline sal_uIntPtr MultiLineEdit::IsUpdateDataEnabled() const +inline sal_uLong MultiLineEdit::IsUpdateDataEnabled() const { return pUpdateDataTimer ? pUpdateDataTimer->GetTimeout() : 0; } diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx index e7aa3f81a80b..70bd623fef0a 100644 --- a/svtools/inc/svtools/svmedit2.hxx +++ b/svtools/inc/svtools/svmedit2.hxx @@ -45,9 +45,9 @@ public: void EnableCursor( sal_Bool bEnable ); // methods of TextEngine - void SetAttrib( const TextAttrib& rAttr, sal_uIntPtr nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); + void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); void SetLeftMargin( sal_uInt16 nLeftMargin ); - sal_uIntPtr GetParagraphCount() const; + sal_uLong GetParagraphCount() const; }; #endif diff --git a/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx index ad24101041f8..7eac9c93d425 100644 --- a/svtools/inc/svtools/svparser.hxx +++ b/svtools/inc/svtools/svparser.hxx @@ -58,8 +58,8 @@ class SVT_DLLPUBLIC SvParser : public SvRefBase protected: SvStream& rInput; String aToken; // gescanntes Token - sal_uIntPtr nlLineNr; // akt. Zeilen Nummer - sal_uIntPtr nlLinePos; // akt. Spalten Nummer + sal_uLong nlLineNr; // akt. Zeilen Nummer + sal_uLong nlLinePos; // akt. Spalten Nummer SvParser_Impl *pImplData; // interne Daten long nTokenValue; // zusaetzlicher Wert (RTF) @@ -68,7 +68,7 @@ protected: rtl_TextEncoding eSrcEnc; // Source encoding - sal_uIntPtr nNextChPos; + sal_uLong nNextChPos; sal_Unicode nNextCh; // Akt. Zeichen fuer die "lex" @@ -129,12 +129,12 @@ public: inline SvParserState GetStatus() const { return eState; } // StatusInfo - inline sal_uIntPtr GetLineNr() const { return nlLineNr; } - inline sal_uIntPtr GetLinePos() const { return nlLinePos; } - inline sal_uIntPtr IncLineNr() { return ++nlLineNr; } - inline sal_uIntPtr IncLinePos() { return ++nlLinePos; } - inline sal_uIntPtr SetLineNr( sal_uIntPtr nlNum ); // inline unten - inline sal_uIntPtr SetLinePos( sal_uIntPtr nlPos ); // inline unten + inline sal_uLong GetLineNr() const { return nlLineNr; } + inline sal_uLong GetLinePos() const { return nlLinePos; } + inline sal_uLong IncLineNr() { return ++nlLineNr; } + inline sal_uLong IncLinePos() { return ++nlLinePos; } + inline sal_uLong SetLineNr( sal_uLong nlNum ); // inline unten + inline sal_uLong SetLinePos( sal_uLong nlPos ); // inline unten sal_Unicode GetNextChar(); void RereadLookahead(); @@ -189,11 +189,11 @@ SV_IMPL_REF(SvParser) -inline sal_uIntPtr SvParser::SetLineNr( sal_uIntPtr nlNum ) -{ sal_uIntPtr nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } +inline sal_uLong SvParser::SetLineNr( sal_uLong nlNum ) +{ sal_uLong nlOld = nlLineNr; nlLineNr = nlNum; return nlOld; } -inline sal_uIntPtr SvParser::SetLinePos( sal_uIntPtr nlPos ) -{ sal_uIntPtr nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } +inline sal_uLong SvParser::SetLinePos( sal_uLong nlPos ) +{ sal_uLong nlOld = nlLinePos; nlLinePos = nlPos; return nlOld; } inline sal_uInt8 SvParser::GetStackPos() const { return nTokenStackPos; } diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx index 65c6cde1c54d..e0c9b71a102e 100644 --- a/svtools/inc/svtools/svtabbx.hxx +++ b/svtools/inc/svtools/svtabbx.hxx @@ -60,8 +60,8 @@ private: SvLBoxTab* pTabList; sal_uInt16 nTabCount; XubString aCurEntry; - sal_uIntPtr nDummy1; - sal_uIntPtr nDummy2; + sal_uLong nDummy1; + sal_uLong nDummy2; protected: SvLBoxEntry* pViewParent; @@ -71,9 +71,9 @@ protected: virtual void SetTabs(); virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); - String GetTabEntryText( sal_uIntPtr nPos, sal_uInt16 nCol ) const; - SvLBoxEntry* GetEntryOnPos( sal_uIntPtr _nEntryPos ) const; - SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, sal_uIntPtr _nEntryPos, sal_uIntPtr& _rPos ) const; + String GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const; + SvLBoxEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const; + SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const; public: SvTabListBox( Window* pParent, WinBits = WB_BORDER ); @@ -88,7 +88,7 @@ public: virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos=LIST_APPEND, void* pUserData = 0, + sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); virtual SvLBoxEntry* InsertEntry( const XubString& rText, @@ -96,26 +96,26 @@ public: const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos = LIST_APPEND, void* pUserData = 0, + sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uIntPtr nPos = LIST_APPEND, + virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, - sal_uIntPtr nPos, sal_uInt16 nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, - sal_uIntPtr nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual String GetEntryText( SvLBoxEntry* pEntry ) const; String GetEntryText( SvLBoxEntry*, sal_uInt16 nCol ) const; - String GetEntryText( sal_uIntPtr nPos, sal_uInt16 nCol = 0xffff ) const; + String GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; - void SetEntryText( const XubString&, sal_uIntPtr, sal_uInt16 nCol=0xffff ); + void SetEntryText( const XubString&, sal_uLong, sal_uInt16 nCol=0xffff ); void SetEntryText(const XubString&,SvLBoxEntry*,sal_uInt16 nCol=0xffff); - String GetCellText( sal_uIntPtr nPos, sal_uInt16 nCol ) const; - sal_uIntPtr GetEntryPos( const XubString&, sal_uInt16 nCol = 0xffff ); - sal_uIntPtr GetEntryPos( const SvLBoxEntry* pEntry ) const; + String GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const; + sal_uLong GetEntryPos( const XubString&, sal_uInt16 nCol = 0xffff ); + sal_uLong GetEntryPos( const SvLBoxEntry* pEntry ) const; virtual void Resize(); void SetTabJustify( sal_uInt16 nTab, SvTabJustify ); @@ -162,15 +162,15 @@ public: void InitHeaderBar( HeaderBar* pHeaderBar ); sal_Bool IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const; - virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uIntPtr nPos = LIST_APPEND, + virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent, - sal_uIntPtr nPos, sal_uInt16 nCol, void* pUserData = NULL ); + sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL ); virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL, - sal_uIntPtr nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); - virtual sal_uIntPtr Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uIntPtr nPos=LIST_APPEND); - virtual sal_uIntPtr Insert( SvLBoxEntry* pEntry, sal_uIntPtr nRootPos = LIST_APPEND ); + sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); + virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND); + virtual sal_uLong Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos = LIST_APPEND ); void RemoveEntry( SvLBoxEntry* _pEntry ); void Clear(); diff --git a/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx index 9da3493204d7..7705050bc3ca 100644 --- a/svtools/inc/svtools/svtreebx.hxx +++ b/svtools/inc/svtools/svtreebx.hxx @@ -145,8 +145,8 @@ protected: // in das Control hineingezeichnet werden virtual void NotifyInvalidating(); - virtual sal_uIntPtr GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); - virtual sal_uIntPtr GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); + virtual sal_uLong GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); + virtual sal_uLong GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent ); virtual void Command( const CommandEvent& rCEvt ); virtual void RequestHelp( const HelpEvent& rHEvt ); @@ -159,7 +159,7 @@ protected: sal_Bool IsCellFocusEnabled() const; bool SetCurrentTabPos( sal_uInt16 _nNewPos ); sal_uInt16 GetCurrentTabPos() const; - void CallImplEventListeners(sal_uIntPtr nEvent, void* pData); + void CallImplEventListeners(sal_uLong nEvent, void* pData); void ImplEditEntry( SvLBoxEntry* pEntry ); @@ -201,7 +201,7 @@ public: virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos=LIST_APPEND, void* pUserData = 0, + sal_uLong nPos=LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); virtual SvLBoxEntry* InsertEntry( const XubString& rText, @@ -209,7 +209,7 @@ public: const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = 0, sal_Bool bChildsOnDemand = sal_False, - sal_uIntPtr nPos = LIST_APPEND, void* pUserData = 0, + sal_uLong nPos = LIST_APPEND, void* pUserData = 0, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); const Image& GetDefaultExpandedEntryBmp( BmpColorMode _eMode = BMP_COLOR_NORMAL ) const; @@ -278,7 +278,7 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving(SvListEntry* pSource, - SvListEntry* pTargetParent, sal_uIntPtr nChildPos ); + SvListEntry* pTargetParent, sal_uLong nChildPos ); virtual void ModelHasMoved(SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); @@ -312,8 +312,8 @@ public: void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False ); SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const; - SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uIntPtr nPos ) const { return SvLBox::GetEntry(pParent,nPos); } - SvLBoxEntry* GetEntry( sal_uIntPtr nRootPos ) const { return SvLBox::GetEntry(nRootPos);} + SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return SvLBox::GetEntry(pParent,nPos); } + SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return SvLBox::GetEntry(nRootPos);} void PaintEntry( SvLBoxEntry* ); long PaintEntry( SvLBoxEntry*, long nLine, @@ -334,7 +334,7 @@ public: virtual sal_Bool Expand( SvLBoxEntry* pParent ); virtual sal_Bool Collapse( SvLBoxEntry* pParent ); virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); - virtual sal_uIntPtr SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); + virtual sal_uLong SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ); virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True ); virtual void SetCurEntry( SvLBoxEntry* _pEntry ); virtual SvLBoxEntry* @@ -354,7 +354,7 @@ public: DECL_LINK( DefaultCompare, SvSortData* ); virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ); + SvListEntry* pEntry2, sal_uLong nPos ); long GetTextOffset() const; void EndSelection(); diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx index d5cbf7fc6aa1..cab942b452b6 100644 --- a/svtools/inc/svtools/tabbar.hxx +++ b/svtools/inc/svtools/tabbar.hxx @@ -352,7 +352,7 @@ private: long mnOffY; long mnLastOffX; long mnSplitSize; - sal_uIntPtr mnSwitchTime; + sal_uLong mnSwitchTime; WinBits mnWinStyle; sal_uInt16 mnCurPageId; sal_uInt16 mnFirstPos; diff --git a/svtools/inc/svtools/taskbar.hxx b/svtools/inc/svtools/taskbar.hxx index 71f028ae6e2f..b254473c7f19 100644 --- a/svtools/inc/svtools/taskbar.hxx +++ b/svtools/inc/svtools/taskbar.hxx @@ -176,7 +176,7 @@ private: ImplTaskItemList* mpItemList; TaskBar* mpNotifyTaskBar; Point maContextMenuPos; - sal_uIntPtr mnOldItemCount; + sal_uLong mnOldItemCount; long mnMaxTextWidth; long mnDummy1; sal_uInt16 mnUpdatePos; @@ -466,7 +466,7 @@ class SVT_DLLPUBLIC WindowArrange private: List* mpWinList; void* mpDummy; - sal_uIntPtr mnDummy; + sal_uLong mnDummy; #ifdef _TASKBAR_CXX SVT_DLLPRIVATE void ImplTile( const Rectangle& rRect ); @@ -479,7 +479,7 @@ public: WindowArrange(); ~WindowArrange(); - void AddWindow( Window* pWindow, sal_uIntPtr nPos = LIST_APPEND ) + void AddWindow( Window* pWindow, sal_uLong nPos = LIST_APPEND ) { mpWinList->Insert( (void*)pWindow, nPos ); } void RemoveAllWindows() { mpWinList->Clear(); } diff --git a/svtools/inc/svtools/testtool.hxx b/svtools/inc/svtools/testtool.hxx index 8f617c7e2d9e..be0f217f4475 100644 --- a/svtools/inc/svtools/testtool.hxx +++ b/svtools/inc/svtools/testtool.hxx @@ -55,14 +55,14 @@ class RemoteControl public: RemoteControl(); ~RemoteControl(); - sal_Bool QueCommands( sal_uIntPtr nServiceId, SvStream *pIn ); + sal_Bool QueCommands( sal_uLong nServiceId, SvStream *pIn ); SvStream* GetReturnStream(); DECL_LINK( IdleHdl, Application* ); DECL_LINK( CommandHdl, Application* ); DECL_LINK( QueCommandsEvent, CommunicationLink* ); - sal_uIntPtr nStoredServiceId; + sal_uLong nStoredServiceId; SvStream *pStoredStream; void ExecuteURL( String &aURL ); diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx index cbd9d95b42cc..0840edd38b11 100644 --- a/svtools/inc/svtools/textdata.hxx +++ b/svtools/inc/svtools/textdata.hxx @@ -59,15 +59,15 @@ class TextPaM { private: - sal_uIntPtr mnPara; + sal_uLong mnPara; sal_uInt16 mnIndex; public: TextPaM() { mnPara = 0, mnIndex = 0; } - TextPaM( sal_uIntPtr nPara, sal_uInt16 nIndex ) { mnPara = nPara, mnIndex = nIndex; } + TextPaM( sal_uLong nPara, sal_uInt16 nIndex ) { mnPara = nPara, mnIndex = nIndex; } - sal_uIntPtr GetPara() const { return mnPara; } - sal_uIntPtr& GetPara() { return mnPara; } + sal_uLong GetPara() const { return mnPara; } + sal_uLong& GetPara() { return mnPara; } sal_uInt16 GetIndex() const { return mnIndex; } sal_uInt16& GetIndex() { return mnIndex; } @@ -153,15 +153,15 @@ inline sal_Bool TextSelection::operator != ( const TextSelection& rSel ) const class SVT_DLLPUBLIC TextHint : public SfxSimpleHint { private: - sal_uIntPtr mnValue; + sal_uLong mnValue; public: TYPEINFO(); - TextHint( sal_uIntPtr nId ); - TextHint( sal_uIntPtr nId, sal_uIntPtr nValue ); + TextHint( sal_uLong nId ); + TextHint( sal_uLong nId, sal_uLong nValue ); - sal_uIntPtr GetValue() const { return mnValue; } - void SetValue( sal_uIntPtr n ) { mnValue = n; } + sal_uLong GetValue() const { return mnValue; } + void SetValue( sal_uLong n ) { mnValue = n; } }; struct TEIMEInfos @@ -195,11 +195,11 @@ struct TEIMEInfos template <class T> class ToolsList : public ::std::vector< T > { public: - sal_uIntPtr Count() const { return static_cast<sal_uIntPtr>(::std::vector< T >::size()); } - sal_uIntPtr GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); } - T GetObject( sal_uIntPtr nIndex ) const { return (*this)[nIndex]; } - void Insert( T pObject, sal_uIntPtr nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); } - void Remove( sal_uIntPtr nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); } + sal_uLong Count() const { return static_cast<sal_uLong>(::std::vector< T >::size()); } + sal_uLong GetPos( T pObject ) const { return ( ::std::find( this->begin(), this->end(), pObject ) ) - this->begin(); } + T GetObject( sal_uLong nIndex ) const { return (*this)[nIndex]; } + void Insert( T pObject, sal_uLong nPos ) { ::std::vector< T >::insert( this->begin()+nPos, pObject ); } + void Remove( sal_uLong nPos ) { ::std::vector< T >::erase( this->begin()+nPos ); } }; #endif // _TEXTDATA_HXX diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx index b75beaed7bb1..3fe7e36f0c0d 100644 --- a/svtools/inc/svtools/texteng.hxx +++ b/svtools/inc/svtools/texteng.hxx @@ -120,11 +120,11 @@ private: sal_uInt16 mnCharHeight; sal_uInt16 mnFixCharWidth100; - sal_uIntPtr mnMaxTextLen; - sal_uIntPtr mnMaxTextWidth; - sal_uIntPtr mnCurTextWidth; - sal_uIntPtr mnCurTextHeight; - sal_uIntPtr mnDefTab; + sal_uLong mnMaxTextLen; + sal_uLong mnMaxTextWidth; + sal_uLong mnCurTextWidth; + sal_uLong mnCurTextHeight; + sal_uLong mnDefTab; TxtAlign meAlign; @@ -143,7 +143,7 @@ private: protected: - void CursorMoved( sal_uIntPtr nNode ); + void CursorMoved( sal_uLong nNode ); void TextModified(); void ImpInitDoc(); @@ -154,9 +154,9 @@ protected: TextPaM ImpInsertParaBreak( const TextSelection& rTextSelection, sal_Bool bKeepEndingAttribs = sal_True ); TextPaM ImpInsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs = sal_True ); void ImpRemoveChars( const TextPaM& rPaM, sal_uInt16 nChars, SfxUndoAction* pCurUndo = 0 ); - TextPaM ImpConnectParagraphs( sal_uIntPtr nLeft, sal_uIntPtr nRight ); - void ImpRemoveParagraph( sal_uIntPtr nPara ); - void ImpInitWritingDirections( sal_uIntPtr nPara ); + TextPaM ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight ); + void ImpRemoveParagraph( sal_uLong nPara ); + void ImpInitWritingDirections( sal_uLong nPara ); LocaleDataWrapper* ImpGetLocaleDataWrapper(); // to remain compatible in the minor release we copy the above ImpInsertText @@ -168,11 +168,11 @@ protected: SAL_DLLPRIVATE sal_Bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // Broadcasten bzw. Selektionen anpassen: - void ImpParagraphInserted( sal_uIntPtr nPara ); - void ImpParagraphRemoved( sal_uIntPtr nPara ); - void ImpCharsRemoved( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16 nChars ); - void ImpCharsInserted( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16 nChars ); - void ImpFormattingParagraph( sal_uIntPtr nPara ); + void ImpParagraphInserted( sal_uLong nPara ); + void ImpParagraphRemoved( sal_uLong nPara ); + void ImpCharsRemoved( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); + void ImpCharsInserted( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ); + void ImpFormattingParagraph( sal_uLong nPara ); void ImpTextHeightChanged(); void ImpTextFormatted(); @@ -180,13 +180,13 @@ protected: void CheckIdleFormatter(); void IdleFormatAndUpdate( TextView* pCurView = 0, sal_uInt16 nMaxTimerRestarts = 5 ); - sal_Bool CreateLines( sal_uIntPtr nPara ); - void CreateAndInsertEmptyLine( sal_uIntPtr nPara ); - void ImpBreakLine( sal_uIntPtr nPara, TextLine* pLine, TETextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth ); - sal_uInt16 SplitTextPortion( sal_uIntPtr nPara, sal_uInt16 nPos ); - void CreateTextPortions( sal_uIntPtr nPara, sal_uInt16 nStartPos ); - void RecalcTextPortion( sal_uIntPtr nPara, sal_uInt16 nStartPos, short nNewChars ); - void SeekCursor( sal_uIntPtr nNode, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev ); + sal_Bool CreateLines( sal_uLong nPara ); + void CreateAndInsertEmptyLine( sal_uLong nPara ); + void ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion* pPortion, sal_uInt16 nPortionStart, long nRemainingWidth ); + sal_uInt16 SplitTextPortion( sal_uLong nPara, sal_uInt16 nPos ); + void CreateTextPortions( sal_uLong nPara, sal_uInt16 nStartPos ); + void RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short nNewChars ); + void SeekCursor( sal_uLong nNode, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev ); void FormatDoc(); void FormatFullDoc(); @@ -201,26 +201,26 @@ protected: sal_Bool IsFormatted() const { return mbFormatted; } - sal_uInt16 GetCharPos( sal_uIntPtr nPara, sal_uInt16 nLine, long nDocPosX, sal_Bool bSmart = sal_False ); + sal_uInt16 GetCharPos( sal_uLong nPara, sal_uInt16 nLine, long nDocPosX, sal_Bool bSmart = sal_False ); Rectangle GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal_Bool bPreferPortionStart = sal_False ); - sal_uInt16 ImpFindIndex( sal_uIntPtr nPortion, const Point& rPosInPara, sal_Bool bSmart ); - long ImpGetPortionXOffset( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nTextPortion ); - long ImpGetXPos( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False ); - long ImpGetOutputOffset( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ); - sal_uInt8 ImpGetRightToLeft( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL ); + sal_uInt16 ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, sal_Bool bSmart ); + long ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion ); + long ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart = sal_False ); + long ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ); + sal_uInt8 ImpGetRightToLeft( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16* pStart = NULL, sal_uInt16* pEnd = NULL ); void ImpInitLayoutMode( OutputDevice* pOutDev, sal_Bool bDrawingR2LPortion = sal_False ); TxtAlign ImpGetAlign() const; - sal_uIntPtr CalcTextHeight(); - sal_uIntPtr CalcParaHeight( sal_uIntPtr nParagraph ) const; - sal_uIntPtr CalcTextWidth( sal_uIntPtr nPara ); - sal_uIntPtr CalcTextWidth( sal_uIntPtr nPara, sal_uInt16 nPortionStart, sal_uInt16 nPortionLen, const Font* pFont = 0 ); - Range GetInvalidYOffsets( sal_uIntPtr nPortion ); + sal_uLong CalcTextHeight(); + sal_uLong CalcParaHeight( sal_uLong nParagraph ) const; + sal_uLong CalcTextWidth( sal_uLong nPara ); + sal_uLong CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nPortionLen, const Font* pFont = 0 ); + Range GetInvalidYOffsets( sal_uLong nPortion ); // Fuer Undo/Redo - void InsertContent( TextNode* pNode, sal_uIntPtr nPara ); - TextPaM SplitContent( sal_uIntPtr nNode, sal_uInt16 nSepPos ); - TextPaM ConnectContents( sal_uIntPtr nLeftNode ); + void InsertContent( TextNode* pNode, sal_uLong nPara ); + TextPaM SplitContent( sal_uLong nNode, sal_uInt16 nSepPos ); + TextPaM ConnectContents( sal_uLong nLeftNode ); // Ans API uebergebene PaM's und Selektionen auf einen gueltigen Bereich einstellen void ValidateSelection( TextSelection& rSel ) const; @@ -236,8 +236,8 @@ public: String GetTextLines( LineEnd aSeparator = LINEEND_LF ) const; void ReplaceText(const TextSelection& rSel, const String& rText); - sal_uIntPtr GetTextLen( LineEnd aSeparator = LINEEND_LF ) const; - sal_uIntPtr GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const; + sal_uLong GetTextLen( LineEnd aSeparator = LINEEND_LF ) const; + sal_uLong GetTextLen( const TextSelection& rSel, LineEnd aSeparator = LINEEND_LF ) const; void SetFont( const Font& rFont ); const Font& GetFont() const { return maFont; } @@ -258,23 +258,23 @@ public: TextView* GetActiveView() const; void SetActiveView( TextView* pView ); - void SetMaxTextLen( sal_uIntPtr nLen ); - sal_uIntPtr GetMaxTextLen() const { return mnMaxTextLen; } + void SetMaxTextLen( sal_uLong nLen ); + sal_uLong GetMaxTextLen() const { return mnMaxTextLen; } - void SetMaxTextWidth( sal_uIntPtr nWidth ); - sal_uIntPtr GetMaxTextWidth() const { return mnMaxTextWidth; } + void SetMaxTextWidth( sal_uLong nWidth ); + sal_uLong GetMaxTextWidth() const { return mnMaxTextWidth; } - sal_uIntPtr GetTextHeight() const; - sal_uIntPtr CalcTextWidth(); + sal_uLong GetTextHeight() const; + sal_uLong CalcTextWidth(); sal_uInt16 GetCharHeight() const { return mnCharHeight; } - sal_uIntPtr GetParagraphCount() const; - String GetText( sal_uIntPtr nParagraph ) const; - sal_uInt16 GetTextLen( sal_uIntPtr nParagraph ) const; - sal_uIntPtr GetTextHeight( sal_uIntPtr nParagraph ) const; + sal_uLong GetParagraphCount() const; + String GetText( sal_uLong nParagraph ) const; + sal_uInt16 GetTextLen( sal_uLong nParagraph ) const; + sal_uLong GetTextHeight( sal_uLong nParagraph ) const; - sal_uInt16 GetLineCount( sal_uIntPtr nParagraph ) const; - sal_uInt16 GetLineLen( sal_uIntPtr nParagraph, sal_uInt16 nLine ) const; + sal_uInt16 GetLineCount( sal_uLong nParagraph ) const; + sal_uInt16 GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const; void SetRightToLeft( sal_Bool bR2L ); sal_Bool IsRightToLeft() const { return mbRightToLeft; } @@ -306,10 +306,10 @@ public: const TextAttrib* FindAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; const TextCharAttrib* FindCharAttrib( const TextPaM& rPaM, sal_uInt16 nWhich ) const; - void RemoveAttribs( sal_uIntPtr nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ); - void RemoveAttrib( sal_uIntPtr nPara, const TextCharAttrib& rAttrib ); - void RemoveAttribs( sal_uIntPtr nPara, sal_Bool bIdleFormatAndUpdate = sal_True ); - void SetAttrib( const TextAttrib& rAttr, sal_uIntPtr nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate = sal_True ); + void RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ); + void RemoveAttrib( sal_uLong nPara, const TextCharAttrib& rAttrib ); + void RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate = sal_True ); + void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate = sal_True ); TxtAlign GetTextAlign() const { return meAlign; } void SetTextAlign( TxtAlign eAlign ); diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx index 51466347f714..ce7d1fdc5e47 100644 --- a/svtools/inc/svtools/transfer.hxx +++ b/svtools/inc/svtools/transfer.hxx @@ -576,8 +576,8 @@ public: void CopyString( sal_uInt16 nFmt, const String& rStr ); void CopyAny( sal_uInt16 nFmt, const ::com::sun::star::uno::Any& rAny ); - void CopyByteString( sal_uIntPtr nFormatId, const ByteString& rStr ); - void CopyAnyData( sal_uIntPtr nFormatId, const sal_Char* pData, sal_uIntPtr nLen ); + void CopyByteString( sal_uLong nFormatId, const ByteString& rStr ); + void CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ); sal_Bool HasAnyData() const; diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index c91b6a9b8924..6576b6a736b2 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -84,8 +84,8 @@ friend class SvListView; private: SvListEntry* pParent; SvTreeEntryList* pChilds; - sal_uIntPtr nAbsPos; - sal_uIntPtr nListPos; + sal_uLong nAbsPos; + sal_uLong nListPos; void SetListPositions(); void InvalidateChildrensListPositions() @@ -103,7 +103,7 @@ public: return sal_True; else return sal_False; } - sal_uIntPtr GetChildListPos() const + sal_uLong GetChildListPos() const { if( pParent && (pParent->nListPos & 0x80000000) ) pParent->SetListPositions(); @@ -119,7 +119,7 @@ class SvViewData friend class SvTreeList; friend class SvListView; - sal_uIntPtr nVisPos; + sal_uLong nVisPos; protected: sal_uInt16 nFlags; public: @@ -174,7 +174,7 @@ class SVT_DLLPUBLIC SvTreeList friend class SvListView; List aViewList; - sal_uIntPtr nEntryCount; + sal_uLong nEntryCount; Link aCloneLink; Link aCompareLink; @@ -192,10 +192,10 @@ class SVT_DLLPUBLIC SvTreeList SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const; sal_Bool IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const; - SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uIntPtr nVisPos ) const; - sal_uIntPtr GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const; - sal_uIntPtr GetVisibleCount( const SvListView* ) const; - sal_uIntPtr GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const; + SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const; + sal_uLong GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const; + sal_uLong GetVisibleCount( const SvListView* ) const; + sal_uLong GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const; SvListEntry* FirstSelected( const SvListView*) const; SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const; @@ -203,9 +203,9 @@ class SVT_DLLPUBLIC SvTreeList SvListEntry* LastSelected( const SvListView*) const; sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True ); - sal_uIntPtr SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect ); + sal_uLong SelectChilds( SvListView*,SvListEntry* pParent, sal_Bool bSelect ); void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl - sal_uIntPtr GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const; + sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const; void Expand( SvListView*,SvListEntry* pParent ); void Collapse( SvListView*,SvListEntry* pParent ); @@ -214,12 +214,12 @@ class SVT_DLLPUBLIC SvTreeList SVT_DLLPRIVATE void SetAbsolutePositions(); SVT_DLLPRIVATE SvTreeEntryList*CloneChilds( SvTreeEntryList* pChilds, SvListEntry* pNewParent, - sal_uIntPtr& nCloneCount ) const; + sal_uLong& nCloneCount ) const; SVT_DLLPRIVATE void SetListPositions( SvTreeEntryList* ); // rPos wird bei SortModeNone nicht geaendert SVT_DLLPRIVATE void GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, - sal_uIntPtr& rPos ); + sal_uLong& rPos ); SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent ); //#endif /* _SOLAR__PRIVATE */ @@ -234,14 +234,14 @@ public: void InsertView( SvListView* ); void RemoveView( SvListView* ); - sal_uIntPtr GetViewCount() const { return aViewList.Count(); } - SvListView* GetView(sal_uIntPtr nPos) const {return (SvListView*)aViewList.GetObject(nPos);} + sal_uLong GetViewCount() const { return aViewList.Count(); } + SvListView* GetView(sal_uLong nPos) const {return (SvListView*)aViewList.GetObject(nPos);} void Broadcast( sal_uInt16 nActionId, SvListEntry* pEntry1=0, - SvListEntry* pEntry2=0, sal_uIntPtr nPos=0 ); + SvListEntry* pEntry2=0, sal_uLong nPos=0 ); // informiert alle Listener void InvalidateEntry( SvListEntry* ); - sal_uIntPtr GetEntryCount() const { return nEntryCount; } + sal_uLong GetEntryCount() const { return nEntryCount; } SvListEntry* First() const; SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const; @@ -252,19 +252,19 @@ public: SvListEntry* PrevSibling( SvListEntry* pEntry ) const; SvListEntry* LastSibling( SvListEntry* pEntry ) const; - sal_uIntPtr Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uIntPtr nPos=LIST_APPEND); - sal_uIntPtr Insert( SvListEntry* pEntry,sal_uIntPtr nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); } + sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=LIST_APPEND); + sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND ) { return Insert(pEntry, pRootItem, nRootPos ); } void InsertTree( SvListEntry* pTree, SvListEntry* pTarget ); void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, - sal_uIntPtr nListPos ); + sal_uLong nListPos ); // Entries muessen im gleichen Model stehen! void Move( SvListEntry* pSource, SvListEntry* pTarget ); // erzeugt ggf. Child-List - sal_uIntPtr Move( SvListEntry* pSource, SvListEntry* pTargetParent, - sal_uIntPtr nListPos); + sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, + sal_uLong nListPos); void Copy( SvListEntry* pSource, SvListEntry* pTarget ); - sal_uIntPtr Copy( SvListEntry* pSource, SvListEntry* pTargetParent, - sal_uIntPtr nListPos); + sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, + sal_uLong nListPos); sal_Bool Remove( SvListEntry* pEntry ); void Clear(); @@ -273,16 +273,16 @@ public: sal_Bool HasParent( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent!=pRootItem); } sal_Bool IsChild( SvListEntry* pParent, SvListEntry* pChild ) const; sal_Bool IsInChildList( SvListEntry* pParent, SvListEntry* pChild) const; - SvListEntry* GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const; - SvListEntry* GetEntry( sal_uIntPtr nRootPos ) const; - SvListEntry* GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const; + SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const; + SvListEntry* GetEntry( sal_uLong nRootPos ) const; + SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const; SvListEntry* GetParent( SvListEntry* pEntry ) const; SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const; SvTreeEntryList* GetChildList( SvListEntry* pParent ) const; - sal_uIntPtr GetAbsPos( SvListEntry* pEntry ) const; - sal_uIntPtr GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); } - sal_uIntPtr GetChildCount( SvListEntry* pParent ) const; + sal_uLong GetAbsPos( SvListEntry* pEntry ) const; + sal_uLong GetRelPos( SvListEntry* pChild ) const { return pChild->GetChildListPos(); } + sal_uLong GetChildCount( SvListEntry* pParent ) const; sal_uInt16 GetDepth( SvListEntry* pEntry ) const; sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const { return (sal_Bool)(pEntry->pParent==pRootItem); } @@ -292,7 +292,7 @@ public: // Deklaration des Clone-Handlers: // DECL_LINK(CloneHdl,SvListEntry*); // der Handler muss einen SvListEntry* zurueckgeben - SvListEntry* Clone( SvListEntry* pEntry, sal_uIntPtr& nCloneCount ) const; + SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const; void SetCloneLink( const Link& rLink ) { aCloneLink=rLink; } const Link& GetCloneLink() const { return aCloneLink; } virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link @@ -315,8 +315,8 @@ class SVT_DLLPUBLIC SvListView { friend class SvTreeList; - sal_uIntPtr nVisibleCount; - sal_uIntPtr nSelectionCount; + sal_uLong nVisibleCount; + sal_uLong nSelectionCount; sal_Bool bVisPositionsValid; //#if 0 // _SOLAR__PRIVATE @@ -329,8 +329,8 @@ protected: Table aDataTable; // Mapping SvListEntry -> ViewData SvTreeList* pModel; - void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uIntPtr nChildPos); - void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uIntPtr nChildPos); + void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); + void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos); void ActionInserted( SvListEntry* pEntry ); void ActionInsertedTree( SvListEntry* pEntry ); void ActionRemoving( SvListEntry* pEntry ); @@ -346,9 +346,9 @@ public: SvTreeList* GetModel() const { return pModel; } virtual void SetModel( SvTreeList* ); virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ); + SvListEntry* pEntry2, sal_uLong nPos ); - sal_uIntPtr GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );} + sal_uLong GetVisibleCount() const { return pModel->GetVisibleCount( (SvListView*)this );} SvListEntry* FirstVisible() const { return pModel->FirstVisible(); } SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->NextVisible(this,pEntry,pDepth); } SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const {return pModel->PrevVisible(this,pEntry,pDepth); } @@ -356,20 +356,20 @@ public: SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->NextVisible(this,pEntry,rDelta); } SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const { return pModel->PrevVisible(this,pEntry,rDelta); } - sal_uIntPtr GetSelectionCount() const { return nSelectionCount; } + sal_uLong GetSelectionCount() const { return nSelectionCount; } SvListEntry* FirstSelected() const { return pModel->FirstSelected(this);} SvListEntry* NextSelected( SvListEntry* pEntry ) const { return pModel->NextSelected(this,pEntry); } SvListEntry* PrevSelected( SvListEntry* pEntry ) const { return pModel->PrevSelected(this,pEntry); } SvListEntry* LastSelected() const { return pModel->LastSelected(this); } - SvListEntry* GetEntryAtVisPos( sal_uIntPtr nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); } - sal_uIntPtr GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); } + SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const { return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); } + sal_uLong GetVisiblePos( SvListEntry* pEntry ) const { return pModel->GetVisiblePos((SvListView*)this,pEntry); } - sal_uIntPtr GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); } - sal_uIntPtr GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } + sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const { return pModel->GetVisibleChildCount((SvListView*)this,pParent); } + sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const { return pModel->GetChildSelectionCount((SvListView*)this,pParent); } void Expand( SvListEntry* pParent ) { pModel->Expand((SvListView*)this,pParent); } void Collapse( SvListEntry* pParent ) { pModel->Collapse((SvListView*)this,pParent); } sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True ) { return pModel->Select((SvListView*)this,pEntry,bSelect); } - sal_uIntPtr SelectChilds( SvListEntry* pParent, sal_Bool bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); } + sal_uLong SelectChilds( SvListEntry* pParent, sal_Bool bSelect ) { return pModel->SelectChilds((SvListView*)this,pParent, bSelect); } // ruft nicht Select-Hdl virtual void SelectAll( sal_Bool bSelect, sal_Bool ) { pModel->SelectAll((SvListView*)this, bSelect); } sal_Bool IsEntryVisible( SvListEntry* pEntry ) const { return pModel->IsEntryVisible((SvListView*)this,pEntry); } @@ -386,7 +386,7 @@ public: virtual void ModelHasInserted( SvListEntry* pEntry ); virtual void ModelHasInsertedTree( SvListEntry* pEntry ); virtual void ModelIsMoving( SvListEntry* pSource, SvListEntry* pTargetParent, - sal_uIntPtr nPos ); + sal_uLong nPos ); virtual void ModelHasMoved( SvListEntry* pSource ); virtual void ModelIsRemoving( SvListEntry* pEntry ); virtual void ModelHasRemoved( SvListEntry* pEntry ); @@ -396,28 +396,28 @@ public: inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->IsExpanded(); } inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->IsSelected(); } inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const { DBG_ASSERT(pEntry,"IsExpanded:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); return pData->HasFocus(); } inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) const { DBG_ASSERT(pEntry,"SetEntryFocus:No Entry"); - SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pData,"Entry not in Table"); pData->SetFocus(bFocus); } @@ -425,9 +425,9 @@ inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) co inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const { #ifndef DBG_UTIL - return (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + return (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); #else - SvViewData* pResult = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); + SvViewData* pResult = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); DBG_ASSERT(pResult,"Entry not in model or wrong view"); return pResult; #endif @@ -440,7 +440,7 @@ inline sal_Bool SvTreeList::HasChilds( SvListEntry* pEntry ) const return (sal_Bool)(pEntry->pChilds != 0); } -inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const +inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const { if ( !pParent ) pParent = pRootItem; SvListEntry* pRet = 0; @@ -449,7 +449,7 @@ inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uIntPtr nPos return pRet; } -inline SvListEntry* SvTreeList::GetEntry( sal_uIntPtr nRootPos ) const +inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const { SvListEntry* pRet; if ( nEntryCount ) @@ -487,11 +487,11 @@ public: \ Type Last( sal_uInt16* pDepth=0 ) const \ { return (Type)SvTreeList::Last(pDepth); } \ \ - Type Clone( SvListEntry* pEntry, sal_uIntPtr& nCloneCount ) const \ + Type Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const \ { return (Type)SvTreeList::Clone(pEntry,nCloneCount); } \ - Type GetEntry( SvListEntry* pParent, sal_uIntPtr nPos ) const \ + Type GetEntry( SvListEntry* pParent, sal_uLong nPos ) const \ { return (Type)SvTreeList::GetEntry(pParent,nPos); } \ - Type GetEntry( sal_uIntPtr nRootPos ) const \ + Type GetEntry( sal_uLong nRootPos ) const \ { return (Type)SvTreeList::GetEntry(nRootPos); } \ Type GetParent( SvListEntry* pEntry ) const \ { return (Type)SvTreeList::GetParent(pEntry); } \ @@ -507,7 +507,7 @@ public: \ using SvTreeList::LastSibling; \ Type LastSibling( Type pEntry ) const \ { return (Type)SvTreeList::LastSibling(pEntry); } \ - Type GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const \ + Type GetEntryAtAbsPos( sal_uLong nAbsPos ) const \ { return (Type)SvTreeList::GetEntryAtAbsPos( nAbsPos); } \ }; diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx index 03cb676755dd..1a6802b9a51c 100644 --- a/svtools/inc/svtools/ttprops.hxx +++ b/svtools/inc/svtools/ttprops.hxx @@ -36,7 +36,7 @@ class SfxPoolItem; class Bitmap; -// Defines zur Steuerung der Ausführung von Slots +// Defines zur Steuerung der Ausf�hrung von Slots #define EXECUTE_NO 0 #define EXECUTE_POSSIBLE 1 #define EXECUTE_YES 2 @@ -60,7 +60,7 @@ class Bitmap; class SVT_DLLPUBLIC TTProperties : public ApplicationProperty { - sal_uInt16 nDonePRs; // Verwaltung für die Properties, die nur einmal gerufen werden mussen. + sal_uInt16 nDonePRs; // Verwaltung f�r die Properties, die nur einmal gerufen werden mussen. SVT_DLLPRIVATE sal_Bool RequestProperty( sal_uInt16 nRequest ); sal_Bool HasSlots(){ return nPropertyVersion == TT_PROPERTIES_VERSION; } @@ -89,14 +89,14 @@ public: static SvtResId GetSvtResId( sal_uInt16 nId ); - sal_uIntPtr nSidOpenUrl; - sal_uIntPtr nSidFileName; - sal_uIntPtr nSidNewDocDirect; - sal_uIntPtr nSidCopy; - sal_uIntPtr nSidPaste; - sal_uIntPtr nSidSourceView; - sal_uIntPtr nSidSelectAll; - sal_uIntPtr nSidReferer; + sal_uLong nSidOpenUrl; + sal_uLong nSidFileName; + sal_uLong nSidNewDocDirect; + sal_uLong nSidCopy; + sal_uLong nSidPaste; + sal_uLong nSidSourceView; + sal_uLong nSidSelectAll; + sal_uLong nSidReferer; sal_uInt16 nActualPR; sal_uInt16 nPropertyVersion; // Wird bei jedem call gesetzt. diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 496ed17ffbe2..09fe2880fec0 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -271,18 +271,18 @@ void BrowseBox::SetFont( const Font& rNewFont ) //------------------------------------------------------------------- -sal_uIntPtr BrowseBox::GetDefaultColumnWidth( const String& _rText ) const +sal_uLong BrowseBox::GetDefaultColumnWidth( const String& _rText ) const { return GetDataWindow().GetTextWidth( _rText ) + GetDataWindow().GetTextWidth( '0' ) * 4; } //------------------------------------------------------------------- -void BrowseBox::InsertHandleColumn( sal_uIntPtr nWidth ) +void BrowseBox::InsertHandleColumn( sal_uLong nWidth ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); - pCols->Insert( new BrowserColumn( 0, Image(), String(), nWidth, GetZoom(), 0 ), (sal_uIntPtr) 0 ); + pCols->Insert( new BrowserColumn( 0, Image(), String(), nWidth, GetZoom(), 0 ), (sal_uLong) 0 ); FreezeColumn( 0 ); // Headerbar anpassen @@ -431,9 +431,9 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) // move to the right of the last frozen column sal_uInt16 nFirstScrollable = FrozenColCount(); BrowserColumn *pColumn = pCols->GetObject(nItemPos); - pCols->Remove( (sal_uIntPtr) nItemPos ); + pCols->Remove( (sal_uLong) nItemPos ); nItemPos = nFirstScrollable; - pCols->Insert( pColumn, (sal_uIntPtr) nItemPos ); + pCols->Insert( pColumn, (sal_uLong) nItemPos ); } // adjust the number of the first scrollable and visible column @@ -448,9 +448,9 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) // move to the leftmost scrollable colum sal_uInt16 nFirstScrollable = FrozenColCount(); BrowserColumn *pColumn = pCols->GetObject(nItemPos); - pCols->Remove( (sal_uIntPtr) nItemPos ); + pCols->Remove( (sal_uLong) nItemPos ); nItemPos = nFirstScrollable; - pCols->Insert( pColumn, (sal_uIntPtr) nItemPos ); + pCols->Insert( pColumn, (sal_uLong) nItemPos ); } // adjust the number of the first scrollable and visible column @@ -664,7 +664,7 @@ void BrowseBox::SetColumnTitle( sal_uInt16 nItemId, const String& rTitle ) //------------------------------------------------------------------- -void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uIntPtr nWidth ) +void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -686,7 +686,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uIntPtr nWidth ) nMaxWidth -= getDataWindow()->bAutoSizeLastCol ? GetFieldRect(nItemId).Left() : GetFrozenWidth(); - if ( ( (BrowserDataWin*)pDataWin )->bAutoSizeLastCol || nWidth > (sal_uIntPtr)nMaxWidth ) + if ( ( (BrowserDataWin*)pDataWin )->bAutoSizeLastCol || nWidth > (sal_uLong)nMaxWidth ) { nWidth = nMaxWidth > 16 ? nMaxWidth : nOldWidth; nWidth = QueryColumnResize( nItemId, nWidth ); @@ -697,7 +697,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uIntPtr nWidth ) // In AutoSizeLastColumn() wird SetColumnWidth mit nWidth==0xffff // gerufen. Deshalb muss hier nochmal geprueft werden, ob sich die // Breite tatsaechlich geaendert hat. - if( (sal_uIntPtr)nOldWidth == nWidth ) + if( (sal_uLong)nOldWidth == nWidth ) return; // soll die Aenderung sofort dargestellt werden? @@ -743,13 +743,13 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uIntPtr nWidth ) if( GetBackground().IsScrollable() ) { - Rectangle aScrRect( nX + std::min( (sal_uIntPtr)nOldWidth, nWidth ), 0, + Rectangle aScrRect( nX + std::min( (sal_uLong)nOldWidth, nWidth ), 0, GetSizePixel().Width() , // the header is longer than the datawin pDataWin->GetPosPixel().Y() - 1 ); Control::Scroll( nWidth-nOldWidth, 0, aScrRect, SCROLL_FLAGS ); aScrRect.Bottom() = pDataWin->GetSizePixel().Height(); getDataWindow()->Scroll( nWidth-nOldWidth, 0, aScrRect, SCROLL_FLAGS ); - Rectangle aInvRect( nX, 0, nX + std::max( nWidth, (sal_uIntPtr)nOldWidth ), USHRT_MAX ); + Rectangle aInvRect( nX, 0, nX + std::max( nWidth, (sal_uLong)nOldWidth ), USHRT_MAX ); Control::Invalidate( aInvRect, INVALIDATE_NOCHILDREN ); ( (BrowserDataWin*)pDataWin )->Invalidate( aInvRect ); } @@ -814,7 +814,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) nCurColId = 0; // Spalte entfernen - delete( pCols->Remove( (sal_uIntPtr) nPos )); + delete( pCols->Remove( (sal_uLong) nPos )); // OJ #93534# if ( nFirstCol >= nPos && nFirstCol > FrozenColCount() ) { @@ -884,7 +884,7 @@ void BrowseBox::RemoveColumns() unsigned int nOldCount = pCols->Count(); // alle Spalten entfernen while ( pCols->Count() ) - delete ( pCols->Remove( (sal_uIntPtr) 0 )); + delete ( pCols->Remove( (sal_uLong) 0 )); // Spaltenselektion korrigieren if ( pColSel ) diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 20556726fe26..c37fb6915725 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -372,7 +372,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) if ( aHighlightList.Count() && nLastRowInRect == ( nRow - 1 ) ) aHighlightList.First()->Union( aAddRect ); else - aHighlightList.Insert( new Rectangle( aAddRect ), (sal_uIntPtr) 0 ); + aHighlightList.Insert( new Rectangle( aAddRect ), (sal_uLong) 0 ); nLastRowInRect = nRow; } @@ -481,7 +481,7 @@ void BrowseBox::DrawCursor() //------------------------------------------------------------------- -sal_uIntPtr BrowseBox::GetColumnWidth( sal_uInt16 nId ) const +sal_uLong BrowseBox::GetColumnWidth( sal_uInt16 nId ) const { DBG_CHKTHIS(BrowseBox,BrowseBoxCheckInvariants); @@ -609,9 +609,9 @@ void BrowseBox::Resize() // calc the size of the scrollbars // (we can't ask the scrollbars for their widths cause if we're zoomed they still have to be // resized - which is done in UpdateScrollbars) - sal_uIntPtr nSBSize = GetSettings().GetStyleSettings().GetScrollBarSize(); + sal_uLong nSBSize = GetSettings().GetStyleSettings().GetScrollBarSize(); if (IsZoom()) - nSBSize = (sal_uIntPtr)(nSBSize * (double)GetZoom()); + nSBSize = (sal_uLong)(nSBSize * (double)GetZoom()); DoHideCursor( "Resize" ); sal_uInt16 nOldVisibleRows = @@ -774,7 +774,7 @@ void BrowseBox::PaintRow( OutputDevice&, const Rectangle& ) //------------------------------------------------------------------- -void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { sal_Bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0; @@ -926,8 +926,8 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ long nDataRowHeigt = GetDataRowHeight(); // compute relative rows to redraw - sal_uIntPtr nRelTopRow = _bForeignDevice ? 0 : ((sal_uIntPtr)_rRect.Top() / nDataRowHeigt); - sal_uIntPtr nRelBottomRow = (sal_uIntPtr)(_bForeignDevice ? aOverallAreaSize.Height() : _rRect.Bottom()) / nDataRowHeigt; + sal_uLong nRelTopRow = _bForeignDevice ? 0 : ((sal_uLong)_rRect.Top() / nDataRowHeigt); + sal_uLong nRelBottomRow = (sal_uLong)(_bForeignDevice ? aOverallAreaSize.Height() : _rRect.Bottom()) / nDataRowHeigt; // cache frequently used values Point aPos( aOverallAreaPos.X(), nRelTopRow * nDataRowHeigt + aOverallAreaPos.Y() ); @@ -948,8 +948,8 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ // redraw the invalid fields sal_Bool bRetouching = sal_False; - for ( sal_uIntPtr nRelRow = nRelTopRow; - nRelRow <= nRelBottomRow && (sal_uIntPtr)nTopRow+nRelRow < (sal_uIntPtr)nRowCount; + for ( sal_uLong nRelRow = nRelTopRow; + nRelRow <= nRelBottomRow && (sal_uLong)nTopRow+nRelRow < (sal_uLong)nRowCount; ++nRelRow, aPos.Y() += nDataRowHeigt ) { // get row @@ -959,7 +959,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ continue; // prepare row - sal_uIntPtr nRow = nTopRow+nRelRow; + sal_uLong nRow = nTopRow+nRelRow; if ( !SeekRow( nRow) ) { DBG_ERROR("BrowseBox::ImplPaintData: SeekRow gescheitert"); } @@ -1023,7 +1023,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ _rOut.DrawRect( aFieldRect ); } - if (!m_bFocusOnlyCursor && (pCol->GetId() == GetCurColumnId()) && (nRow == (sal_uIntPtr)GetCurRow())) + if (!m_bFocusOnlyCursor && (pCol->GetId() == GetCurColumnId()) && (nRow == (sal_uLong)GetCurRow())) DrawCursor(); // draw a single field @@ -1199,9 +1199,9 @@ void BrowseBox::UpdateScrollbars() pBDW->bInUpdateScrollbars = sal_True; // the size of the corner window (and the width of the VSB/height of the HSB) - sal_uIntPtr nCornerSize = GetSettings().GetStyleSettings().GetScrollBarSize(); + sal_uLong nCornerSize = GetSettings().GetStyleSettings().GetScrollBarSize(); if (IsZoom()) - nCornerSize = (sal_uIntPtr)(nCornerSize * (double)GetZoom()); + nCornerSize = (sal_uLong)(nCornerSize * (double)GetZoom()); // needs VScroll? long nMaxRows = (pDataWin->GetSizePixel().Height()) / GetDataRowHeight(); @@ -1227,7 +1227,7 @@ void BrowseBox::UpdateScrollbars() } // needs HScroll? - sal_uIntPtr nLastCol = GetColumnAtXPosPixel( aDataWinSize.Width() - 1 ); + sal_uLong nLastCol = GetColumnAtXPosPixel( aDataWinSize.Width() - 1 ); sal_uInt16 nFrozenCols = FrozenColCount(); sal_Bool bNeedsHScroll = getDataWindow()->bAutoHScroll @@ -1251,7 +1251,7 @@ void BrowseBox::UpdateScrollbars() } // adjust position and Width of horizontal scrollbar - sal_uIntPtr nHScrX = nControlAreaWidth == USHRT_MAX + sal_uLong nHScrX = nControlAreaWidth == USHRT_MAX ? 0 : nControlAreaWidth; @@ -1310,7 +1310,7 @@ void BrowseBox::UpdateScrollbars() // needs corner-window? // (do that AFTER positioning BOTH scrollbars) - sal_uIntPtr nActualCorderWidth = 0; + sal_uLong nActualCorderWidth = 0; if (aHScroll.IsVisible() && pVScroll && pVScroll->IsVisible() ) { // if we have both scrollbars, the corner window fills the point of intersection of these two @@ -1586,7 +1586,7 @@ void BrowseBox::MouseMove( const MouseEvent& rEvt ) nDragX = Max( rEvt.GetPosPixel().X(), nMinResizeX ); long nDeltaX = nDragX - nResizeX; sal_uInt16 nId = GetColumnId(nResizeCol); - sal_uIntPtr nOldWidth = GetColumnWidth(nId); + sal_uLong nOldWidth = GetColumnWidth(nId); nDragX = QueryColumnResize( GetColumnId(nResizeCol), nOldWidth + nDeltaX ) + nResizeX - nOldWidth; diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index c62a377dc4e3..c13eabd2314e 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -124,7 +124,7 @@ void ButtonFrame::Draw( OutputDevice& rDev ) //------------------------------------------------------------------- BrowserColumn::BrowserColumn( sal_uInt16 nItemId, const class Image &rImage, - const String& rTitle, sal_uIntPtr nWidthPixel, const Fraction& rCurrentZoom, + const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom, HeaderBarItemBits nFlags ) : _nId( nItemId ), _nWidth( nWidthPixel ), @@ -145,7 +145,7 @@ BrowserColumn::~BrowserColumn() //------------------------------------------------------------------- -void BrowserColumn::SetWidth(sal_uIntPtr nNewWidthPixel, const Fraction& rCurrentZoom) +void BrowserColumn::SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom) { _nWidth = nNewWidthPixel; double n = (double)_nWidth; @@ -749,7 +749,7 @@ void BrowserDataWin::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) void BrowserScrollBar::Tracking( const TrackingEvent& rTEvt ) { - sal_uIntPtr nPos = GetThumbPos(); + sal_uLong nPos = GetThumbPos(); if ( nPos != _nLastPos ) { if ( _nTip ) diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 6061d028ed18..91b22d764bb0 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -84,8 +84,8 @@ public: class BrowserColumn { sal_uInt16 _nId; - sal_uIntPtr _nOriginalWidth; - sal_uIntPtr _nWidth; + sal_uLong _nOriginalWidth; + sal_uLong _nWidth; Image _aImage; String _aTitle; sal_Bool _bFrozen; @@ -93,13 +93,13 @@ class BrowserColumn public: BrowserColumn( sal_uInt16 nItemId, const Image &rImage, - const String& rTitle, sal_uIntPtr nWidthPixel, const Fraction& rCurrentZoom, + const String& rTitle, sal_uLong nWidthPixel, const Fraction& rCurrentZoom, HeaderBarItemBits nFlags ); virtual ~BrowserColumn(); sal_uInt16 GetId() const { return _nId; } - sal_uIntPtr Width() { return _nWidth; } + sal_uLong Width() { return _nWidth; } Image& GetImage() { return _aImage; } String& Title() { return _aTitle; } HeaderBarItemBits& Flags() { return _nFlags; } @@ -110,7 +110,7 @@ public: virtual void Draw( BrowseBox& rBox, OutputDevice& rDev, const Point& rPos, sal_Bool bCurs ); - void SetWidth(sal_uIntPtr nNewWidthPixel, const Fraction& rCurrentZoom); + void SetWidth(sal_uLong nNewWidthPixel, const Fraction& rCurrentZoom); void ZoomChanged(const Fraction& rNewZoom); }; @@ -213,8 +213,8 @@ inline void BrowserDataWin::Repaint() class BrowserScrollBar: public ScrollBar { - sal_uIntPtr _nTip; - sal_uIntPtr _nLastPos; + sal_uLong _nTip; + sal_uLong _nLastPos; BrowserDataWin* _pDataWin; public: diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index c6854bbeab0f..8f2534b449e2 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -311,7 +311,7 @@ namespace svt } //------------------------------------------------------------------ - void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) + void CheckBoxControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { pBox->Draw(pDev,rPos,rSize,nFlags); } diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx index 89de59baadb4..00f43b9c053d 100644 --- a/svtools/source/config/apearcfg.cxx +++ b/svtools/source/config/apearcfg.cxx @@ -271,7 +271,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) // Mouse Snap MouseSettings hMouseSettings = hAppSettings.GetMouseSettings(); - sal_uIntPtr nMouseOptions = hMouseSettings.GetOptions(); + sal_uLong nMouseOptions = hMouseSettings.GetOptions(); nMouseOptions &= ! (MOUSE_OPTION_AUTOCENTERPOS | MOUSE_OPTION_AUTODEFBTNPOS); @@ -292,7 +292,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp ) // Merge and Publish Settings - sal_uIntPtr nFollow = hMouseSettings.GetFollow(); + sal_uLong nFollow = hMouseSettings.GetFollow(); if(bMenuMouseFollow) nFollow |= MOUSE_FOLLOW_MENU; else diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index bb385ca314f9..9668a2144ebf 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -725,7 +725,7 @@ sal_Int16 SvtMiscOptions::GetCurrentSymbolsSize() const { // Use system settings, we have to retrieve the toolbar icon size from the // Application class - sal_uIntPtr nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); + sal_uLong nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); if ( nStyleIconSize == STYLE_TOOLBAR_ICONSIZE_LARGE ) eOptSymbolsSize = SFX_SYMBOLS_SIZE_LARGE; else diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index accbbc84dcdd..4ea086ad7580 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -113,7 +113,7 @@ namespace struct ReleaseSolarMutex { private: - sal_uIntPtr m_nCount; + sal_uLong m_nCount; public: inline ReleaseSolarMutex() @@ -615,7 +615,7 @@ public: String FolderInserted( const OUString& rURL, const OUString& rTitle ); - sal_uIntPtr GetEntryPos( const OUString& rURL ); + sal_uLong GetEntryPos( const OUString& rURL ); inline void EnableContextMenu( sal_Bool bEnable ); inline void EnableDelete( sal_Bool bEnable ); @@ -1612,7 +1612,7 @@ void SvtFileView::SetDoubleClickHdl( const Link& rHdl ) // ----------------------------------------------------------------------- -sal_uIntPtr SvtFileView::GetSelectionCount() const +sal_uLong SvtFileView::GetSelectionCount() const { return mpImp->mpView->GetSelectionCount(); } @@ -2480,7 +2480,7 @@ void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending ) if ( !mbIsFirstResort ) { - sal_uIntPtr nPos = GetEntryPos( aEntryURL ); + sal_uLong nPos = GetEntryPos( aEntryURL ); if ( nPos < mpView->GetEntryCount() ) { pEntry = mpView->GetEntry( nPos ); @@ -2688,12 +2688,12 @@ String SvtFileView_Impl::FolderInserted( const OUString& rURL, const OUString& r } // ----------------------------------------------------------------------- -sal_uIntPtr SvtFileView_Impl::GetEntryPos( const OUString& rURL ) +sal_uLong SvtFileView_Impl::GetEntryPos( const OUString& rURL ) { ::osl::MutexGuard aGuard( maMutex ); std::vector< SortingData_Impl* >::iterator aIt; - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; for ( aIt = maContent.begin(); aIt != maContent.end(); aIt++ ) { diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 81231925154c..a54d578593cd 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -142,8 +142,8 @@ public: ~EntryList_Impl(); void Clear(); - void Insert( SvxIconChoiceCtrlEntry* pEntry, sal_uIntPtr nPos ); - SvxIconChoiceCtrlEntry* Remove( sal_uIntPtr nPos ); + void Insert( SvxIconChoiceCtrlEntry* pEntry, sal_uLong nPos ); + SvxIconChoiceCtrlEntry* Remove( sal_uLong nPos ); void Remove( SvxIconChoiceCtrlEntry* pEntry ); }; @@ -190,8 +190,8 @@ class SvxIconChoiceCtrl_Impl long nMaxBoundHeight; // Hoehe des hoechsten BoundRects sal_uInt16 nFlags; sal_uInt16 nCurTextDrawFlags; - sal_uIntPtr nUserEventAdjustScrBars; - sal_uIntPtr nUserEventShowCursor; + sal_uLong nUserEventAdjustScrBars; + sal_uLong nUserEventShowCursor; SvxIconChoiceCtrlEntry* pCurHighlightFrame; sal_Bool bHighlightFramePressed; SvxIconChoiceCtrlEntry* pHead; // Eintrag oben links @@ -211,7 +211,7 @@ class SvxIconChoiceCtrl_Impl SvxIconChoiceCtrlEntry* pCurEditedEntry; SvxIconChoiceCtrlTextMode eTextMode; SelectionMode eSelectionMode; - sal_uIntPtr nSelectionCount; + sal_uLong nSelectionCount; SvxIconChoiceCtrlPositionMode ePositionMode; sal_Bool bBoundRectsDirty; sal_Bool bUpdateMode; @@ -275,7 +275,7 @@ class SvxIconChoiceCtrl_Impl Point AdjustAtGrid( const Rectangle& rCenterRect, // "Schwerpunkt" des Objekts (typ. Bmp-Rect) const Rectangle& rBoundRect ) const; - sal_uIntPtr GetPredecessorGrid( const Point& rDocPos) const; + sal_uLong GetPredecessorGrid( const Point& rDocPos) const; void InitPredecessors(); void ClearPredecessors(); @@ -303,7 +303,7 @@ class SvxIconChoiceCtrl_Impl void HideFocus (); void DrawFocusRect ( OutputDevice* pOut ); - sal_Bool IsMnemonicChar( sal_Unicode cChar, sal_uIntPtr& rPos ) const; + sal_Bool IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const; public: @@ -319,7 +319,7 @@ public: void Clear( sal_Bool bInCtor = sal_False ); void SetStyle( WinBits nWinStyle ); WinBits GetStyle() const { return nWinBits; } - void InsertEntry( SvxIconChoiceCtrlEntry*, sal_uIntPtr nPos, const Point* pPos=0 ); + void InsertEntry( SvxIconChoiceCtrlEntry*, sal_uLong nPos, const Point* pPos=0 ); void CreateAutoMnemonics( MnemonicGenerator* _pGenerator = NULL ); void RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ); void FontModified(); @@ -435,10 +435,10 @@ public: void Command( const CommandEvent& rCEvt ); void ToTop( SvxIconChoiceCtrlEntry* ); - sal_uIntPtr GetSelectionCount() const; + sal_uLong GetSelectionCount() const; void SetGrid( const Size& ); Size GetMinGrid() const; - sal_uIntPtr GetGridCount( + sal_uLong GetGridCount( const Size& rSize, sal_Bool bCheckScrBars, sal_Bool bSmartScrBar ) const; @@ -483,10 +483,10 @@ public: void EditEntry( SvxIconChoiceCtrlEntry* pEntry ); void StopEntryEditing( sal_Bool bCancel ); void LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, sal_Bool bLock ); - sal_uIntPtr GetEntryCount() const { return aEntries.Count(); } - SvxIconChoiceCtrlEntry* GetEntry( sal_uIntPtr nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); } - SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( sal_uIntPtr& ) const; - SvxIconChoiceCtrlEntry* GetNextSelectedEntry( sal_uIntPtr& ) const; + sal_uLong GetEntryCount() const { return aEntries.Count(); } + SvxIconChoiceCtrlEntry* GetEntry( sal_uLong nPos ) const { return (SvxIconChoiceCtrlEntry*)aEntries.GetObject(nPos); } + SvxIconChoiceCtrlEntry* GetFirstSelectedEntry( sal_uLong& ) const; + SvxIconChoiceCtrlEntry* GetNextSelectedEntry( sal_uLong& ) const; SvxIconChoiceCtrlEntry* GetHdlEntry() const { return pHdlEntry; } void SetHdlEntry( SvxIconChoiceCtrlEntry* pEntry ) { pHdlEntry = pEntry; } @@ -499,8 +499,8 @@ public: if( bMoved ) nFlags |= F_MOVED_ENTRIES; else nFlags &= ~(F_MOVED_ENTRIES); } - sal_uIntPtr GetEntryListPos( SvxIconChoiceCtrlEntry* ) const; - void SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, sal_uIntPtr nNewPos ); + sal_uLong GetEntryListPos( SvxIconChoiceCtrlEntry* ) const; + void SetEntryListPos( SvxIconChoiceCtrlEntry* pEntry, sal_uLong nNewPos ); void SetEntryImageSize( const Size& rSize ) { aImageSize = rSize; } void SetEntryFlags( SvxIconChoiceCtrlEntry* pEntry, sal_uInt16 nFlags ); SvxIconChoiceCtrlEntry* GoLeftRight( SvxIconChoiceCtrlEntry*, sal_Bool bRight ); @@ -536,7 +536,7 @@ public: sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); - void CallEventListeners( sal_uIntPtr nEvent, void* pData = NULL ); + void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); inline ::svt::IAccessibleFactory& GetAccessibleFactory() { return aAccFactory.getFactory(); } @@ -585,7 +585,7 @@ public: // ---------------------------------------------------------------------------------------------- -typedef sal_uIntPtr GridId; +typedef sal_uLong GridId; #define GRID_NOT_FOUND ((GridId)ULONG_MAX) @@ -616,14 +616,14 @@ public: void OccupyGrids( const SvxIconChoiceCtrlEntry*, sal_Bool bOccupy = sal_True ); void OccupyGrid( GridId nId, sal_Bool bOccupy = sal_True ) { - DBG_ASSERT(!_pGridMap || nId<(sal_uIntPtr)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId"); - if(_pGridMap && nId < (sal_uIntPtr)(_nGridCols *_nGridRows) ) + DBG_ASSERT(!_pGridMap || nId<(sal_uLong)(_nGridCols*_nGridRows),"OccupyGrid: Bad GridId"); + if(_pGridMap && nId < (sal_uLong)(_nGridCols *_nGridRows) ) _pGridMap[ nId ] = bOccupy; } Rectangle GetGridRect( GridId ); void GetGridCoord( GridId, sal_uInt16& rGridX, sal_uInt16& rGridY ); - static sal_uIntPtr GetGridCount( const Size& rSizePixel, sal_uInt16 nGridWidth, sal_uInt16 nGridHeight ); + static sal_uLong GetGridCount( const Size& rSizePixel, sal_uInt16 nGridWidth, sal_uInt16 nGridHeight ); void OutputSizeChanged(); }; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 1ba9419d48a3..3963ce48c255 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -229,8 +229,8 @@ void SvxIconChoiceCtrl_Impl::Clear( sal_Bool bInCtor ) pView->Invalidate(INVALIDATE_NOCHILDREN); } AdjustScrollBars(); - sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pCur = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); delete pCur; @@ -297,7 +297,7 @@ void SvxIconChoiceCtrl_Impl::FontModified() ShowCursor( sal_True ); } -void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, sal_uIntPtr nPos, +void SvxIconChoiceCtrl_Impl::InsertEntry( SvxIconChoiceCtrlEntry* pEntry, sal_uLong nPos, const Point* pPos ) { StopEditTimer(); @@ -347,8 +347,8 @@ void SvxIconChoiceCtrl_Impl::CreateAutoMnemonics( MnemonicGenerator* _pGenerator pAutoDeleteOwnGenerator.reset( _pGenerator ); } - sal_uIntPtr nEntryCount = GetEntryCount(); - sal_uIntPtr i; + sal_uLong nEntryCount = GetEntryCount(); + sal_uLong i; // insert texts in generator for( i = 0; i < nEntryCount; ++i ) @@ -381,8 +381,8 @@ void SvxIconChoiceCtrl_Impl::SetListPositions() if( nFlags & F_ENTRYLISTPOS_VALID ) return; - sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); pEntry->nPos = nCur; @@ -442,7 +442,7 @@ void SvxIconChoiceCtrl_Impl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ) sal_Bool bCurEntryPosValid = (nFlags & F_ENTRYLISTPOS_VALID) ? sal_True : sal_False; if( bCurEntryPosValid && aEntries.GetObject(aEntries.Count()-1) != pEntry ) nFlags &= ~F_ENTRYLISTPOS_VALID; - sal_uIntPtr nPos = pZOrderList->GetPos( (void*)pEntry ); + sal_uLong nPos = pZOrderList->GetPos( (void*)pEntry ); pZOrderList->Remove( nPos ); if( bCurEntryPosValid ) { @@ -552,8 +552,8 @@ void SvxIconChoiceCtrl_Impl::ResetVirtSize() aVirtOutputSize.Width() = 0; aVirtOutputSize.Height() = 0; sal_Bool bLockedEntryFound = sal_False; - const sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + const sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pCur = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); pCur->ClearFlags( ICNVIEW_FLAG_POS_MOVED ); @@ -576,7 +576,7 @@ void SvxIconChoiceCtrl_Impl::ResetVirtSize() if( aVirtOutputSize.Width() < aRealOutputSize.Width() || aVirtOutputSize.Height() < aRealOutputSize.Height() ) { - sal_uIntPtr nGridCount = IcnGridMap_Impl::GetGridCount( + sal_uLong nGridCount = IcnGridMap_Impl::GetGridCount( aRealOutputSize, (sal_uInt16)nGridDX, (sal_uInt16)nGridDY ); if( nGridCount < nCount ) { @@ -625,11 +625,11 @@ void SvxIconChoiceCtrl_Impl::AdjustVirtSize( const Rectangle& rRect ) void SvxIconChoiceCtrl_Impl::InitPredecessors() { DBG_ASSERT(!pHead,"SvxIconChoiceCtrl_Impl::InitPredecessors() >> Already initialized"); - sal_uIntPtr nCount = aEntries.Count(); + sal_uLong nCount = aEntries.Count(); if( nCount ) { SvxIconChoiceCtrlEntry* pPrev = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( 0 ); - for( sal_uIntPtr nCur = 1; nCur <= nCount; nCur++ ) + for( sal_uLong nCur = 1; nCur <= nCount; nCur++ ) { pPrev->ClearFlags( ICNVIEW_FLAG_POS_LOCKED | ICNVIEW_FLAG_POS_MOVED | ICNVIEW_FLAG_PRED_SET); @@ -654,8 +654,8 @@ void SvxIconChoiceCtrl_Impl::ClearPredecessors() { if( pHead ) { - sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pCur = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); pCur->pflink = 0; @@ -765,7 +765,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) { // set cursor to item with focus-flag sal_Bool bfound = sal_False; - for ( sal_uIntPtr i = 0; i < pView->GetEntryCount() && !bfound; i++) + for ( sal_uLong i = 0; i < pView->GetEntryCount() && !bfound; i++) { SvxIconChoiceCtrlEntry* pEntry = pView->GetEntry ( i ); if( pEntry->IsFocused() ) @@ -783,7 +783,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) if ( pView->HasFocus() ) GetFocus(); - sal_uIntPtr nCount = pZOrderList->Count(); + sal_uLong nCount = pZOrderList->Count(); if( !nCount ) return; @@ -800,7 +800,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) List* pNewZOrderList = new List( nListInitSize ); List* pPaintedEntries = new List( nListInitSize ); - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; while( nCount ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)(pZOrderList->GetObject(nPos )); @@ -822,7 +822,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) nCount = pPaintedEntries->Count(); if( nCount ) { - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) pZOrderList->Insert( pPaintedEntries->GetObject(nCur), LIST_APPEND); } delete pPaintedEntries; @@ -833,7 +833,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) void SvxIconChoiceCtrl_Impl::RepaintEntries( sal_uInt16 nEntryFlagsMask ) { - const sal_uIntPtr nCount = pZOrderList->Count(); + const sal_uLong nCount = pZOrderList->Count(); if( !nCount ) return; @@ -844,7 +844,7 @@ void SvxIconChoiceCtrl_Impl::RepaintEntries( sal_uInt16 nEntryFlagsMask ) bResetClipRegion = sal_True; pView->SetClipRegion( aOutRect ); } - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)(pZOrderList->GetObject(nCur)); if( pEntry->GetFlags() & nEntryFlagsMask ) @@ -1194,7 +1194,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt ) sal_Bool bMod2 = rKEvt.GetKeyCode().IsMod2(); sal_Unicode cChar = rKEvt.GetCharCode(); - sal_uIntPtr nPos = (sal_uIntPtr)-1; + sal_uLong nPos = (sal_uLong)-1; if ( bMod2 && cChar && IsMnemonicChar( cChar, nPos ) ) { // shortcut is clicked @@ -1634,9 +1634,9 @@ sal_Bool SvxIconChoiceCtrl_Impl::CheckHorScrollBar() if(!( nWinBits & WB_HSCROLL) && !aOrigin.X() ) { long nWidth = aOutputSize.Width(); - const sal_uIntPtr nCount = pZOrderList->Count(); + const sal_uLong nCount = pZOrderList->Count(); long nMostRight = 0; - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)pZOrderList->GetObject(nCur); long nRight = GetEntryBoundRect(pEntry).Right(); @@ -1673,8 +1673,8 @@ sal_Bool SvxIconChoiceCtrl_Impl::CheckVerScrollBar() { long nDeepest = 0; long nHeight = aOutputSize.Height(); - const sal_uIntPtr nCount = pZOrderList->Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + const sal_uLong nCount = pZOrderList->Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)pZOrderList->GetObject(nCur); long nBottom = GetEntryBoundRect(pEntry).Bottom(); @@ -2135,7 +2135,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetEntry( const Point& rDocPos, { CheckBoundingRects(); // Z-Order-Liste vom Ende her absuchen - sal_uIntPtr nCount = pZOrderList->Count(); + sal_uLong nCount = pZOrderList->Count(); while( nCount ) { nCount--; @@ -2166,11 +2166,11 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetNextEntry( const Point& rDocP { CheckBoundingRects(); SvxIconChoiceCtrlEntry* pTarget = 0; - const sal_uIntPtr nStartPos = pZOrderList->GetPos( (void*)pCurEntry ); + const sal_uLong nStartPos = pZOrderList->GetPos( (void*)pCurEntry ); if( nStartPos != LIST_ENTRY_NOTFOUND ) { - const sal_uIntPtr nCount = pZOrderList->Count(); - for( sal_uIntPtr nCur = nStartPos+1; nCur < nCount; nCur++ ) + const sal_uLong nCount = pZOrderList->Count(); + for( sal_uLong nCur = nStartPos+1; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)(pZOrderList->GetObject(nCur)); if( pEntry->aRect.IsInside( rDocPos ) ) @@ -2187,7 +2187,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetPrevEntry( const Point& rDocP { CheckBoundingRects(); SvxIconChoiceCtrlEntry* pTarget = 0; - sal_uIntPtr nStartPos = pZOrderList->GetPos( (void*)pCurEntry ); + sal_uLong nStartPos = pZOrderList->GetPos( (void*)pCurEntry ); if( nStartPos != LIST_ENTRY_NOTFOUND && nStartPos != 0 ) { nStartPos--; @@ -2381,8 +2381,8 @@ void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRects() { nMaxBoundHeight = 0; pZOrderList->Clear(); - sal_uIntPtr nCount = aEntries.Count(); - sal_uIntPtr nCur; + sal_uLong nCount = aEntries.Count(); + sal_uLong nCur; SvxIconChoiceCtrlEntry* pEntry; if( !IsAutoArrange() || !pHead ) @@ -2415,9 +2415,9 @@ void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart() { nMaxBoundHeight = 0; pZOrderList->Clear(); - sal_uIntPtr nCur; + sal_uLong nCur; SvxIconChoiceCtrlEntry* pEntry; - const sal_uIntPtr nCount = aEntries.Count(); + const sal_uLong nCount = aEntries.Count(); if( !IsAutoArrange() || !pHead ) { @@ -2460,8 +2460,8 @@ void SvxIconChoiceCtrl_Impl::RecalcAllBoundingRectsSmart() void SvxIconChoiceCtrl_Impl::UpdateBoundingRects() { - const sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + const sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); GetEntryBoundRect( pEntry ); @@ -2742,7 +2742,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::HandleScrollCommand( const CommandEvent& rCmd ) const CommandWheelData* pData = rCmd.GetWheelData(); if( pData && (COMMAND_WHEEL_SCROLL == pData->GetMode()) && !pData->IsHorz() ) { - sal_uIntPtr nScrollLines = pData->GetScrollLines(); + sal_uLong nScrollLines = pData->GetScrollLines(); if( nScrollLines == COMMAND_WHEEL_PAGESCROLL ) { nScrollDY = GetScrollBarPageSize( aVisSize.Width() ); @@ -2806,7 +2806,7 @@ void SvxIconChoiceCtrl_Impl::ToTop( SvxIconChoiceCtrlEntry* pEntry ) { if( pZOrderList->GetObject( pZOrderList->Count() - 1 ) != pEntry ) { - sal_uIntPtr nPos = pZOrderList->GetPos( (void*)pEntry ); + sal_uLong nPos = pZOrderList->GetPos( (void*)pEntry ); pZOrderList->Remove( nPos ); pZOrderList->Insert( pEntry, LIST_APPEND ); } @@ -2954,7 +2954,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindNewCursor() return pNewCursor; } -sal_uIntPtr SvxIconChoiceCtrl_Impl::GetSelectionCount() const +sal_uLong SvxIconChoiceCtrl_Impl::GetSelectionCount() const { if( (nWinBits & WB_HIGHLIGHTFRAME) && pCurHighlightFrame ) return 1; @@ -2978,8 +2978,8 @@ void SvxIconChoiceCtrl_Impl::DeselectAllBut( SvxIconChoiceCtrlEntry* pThisEntryN // // !!!!!!! Todo: Evtl. Z-Orderlist abarbeiten !!!!!!! // - sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); if( pEntry != pThisEntryNot && pEntry->IsSelected() ) @@ -3193,7 +3193,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const Rectangle& rRect, sal_Bool bAdd, CheckBoundingRects(); pView->Update(); - const sal_uIntPtr nCount = pZOrderList->Count(); + const sal_uLong nCount = pZOrderList->Count(); Rectangle aRect( rRect ); aRect.Justify(); @@ -3206,7 +3206,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const Rectangle& rRect, sal_Bool bAdd, pView->SetClipRegion( GetOutputRect() ); } - for( sal_uIntPtr nPos = 0; nPos < nCount; nPos++ ) + for( sal_uLong nPos = 0; nPos < nCount; nPos++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)(pZOrderList->GetObject(nPos )); @@ -3283,11 +3283,11 @@ void SvxIconChoiceCtrl_Impl::SelectRange( SvxIconChoiceCtrlEntry* pEnd, sal_Bool bAdd ) { - sal_uIntPtr nFront = GetEntryListPos( pStart ); - sal_uIntPtr nBack = GetEntryListPos( pEnd ); - sal_uIntPtr nFirst = std::min( nFront, nBack ); - sal_uIntPtr nLast = std::max( nFront, nBack ); - sal_uIntPtr i; + sal_uLong nFront = GetEntryListPos( pStart ); + sal_uLong nBack = GetEntryListPos( pEnd ); + sal_uLong nFirst = std::min( nFront, nBack ); + sal_uLong nLast = std::max( nFront, nBack ); + sal_uLong i; SvxIconChoiceCtrlEntry* pEntry; if ( ! bAdd ) @@ -3314,7 +3314,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange( { // deselect everything behind the last entry if not in // adding mode - sal_uIntPtr nEnd = GetEntryCount(); + sal_uLong nEnd = GetEntryCount(); for ( ; i<nEnd; i++ ) { pEntry = GetEntry( i ); @@ -3644,12 +3644,12 @@ void SvxIconChoiceCtrl_Impl::DrawFocusRect ( OutputDevice* pOut ) pOut->DrawPolyLine ( aPolygon, aLineInfo ); } -sal_Bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uIntPtr& rPos ) const +sal_Bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos ) const { sal_Bool bRet = sal_False; const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); - sal_uIntPtr nEntryCount = GetEntryCount(); - for ( sal_uIntPtr i = 0; i < nEntryCount; ++i ) + sal_uLong nEntryCount = GetEntryCount(); + for ( sal_uLong i = 0; i < nEntryCount; ++i ) { if ( rI18nHelper.MatchMnemonic( GetEntry( i )->GetText(), cChar ) ) { @@ -3783,7 +3783,7 @@ void SvxIconChoiceCtrl_Impl::LockEntryPos( SvxIconChoiceCtrlEntry* pEntry, sal_B pEntry->ClearFlags( ICNVIEW_FLAG_POS_LOCKED ); } -SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uIntPtr& rPos ) const +SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uLong& rPos ) const { if( !GetSelectionCount() ) return 0; @@ -3794,10 +3794,10 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uIntP return pCurHighlightFrame; } - sal_uIntPtr nCount = aEntries.Count(); + sal_uLong nCount = aEntries.Count(); if( !pHead ) { - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); if( pEntry->IsSelected() ) @@ -3829,14 +3829,14 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( sal_uIntP } // kein Round Robin! -SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetNextSelectedEntry( sal_uIntPtr& rStartPos ) const +SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetNextSelectedEntry( sal_uLong& rStartPos ) const { - sal_uIntPtr nCount = aEntries.Count(); + sal_uLong nCount = aEntries.Count(); if( rStartPos > nCount || !GetSelectionCount() ) return 0; if( !pHead ) { - for( sal_uIntPtr nCur = rStartPos+1; nCur < nCount; nCur++ ) + for( sal_uLong nCur = rStartPos+1; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); if( pEntry->IsSelected() ) @@ -3869,8 +3869,8 @@ void SvxIconChoiceCtrl_Impl::SelectAll( sal_Bool bSelect, sal_Bool bPaint ) { bPaint = sal_True; - sal_uIntPtr nCount = aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount && (bSelect || GetSelectionCount() ); nCur++ ) + sal_uLong nCount = aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount && (bSelect || GetSelectionCount() ); nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)aEntries.GetObject( nCur ); SelectEntry( pEntry, bSelect, sal_True, sal_True, bPaint ); @@ -3883,7 +3883,7 @@ void SvxIconChoiceCtrl_Impl::SaveSelection( List** ppList ) { if( !*ppList ) *ppList = new List; - sal_uIntPtr nPos; + sal_uLong nPos; SvxIconChoiceCtrlEntry* pEntry = GetFirstSelectedEntry( nPos ); while( pEntry && GetSelectionCount() != (*ppList)->Count() ) { @@ -4020,22 +4020,22 @@ void IcnViewEdit_Impl::StopEditing( sal_Bool bCancel ) } } -sal_uIntPtr SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const +sal_uLong SvxIconChoiceCtrl_Impl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const { if( !(nFlags & F_ENTRYLISTPOS_VALID )) ((SvxIconChoiceCtrl_Impl*)this)->SetListPositions(); return pEntry->nPos; } -void SvxIconChoiceCtrl_Impl::SetEntryListPos( SvxIconChoiceCtrlEntry* pListEntry, sal_uIntPtr nNewPos ) +void SvxIconChoiceCtrl_Impl::SetEntryListPos( SvxIconChoiceCtrlEntry* pListEntry, sal_uLong nNewPos ) { - sal_uIntPtr nCurPos = GetEntryListPos( pListEntry ); + sal_uLong nCurPos = GetEntryListPos( pListEntry ); if( nCurPos == nNewPos ) return; aEntries.List::Remove( nCurPos ); aEntries.List::Insert( (void*)pListEntry, nNewPos ); // Eintragspositionen anpassen - sal_uIntPtr nStart, nEnd; + sal_uLong nStart, nEnd; if( nNewPos < nCurPos ) { nStart = nNewPos; @@ -4141,14 +4141,14 @@ void EntryList_Impl::Clear() List::Clear(); } -void EntryList_Impl::Insert( SvxIconChoiceCtrlEntry* pEntry, sal_uIntPtr nPos ) +void EntryList_Impl::Insert( SvxIconChoiceCtrlEntry* pEntry, sal_uLong nPos ) { List::Insert( pEntry, nPos ); if( _pOwner->pHead ) pEntry->SetBacklink( _pOwner->pHead->pblink ); } -SvxIconChoiceCtrlEntry* EntryList_Impl::Remove( sal_uIntPtr nPos ) +SvxIconChoiceCtrlEntry* EntryList_Impl::Remove( sal_uLong nPos ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)List::Remove( nPos ); DBG_ASSERT(pEntry,"EntryList_Impl::Remove > Entry not found"); @@ -4182,14 +4182,14 @@ void EntryList_Impl::Removed_Impl( SvxIconChoiceCtrlEntry* pEntry ) void SvxIconChoiceCtrl_Impl::SetPositionMode( SvxIconChoiceCtrlPositionMode eMode ) { - sal_uIntPtr nCur; + sal_uLong nCur; if( eMode == ePositionMode ) return; SvxIconChoiceCtrlPositionMode eOldMode = ePositionMode; ePositionMode = eMode; - sal_uIntPtr nCount = aEntries.Count(); + sal_uLong nCount = aEntries.Count(); if( eOldMode == IcnViewPositionModeAutoArrange ) { @@ -4258,12 +4258,12 @@ void SvxIconChoiceCtrl_Impl::SetEntryPredecessor( SvxIconChoiceCtrlEntry* pEntry if( pEntry == pPredecessor ) return; - sal_uIntPtr nPos1 = GetEntryListPos( pEntry ); + sal_uLong nPos1 = GetEntryListPos( pEntry ); if( !pHead ) { if( pPredecessor ) { - sal_uIntPtr nPos2 = GetEntryListPos( pPredecessor ); + sal_uLong nPos2 = GetEntryListPos( pPredecessor ); if( nPos1 == (nPos2 + 1) ) return; // ist schon Vorgaenger } @@ -4328,8 +4328,8 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconCho Point aPos( rPosTopLeft ); //TopLeft Rectangle aCenterRect( CalcBmpRect( pEntry, &aPos )); Point aNewPos( aCenterRect.Center() ); - sal_uIntPtr nGrid = GetPredecessorGrid( aNewPos ); - sal_uIntPtr nCount = aEntries.Count(); + sal_uLong nGrid = GetPredecessorGrid( aNewPos ); + sal_uLong nCount = aEntries.Count(); if( nGrid == ULONG_MAX ) return 0; if( nGrid >= nCount ) @@ -4339,13 +4339,13 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::FindEntryPredecessor( SvxIconCho SvxIconChoiceCtrlEntry* pCur = pHead; // Grid 0 // todo: Liste von hinten aufrollen wenn nGrid > nCount/2 - for( sal_uIntPtr nCur = 0; nCur < nGrid; nCur++ ) + for( sal_uLong nCur = 0; nCur < nGrid; nCur++ ) pCur = pCur->pflink; return pCur; } -sal_uIntPtr SvxIconChoiceCtrl_Impl::GetPredecessorGrid( const Point& rPos) const +sal_uLong SvxIconChoiceCtrl_Impl::GetPredecessorGrid( const Point& rPos) const { Point aPos( rPos ); aPos.X() -= LROFFS_WINBORDER; @@ -4358,7 +4358,7 @@ sal_uIntPtr SvxIconChoiceCtrl_Impl::GetPredecessorGrid( const Point& rPos) const nGridX = nMaxCol; sal_uInt16 nGridY = (sal_uInt16)(aPos.Y() / nGridDY); sal_uInt16 nGridsX = (sal_uInt16)(aOutputSize.Width() / nGridDX); - sal_uIntPtr nGrid = (nGridY * nGridsX) + nGridX; + sal_uLong nGrid = (nGridY * nGridsX) + nGridX; long nMiddle = (nGridX * nGridDX) + (nGridDX / 2); if( rPos.X() < nMiddle ) { @@ -4585,7 +4585,7 @@ Point SvxIconChoiceCtrl_Impl::GetPopupMenuPosPixel() const SvxIconChoiceCtrlEntry* pEntry = GetCurEntry(); if( !pEntry || !pEntry->IsSelected() ) { - sal_uIntPtr nNext; + sal_uLong nNext; pEntry = GetFirstSelectedEntry( nNext ); } if( pEntry ) @@ -4615,7 +4615,7 @@ void SvxIconChoiceCtrl_Impl::SetOrigin( const Point& rPos, sal_Bool bDoNotUpdate } } -sal_uIntPtr SvxIconChoiceCtrl_Impl::GetGridCount( const Size& rSize, sal_Bool bCheckScrBars, +sal_uLong SvxIconChoiceCtrl_Impl::GetGridCount( const Size& rSize, sal_Bool bCheckScrBars, sal_Bool bSmartScrBar ) const { Size aSize( rSize ); @@ -4646,7 +4646,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::HandleShortCutKey( const KeyEvent& rKEvt ) DBG_ASSERT( rKEvt.GetKeyCode().IsMod2(), "*SvxIconChoiceCtrl_Impl::HandleShortCutKey(): no <ALT> pressed!?" ); sal_Unicode cChar = rKEvt.GetCharCode(); - sal_uIntPtr nPos = (sal_uIntPtr)-1; + sal_uLong nPos = (sal_uLong)-1; if( cChar && IsMnemonicChar( cChar, nPos ) ) { @@ -4673,7 +4673,7 @@ sal_Bool SvxIconChoiceCtrl_Impl::HandleShortCutKey( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -void SvxIconChoiceCtrl_Impl::CallEventListeners( sal_uIntPtr nEvent, void* pData ) +void SvxIconChoiceCtrl_Impl::CallEventListeners( sal_uLong nEvent, void* pData ) { pView->CallImplEventListeners( nEvent, pData ); } diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 8b69940a428b..539477c03599 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -84,8 +84,8 @@ void IcnCursor_Impl::ImplCreate() pColumns = new SvPtrarr[ nCols ]; pRows = new SvPtrarr[ nRows ]; - sal_uIntPtr nCount = pView->aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = pView->aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( nCur ); // const Rectangle& rRect = pView->GetEntryBoundRect( pEntry ); @@ -366,7 +366,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoPageUpDown( SvxIconChoiceCtrlEntry* pS nNewPos = 0; } if( nPos != nNewPos ) - return (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( (sal_uIntPtr)nNewPos ); + return (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( (sal_uLong)nNewPos ); return 0; } long nOpt = pView->GetEntryBoundRect( pStart ).Top(); @@ -408,7 +408,7 @@ SvxIconChoiceCtrlEntry* IcnCursor_Impl::GoUpDown( SvxIconChoiceCtrlEntry* pCtrlE { if( pView->IsAutoArrange() && !(pView->nWinBits & WB_ALIGN_TOP) ) { - sal_uIntPtr nPos = pView->GetEntryListPos( pCtrlEntry ); + sal_uLong nPos = pView->GetEntryListPos( pCtrlEntry ); if( bDown && nPos < (pView->aEntries.Count() - 1) ) return (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( nPos + 1 ); else if( !bDown && nPos > 0 ) @@ -503,8 +503,8 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt SvPtrarr* pRow = new SvPtrarr; rLists.Insert( (void*)pRow, nCurList ); } - const sal_uIntPtr nCount = pView->aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + const sal_uLong nCount = pView->aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( nCur ); const Rectangle& rRect = pView->GetEntryBoundRect( pEntry ); @@ -522,8 +522,8 @@ void IcnCursor_Impl::CreateGridAjustData( SvPtrarr& rLists, SvxIconChoiceCtrlEnt short nRefRow = (short)( ((rRefRect.Top()+rRefRect.Bottom())/2) / pView->nGridDY ); SvPtrarr* pRow = new SvPtrarr; rLists.Insert( (void*)pRow, 0 ); - sal_uIntPtr nCount = pView->aEntries.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = pView->aEntries.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvxIconChoiceCtrlEntry* pEntry = (SvxIconChoiceCtrlEntry*)pView->aEntries.GetObject( nCur ); Rectangle rRect( pView->CalcBmpRect(pEntry) ); @@ -600,8 +600,8 @@ void IcnGridMap_Impl::Create_Impl() _pGridMap = new sal_Bool[ _nGridRows * _nGridCols]; memset( (void*)_pGridMap, 0, _nGridRows * _nGridCols ); - const sal_uIntPtr nCount = _pView->aEntries.Count(); - for( sal_uIntPtr nCur=0; nCur < nCount; nCur++ ) + const sal_uLong nCount = _pView->aEntries.Count(); + for( sal_uLong nCur=0; nCur < nCount; nCur++ ) OccupyGrids( (SvxIconChoiceCtrlEntry*)_pView->aEntries.GetObject( nCur )); } @@ -680,7 +680,7 @@ GridId IcnGridMap_Impl::GetGrid( const Point& rDocPos, sal_Bool* pbClipped ) GridId nId = GetGrid( (sal_uInt16)nX, (sal_uInt16)nY ); if( pbClipped ) *pbClipped = bClipped; - DBG_ASSERT(nId <(sal_uIntPtr)(_nGridCols*_nGridRows),"GetGrid failed"); + DBG_ASSERT(nId <(sal_uLong)(_nGridCols*_nGridRows),"GetGrid failed"); return nId; } @@ -700,13 +700,13 @@ Rectangle IcnGridMap_Impl::GetGridRect( GridId nId ) GridId IcnGridMap_Impl::GetUnoccupiedGrid( sal_Bool bOccupyFound ) { Create(); - sal_uIntPtr nStart = 0; + sal_uLong nStart = 0; sal_Bool bExpanded = sal_False; while( 1 ) { - const sal_uIntPtr nCount = (sal_uInt16)(_nGridCols * _nGridRows); - for( sal_uIntPtr nCur = nStart; nCur < nCount; nCur++ ) + const sal_uLong nCount = (sal_uInt16)(_nGridCols * _nGridRows); + for( sal_uLong nCur = nStart; nCur < nCount; nCur++ ) { if( !_pGridMap[ nCur ] ) { @@ -794,13 +794,13 @@ void IcnGridMap_Impl::Clear() } } -sal_uIntPtr IcnGridMap_Impl::GetGridCount( const Size& rSizePixel, sal_uInt16 nDX, sal_uInt16 nDY) +sal_uLong IcnGridMap_Impl::GetGridCount( const Size& rSizePixel, sal_uInt16 nDX, sal_uInt16 nDY) { long ndx = (rSizePixel.Width() - LROFFS_WINBORDER) / nDX; if( ndx < 0 ) ndx *= -1; long ndy = (rSizePixel.Height() - TBOFFS_WINBORDER) / nDY; if( ndy < 0 ) ndy *= -1; - return (sal_uIntPtr)(ndx * ndy); + return (sal_uLong)(ndx * ndy); } void IcnGridMap_Impl::OutputSizeChanged() diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index d674712d9d23..8a94d3ff086b 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -160,14 +160,14 @@ SvtIconChoiceCtrl::~SvtIconChoiceCtrl() delete _pImp; } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( sal_uIntPtr nPos, const Point* pPos, sal_uInt16 nFlags ) +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( sal_uLong nPos, const Point* pPos, sal_uInt16 nFlags ) { SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( nFlags ); _pImp->InsertEntry( pEntry, nPos, pPos ); return pEntry; } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, sal_uIntPtr nPos, const Point* pPos, sal_uInt16 nFlags ) +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, sal_uLong nPos, const Point* pPos, sal_uInt16 nFlags ) { SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, nFlags); @@ -176,7 +176,7 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, con return pEntry; } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, sal_uIntPtr nPos, const Point* pPos, sal_uInt16 nFlags ) +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::InsertEntry( const String& rText, const Image& rImage, const Image& rImageHC, sal_uLong nPos, const Point* pPos, sal_uInt16 nFlags ) { SvxIconChoiceCtrlEntry* pEntry = new SvxIconChoiceCtrlEntry( rText, rImage, rImageHC, nFlags); @@ -247,7 +247,7 @@ void SvtIconChoiceCtrl::ArrangeIcons() Size aFullSize; Rectangle aEntryRect; - for ( sal_uIntPtr i = 0; i < GetEntryCount(); i++ ) + for ( sal_uLong i = 0; i < GetEntryCount(); i++ ) { SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i ); aEntryRect = _pImp->GetEntryBoundRect ( pEntry ); @@ -262,7 +262,7 @@ void SvtIconChoiceCtrl::ArrangeIcons() Size aFullSize; Rectangle aEntryRect; - for ( sal_uIntPtr i = 0; i < GetEntryCount(); i++ ) + for ( sal_uLong i = 0; i < GetEntryCount(); i++ ) { SvxIconChoiceCtrlEntry* pEntry = GetEntry ( i ); aEntryRect = _pImp->GetEntryBoundRect ( pEntry ); @@ -312,7 +312,7 @@ void SvtIconChoiceCtrl::GetFocus() { _pImp->GetFocus(); Control::GetFocus(); - sal_uIntPtr nPos; + sal_uLong nPos; SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry ( nPos ); if ( pSelectedEntry ) _pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); @@ -390,12 +390,12 @@ SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetPrevEntry( const Point& rPixPos, S aPos -= GetMapMode().GetOrigin(); return ((SvtIconChoiceCtrl*)this)->_pImp->GetPrevEntry( aPos, pCurEntry ); } -sal_uIntPtr SvtIconChoiceCtrl::GetEntryCount() const +sal_uLong SvtIconChoiceCtrl::GetEntryCount() const { return _pImp->GetEntryCount(); } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_uIntPtr nPos ) const +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetEntry( sal_uLong nPos ) const { return _pImp->GetEntry( nPos ); } @@ -415,14 +415,14 @@ void SvtIconChoiceCtrl::RemoveEntry( SvxIconChoiceCtrlEntry* pEntry ) _pImp->RemoveEntry( pEntry ); } -SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry( sal_uIntPtr& rPos ) const +SvxIconChoiceCtrlEntry* SvtIconChoiceCtrl::GetSelectedEntry( sal_uLong& rPos ) const { return _pImp->GetFirstSelectedEntry( rPos ); } void SvtIconChoiceCtrl::ClickIcon() { - sal_uIntPtr nPos; + sal_uLong nPos; GetSelectedEntry ( nPos ); _aClickIconHdl.Call( this ); } @@ -456,7 +456,7 @@ sal_Bool SvtIconChoiceCtrl::DoKeyInput( const KeyEvent& rKEvt ) _pCurKeyEvent = NULL; return bHandled; } -sal_uIntPtr SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const +sal_uLong SvtIconChoiceCtrl::GetEntryListPos( SvxIconChoiceCtrlEntry* pEntry ) const { return _pImp->GetEntryListPos( pEntry ); } @@ -615,7 +615,7 @@ void SvtIconChoiceCtrl::SetNoSelection() _pImp->SetNoSelection(); } -void SvtIconChoiceCtrl::CallImplEventListeners(sal_uIntPtr nEvent, void* pData) +void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData) { CallEventListeners(nEvent, pData); } diff --git a/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx index f41c480e3c08..72768dd01746 100644 --- a/svtools/source/contnr/svicnvw.cxx +++ b/svtools/source/contnr/svicnvw.cxx @@ -106,7 +106,7 @@ void SvIconView::DisconnectFromModel() SvLBoxEntry* SvIconView::InsertEntry( const XubString& rText, - SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos ) + SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos ) { SvLBoxEntry* pEntry = CreateEntry( rText, aCollapsedEntryBmp, aExpandedEntryBmp ); @@ -122,7 +122,7 @@ SvLBoxEntry* SvIconView::InsertEntry( const XubString& rText, SvLBoxEntry* SvIconView::InsertEntry( const XubString& rText, const Image& rExpEntryBmp, const Image& rCollEntryBmp, - SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos) + SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos) { SvLBoxEntry* pEntry = CreateEntry( rText, rCollEntryBmp, rExpEntryBmp ); @@ -319,7 +319,7 @@ void __EXPORT SvIconView::ModelHasInsertedTree( SvListEntry* pEntry ) } void __EXPORT SvIconView::ModelIsMoving(SvListEntry* pSource, - SvListEntry* /* pTargetParent */ , sal_uIntPtr /* nChildPos */ ) + SvListEntry* /* pTargetParent */ , sal_uLong /* nChildPos */ ) { pImp->MovingEntry( (SvLBoxEntry*)pSource ); } @@ -499,13 +499,13 @@ void SvIconView::SetSpaceBetweenEntries( long nX, long nY ) } sal_Bool SvIconView::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos ) + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ) { return pImp->NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos); } sal_Bool SvIconView::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos ) + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ) { return pImp->NotifyCopying(pTarget,pEntry,rpNewParent,rNewChildPos); } @@ -659,9 +659,9 @@ Region SvIconView::GetDragRegion() const return aRegion; } -sal_uIntPtr SvIconView::GetSelectionCount() const +sal_uLong SvIconView::GetSelectionCount() const { - return (sal_uIntPtr)(pImp->GetSelectionCount()); + return (sal_uLong)(pImp->GetSelectionCount()); } void SvIconView::SetGrid( long nDX, long nDY ) @@ -670,7 +670,7 @@ void SvIconView::SetGrid( long nDX, long nDY ) } void SvIconView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ) + SvListEntry* pEntry2, sal_uLong nPos ) { SvLBox::ModelNotification( nActionId, pEntry1, pEntry2, nPos ); switch( nActionId ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 6a5aadfbbbf0..7d63304203cd 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -409,7 +409,7 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta ) SvLBoxEntry* pNext; pNext = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nRealDelta )); - if( (sal_uIntPtr)pNext == (sal_uIntPtr)pStartEntry ) + if( (sal_uLong)pNext == (sal_uLong)pStartEntry ) return; ShowCursor( sal_False ); @@ -446,7 +446,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta ) return; SvLBoxEntry* pPrev = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry, nRealDelta )); - if( (sal_uIntPtr)pPrev == (sal_uIntPtr)pStartEntry ) + if( (sal_uLong)pPrev == (sal_uLong)pStartEntry ) return; nFlags &= (~F_FILLING); @@ -913,8 +913,8 @@ void SvImpLBox::Paint( const Rectangle& rRect ) } #ifdef XX_OV - sal_uIntPtr nXAbsPos = (sal_uInt16)pTree->GetAbsPos( pStartEntry ); - sal_uIntPtr nXVisPos = pView->GetVisiblePos( pStartEntry ); + sal_uLong nXAbsPos = (sal_uInt16)pTree->GetAbsPos( pStartEntry ); + sal_uLong nXVisPos = pView->GetVisiblePos( pStartEntry ); SvLBoxString* pXStr = (SvLBoxString*)pStartEntry->GetFirstItem( SV_ITEM_ID_LBOXSTRING); #endif @@ -1034,10 +1034,10 @@ void SvImpLBox::RepaintSelectionItems() long nEntryHeight = pView->GetEntryHeight(); - sal_uIntPtr nCount = nVisibleCount; + sal_uLong nCount = nVisibleCount; long nY = 0; SvLBoxEntry* pEntry = pStartEntry; - for( sal_uIntPtr n=0; n< nCount && pEntry; n++ ) + for( sal_uLong n=0; n< nCount && pEntry; n++ ) { pView->PaintEntry1( pEntry, nY, 0xffff ); //wg. ItemsetBrowser SV_LBOXTAB_SHOW_SELECTION ); nY += nEntryHeight; @@ -1096,11 +1096,11 @@ void SvImpLBox::DrawNet() pView->SetLineColor( aCol ); Point aPos1, aPos2; sal_uInt16 nDistance; - sal_uIntPtr nMax = nVisibleCount + nOffs + 1; + sal_uLong nMax = nVisibleCount + nOffs + 1; const Image& rExpandedNodeBitmap = GetExpandedNodeBmp(); - for( sal_uIntPtr n=0; n< nMax && pEntry; n++ ) + for( sal_uLong n=0; n< nMax && pEntry; n++ ) { if( pView->IsExpanded(pEntry) ) { @@ -1253,7 +1253,7 @@ sal_uInt16 SvImpLBox::AdjustScrollBars( Size& rSize ) bHorBar = sal_True; // Anzahl aller nicht eingeklappten Eintraege - sal_uIntPtr nTotalCount = pView->GetVisibleCount(); + sal_uLong nTotalCount = pView->GetVisibleCount(); // Anzahl in der View sichtbarer Eintraege nVisibleCount = aOSize.Height() / nEntryHeight; @@ -1432,10 +1432,10 @@ void SvImpLBox::FillView() void SvImpLBox::ShowVerSBar() { sal_Bool bVerBar = ( pView->GetStyle() & WB_VSCROLL ) != 0; - sal_uIntPtr nVis = 0; + sal_uLong nVis = 0; if( !bVerBar ) nVis = pView->GetVisibleCount(); - if( bVerBar || (nVisibleCount && nVis > (sal_uIntPtr)(nVisibleCount-1)) ) + if( bVerBar || (nVisibleCount && nVis > (sal_uLong)(nVisibleCount-1)) ) { if( !aVerSBar.IsVisible() ) { @@ -1592,7 +1592,7 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry ) if( pStartEntry ) { long nOldThumbPos = aVerSBar.GetThumbPos(); - sal_uIntPtr nVisList = pView->GetVisibleCount(); + sal_uLong nVisList = pView->GetVisibleCount(); aVerSBar.SetRange( Range(0, nVisList-1) ); long nNewThumbPos = aVerSBar.GetThumbPos(); if( nNewThumbPos != nOldThumbPos ) @@ -2417,7 +2417,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( nDelta ) { - DBG_ASSERT(pNewCursor&&(sal_uIntPtr)pNewCursor!=(sal_uIntPtr)pCursor,"Cursor?"); + DBG_ASSERT(pNewCursor&&(sal_uLong)pNewCursor!=(sal_uLong)pCursor,"Cursor?"); aSelEng.CursorPosChanging( bShift, bMod1 ); if( IsEntryInView( pNewCursor ) ) SetCursor( pNewCursor ); @@ -2445,7 +2445,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) if( nDelta ) { - DBG_ASSERT(pNewCursor&&(sal_uIntPtr)pNewCursor!=(sal_uIntPtr)pCursor,"Cursor?"); + DBG_ASSERT(pNewCursor&&(sal_uLong)pNewCursor!=(sal_uLong)pCursor,"Cursor?"); aSelEng.CursorPosChanging( bShift, bMod1 ); if( IsEntryInView( pNewCursor ) ) SetCursor( pNewCursor ); @@ -2854,9 +2854,9 @@ void __EXPORT ImpLBSelEng::DeselectAll() void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCursor) { SvLBoxEntry* pEntry; - sal_uIntPtr nAnchorVisPos = pView->GetVisiblePos( pAnchor ); - sal_uIntPtr nOldVisPos = pView->GetVisiblePos( pOldCursor ); - sal_uIntPtr nNewVisPos = pView->GetVisiblePos( pNewCursor ); + sal_uLong nAnchorVisPos = pView->GetVisiblePos( pAnchor ); + sal_uLong nOldVisPos = pView->GetVisiblePos( pOldCursor ); + sal_uLong nNewVisPos = pView->GetVisiblePos( pNewCursor ); if( nOldVisPos > nAnchorVisPos || ( nAnchorVisPos==nOldVisPos && nNewVisPos > nAnchorVisPos) ) @@ -3218,7 +3218,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt ) SvLBoxEntry* pEntry = aSelRestore.top(); //#i19717# the entry is maybe already deleted bool bFound = false; - for(sal_uIntPtr nEntry = 0; nEntry < pView->GetEntryCount(); nEntry++) + for(sal_uLong nEntry = 0; nEntry < pView->GetEntryCount(); nEntry++) if(pEntry == pView->GetEntry(nEntry)) { bFound = true; @@ -3483,8 +3483,8 @@ void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToI if( !pList ) return; - sal_uIntPtr nCount = pList->Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = pList->Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvLBoxEntry* pChild = (SvLBoxEntry*)pList->GetObject( nCur ); if( pChild != pEntryToIgnore ) @@ -3591,7 +3591,7 @@ const Image& SvImpLBox::GetDefaultCollapsedNodeImage( BmpColorMode _eMode ) } // ----------------------------------------------------------------------- -void SvImpLBox::CallEventListeners( sal_uIntPtr nEvent, void* pData ) +void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData ) { if ( pView ) pView->CallImplEventListeners( nEvent, pData); diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx index 4b9d82f59172..420c0fcd2162 100644 --- a/svtools/source/contnr/svimpicn.cxx +++ b/svtools/source/contnr/svimpicn.cxx @@ -2795,7 +2795,7 @@ void SvImpIconView::ShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool ) } sal_Bool SvImpIconView::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewPar, sal_uIntPtr& rNewChildPos ) + SvLBoxEntry*& rpNewPar, sal_uLong& rNewChildPos ) { if( pTarget == pCurParent && pModel->GetParent(pEntry) == pCurParent ) { @@ -2812,7 +2812,7 @@ sal_Bool SvImpIconView::NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, } sal_Bool SvImpIconView::NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos ) + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ) { return pView->SvLBox::NotifyCopying(pTarget,pEntry,rpNewParent,rNewChildPos); } diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx index 2074d41e248d..e34ed061cd69 100644 --- a/svtools/source/contnr/svlbox.cxx +++ b/svtools/source/contnr/svlbox.cxx @@ -814,17 +814,17 @@ IMPL_LINK_INLINE_START( SvLBox, CloneHdl_Impl, SvListEntry*, pEntry ) } IMPL_LINK_INLINE_END( SvLBox, CloneHdl_Impl, SvListEntry*, pEntry ) -sal_uIntPtr SvLBox::Insert( SvLBoxEntry* pEntry, SvLBoxEntry* pParent, sal_uIntPtr nPos ) +sal_uLong SvLBox::Insert( SvLBoxEntry* pEntry, SvLBoxEntry* pParent, sal_uLong nPos ) { DBG_CHKTHIS(SvLBox,0); - sal_uIntPtr nInsPos = pModel->Insert( pEntry, pParent, nPos ); + sal_uLong nInsPos = pModel->Insert( pEntry, pParent, nPos ); return nInsPos; } -sal_uIntPtr SvLBox::Insert( SvLBoxEntry* pEntry,sal_uIntPtr nRootPos ) +sal_uLong SvLBox::Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos ) { DBG_CHKTHIS(SvLBox,0); - sal_uIntPtr nInsPos = pModel->Insert( pEntry, nRootPos ); + sal_uLong nInsPos = pModel->Insert( pEntry, nRootPos ); return nInsPos; } @@ -924,14 +924,14 @@ sal_Bool SvLBox::NotifyMoving( SvLBoxEntry* pEntry, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - sal_uIntPtr& rNewChildPos) // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos) // Position in Childlist des Target-Parents #else sal_Bool SvLBox::NotifyMoving( SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel() SvLBoxEntry*, // Zu verschiebender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - sal_uIntPtr& rNewChildPos) // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos) // Position in Childlist des Target-Parents #endif { DBG_CHKTHIS(SvLBox,0); @@ -967,7 +967,7 @@ sal_Bool SvLBox::NotifyCopying( SvLBoxEntry* pEntry, // Zu kopierender Entry aus // GetSourceListBox()->GetModel() SvLBoxEntry*& rpNewParent, // Neuer Target-Parent - sal_uIntPtr& rNewChildPos) // Position in Childlist des Target-Parents + sal_uLong& rNewChildPos) // Position in Childlist des Target-Parents { DBG_CHKTHIS(SvLBox,0); return NotifyMoving(pTarget,pEntry,rpNewParent,rNewChildPos); @@ -1014,7 +1014,7 @@ sal_Bool SvLBox::CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget ) nCurEntrySelPos = 0; // Selektionszaehler fuer NotifyMoving/Copying sal_Bool bSuccess = sal_True; SvTreeEntryList aList; - sal_Bool bClone = (sal_Bool)( (sal_uIntPtr)(pSource->GetModel()) != (sal_uIntPtr)GetModel() ); + sal_Bool bClone = (sal_Bool)( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); Link aCloneLink( pModel->GetCloneLink() ); pModel->SetCloneLink( LINK(this, SvLBox, CloneHdl_Impl )); @@ -1034,13 +1034,13 @@ sal_Bool SvLBox::CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget ) while ( pSourceEntry ) { SvLBoxEntry* pNewParent = 0; - sal_uIntPtr nInsertionPos = LIST_APPEND; + sal_uLong nInsertionPos = LIST_APPEND; sal_Bool bOk=NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos); if ( bOk ) { if ( bClone ) { - sal_uIntPtr nCloneCount = 0; + sal_uLong nCloneCount = 0; pSourceEntry = (SvLBoxEntry*) pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount ); pModel->InsertTree( (SvListEntry*)pSourceEntry, @@ -1048,7 +1048,7 @@ sal_Bool SvLBox::CopySelection( SvLBox* pSource, SvLBoxEntry* pTarget ) } else { - sal_uIntPtr nListPos = pModel->Copy( (SvListEntry*)pSourceEntry, + sal_uLong nListPos = pModel->Copy( (SvListEntry*)pSourceEntry, (SvListEntry*)pNewParent, nInsertionPos ); pSourceEntry = GetEntry( pNewParent, nListPos ); } @@ -1077,7 +1077,7 @@ sal_Bool SvLBox::MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry nCurEntrySelPos = 0; // Selektionszaehler fuer NotifyMoving/Copying sal_Bool bSuccess = sal_True; SvTreeEntryList aList; - sal_Bool bClone = (sal_Bool)( (sal_uIntPtr)(pSource->GetModel()) != (sal_uIntPtr)GetModel() ); + sal_Bool bClone = (sal_Bool)( (sal_uLong)(pSource->GetModel()) != (sal_uLong)GetModel() ); Link aCloneLink( pModel->GetCloneLink() ); if ( bClone ) pModel->SetCloneLink( LINK(this, SvLBox, CloneHdl_Impl )); @@ -1095,7 +1095,7 @@ sal_Bool SvLBox::MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry while ( pSourceEntry ) { SvLBoxEntry* pNewParent = 0; - sal_uIntPtr nInsertionPos = LIST_APPEND; + sal_uLong nInsertionPos = LIST_APPEND; sal_Bool bOk = NotifyMoving(pTarget,pSourceEntry,pNewParent,nInsertionPos); sal_Bool bCopyOk = bOk; if ( !bOk && bAllowCopyFallback ) @@ -1108,7 +1108,7 @@ sal_Bool SvLBox::MoveSelectionCopyFallbackPossible( SvLBox* pSource, SvLBoxEntry { if ( bClone ) { - sal_uIntPtr nCloneCount = 0; + sal_uLong nCloneCount = 0; pSourceEntry = (SvLBoxEntry*) pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount ); pModel->InsertTree( (SvListEntry*)pSourceEntry, @@ -1244,7 +1244,7 @@ sal_Bool SvLBox::Select( SvLBoxEntry*, sal_Bool ) return sal_False; } -sal_uIntPtr SvLBox::SelectChilds( SvLBoxEntry* , sal_Bool ) +sal_uLong SvLBox::SelectChilds( SvLBoxEntry* , sal_Bool ) { DBG_CHKTHIS(SvLBox,0); return 0; @@ -1287,7 +1287,7 @@ void SvLBox::FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPa SvLBoxEntry* pParentEntry = GetParent( pEntry ); while ( sal_True ) { - sal_uIntPtr i, nCount = GetLevelChildCount( pParentEntry ); + sal_uLong i, nCount = GetLevelChildCount( pParentEntry ); for ( i = 0; i < nCount; ++i ) { SvLBoxEntry* pTemp = GetEntry( pParentEntry, i ); @@ -1317,11 +1317,11 @@ String SvLBox::GetEntryText( SvLBoxEntry* ) const return String(); } -sal_uIntPtr SvLBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const +sal_uLong SvLBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const { DBG_CHKTHIS(SvLBox,0); - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; SvLBoxEntry* pEntry = FirstChild( _pParent ); while ( pEntry ) { @@ -1898,7 +1898,7 @@ nAction #ifndef UNX if( (nAction == DND_ACTION_MOVE) && ( (pDDTarget && - ((sal_uIntPtr)(pDDTarget->GetModel())!=(sal_uIntPtr)(this->GetModel()))) || + ((sal_uLong)(pDDTarget->GetModel())!=(sal_uLong)(this->GetModel()))) || !pDDTarget )) { RemoveSelection(); @@ -1938,19 +1938,19 @@ namespace void SvLBox::AddBoxToDDList_Impl( const SvLBox& rB ) { - sal_uIntPtr nVal = (sal_uIntPtr)&rB; + sal_uLong nVal = (sal_uLong)&rB; SortLBoxes::get().Insert( nVal ); } void SvLBox::RemoveBoxFromDDList_Impl( const SvLBox& rB ) { - sal_uIntPtr nVal = (sal_uIntPtr)&rB; + sal_uLong nVal = (sal_uLong)&rB; SortLBoxes::get().Remove( nVal ); } IMPL_STATIC_LINK( SvLBox, DragFinishHdl_Impl, sal_Int8*, pAction ) { - sal_uIntPtr nVal = (sal_uIntPtr)pThis; + sal_uLong nVal = (sal_uLong)pThis; sal_uInt16 nFnd; SvULongsSort &rSortLBoxes = SortLBoxes::get(); if( rSortLBoxes.Seek_Entry( nVal, &nFnd ) ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 5528dcc9579d..ed48f9fc6352 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -188,7 +188,7 @@ void SvTabListBox::SetTab( sal_uInt16 nTab,long nValue,MapUnit eMapUnit ) SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool /*bChildsOnDemand*/, - sal_uIntPtr nPos, void* pUserData, + sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) { return InsertEntryToColumn( rText, pParent, nPos, 0xffff, pUserData ); @@ -199,14 +199,14 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent, sal_Bool /*bChildsOnDemand*/, - sal_uIntPtr nPos, void* pUserData, + sal_uLong nPos, void* pUserData, SvLBoxButtonKind ) { return InsertEntryToColumn( rText, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, nPos, 0xffff, pUserData ); } -SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry* pParent,sal_uIntPtr nPos,sal_uInt16 nCol, +SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) { XubString aStr; @@ -234,7 +234,7 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent,sal_uIntPtr nPos,sal_uInt16 nCol, void* pUser ) + SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser ) { XubString aStr; if( nCol != 0xffff ) @@ -263,7 +263,7 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, pParent, sal_False, nPos, pUser ); } -SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uIntPtr nPos, +SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUser ) { return InsertEntryToColumn( rStr,0,nPos, nCol, pUser ); @@ -306,13 +306,13 @@ String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const return aResult; } -String SvTabListBox::GetEntryText( sal_uIntPtr nPos, sal_uInt16 nCol ) const +String SvTabListBox::GetEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { SvLBoxEntry* pEntry = GetEntryOnPos( nPos ); return GetEntryText( pEntry, nCol ); } -void SvTabListBox::SetEntryText( const XubString& rStr, sal_uIntPtr nPos, sal_uInt16 nCol ) +void SvTabListBox::SetEntryText( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol ) { SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos ); SetEntryText( rStr, pEntry, nCol ); @@ -375,7 +375,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal delete pData; } -String SvTabListBox::GetCellText( sal_uIntPtr nPos, sal_uInt16 nCol ) const +String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const { SvLBoxEntry* pEntry = GetEntryOnPos( nPos ); DBG_ASSERT( pEntry, "SvTabListBox::GetCellText(): Invalid Entry" ); @@ -389,9 +389,9 @@ String SvTabListBox::GetCellText( sal_uIntPtr nPos, sal_uInt16 nCol ) const return aResult; } -sal_uIntPtr SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol ) +sal_uLong SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol ) { - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; SvLBoxEntry* pEntry = First(); while( pEntry ) { @@ -404,9 +404,9 @@ sal_uIntPtr SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol ) return 0xffffffff; } -sal_uIntPtr SvTabListBox::GetEntryPos( const SvLBoxEntry* pEntry ) const +sal_uLong SvTabListBox::GetEntryPos( const SvLBoxEntry* pEntry ) const { - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; SvLBoxEntry* pTmpEntry = First(); while( pTmpEntry ) { @@ -447,7 +447,7 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16& return pPtr; } -String SvTabListBox::GetTabEntryText( sal_uIntPtr nPos, sal_uInt16 nCol ) const +String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const { SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos ); DBG_ASSERT( pEntry, "GetTabEntryText(): Invalid entry " ); @@ -485,10 +485,10 @@ String SvTabListBox::GetTabEntryText( sal_uIntPtr nPos, sal_uInt16 nCol ) const return aResult; } -SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uIntPtr _nEntryPos ) const +SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const { SvLBoxEntry* pEntry = NULL; - sal_uIntPtr i, nPos = 0, nCount = GetLevelChildCount( NULL ); + sal_uLong i, nPos = 0, nCount = GetLevelChildCount( NULL ); for ( i = 0; i < nCount; ++i ) { SvLBoxEntry* pParent = GetEntry(i); @@ -509,9 +509,9 @@ SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uIntPtr _nEntryPos ) const return pEntry; } -SvLBoxEntry* SvTabListBox::GetChildOnPos( SvLBoxEntry* _pParent, sal_uIntPtr _nEntryPos, sal_uIntPtr& _rPos ) const +SvLBoxEntry* SvTabListBox::GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const { - sal_uIntPtr i, nCount = GetLevelChildCount( _pParent ); + sal_uLong i, nCount = GetLevelChildCount( _pParent ); for ( i = 0; i < nCount; ++i ) { SvLBoxEntry* pParent = GetEntry( _pParent, i ); @@ -650,7 +650,7 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol // ----------------------------------------------------------------------- SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( - const XubString& rStr, sal_uIntPtr nPos, sal_uInt16 nCol, void* pUserData ) + const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData ); RecalculateAccessibleChildren(); @@ -660,7 +660,7 @@ SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( // ----------------------------------------------------------------------- SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( - const XubString& rStr, SvLBoxEntry* pParent, sal_uIntPtr nPos, sal_uInt16 nCol, void* pUserData ) + const XubString& rStr, SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData ); RecalculateAccessibleChildren(); @@ -671,7 +671,7 @@ SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp, - SvLBoxEntry* pParent, sal_uIntPtr nPos, sal_uInt16 nCol, void* pUserData ) + SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData ) { SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, nPos, nCol, pUserData ); @@ -681,19 +681,19 @@ SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn( // ----------------------------------------------------------------------- -sal_uIntPtr SvHeaderTabListBox::Insert( - SvLBoxEntry* pEnt, SvLBoxEntry* pPar, sal_uIntPtr nPos ) +sal_uLong SvHeaderTabListBox::Insert( + SvLBoxEntry* pEnt, SvLBoxEntry* pPar, sal_uLong nPos ) { - sal_uIntPtr n = SvTabListBox::Insert( pEnt, pPar, nPos ); + sal_uLong n = SvTabListBox::Insert( pEnt, pPar, nPos ); RecalculateAccessibleChildren(); return n; } // ----------------------------------------------------------------------- -sal_uIntPtr SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uIntPtr nRootPos ) +sal_uLong SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos ) { - sal_uIntPtr nPos = SvTabListBox::Insert( pEntry, nRootPos ); + sal_uLong nPos = SvTabListBox::Insert( pEntry, nRootPos ); RecalculateAccessibleChildren(); return nPos; } @@ -801,8 +801,8 @@ sal_Int32 SvHeaderTabListBox::GetCurrRow() const SvLBoxEntry* pEntry = GetCurEntry(); if ( pEntry ) { - sal_uIntPtr nCount = GetEntryCount(); - for ( sal_uIntPtr i = 0; i < nCount; ++i ) + sal_uLong nCount = GetEntryCount(); + for ( sal_uLong i = 0; i < nCount; ++i ) { if ( pEntry == GetEntry(i) ) { diff --git a/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx index 0e66c425825e..ba5f6d44eeb8 100644 --- a/svtools/source/contnr/svtreebx.cxx +++ b/svtools/source/contnr/svtreebx.cxx @@ -399,7 +399,7 @@ IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pDa IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData ) SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pParent, - sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUser, + sal_Bool bChildsOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -439,7 +439,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,SvLBoxEntry* pPa SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText, const Image& aExpEntryBmp, const Image& aCollEntryBmp, - SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUser, + SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uLong nPos, void* pUser, SvLBoxButtonKind eButtonKind ) { DBG_CHKTHIS(SvTreeListBox,0); @@ -1076,11 +1076,11 @@ sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) return bRetVal; } -sal_uIntPtr SvTreeListBox::SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ) +sal_uLong SvTreeListBox::SelectChilds( SvLBoxEntry* pParent, sal_Bool bSelect ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->DestroyAnchor(); - sal_uIntPtr nRet = 0; + sal_uLong nRet = 0; if( !pParent->HasChilds() ) return 0; sal_uInt16 nRefDepth = pModel->GetDepth( pParent ); @@ -1124,7 +1124,7 @@ void SvTreeListBox::ModelHasInserted( SvListEntry* pEntry ) void SvTreeListBox::ModelIsMoving(SvListEntry* pSource, SvListEntry* /* pTargetParent */, - sal_uIntPtr /* nChildPos */ ) + sal_uLong /* nChildPos */ ) { DBG_CHKTHIS(SvTreeListBox,0); pImp->MovingEntry( (SvLBoxEntry*)pSource ); @@ -2204,12 +2204,12 @@ void SvTreeListBox::RemoveHighlightRange() Invalidate(); } -sal_uIntPtr SvTreeListBox::GetAscInsertionPos(SvLBoxEntry*,SvLBoxEntry*) +sal_uLong SvTreeListBox::GetAscInsertionPos(SvLBoxEntry*,SvLBoxEntry*) { return LIST_APPEND; } -sal_uIntPtr SvTreeListBox::GetDescInsertionPos(SvLBoxEntry*,SvLBoxEntry*) +sal_uLong SvTreeListBox::GetDescInsertionPos(SvLBoxEntry*,SvLBoxEntry*) { DBG_CHKTHIS(SvTreeListBox,0); return LIST_APPEND; @@ -2322,7 +2322,7 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData ) } void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ) + SvListEntry* pEntry2, sal_uLong nPos ) { if( nActionId == LISTACTION_CLEARING ) CancelTextEditing(); @@ -2671,7 +2671,7 @@ void SvTreeListBox::EnableCellFocus() pImp->EnableCellFocus(); } -void SvTreeListBox::CallImplEventListeners(sal_uIntPtr nEvent, void* pData) +void SvTreeListBox::CallImplEventListeners(sal_uLong nEvent, void* pData) { CallEventListeners(nEvent, pData); } diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 82514405cbdd..2959d8e0460f 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -121,7 +121,7 @@ extern ::rtl::OUString CreateExactSizeText_Impl( sal_Int64 nSize ); // fileview. struct FolderHistory { String m_sURL; - sal_uIntPtr m_nGroup; + sal_uLong m_nGroup; FolderHistory( const String& _rURL, sal_Int32 _nGroup ) : m_sURL( _rURL ), m_nGroup( _nGroup ) {} @@ -237,7 +237,7 @@ void ODocumentInfoPreview::fill( // size if ( i_rURL.Len() > 0 ) { - sal_uIntPtr nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL ); + sal_uLong nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL ); m_pEditWin->InsertEntry( m_pInfoTable->GetString( DI_SIZE ), CreateExactSizeText_Impl( nDocSize ) ); @@ -413,7 +413,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : SvtIconWindow_Impl::~SvtIconWindow_Impl() { - for ( sal_uIntPtr i = 0; i < aIconCtrl.GetEntryCount(); ++i ) + for ( sal_uLong i = 0; i < aIconCtrl.GetEntryCount(); ++i ) { SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( i ); delete (String*)pEntry->GetUserData(); @@ -423,7 +423,7 @@ SvtIconWindow_Impl::~SvtIconWindow_Impl() SvxIconChoiceCtrlEntry* SvtIconWindow_Impl::GetEntry( const String& rURL ) const { SvxIconChoiceCtrlEntry* pEntry = NULL; - for ( sal_uIntPtr i = 0; i < aIconCtrl.GetEntryCount(); ++i ) + for ( sal_uLong i = 0; i < aIconCtrl.GetEntryCount(); ++i ) { SvxIconChoiceCtrlEntry* pTemp = aIconCtrl.GetEntry( i ); String aURL( *( (String*)pTemp->GetUserData() ) ); @@ -461,7 +461,7 @@ String SvtIconWindow_Impl::GetCursorPosIconURL() const String SvtIconWindow_Impl::GetSelectedIconURL() const { - sal_uIntPtr nPos; + sal_uLong nPos; SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetSelectedEntry( nPos ); String aURL; if ( pEntry ) @@ -471,7 +471,7 @@ String SvtIconWindow_Impl::GetSelectedIconURL() const String SvtIconWindow_Impl::GetSelectedIconText() const { - sal_uIntPtr nPos; + sal_uLong nPos; return MnemonicGenerator::EraseAllMnemonicChars( aIconCtrl.GetSelectedEntry( nPos )->GetText() ); } @@ -489,9 +489,9 @@ void SvtIconWindow_Impl::InvalidateIconControl() aIconCtrl.Invalidate(); } -sal_uIntPtr SvtIconWindow_Impl::GetCursorPos() const +sal_uLong SvtIconWindow_Impl::GetCursorPos() const { - sal_uIntPtr nPos = ~sal_uIntPtr(0); + sal_uLong nPos = ~sal_uLong(0); SvxIconChoiceCtrlEntry* pCursorEntry = aIconCtrl.GetCursor( ); if ( pCursorEntry ) @@ -500,15 +500,15 @@ sal_uIntPtr SvtIconWindow_Impl::GetCursorPos() const return nPos; } -sal_uIntPtr SvtIconWindow_Impl::GetSelectEntryPos() const +sal_uLong SvtIconWindow_Impl::GetSelectEntryPos() const { - sal_uIntPtr nPos; + sal_uLong nPos; if ( !aIconCtrl.GetSelectedEntry( nPos ) ) - nPos = ~sal_uIntPtr(0); + nPos = ~sal_uLong(0); return nPos; } -void SvtIconWindow_Impl::SetCursorPos( sal_uIntPtr nPos ) +void SvtIconWindow_Impl::SetCursorPos( sal_uLong nPos ) { SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nPos ); aIconCtrl.SetCursor( pEntry ); @@ -525,7 +525,7 @@ long SvtIconWindow_Impl::CalcHeight() const { // calculate the required height of the IconControl long nHeight = 0; - sal_uIntPtr nCount = aIconCtrl.GetEntryCount(); + sal_uLong nCount = aIconCtrl.GetEntryCount(); if ( nCount > 0 ) // bottom of the last icon nHeight = aIconCtrl.GetEntry(nCount-1)->GetBoundRect().Bottom(); @@ -544,9 +544,9 @@ sal_Bool SvtIconWindow_Impl::IsRootURL( const String& rURL ) const rURL == aSamplesFolderRootURL; } -sal_uIntPtr SvtIconWindow_Impl::GetRootPos( const String& rURL ) const +sal_uLong SvtIconWindow_Impl::GetRootPos( const String& rURL ) const { - sal_uIntPtr nPos = ~sal_uIntPtr(0); + sal_uLong nPos = ~sal_uLong(0); if ( aNewDocumentRootURL.Match( rURL ) == STRING_MATCH ) nPos = 0; else if ( aTemplateRootURL.Match( rURL ) == STRING_MATCH ) @@ -788,7 +788,7 @@ void SvtExtendedMultiLineEdit_Impl::InsertEntry( const String& rTitle, const Str aText += rTitle; aText += ':'; InsertText( aText ); - sal_uIntPtr nPara = GetParagraphCount() - 1; + sal_uLong nPara = GetParagraphCount() - 1; SetAttrib( TextAttribFontWeight( WEIGHT_BOLD ), nPara, 0, aText.Len() ); aText = '\n'; @@ -1163,7 +1163,7 @@ IMPL_LINK ( SvtTemplateWindow , NewFolderHdl_Impl, SvtFileView *, EMPTYARG ) aFileViewTB.EnableItem( TI_DOCTEMPLATE_PRINT, sal_False ); String sURL = pFileWin->GetFolderURL(); - sal_uIntPtr nPos = pIconWin->GetRootPos( sURL ); + sal_uLong nPos = pIconWin->GetRootPos( sURL ); AppendHistoryURL( sURL, nPos ); aNewFolderHdl.Call( this ); @@ -1234,7 +1234,7 @@ void SvtTemplateWindow::PrintFile( const String& rURL ) // ------------------------------------------------------------------------ -void SvtTemplateWindow::AppendHistoryURL( const String& rURL, sal_uIntPtr nGroup ) +void SvtTemplateWindow::AppendHistoryURL( const String& rURL, sal_uLong nGroup ) { sal_Bool bInsert = sal_True; if ( !pHistoryList ) diff --git a/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx index 0bab9d2a6546..c6100ba5bc20 100644 --- a/svtools/source/contnr/templwin.hxx +++ b/svtools/source/contnr/templwin.hxx @@ -94,13 +94,13 @@ public: String GetCursorPosIconURL() const; String GetIconText( const String& rURL ) const; void InvalidateIconControl(); - void SetCursorPos( sal_uIntPtr nPos ); - sal_uIntPtr GetCursorPos() const; - sal_uIntPtr GetSelectEntryPos() const; + void SetCursorPos( sal_uLong nPos ); + sal_uLong GetCursorPos() const; + sal_uLong GetSelectEntryPos() const; void SetFocus(); long CalcHeight() const; sal_Bool IsRootURL( const String& rURL ) const; - sal_uIntPtr GetRootPos( const String& rURL ) const; + sal_uLong GetRootPos( const String& rURL ) const; void UpdateIcons( sal_Bool _bHiContrast ); inline sal_Bool ProcessKeyEvent( const KeyEvent& rKEvt ); @@ -267,7 +267,7 @@ private: DECL_LINK( ResizeHdl_Impl, SplitWindow* ); // used for split and initial setting of toolbar pos void PrintFile( const String& rURL ); - void AppendHistoryURL( const String& rURL, sal_uIntPtr nGroup ); + void AppendHistoryURL( const String& rURL, sal_uLong nGroup ); void OpenHistory(); void DoAction( sal_uInt16 nAction ); void InitToolBoxes(); diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index 9e62f37d097b..c4ec516a735b 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -89,7 +89,7 @@ void SvListEntry::SetListPositions() if( pChilds ) { SvListEntry *pEntry = (SvListEntry*)pChilds->First(); - sal_uIntPtr nCur = 0; + sal_uLong nCur = 0; while ( pEntry ) { pEntry->nListPos &= 0x80000000; @@ -189,10 +189,10 @@ SvTreeList::~SvTreeList() *************************************************************************/ void SvTreeList::Broadcast( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ) + SvListEntry* pEntry2, sal_uLong nPos ) { - sal_uIntPtr nViewCount = aViewList.Count(); - for( sal_uIntPtr nCurView = 0; nCurView < nViewCount; nCurView++ ) + sal_uLong nViewCount = aViewList.Count(); + for( sal_uLong nCurView = 0; nCurView < nViewCount; nCurView++ ) { SvListView* pView = (SvListView*)aViewList.GetObject( nCurView ); if( pView ) @@ -202,7 +202,7 @@ void SvTreeList::Broadcast( sal_uInt16 nActionId, SvListEntry* pEntry1, void SvTreeList::InsertView( SvListView* pView) { - sal_uIntPtr nPos = aViewList.GetPos( pView ); + sal_uLong nPos = aViewList.GetPos( pView ); if ( nPos == LIST_ENTRY_NOTFOUND ) { aViewList.Insert( pView, LIST_APPEND ); @@ -212,7 +212,7 @@ void SvTreeList::InsertView( SvListView* pView) void SvTreeList::RemoveView( SvListView* pView ) { - sal_uIntPtr nPos = aViewList.GetPos( pView ); + sal_uLong nPos = aViewList.GetPos( pView ); if ( nPos != LIST_ENTRY_NOTFOUND ) { aViewList.Remove( pView ); @@ -314,7 +314,7 @@ sal_Bool SvTreeList::IsChild( SvListEntry* pParent, SvListEntry* pChild ) const return bIsChild; } -sal_uIntPtr SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uIntPtr nListPos) +sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos) { // pDest darf Null sein! DBG_ASSERT(pSrcEntry,"Entry?"); @@ -358,20 +358,20 @@ sal_uIntPtr SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,s // Listenpositionen in Zielliste korrigieren SetListPositions( pDstList ); - if ( pSrcList && (sal_uIntPtr)pSrcList != (sal_uIntPtr)pDstList ) + if ( pSrcList && (sal_uLong)pSrcList != (sal_uLong)pDstList ) SetListPositions( pSrcList ); #ifdef CHECK_INTEGRITY CheckIntegrity(); #endif - sal_uIntPtr nRetVal = pDstList->GetPos( pSrcEntry ); + sal_uLong nRetVal = pDstList->GetPos( pSrcEntry ); DBG_ASSERT(nRetVal==pSrcEntry->GetChildListPos(),"ListPos not valid"); Broadcast( LISTACTION_MOVED,pSrcEntry,pTargetParent,nRetVal); return nRetVal; } -sal_uIntPtr SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uIntPtr nListPos) +sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos) { // pDest darf Null sein! DBG_ASSERT(pSrcEntry,"Entry?"); @@ -382,7 +382,7 @@ sal_uIntPtr SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,s bAbsPositionsValid = sal_False; - sal_uIntPtr nCloneCount = 0; + sal_uLong nCloneCount = 0; SvListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount ); nEntryCount += nCloneCount; @@ -395,7 +395,7 @@ sal_uIntPtr SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,s CheckIntegrity(); #endif Broadcast( LISTACTION_INSERTED_TREE, pClonedEntry ); - sal_uIntPtr nRetVal = pDstList->GetPos( pClonedEntry ); + sal_uLong nRetVal = pDstList->GetPos( pClonedEntry ); return nRetVal; } @@ -414,7 +414,7 @@ CheckIntegrity(); void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) { SvListEntry* pParent; - sal_uIntPtr nPos; + sal_uLong nPos; if ( !pDstEntry ) { @@ -443,7 +443,7 @@ void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) void SvTreeList::Copy( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) { SvListEntry* pParent; - sal_uIntPtr nPos; + sal_uLong nPos; if ( !pDstEntry ) { @@ -470,7 +470,7 @@ void SvTreeList::Copy( SvListEntry* pSrcEntry, SvListEntry* pDstEntry ) void SvTreeList::InsertTree( SvListEntry* pSrcEntry, SvListEntry* pDstEntry) { SvListEntry* pParent; - sal_uIntPtr nPos; + sal_uLong nPos; if ( !pDstEntry ) { @@ -487,7 +487,7 @@ void SvTreeList::InsertTree( SvListEntry* pSrcEntry, SvListEntry* pDstEntry) void SvTreeList::InsertTree(SvListEntry* pSrcEntry, - SvListEntry* pTargetParent,sal_uIntPtr nListPos) + SvListEntry* pTargetParent,sal_uLong nListPos) { DBG_ASSERT(pSrcEntry,"InsertTree:Entry?"); if ( !pSrcEntry ) @@ -540,7 +540,7 @@ SvListEntry* SvTreeList::CreateEntry() const |* *************************************************************************/ -SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uIntPtr& nCloneCount ) const +SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const { SvListEntry* pClonedEntry = CloneEntry( pEntry ); nCloneCount = 1; @@ -562,7 +562,7 @@ SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uIntPtr& nCloneCount ) SvTreeEntryList* SvTreeList::CloneChilds( SvTreeEntryList* pChilds, SvListEntry* pNewParent, - sal_uIntPtr& nCloneCount ) const + sal_uLong& nCloneCount ) const { DBG_ASSERT(pChilds->Count(),"Childs?"); SvTreeEntryList* pClonedChilds = new SvTreeEntryList; @@ -596,14 +596,14 @@ SvTreeEntryList* SvTreeList::CloneChilds( SvTreeEntryList* pChilds, |* *************************************************************************/ -sal_uIntPtr SvTreeList::GetChildCount( SvListEntry* pParent ) const +sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const { if ( !pParent ) return GetEntryCount(); if ( !pParent || !pParent->pChilds) return 0; - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; sal_uInt16 nRefDepth = GetDepth( pParent ); sal_uInt16 nActDepth = nRefDepth; do @@ -625,14 +625,14 @@ sal_uIntPtr SvTreeList::GetChildCount( SvListEntry* pParent ) const |* *************************************************************************/ -sal_uIntPtr SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pParent) const +sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pParent) const { DBG_ASSERT(pView,"GetVisChildCount:No View"); if ( !pParent ) pParent = pRootItem; if ( !pParent || !pView->IsExpanded(pParent) || !pParent->pChilds ) return 0; - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; sal_uInt16 nRefDepth = GetDepth( pParent ); sal_uInt16 nActDepth = nRefDepth; do @@ -644,14 +644,14 @@ sal_uIntPtr SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntr return nCount; } -sal_uIntPtr SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pParent) const +sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pParent) const { DBG_ASSERT(pView,"GetChildSelCount:No View"); if ( !pParent ) pParent = pRootItem; if ( !pParent || !pParent->pChilds) return 0; - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; sal_uInt16 nRefDepth = GetDepth( pParent ); sal_uInt16 nActDepth = nRefDepth; do @@ -707,7 +707,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons } SvTreeEntryList* pActualList = pActEntry->pParent->pChilds; - sal_uIntPtr nActualPos = pActEntry->GetChildListPos(); + sal_uLong nActualPos = pActEntry->GetChildListPos(); if ( pActEntry->pChilds /* && pActEntry->pChilds->Count() */ ) { @@ -769,7 +769,7 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons } SvTreeEntryList* pActualList = pActEntry->pParent->pChilds; - sal_uIntPtr nActualPos = pActEntry->GetChildListPos(); + sal_uLong nActualPos = pActEntry->GetChildListPos(); if ( nActualPos > 0 ) { @@ -835,7 +835,7 @@ SvListEntry* SvTreeList::Last( sal_uInt16* /* nDepth */ ) const |* *************************************************************************/ -sal_uIntPtr SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) const +sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) const { DBG_ASSERT(pView&&pEntry,"View/Entry?"); @@ -859,7 +859,7 @@ sal_uIntPtr SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEn |* *************************************************************************/ -sal_uIntPtr SvTreeList::GetVisibleCount( const SvListView* pView ) const +sal_uLong SvTreeList::GetVisibleCount( const SvListView* pView ) const { DBG_ASSERT(pView,"GetVisCount:No View"); if( !pView->HasViewData() ) @@ -867,7 +867,7 @@ sal_uIntPtr SvTreeList::GetVisibleCount( const SvListView* pView ) const if ( pView->nVisibleCount ) return pView->nVisibleCount; - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; SvListEntry* pEntry = First(); // erster Eintrag immer sichtbar while ( pEntry ) { @@ -916,7 +916,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn } SvTreeEntryList* pActualList = pActEntry->pParent->pChilds; - sal_uIntPtr nActualPos = pActEntry->GetChildListPos(); + sal_uLong nActualPos = pActEntry->GetChildListPos(); if ( pView->IsExpanded(pActEntry) ) { @@ -984,7 +984,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE } SvTreeEntryList* pActualList = pActEntry->pParent->pChilds; - sal_uIntPtr nActualPos = pActEntry->GetChildListPos(); + sal_uLong nActualPos = pActEntry->GetChildListPos(); if ( nActualPos > 0 ) { @@ -1049,7 +1049,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry { DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"NextVis:Wrong Prms/!Vis"); - sal_uIntPtr nVisPos = GetVisiblePos( pView, pEntry ); + sal_uLong nVisPos = GetVisiblePos( pView, pEntry ); // nDelta Eintraege vorhanden ? // Beispiel: 0,1,2,3,4,5,6,7,8,9 nVisPos=5 nDelta=7 // nNewDelta = 10-nVisPos-1 == 4 @@ -1082,7 +1082,7 @@ SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEnt { DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"PrevVis:Parms/!Vis"); - sal_uIntPtr nVisPos = GetVisiblePos( pView, pEntry ); + sal_uLong nVisPos = GetVisiblePos( pView, pEntry ); // nDelta Eintraege vorhanden ? // Beispiel: 0,1,2,3,4,5,6,7,8,9 nVisPos=8 nDelta=20 // nNewDelta = nNewVisPos @@ -1138,8 +1138,8 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const if( !pEntry ) return 0; SvTreeEntryList* pList = pEntry->pParent->pChilds; -// sal_uIntPtr nPos = pList->GetPos( pEntry ); - sal_uIntPtr nPos = pEntry->GetChildListPos(); +// sal_uLong nPos = pList->GetPos( pEntry ); + sal_uLong nPos = pEntry->GetChildListPos(); nPos++; pEntry = (SvListEntry*)(pList->GetObject( nPos )); return pEntry; @@ -1152,8 +1152,8 @@ SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const return 0; SvTreeEntryList* pList = pEntry->pParent->pChilds; - // sal_uIntPtr nPos = pList->GetPos( pEntry ); - sal_uIntPtr nPos = pEntry->GetChildListPos(); + // sal_uLong nPos = pList->GetPos( pEntry ); + sal_uLong nPos = pEntry->GetChildListPos(); if ( nPos == 0 ) return 0; nPos--; @@ -1243,7 +1243,7 @@ SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const |* Letzte Aenderung 17.08.94 |* *************************************************************************/ -sal_uIntPtr SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uIntPtr nPos ) +sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uLong nPos ) { DBG_ASSERT( pEntry,"Entry?"); @@ -1289,7 +1289,7 @@ CheckIntegrity(); |* *************************************************************************/ -sal_uIntPtr SvTreeList::GetAbsPos( SvListEntry* pEntry) const +sal_uLong SvTreeList::GetAbsPos( SvListEntry* pEntry) const { if ( !bAbsPositionsValid ) ((SvTreeList*)this)->SetAbsolutePositions(); @@ -1308,7 +1308,7 @@ sal_uIntPtr SvTreeList::GetAbsPos( SvListEntry* pEntry) const void SvTreeList::SetAbsolutePositions() { - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; SvListEntry* pEntry = First(); while ( pEntry ) { @@ -1452,7 +1452,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry ) } Broadcast( LISTACTION_REMOVING, pEntry ); - sal_uIntPtr nRemoved = 1 + GetChildCount(pEntry); + sal_uLong nRemoved = 1 + GetChildCount(pEntry); bAbsPositionsValid = sal_False; SvListEntry* pParent = pEntry->pParent; @@ -1462,7 +1462,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry ) if ( pEntry->HasChildListPos() ) { - sal_uIntPtr nListPos = pEntry->GetChildListPos(); + sal_uLong nListPos = pEntry->GetChildListPos(); bLastEntry = (nListPos == (pList->Count()-1) ) ? sal_True : sal_False; pList->Remove( nListPos ); } @@ -1506,7 +1506,7 @@ CheckIntegrity(); |* *************************************************************************/ -sal_uIntPtr SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,sal_Bool bSelect ) +sal_uLong SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,sal_Bool bSelect ) { DBG_ASSERT(pView&&pParent,"SelChilds:View/Parent?"); if ( !pParent->pChilds ) @@ -1516,7 +1516,7 @@ sal_uIntPtr SvTreeList::SelectChilds(SvListView* pView, SvListEntry* pParent,sal sal_uInt16 nRefDepth = GetDepth( pParent ); sal_uInt16 nDepth = nRefDepth; - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; pParent = Next( pParent ); do { @@ -1555,7 +1555,7 @@ CheckIntegrity(); } -SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const +SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const { SvListEntry* pEntry = First(); while ( nAbsPos && pEntry ) @@ -1566,7 +1566,7 @@ SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uIntPtr nAbsPos ) const return pEntry; } -SvListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uIntPtr nVisPos ) const +SvListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uLong nVisPos ) const { DBG_ASSERT(pView,"GetEntryAtVisPos:No View"); SvListEntry* pEntry = First(); @@ -1587,7 +1587,7 @@ void SvTreeList::SetListPositions( SvTreeEntryList* pList ) pEntry->pParent->InvalidateChildrensListPositions(); } /* - sal_uIntPtr nListPos = 0; + sal_uLong nListPos = 0; SvListEntry* pEntry = (SvListEntry*)(pList->First()); while( pEntry ) { @@ -1618,7 +1618,7 @@ sal_Bool SvTreeList::IsInChildList( SvListEntry* pParent, SvListEntry* pChild) c void lcl_CheckList( SvTreeEntryList* pList ) { SvListEntry* pEntry = (SvListEntry*)(pList->First()); - sal_uIntPtr nPos = 0; + sal_uLong nPos = 0; while ( pEntry ) { DBG_ASSERT(pEntry->GetChildListPos()==nPos,"Wrong ListPos"); @@ -1629,7 +1629,7 @@ void lcl_CheckList( SvTreeEntryList* pList ) void SvTreeList::CheckIntegrity() const { - sal_uIntPtr nMyEntryCount = 0; + sal_uLong nMyEntryCount = 0; if ( pRootItem->pChilds ) { lcl_CheckList( pRootItem->pChilds ); @@ -1724,7 +1724,7 @@ void SvListView::InitTable() pEntry = pModel->pRootItem; pViewData = new SvViewData; pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED; - aDataTable.Insert( (sal_uIntPtr)pEntry, pViewData ); + aDataTable.Insert( (sal_uLong)pEntry, pViewData ); // Jetzt alle anderen Entries pEntry = pModel->First(); while( pEntry ) @@ -1732,7 +1732,7 @@ void SvListView::InitTable() pViewData = CreateViewData( pEntry ); DBG_ASSERT(pViewData,"InitTable:No ViewData"); InitViewData( pViewData, pEntry ); - aDataTable.Insert( (sal_uIntPtr)pEntry, pViewData ); + aDataTable.Insert( (sal_uLong)pEntry, pViewData ); pEntry = pModel->Next( pEntry ); } } @@ -1767,7 +1767,7 @@ void SvListView::Clear() SvListEntry* pEntry = pModel->pRootItem; SvViewData* pViewData = new SvViewData; pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED; - aDataTable.Insert( (sal_uIntPtr)pEntry, pViewData ); + aDataTable.Insert( (sal_uLong)pEntry, pViewData ); } } @@ -1807,7 +1807,7 @@ void SvListView::ModelHasInsertedTree( SvListEntry* ) } void SvListView::ModelIsMoving( SvListEntry* /* pSource */ , - SvListEntry* /* pTargetParent */ , sal_uIntPtr /* nPos */ ) + SvListEntry* /* pTargetParent */ , sal_uLong /* nPos */ ) { DBG_CHKTHIS(SvListView,0); } @@ -1833,14 +1833,14 @@ void SvListView::ModelHasEntryInvalidated( SvListEntry*) DBG_CHKTHIS(SvListView,0); } -void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uIntPtr) +void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong) { DBG_CHKTHIS(SvListView,0); SvListEntry* pParent = pEntry->pParent; DBG_ASSERT(pParent,"Model not consistent"); if( pParent != pModel->pRootItem && pParent->pChilds->Count() == 1 ) { - SvViewData* pViewData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pParent ); + SvViewData* pViewData = (SvViewData*)aDataTable.Get( (sal_uLong)pParent ); pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED); } // vorlaeufig @@ -1850,7 +1850,7 @@ void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uIntPtr) void SvListView::ActionMoved( SvListEntry* /* pEntry */ , SvListEntry* /* pTargetPrnt */ , - sal_uIntPtr /* nChildPos */ ) + sal_uLong /* nChildPos */ ) { DBG_CHKTHIS(SvListView,0); nVisibleCount = 0; @@ -1866,7 +1866,7 @@ void SvListView::ActionInserted( SvListEntry* pEntry ) #ifdef DBG_UTIL sal_Bool bSuccess = #endif - aDataTable.Insert( (sal_uIntPtr)pEntry, pData ); + aDataTable.Insert( (sal_uLong)pEntry, pData ); DBG_ASSERT(bSuccess,"Entry already in View"); if ( nVisibleCount && pModel->IsEntryVisible( this, pEntry )) { @@ -1888,11 +1888,11 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry ) sal_uInt16 nRefDepth = pModel->GetDepth( pCurEntry ); while( pCurEntry ) { - DBG_ASSERT(aDataTable.Get((sal_uIntPtr)pCurEntry)==0,"Entry already in Table"); + DBG_ASSERT(aDataTable.Get((sal_uLong)pCurEntry)==0,"Entry already in Table"); SvViewData* pViewData = CreateViewData( pCurEntry ); DBG_ASSERT(pViewData,"No ViewData"); InitViewData( pViewData, pEntry ); - aDataTable.Insert( (sal_uIntPtr)pCurEntry, pViewData ); + aDataTable.Insert( (sal_uLong)pCurEntry, pViewData ); pCurEntry = pModel->Next( pCurEntry ); if ( pCurEntry && pModel->GetDepth(pCurEntry) <= nRefDepth) pCurEntry = 0; @@ -1907,9 +1907,9 @@ void SvListView::RemoveViewData( SvListEntry* pParent ) SvListEntry* pCur = (SvListEntry*)pChilds->First(); while( pCur ) { - SvViewData* pViewData = (SvViewData*)aDataTable.Get((sal_uIntPtr)pCur); + SvViewData* pViewData = (SvViewData*)aDataTable.Get((sal_uLong)pCur); delete pViewData; - aDataTable.Remove( (sal_uIntPtr)pCur ); + aDataTable.Remove( (sal_uLong)pCur ); if( pCur->HasChilds()) RemoveViewData( pCur ); pCur = (SvListEntry*)pChilds->Next(); @@ -1924,12 +1924,12 @@ void SvListView::ActionRemoving( SvListEntry* pEntry ) DBG_CHKTHIS(SvListView,0); DBG_ASSERT(pEntry,"Remove:No Entry"); - SvViewData* pViewData = (SvViewData*)aDataTable.Get( (sal_uIntPtr)pEntry ); - sal_uIntPtr nSelRemoved = 0; + SvViewData* pViewData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry ); + sal_uLong nSelRemoved = 0; if ( pViewData->IsSelected() ) nSelRemoved = 1 + pModel->GetChildSelectionCount( this, pEntry ); nSelectionCount -= nSelRemoved; - sal_uIntPtr nVisibleRemoved = 0; + sal_uLong nVisibleRemoved = 0; if ( pModel->IsEntryVisible( this, pEntry ) ) nVisibleRemoved = 1 + pModel->GetVisibleChildCount( this, pEntry ); if( nVisibleCount ) @@ -1944,16 +1944,16 @@ void SvListView::ActionRemoving( SvListEntry* pEntry ) } bVisPositionsValid = sal_False; - pViewData = (SvViewData*)aDataTable.Get((sal_uIntPtr)pEntry); + pViewData = (SvViewData*)aDataTable.Get((sal_uLong)pEntry); delete pViewData; - aDataTable.Remove( (sal_uIntPtr)pEntry ); + aDataTable.Remove( (sal_uLong)pEntry ); RemoveViewData( pEntry ); SvListEntry* pCurEntry = pEntry->pParent; if ( pCurEntry && pCurEntry != pModel->pRootItem && pCurEntry->pChilds->Count() == 1 ) { - pViewData = (SvViewData*)aDataTable.Get((sal_uIntPtr)pCurEntry); + pViewData = (SvViewData*)aDataTable.Get((sal_uLong)pCurEntry); pViewData->nFlags &= (~SVLISTENTRYFLAG_EXPANDED); } } @@ -1970,7 +1970,7 @@ void SvListView::ActionClear() } void SvListView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1, - SvListEntry* pEntry2, sal_uIntPtr nPos ) + SvListEntry* pEntry2, sal_uLong nPos ) { DBG_CHKTHIS(SvListView,0); switch( nActionId ) @@ -2052,11 +2052,11 @@ void SvTreeList::ResortChilds( SvListEntry* pParent ) List aList( *pChildList ); pChildList->Clear(); - sal_uIntPtr nCount = aList.Count(); - for( sal_uIntPtr nCur = 0; nCur < nCount; nCur++ ) + sal_uLong nCount = aList.Count(); + for( sal_uLong nCur = 0; nCur < nCount; nCur++ ) { SvListEntry* pCurEntry = (SvListEntry*)aList.GetObject( nCur ); - sal_uIntPtr nListPos = LIST_APPEND; + sal_uLong nListPos = LIST_APPEND; GetInsertionPos( pCurEntry, pParent, nListPos ); pChildList->Insert( pCurEntry, nListPos ); if( pCurEntry->pChilds ) @@ -2066,7 +2066,7 @@ void SvTreeList::ResortChilds( SvListEntry* pParent ) } void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent, - sal_uIntPtr& rPos ) + sal_uLong& rPos ) { DBG_ASSERT(pEntry,"No Entry"); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index d1ae83fc94b3..17790d1ad4c8 100755 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -541,7 +541,7 @@ void Calendar::ImplFormat() maFirstDate = aTempDate; nWeekDay = (sal_uInt16)aTempDate.GetDayOfWeek(); nWeekDay = (nWeekDay+(7-(sal_uInt16)eStartDay)) % 7; - maFirstDate -= (sal_uIntPtr)nWeekDay; + maFirstDate -= (sal_uLong)nWeekDay; mnDayCount = nWeekDay; sal_uInt16 nDaysInMonth; sal_uInt16 nMonthCount = (sal_uInt16)(mnMonthPerLine*mnLines); @@ -814,7 +814,7 @@ void Calendar::ImplDrawSpin( sal_Bool bDrawPrev, sal_Bool bDrawNext ) void Calendar::ImplDrawDate( long nX, long nY, sal_uInt16 nDay, sal_uInt16 nMonth, sal_uInt16 nYear, DayOfWeek eDayOfWeek, - sal_Bool bBack, sal_Bool bOther, sal_uIntPtr nToday ) + sal_Bool bBack, sal_Bool bOther, sal_uLong nToday ) { ImplDateInfo* pDateInfo; Color* pTextColor = NULL; @@ -979,7 +979,7 @@ void Calendar::ImplDraw( sal_Bool bPaint ) long nDeltaY; long nDayX; long nDayY; - sal_uIntPtr nToday = Date().GetDate(); + sal_uLong nToday = Date().GetDate(); sal_uInt16 nDay; sal_uInt16 nMonth; sal_uInt16 nYear; @@ -1229,7 +1229,7 @@ void Calendar::ImplUpdateSelection( Table* pOld ) { Table* pNew = mpSelectTable; void* p; - sal_uIntPtr nKey; + sal_uLong nKey; p = pOld->First(); while ( p ) @@ -1553,7 +1553,7 @@ void Calendar::ImplEndTracking( sal_Bool bCancel ) if ( !bCancel ) { // Feststellen, ob wir sichtbaren Bereich scrollen sollen - sal_uIntPtr nSelCount = mpSelectTable->Count(); + sal_uLong nSelCount = mpSelectTable->Count(); if ( nSelCount ) { Date aFirstSelDate( mpSelectTable->GetObjectKey( 0 ) ); @@ -2093,14 +2093,14 @@ sal_Bool Calendar::IsDateSelected( const Date& rDate ) const // ----------------------------------------------------------------------- -sal_uIntPtr Calendar::GetSelectDateCount() const +sal_uLong Calendar::GetSelectDateCount() const { return mpSelectTable->Count(); } // ----------------------------------------------------------------------- -Date Calendar::GetSelectDate( sal_uIntPtr nIndex ) const +Date Calendar::GetSelectDate( sal_uLong nIndex ) const { if ( nIndex < mpSelectTable->Count() ) return Date( mpSelectTable->GetObjectKey( nIndex ) ); @@ -2256,7 +2256,7 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const long nX; long nY; - sal_uIntPtr nDaysOff; + sal_uLong nDaysOff; sal_uInt16 nDayIndex; Date aDate = GetFirstMonth(); @@ -2390,7 +2390,7 @@ void Calendar::AddDateInfo( const Date& rDate, const String& rText, mpDateTable = new ImplDateTable( 256, 256 ); sal_Bool bChanged = sal_False; - sal_uIntPtr nKey = rDate.GetDate(); + sal_uLong nKey = rDate.GetDate(); ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); if ( pDateInfo ) pDateInfo->maText = rText; @@ -2483,7 +2483,7 @@ void Calendar::ClearDateInfo() ImplDateInfo* pDateInfo = mpDateTable->First(); while ( pDateInfo ) { - sal_uIntPtr nKey = mpDateTable->GetCurKey(); + sal_uLong nKey = mpDateTable->GetCurKey(); mpDateTable->Remove( nKey ); Date aDate( nKey ); ImplUpdateDate( aDate ); @@ -2502,7 +2502,7 @@ XubString Calendar::GetDateInfoText( const Date& rDate ) XubString aRet; if ( mpDateTable ) { - sal_uIntPtr nKey = rDate.GetDate(); + sal_uLong nKey = rDate.GetDate(); ImplDateInfo* pDateInfo = mpDateTable->Get( nKey ); if ( pDateInfo ) aRet = pDateInfo->maText; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 08dffc8d7e29..219b5428edeb 100755 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -385,8 +385,8 @@ LineListBox::LineListBox( Window* pParent, const ResId& rResId ) : LineListBox::~LineListBox() { - sal_uIntPtr n = 0; - sal_uIntPtr nCount = pLineList->Count(); + sal_uLong n = 0; + sal_uLong nCount = pLineList->Count(); while ( n < nCount ) { ImpLineListData* pData = pLineList->GetObject( n ); @@ -442,8 +442,8 @@ void LineListBox::RemoveEntry( sal_uInt16 nPos ) void LineListBox::Clear() { - sal_uIntPtr n = 0; - sal_uIntPtr nCount = pLineList->Count(); + sal_uLong n = 0; + sal_uLong nCount = pLineList->Count(); while ( n < nCount ) { ImpLineListData* pData = pLineList->GetObject( n ); @@ -461,8 +461,8 @@ void LineListBox::Clear() sal_uInt16 LineListBox::GetEntryPos( long nLine1, long nLine2, long nDistance ) const { - sal_uIntPtr n = 0; - sal_uIntPtr nCount = pLineList->Count(); + sal_uLong n = 0; + sal_uLong nCount = pLineList->Count(); while ( n < nCount ) { ImpLineListData* pData = pLineList->GetObject( n ); @@ -519,7 +519,7 @@ void LineListBox::UpdateLineColors( void ) { if( UpdatePaintLineColor() ) { - sal_uIntPtr nCount = pLineList->Count(); + sal_uLong nCount = pLineList->Count(); if( !nCount ) return; @@ -530,7 +530,7 @@ void LineListBox::UpdateLineColors( void ) SetUpdateMode( sal_False ); sal_uInt16 nSelEntry = GetSelectEntryPos(); - for( sal_uIntPtr n = 0 ; n < nCount ; ++n ) + for( sal_uLong n = 0 ; n < nCount ; ++n ) { ImpLineListData* pData = pLineList->GetObject( n ); if( pData ) @@ -676,7 +676,7 @@ void FontNameBox::Fill( const FontList* pList ) for ( sal_uInt16 i = 0; i < nFontCount; i++ ) { const FontInfo& rFontInfo = pList->GetFontName( i ); - sal_uIntPtr nIndex = InsertEntry( rFontInfo.GetName() ); + sal_uLong nIndex = InsertEntry( rFontInfo.GetName() ); if ( nIndex != LISTBOX_ERROR ) { sal_uInt16 nType = pList->GetFontNameType( i ); @@ -1269,8 +1269,8 @@ void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList ) if ( pAry == pList->GetStdSizeAry() ) { // for scalable fonts all font size names - sal_uIntPtr nCount = aFontSizeNames.Count(); - for( sal_uIntPtr i = 0; i < nCount; i++ ) + sal_uLong nCount = aFontSizeNames.Count(); + for( sal_uLong i = 0; i < nCount; i++ ) { String aSizeName = aFontSizeNames.GetIndexName( i ); long nSize = aFontSizeNames.GetIndexSize( i ); diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 55968967a34f..1314f416eec6 100755 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -163,7 +163,7 @@ static void ImplMakeSearchStringFromName( XubString& rStr ) // ----------------------------------------------------------------------- -ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, sal_uIntPtr* pIndex ) const +ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, sal_uLong* pIndex ) const { // Wenn kein Eintrag in der Liste oder der Eintrag groesser ist als // der Letzte, dann hinten dranhaengen. Wir vergleichen erst mit dem @@ -171,7 +171,7 @@ ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, sal_uInt // und somit die Wahrscheinlichkeit das hinten angehaengt werden muss // sehr gross ist. StringCompare eComp; - sal_uIntPtr nCnt = Count(); + sal_uLong nCnt = Count(); if ( !nCnt ) { if ( pIndex ) @@ -195,9 +195,9 @@ ImplFontListNameInfo* FontList::ImplFind( const XubString& rSearchName, sal_uInt // Fonts in der Liste suchen ImplFontListNameInfo* pCompareData; ImplFontListNameInfo* pFoundData = NULL; - sal_uIntPtr nLow = 0; - sal_uIntPtr nHigh = nCnt-1; - sal_uIntPtr nMid; + sal_uLong nLow = 0; + sal_uLong nHigh = nCnt-1; + sal_uLong nMid; do { @@ -271,7 +271,7 @@ void FontList::ImplInsertFonts( OutputDevice* pDevice, sal_Bool bAll, XubString aSearchName = aFontInfo.GetName(); ImplFontListNameInfo* pData; - sal_uIntPtr nIndex; + sal_uLong nIndex; ImplMakeSearchString( aSearchName ); pData = ImplFind( aSearchName, &nIndex ); @@ -991,7 +991,7 @@ String FontSizeNames::Size2Name( long nValue ) const //------------------------------------------------------------------------ -String FontSizeNames::GetIndexName( sal_uIntPtr nIndex ) const +String FontSizeNames::GetIndexName( sal_uLong nIndex ) const { String aStr; @@ -1003,7 +1003,7 @@ String FontSizeNames::GetIndexName( sal_uIntPtr nIndex ) const //------------------------------------------------------------------------ -long FontSizeNames::GetIndexSize( sal_uIntPtr nIndex ) const +long FontSizeNames::GetIndexSize( sal_uLong nIndex ) const { if ( nIndex >= mnElem ) return 0; diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index 1988dffebec9..eff46b78b2a2 100755 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -200,7 +200,7 @@ void FileControl::GetFocus() // ----------------------------------------------------------------------- -void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void FileControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { WinBits nOldEditStyle = GetEdit().GetStyle(); if ( GetStyle() & WB_BORDER ) diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index 3f15a9937cff..f123af14d510 100755 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -305,7 +305,7 @@ namespace validation //============================================================================== SvNumberFormatter* FormattedField::StaticFormatter::s_cFormatter = NULL; -sal_uIntPtr FormattedField::StaticFormatter::s_nReferences = 0; +sal_uLong FormattedField::StaticFormatter::s_nReferences = 0; //------------------------------------------------------------------------------ SvNumberFormatter* FormattedField::StaticFormatter::GetFormatter() @@ -464,7 +464,7 @@ void FormattedField::SetTextFormatted(const XubString& rStr) aNewSel.Max() = nNewLen; if (!nCurrentLen) { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options - sal_uIntPtr nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); + sal_uLong nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if (nSelOptions & SELECTION_OPTION_SHOWFIRST) { // selection should be from right to left -> swap min and max aNewSel.Min() = aNewSel.Max(); @@ -579,7 +579,7 @@ void FormattedField::ImplSetTextImpl(const XubString& rNew, Selection* pNewSel) aSel.Max() = nNewLen; if (!nCurrentLen) { // there wasn't really a previous selection (as there was no previous text), we're setting a new one -> check the selection options - sal_uIntPtr nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); + sal_uLong nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions(); if (nSelOptions & SELECTION_OPTION_SHOWFIRST) { // selection should be from right to left -> swap min and max aSel.Min() = aSel.Max(); @@ -612,7 +612,7 @@ long FormattedField::PreNotify(NotifyEvent& rNEvt) } //------------------------------------------------------------------------------ -void FormattedField::ImplSetFormatKey(sal_uIntPtr nFormatKey) +void FormattedField::ImplSetFormatKey(sal_uLong nFormatKey) { DBG_CHKTHIS(FormattedField, NULL); @@ -632,7 +632,7 @@ void FormattedField::ImplSetFormatKey(sal_uIntPtr nFormatKey) } //------------------------------------------------------------------------------ -void FormattedField::SetFormatKey(sal_uIntPtr nFormatKey) +void FormattedField::SetFormatKey(sal_uLong nFormatKey) { DBG_CHKTHIS(FormattedField, NULL); sal_Bool bNoFormatter = (m_pFormatter == NULL); @@ -1035,7 +1035,7 @@ sal_Bool FormattedField::ImplGetValue(double& dNewVal) // the language of our format LanguageType eLanguage = m_pFormatter->GetEntry(m_nFormatKey)->GetLanguage(); // the default number format for this language - sal_uIntPtr nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage); + sal_uLong nStandardNumericFormat = m_pFormatter->GetStandardFormat(NUMBERFORMAT_NUMBER, eLanguage); sal_uInt32 nTempFormat = nStandardNumericFormat; double dTemp; diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index f4da39f60096..06886339fda5 100755 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -333,7 +333,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, sal_uInt16 nPos, sal_Bool bHigh, sal_Bool bDrag, const Rectangle& rItemRect, const Rectangle* pRect, - sal_uIntPtr ) + sal_uLong ) { Rectangle aRect = rItemRect; @@ -1013,7 +1013,7 @@ void HeaderBar::Paint( const Rectangle& rRect ) // ----------------------------------------------------------------------- void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index de4d77a6be8d..164118d12ef9 100755 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -614,7 +614,7 @@ void Ruler::ImplDrawTicks( long nMin, long nMax, long nStart, long nCenter ) } } // #i49017# with some zoom factors the value nTick can overflow - if( ((sal_uIntPtr)nTick + (sal_uIntPtr)nTickCount) > (sal_uIntPtr)LONG_MAX) + if( ((sal_uLong)nTick + (sal_uLong)nTickCount) > (sal_uLong)LONG_MAX) break; nTick += nTickCount; } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 2f17fd9ff606..ab4946a8400b 100755 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -465,7 +465,7 @@ Rectangle ScrollableWindow::GetVisibleArea() const //------------------------------------------------------------------- -void ScrollableWindow::SetLineSize( sal_uIntPtr nHorz, sal_uIntPtr nVert ) +void ScrollableWindow::SetLineSize( sal_uLong nHorz, sal_uLong nVert ) { Size aPixSz( LogicToPixel( Size(nHorz, nVert) ) ); nColumnPixW = aPixSz.Width(); @@ -561,8 +561,8 @@ void ScrollableWindow::ScrollLines( long nLinesX, long nLinesY ) //------------------------------------------------------------------- -void ScrollableWindow::ScrollPages( long nPagesX, sal_uIntPtr nOverlapX, - long nPagesY, sal_uIntPtr nOverlapY ) +void ScrollableWindow::ScrollPages( long nPagesX, sal_uLong nOverlapX, + long nPagesY, sal_uLong nOverlapY ) { Size aOutSz( GetVisibleArea().GetSize() ); Scroll( nPagesX * aOutSz.Width() + (nPagesX>0 ? 1 : -1) * nOverlapX, diff --git a/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx index b51260de7b7d..94c15a8604d2 100755 --- a/svtools/source/control/stdmenu.cxx +++ b/svtools/source/control/stdmenu.cxx @@ -439,8 +439,8 @@ void FontSizeMenu::Fill( const FontInfo& rInfo, const FontList* pList ) if ( pAry == pList->GetStdSizeAry() ) { // for scalable fonts all font size names - sal_uIntPtr nCount = aFontSizeNames.Count(); - for( sal_uIntPtr i = 0; i < nCount; i++ ) + sal_uLong nCount = aFontSizeNames.Count(); + for( sal_uLong i = 0; i < nCount; i++ ) { String aSizeName = aFontSizeNames.GetIndexName( i ); long nSize = aFontSizeNames.GetIndexSize( i ); diff --git a/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx index f10d8e117ce1..798126ae37af 100755 --- a/svtools/source/control/taskbox.cxx +++ b/svtools/source/control/taskbox.cxx @@ -208,7 +208,7 @@ void TaskToolBox::ImplFormatTaskToolBox() { // Eintraege aus der Liste entfernen while ( mpItemList->Count() > mnUpdatePos ) - delete mpItemList->Remove( (sal_uIntPtr)mnUpdatePos ); + delete mpItemList->Remove( (sal_uLong)mnUpdatePos ); mnUpdateNewPos = mnUpdatePos; } @@ -310,7 +310,7 @@ void TaskToolBox::UpdateTask( const Image& rImage, const String& rText, { // Eintraege aus der Liste entfernen while ( mpItemList->Count() > mnUpdatePos ) - delete mpItemList->Remove( (sal_uIntPtr)mnUpdatePos ); + delete mpItemList->Remove( (sal_uLong)mnUpdatePos ); pItem = NULL; } } @@ -340,7 +340,7 @@ void TaskToolBox::EndUpdateTask() { // Eintraege aus der Liste entfernen while ( mpItemList->Count() > mnUpdatePos ) - delete mpItemList->Remove( (sal_uIntPtr)mnUpdatePos ); + delete mpItemList->Remove( (sal_uLong)mnUpdatePos ); mnUpdateNewPos = mnUpdatePos; } diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 34870bafd5fd..7792fe32bff8 100755 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -604,7 +604,7 @@ void TaskStatusBar::AddStatusFieldItem( sal_uInt16 nItemId, const TaskStatusFiel pItem->maItem = rItem; pItem->mnId = nItemId; pItem->mnOffX = 0; - mpFieldItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpFieldItemList->Insert( pItem, (sal_uLong)nPos ); ImplUpdateField( sal_True ); } diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 411539f20b8d..8875ce66354c 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -345,7 +345,7 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem ) void ValueSet::Format() { Size aWinSize = GetOutputSizePixel(); - sal_uIntPtr nItemCount = mpImpl->mpItemList->Count(); + sal_uLong nItemCount = mpImpl->mpItemList->Count(); WinBits nStyle = GetStyle(); long nTxtHeight = GetTextHeight(); long nOff; @@ -509,7 +509,7 @@ void ValueSet::Format() } } - for ( sal_uIntPtr i = 0; i < nItemCount; i++ ) + for ( sal_uLong i = 0; i < nItemCount; i++ ) { ValueSetItem* pItem = mpImpl->mpItemList->GetObject( i ); pItem->maRect.SetEmpty(); @@ -587,8 +587,8 @@ void ValueSet::Format() } // draw items - sal_uIntPtr nFirstItem = mnFirstLine * mnCols; - sal_uIntPtr nLastItem = nFirstItem + (mnVisLines * mnCols); + sal_uLong nFirstItem = mnFirstLine * mnCols; + sal_uLong nLastItem = nFirstItem + (mnVisLines * mnCols); if ( !mbFullMode ) { @@ -598,7 +598,7 @@ void ValueSet::Format() if ( y+(mnVisLines*(nItemHeight+nSpace)) < aWinSize.Height() ) nLastItem += mnCols; } - for ( sal_uIntPtr i = 0; i < nItemCount; i++ ) + for ( sal_uLong i = 0; i < nItemCount; i++ ) { ValueSetItem* pItem = mpImpl->mpItemList->GetObject( i ); @@ -1146,8 +1146,8 @@ sal_uInt16 ValueSet::ImplGetItem( const Point& rPos, sal_Bool bMove ) const Point aDefPos; Rectangle aWinRect( aDefPos, maVirDev.GetOutputSizePixel() ); - sal_uIntPtr nItemCount = mpImpl->mpItemList->Count(); - for ( sal_uIntPtr i = 0; i < nItemCount; i++ ) + sal_uLong nItemCount = mpImpl->mpItemList->Count(); + for ( sal_uLong i = 0; i < nItemCount; i++ ) { ValueSetItem* pItem = mpImpl->mpItemList->GetObject( i ); if ( pItem->maRect.IsInside( rPos ) ) @@ -1827,7 +1827,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, sal_uInt16 n pItem->mnId = nItemId; pItem->meType = VALUESETITEM_IMAGE; pItem->maImage = rImage; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1846,7 +1846,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, sal_uInt16 n pItem->mnId = nItemId; pItem->meType = VALUESETITEM_COLOR; pItem->maColor = rColor; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1867,7 +1867,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Image& rImage, pItem->meType = VALUESETITEM_IMAGE; pItem->maImage = rImage; pItem->maText = rText; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1888,7 +1888,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, const Color& rColor, pItem->meType = VALUESETITEM_COLOR; pItem->maColor = rColor; pItem->maText = rText; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1906,7 +1906,7 @@ void ValueSet::InsertItem( sal_uInt16 nItemId, sal_uInt16 nPos ) ValueSetItem* pItem = new ValueSetItem( *this ); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_USERDRAW; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) @@ -1924,7 +1924,7 @@ void ValueSet::InsertSpace( sal_uInt16 nItemId, sal_uInt16 nPos ) ValueSetItem* pItem = new ValueSetItem( *this ); pItem->mnId = nItemId; pItem->meType = VALUESETITEM_SPACE; - mpImpl->mpItemList->Insert( pItem, (sal_uIntPtr)nPos ); + mpImpl->mpItemList->Insert( pItem, (sal_uLong)nPos ); mbFormat = sal_True; if ( IsReallyVisible() && IsUpdateMode() ) diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 7eda7eb16191..6e6fd4fd2e84 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -461,7 +461,7 @@ void ImpPathDialog::UpdateEntries( const sal_Bool ) { if( FileStat( rEntry ).GetKind() & FSYS_KIND_DIR ) { - sal_uIntPtr l = 0; + sal_uLong l = 0; if( xCollator.is() ) { for( l = 0; l < aSortDirList.Count(); l++ ) @@ -473,7 +473,7 @@ void ImpPathDialog::UpdateEntries( const sal_Bool ) } } - for( sal_uIntPtr l = 0; l < aSortDirList.Count(); l++ ) + for( sal_uLong l = 0; l < aSortDirList.Count(); l++ ) { UniString aEntryStr( aTabString ); aEntryStr += *aSortDirList.GetObject(l); @@ -1045,7 +1045,7 @@ void ImpFileDialog::UpdateEntries( const sal_Bool bWithDirs ) } else { - sal_uIntPtr l = 0; + sal_uLong l = 0; if( xCollator.is() ) { for( l = 0; l < aSortDirList.Count(); l++ ) @@ -1057,7 +1057,7 @@ void ImpFileDialog::UpdateEntries( const sal_Bool bWithDirs ) } } } - for( sal_uIntPtr l = 0; l < aSortDirList.Count(); l++ ) + for( sal_uLong l = 0; l < aSortDirList.Count(); l++ ) { UniString aEntryStr( aTabString ); aEntryStr += *aSortDirList.GetObject(l); diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index 2052da492737..605f9ed5db07 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -77,7 +77,7 @@ PRV_SV_IMPL_OWNER_LIST( SvObjectServerList, SvObjectServer ) *************************************************************************/ const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) const { - for( sal_uIntPtr i = 0; i < Count(); i++ ) + for( sal_uLong i = 0; i < Count(); i++ ) { if( rHumanName == GetObject( i ).GetHumanName() ) return &GetObject( i ); @@ -92,7 +92,7 @@ const SvObjectServer * SvObjectServerList::Get( const String & rHumanName ) cons *************************************************************************/ const SvObjectServer * SvObjectServerList::Get( const SvGlobalName & rName ) const { - for( sal_uIntPtr i = 0; i < Count(); i++ ) + for( sal_uLong i = 0; i < Count(); i++ ) { if( rName == GetObject( i ).GetClassName() ) return &GetObject( i ); diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx index 28505c6280b4..d98493114fd3 100644 --- a/svtools/source/dialogs/mcvmath.cxx +++ b/svtools/source/dialogs/mcvmath.cxx @@ -99,11 +99,11 @@ FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ) |* **************************************************************************/ -sal_uInt16 ImpSqrt( sal_uIntPtr nRadi ) +sal_uInt16 ImpSqrt( sal_uLong nRadi ) { - register sal_uIntPtr inf = 1; - register sal_uIntPtr sup = nRadi; - register sal_uIntPtr sqr; + register sal_uLong inf = 1; + register sal_uLong sup = nRadi; + register sal_uLong sqr; if ( !nRadi ) return 0; @@ -245,7 +245,7 @@ static sal_uInt16 ImpATanx2( const Fix& rX, const Fix& rY ) sal_uInt16 ImpATan2( const short x, const short y ) { - Fix rRad = ImpSqrt(sal_uIntPtr(long(x)*x+long(y)*y)); + Fix rRad = ImpSqrt(sal_uLong(long(x)*x+long(y)*y)); if ( !rRad.x ) return 0; @@ -269,7 +269,7 @@ sal_uInt16 ImpATan2( const short x, const short y ) void ImpCartToPolar( const short x, const short y, Fix& rRad, sal_uInt16& rPhi ) { - rRad = Fix( ImpSqrt( sal_uIntPtr( long(x)*x+long(y)*y ) ) ); + rRad = Fix( ImpSqrt( sal_uLong( long(x)*x+long(y)*y ) ) ); if ( !rRad.x ) rPhi=0; diff --git a/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx index bd4deab0a769..7708a8f1c89a 100644 --- a/svtools/source/dialogs/mcvmath.hxx +++ b/svtools/source/dialogs/mcvmath.hxx @@ -221,7 +221,7 @@ FixCpx ImpMultBig2( const FixCpx& ra, const FixCpx& rb ); void ImpCartToPolar( const short x, const short y, Fix& rRad, sal_uInt16& rPhi ); void ImpPolarToCart( const Fix& rR, const sal_uInt16 Phi, short& rX, short& rY ); -sal_uInt16 ImpSqrt( sal_uIntPtr nRadi ); +sal_uInt16 ImpSqrt( sal_uLong nRadi ); sal_uInt16 ImpATan2( const short x, const short y ); FixCpx ImpExPI( sal_uInt16 nPhi ); diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index aa67a62b66ba..12a71a706b60 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -161,7 +161,7 @@ static void ImplPrnDlgAddResString( XubString& rStr, sal_uInt16 nResId ) XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) { XubString aStr; - sal_uIntPtr nStatus = rInfo.GetStatus(); + sal_uLong nStatus = rInfo.GetStatus(); // Default-Printer if ( rInfo.GetPrinterName().Len() && @@ -221,7 +221,7 @@ XubString ImplPrnDlgGetStatusText( const QueueInfo& rInfo ) ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_POWER_SAVE ); // Anzahl Jobs - sal_uIntPtr nJobs = rInfo.GetJobs(); + sal_uLong nJobs = rInfo.GetJobs(); if ( nJobs && (nJobs != QUEUE_JOBS_DONTKNOW) ) { XubString aJobStr( SvtResId( STR_SVT_PRNDLG_JOBCOUNT ) ); diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx index ba9cb3be4ce7..a62df6d64700 100644 --- a/svtools/source/edit/editsyntaxhighlighter.cxx +++ b/svtools/source/edit/editsyntaxhighlighter.cxx @@ -72,7 +72,7 @@ void MultiLineEditSyntaxHighlight::DoBracketHilight(sal_uInt16 aKey) { TextSelection aCurrentPos = GetTextView()->GetSelection(); xub_StrLen aStartPos = aCurrentPos.GetStart().GetIndex(); - sal_uIntPtr nStartPara = aCurrentPos.GetStart().GetPara(); + sal_uLong nStartPara = aCurrentPos.GetStart().GetPara(); sal_uInt16 aCount = 0; int aChar = -1; diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index dc87086922e1..1e9e7b7cd48b 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -208,10 +208,10 @@ void ImpSvMEdit::ImpUpdateSrollBarVis( WinBits nWinStyle ) if ( !bNeedVScroll && bAutoVScroll ) { TextEngine& rEngine( *mpTextWindow->GetTextEngine() ); - sal_uIntPtr nOverallTextHeight(0); - for ( sal_uIntPtr i=0; i<rEngine.GetParagraphCount(); ++i ) + sal_uLong nOverallTextHeight(0); + for ( sal_uLong i=0; i<rEngine.GetParagraphCount(); ++i ) nOverallTextHeight += rEngine.GetTextHeight( i ); - if ( nOverallTextHeight > (sal_uIntPtr)mpTextWindow->GetOutputSizePixel().Height() ) + if ( nOverallTextHeight > (sal_uLong)mpTextWindow->GetOutputSizePixel().Height() ) bNeedVScroll = true; } @@ -304,14 +304,14 @@ void ImpSvMEdit::ImpSetScrollBarRanges() { if ( mpVScrollBar ) { - sal_uIntPtr nTextHeight = mpTextWindow->GetTextEngine()->GetTextHeight(); + sal_uLong nTextHeight = mpTextWindow->GetTextEngine()->GetTextHeight(); mpVScrollBar->SetRange( Range( 0, (long)nTextHeight-1 ) ); } if ( mpHScrollBar ) { -// sal_uIntPtr nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); +// sal_uLong nTextWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); // Es gibt kein Notify bei Breiten-Aenderung... -// sal_uIntPtr nW = Max( (sal_uIntPtr)mpTextWindow->GetOutputSizePixel().Width()*5, (sal_uIntPtr)nTextWidth ); +// sal_uLong nW = Max( (sal_uLong)mpTextWindow->GetOutputSizePixel().Width()*5, (sal_uLong)nTextWidth ); // mpHScrollBar->SetRange( Range( 0, (long)nW ) ); mpHScrollBar->SetRange( Range( 0, (long)mnTextWidth-1 ) ); } @@ -593,7 +593,7 @@ void ImpSvMEdit::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( mpHScrollBar ) { - sal_uIntPtr nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); + sal_uLong nWidth = mpTextWindow->GetTextEngine()->CalcTextWidth(); if ( nWidth != mnTextWidth ) { mnTextWidth = sal::static_int_cast< xub_StrLen >(nWidth); @@ -625,7 +625,7 @@ void ImpSvMEdit::SetSelection( const Selection& rSelection ) long nEnd = Max( aNewSelection.Min(), aNewSelection.Max() ); TextSelection aTextSel; - sal_uIntPtr nPara = 0; + sal_uLong nPara = 0; sal_uInt16 nChar = 0; sal_uInt16 x = 0; while ( x <= nEnd ) @@ -656,7 +656,7 @@ const Selection& ImpSvMEdit::GetSelection() const ExtTextEngine* pExtTextEngine = mpTextWindow->GetTextEngine(); // Absaetze davor: - sal_uIntPtr n; + sal_uLong n; for ( n = 0; n < aTextSel.GetStart().GetPara(); n++ ) { maSelection.Min() += pExtTextEngine->GetTextLen( n ); @@ -1139,7 +1139,7 @@ sal_Bool MultiLineEdit::IsModified() const return pImpSvMEdit->IsModified(); } -void MultiLineEdit::EnableUpdateData( sal_uIntPtr nTimeout ) +void MultiLineEdit::EnableUpdateData( sal_uLong nTimeout ) { if ( !nTimeout ) DisableUpdateData(); @@ -1381,7 +1381,7 @@ void MultiLineEdit::DataChanged( const DataChangedEvent& rDCEvt ) Control::DataChanged( rDCEvt ); } -void MultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uIntPtr nFlags ) +void MultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { ImplInitSettings( sal_True, sal_True, sal_True ); @@ -1434,7 +1434,7 @@ void MultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSi XubString aText = GetText(); Size aTextSz( pDev->GetTextWidth( aText ), pDev->GetTextHeight() ); - sal_uIntPtr nLines = (sal_uIntPtr) (aSize.Height() / aTextSz.Height()); + sal_uLong nLines = (sal_uLong) (aSize.Height() / aTextSz.Height()); if ( !nLines ) nLines = 1; aTextSz.Height() = nLines*aTextSz.Height(); diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx index f63487cc17bb..2a4c0134005a 100644 --- a/svtools/source/edit/svmedit2.cxx +++ b/svtools/source/edit/svmedit2.cxx @@ -64,7 +64,7 @@ void ExtMultiLineEdit::EnableCursor( sal_Bool bEnable ) GetTextView()->EnableCursor( bEnable ); } -void ExtMultiLineEdit::SetAttrib( const TextAttrib& rAttr, sal_uIntPtr nPara, sal_uInt16 nStart, sal_uInt16 nEnd ) +void ExtMultiLineEdit::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ) { GetTextEngine()->SetAttrib( rAttr, nPara, nStart, nEnd ); } @@ -74,7 +74,7 @@ void ExtMultiLineEdit::SetLeftMargin( sal_uInt16 nLeftMargin ) GetTextEngine()->SetLeftMargin( nLeftMargin ); } -sal_uIntPtr ExtMultiLineEdit::GetParagraphCount() const +sal_uLong ExtMultiLineEdit::GetParagraphCount() const { return GetTextEngine()->GetParagraphCount(); } diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx index e311688d97d4..1cefb30700df 100644 --- a/svtools/source/edit/textdata.cxx +++ b/svtools/source/edit/textdata.cxx @@ -318,12 +318,12 @@ void IdleFormatter::ForceTimeout() TYPEINIT1( TextHint, SfxSimpleHint ); -TextHint::TextHint( sal_uIntPtr Id ) : SfxSimpleHint( Id ) +TextHint::TextHint( sal_uLong Id ) : SfxSimpleHint( Id ) { mnValue = 0; } -TextHint::TextHint( sal_uIntPtr Id, sal_uIntPtr nValue ) : SfxSimpleHint( Id ) +TextHint::TextHint( sal_uLong Id, sal_uLong nValue ) : SfxSimpleHint( Id ) { mnValue = nValue; } diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx index d95dfe7fe241..2dfb014117b1 100644 --- a/svtools/source/edit/textdoc.cxx +++ b/svtools/source/edit/textdoc.cxx @@ -539,15 +539,15 @@ void TextDoc::Clear() void TextDoc::DestroyTextNodes() { - for ( sal_uIntPtr nNode = 0; nNode < maTextNodes.Count(); nNode++ ) + for ( sal_uLong nNode = 0; nNode < maTextNodes.Count(); nNode++ ) delete maTextNodes.GetObject( nNode ); maTextNodes.clear(); } String TextDoc::GetText( const sal_Unicode* pSep ) const { - sal_uIntPtr nLen = GetTextLen( pSep ); - sal_uIntPtr nNodes = maTextNodes.Count(); + sal_uLong nLen = GetTextLen( pSep ); + sal_uLong nNodes = maTextNodes.Count(); if ( nLen > STRING_MAXLEN ) { @@ -556,8 +556,8 @@ String TextDoc::GetText( const sal_Unicode* pSep ) const } String aASCIIText; - sal_uIntPtr nLastNode = nNodes-1; - for ( sal_uIntPtr nNode = 0; nNode < nNodes; nNode++ ) + sal_uLong nLastNode = nNodes-1; + for ( sal_uLong nNode = 0; nNode < nNodes; nNode++ ) { TextNode* pNode = maTextNodes.GetObject( nNode ); String aTmp( pNode->GetText() ); @@ -569,7 +569,7 @@ String TextDoc::GetText( const sal_Unicode* pSep ) const return aASCIIText; } -XubString TextDoc::GetText( sal_uIntPtr nPara ) const +XubString TextDoc::GetText( sal_uLong nPara ) const { XubString aText; TextNode* pNode = ( nPara < maTextNodes.Count() ) ? maTextNodes.GetObject( nPara ) : 0; @@ -580,26 +580,26 @@ XubString TextDoc::GetText( sal_uIntPtr nPara ) const } -sal_uIntPtr TextDoc::GetTextLen( const xub_Unicode* pSep, const TextSelection* pSel ) const +sal_uLong TextDoc::GetTextLen( const xub_Unicode* pSep, const TextSelection* pSel ) const { - sal_uIntPtr nLen = 0; - sal_uIntPtr nNodes = maTextNodes.Count(); + sal_uLong nLen = 0; + sal_uLong nNodes = maTextNodes.Count(); if ( nNodes ) { - sal_uIntPtr nStartNode = 0; - sal_uIntPtr nEndNode = nNodes-1; + sal_uLong nStartNode = 0; + sal_uLong nEndNode = nNodes-1; if ( pSel ) { nStartNode = pSel->GetStart().GetPara(); nEndNode = pSel->GetEnd().GetPara(); } - for ( sal_uIntPtr nNode = nStartNode; nNode <= nEndNode; nNode++ ) + for ( sal_uLong nNode = nStartNode; nNode <= nEndNode; nNode++ ) { TextNode* pNode = maTextNodes.GetObject( nNode ); sal_uInt16 nS = 0; - sal_uIntPtr nE = pNode->GetText().Len(); + sal_uLong nE = pNode->GetText().Len(); if ( pSel && ( nNode == pSel->GetStart().GetPara() ) ) nS = pSel->GetStart().GetIndex(); if ( pSel && ( nNode == pSel->GetEnd().GetPara() ) ) @@ -656,11 +656,11 @@ TextPaM TextDoc::ConnectParagraphs( TextNode* pLeft, TextNode* pRight ) pLeft->Append( *pRight ); // der rechte verschwindet. - sal_uIntPtr nRight = maTextNodes.GetPos( pRight ); + sal_uLong nRight = maTextNodes.GetPos( pRight ); maTextNodes.Remove( nRight ); delete pRight; - sal_uIntPtr nLeft = maTextNodes.GetPos( pLeft ); + sal_uLong nLeft = maTextNodes.GetPos( pLeft ); TextPaM aPaM( nLeft, nPrevLen ); return aPaM; } @@ -809,7 +809,7 @@ sal_Bool TextDoc::RemoveAttribs( TextNode* pNode, sal_uInt16 nStart, sal_uInt16 sal_uInt16 nOldEnd = pAttr->GetEnd(); pAttr->GetEnd() = nStart; rpEnding = pAttr; -// sal_uIntPtr nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos(); +// sal_uLong nSavePos = pNode->GetCharAttribs().GetStartList().GetCurPos(); InsertAttrib( *pAttr->GetItem(), pNode, nEnd, nOldEnd ); // pNode->GetCharAttribs().GetStartList().Seek( nSavePos ); break; // es kann weitere Attribute geben! diff --git a/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx index c091ca1c6bd9..44ae2371a181 100644 --- a/svtools/source/edit/textdoc.hxx +++ b/svtools/source/edit/textdoc.hxx @@ -129,9 +129,9 @@ public: TextPaM InsertParaBreak( const TextPaM& rPaM, sal_Bool bKeepEndingAttribs ); TextPaM ConnectParagraphs( TextNode* pLeft, TextNode* pRight ); - sal_uIntPtr GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const; + sal_uLong GetTextLen( const sal_Unicode* pSep, const TextSelection* pSel = NULL ) const; String GetText( const sal_Unicode* pSep ) const; - String GetText( sal_uIntPtr nPara ) const; + String GetText( sal_uLong nPara ) const; void SetLeftMargin( sal_uInt16 n ) { mnLeftMargin = n; } sal_uInt16 GetLeftMargin() const { return mnLeftMargin; } diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx index 821a7d5b5bee..f73cecaeecc2 100644 --- a/svtools/source/edit/texteng.cxx +++ b/svtools/source/edit/texteng.cxx @@ -81,8 +81,8 @@ typedef TextView* TextViewPtr; SV_DECL_PTRARR( TextViews, TextViewPtr, 0, 1 ) // SV_IMPL_PTRARR( TextViews, TextViewPtr ); -SV_DECL_VARARR_SORT( TESortedPositions, sal_uIntPtr, 16, 8 ) -SV_IMPL_VARARR_SORT( TESortedPositions, sal_uIntPtr ) +SV_DECL_VARARR_SORT( TESortedPositions, sal_uLong, 16, 8 ) +SV_IMPL_VARARR_SORT( TESortedPositions, sal_uLong ) #define RESDIFF 10 #define SCRLRANGE 20 // 1/20 der Breite/Hoehe scrollen, wenn im QueryDrop @@ -266,16 +266,16 @@ void TextEngine::SetDefTab( sal_uInt16 nDefTab ) // evtl neu setzen? } -void TextEngine::SetMaxTextLen( sal_uIntPtr nLen ) +void TextEngine::SetMaxTextLen( sal_uLong nLen ) { mnMaxTextLen = nLen; } -void TextEngine::SetMaxTextWidth( sal_uIntPtr nMaxWidth ) +void TextEngine::SetMaxTextWidth( sal_uLong nMaxWidth ) { if ( nMaxWidth != mnMaxTextWidth ) { - mnMaxTextWidth = Min( nMaxWidth, (sal_uIntPtr)0x7FFFFFFF ); + mnMaxTextWidth = Min( nMaxWidth, (sal_uLong)0x7FFFFFFF ); FormatFullDoc(); UpdateViews(); } @@ -311,9 +311,9 @@ String TextEngine::GetText( LineEnd aSeparator ) const String TextEngine::GetTextLines( LineEnd aSeparator ) const { String aText; - sal_uIntPtr nParas = mpTEParaPortions->Count(); + sal_uLong nParas = mpTEParaPortions->Count(); const sal_Unicode* pSep = static_getLineEndText( aSeparator ); - for ( sal_uIntPtr nP = 0; nP < nParas; nP++ ) + for ( sal_uLong nP = 0; nP < nParas; nP++ ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nP ); @@ -329,17 +329,17 @@ String TextEngine::GetTextLines( LineEnd aSeparator ) const return aText; } -String TextEngine::GetText( sal_uIntPtr nPara ) const +String TextEngine::GetText( sal_uLong nPara ) const { return mpDoc->GetText( nPara ); } -sal_uIntPtr TextEngine::GetTextLen( LineEnd aSeparator ) const +sal_uLong TextEngine::GetTextLen( LineEnd aSeparator ) const { return mpDoc->GetTextLen( static_getLineEndText( aSeparator ) ); } -sal_uIntPtr TextEngine::GetTextLen( const TextSelection& rSel, LineEnd aSeparator ) const +sal_uLong TextEngine::GetTextLen( const TextSelection& rSel, LineEnd aSeparator ) const { TextSelection aSel( rSel ); aSel.Justify(); @@ -347,7 +347,7 @@ sal_uIntPtr TextEngine::GetTextLen( const TextSelection& rSel, LineEnd aSeparato return mpDoc->GetTextLen( static_getLineEndText( aSeparator ), &aSel ); } -sal_uInt16 TextEngine::GetTextLen( sal_uIntPtr nPara ) const +sal_uInt16 TextEngine::GetTextLen( sal_uLong nPara ) const { return mpDoc->GetNodes().GetObject( nPara )->GetText().Len(); } @@ -459,7 +459,7 @@ void TextEngine::ImpInitDoc() mpDoc->GetNodes().Insert( pNode, 0 ); TEParaPortion* pIniPortion = new TEParaPortion( pNode ); - mpTEParaPortions->Insert( pIniPortion, (sal_uIntPtr)0 ); + mpTEParaPortions->Insert( pIniPortion, (sal_uLong)0 ); mbFormatted = sal_False; @@ -477,10 +477,10 @@ String TextEngine::GetText( const TextSelection& rSel, LineEnd aSeparator ) cons TextSelection aSel( rSel ); aSel.Justify(); - sal_uIntPtr nStartPara = aSel.GetStart().GetPara(); - sal_uIntPtr nEndPara = aSel.GetEnd().GetPara(); + sal_uLong nStartPara = aSel.GetStart().GetPara(); + sal_uLong nEndPara = aSel.GetEnd().GetPara(); const sal_Unicode* pSep = static_getLineEndText( aSeparator ); - for ( sal_uIntPtr nNode = aSel.GetStart().GetPara(); nNode <= nEndPara; nNode++ ) + for ( sal_uLong nNode = aSel.GetStart().GetPara(); nNode <= nEndPara; nNode++ ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nNode ); @@ -548,7 +548,7 @@ void TextEngine::SetText( const XubString& rText ) } -void TextEngine::CursorMoved( sal_uIntPtr nNode ) +void TextEngine::CursorMoved( sal_uLong nNode ) { // Leere Attribute loeschen, aber nur, wenn Absatz nicht leer! TextNode* pNode = mpDoc->GetNodes().GetObject( nNode ); @@ -590,7 +590,7 @@ void TextEngine::ImpRemoveChars( const TextPaM& rPaM, sal_uInt16 nChars, SfxUndo ImpCharsRemoved( rPaM.GetPara(), rPaM.GetIndex(), nChars ); } -TextPaM TextEngine::ImpConnectParagraphs( sal_uIntPtr nLeft, sal_uIntPtr nRight ) +TextPaM TextEngine::ImpConnectParagraphs( sal_uLong nLeft, sal_uLong nRight ) { DBG_ASSERT( nLeft != nRight, "Den gleichen Absatz zusammenfuegen ?" ); @@ -634,11 +634,11 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) DBG_ASSERT( mpDoc->IsValidPaM( aStartPaM ), "Index im Wald in ImpDeleteText" ); DBG_ASSERT( mpDoc->IsValidPaM( aEndPaM ), "Index im Wald in ImpDeleteText" ); - sal_uIntPtr nStartNode = aStartPaM.GetPara(); - sal_uIntPtr nEndNode = aEndPaM.GetPara(); + sal_uLong nStartNode = aStartPaM.GetPara(); + sal_uLong nEndNode = aEndPaM.GetPara(); // Alle Nodes dazwischen entfernen.... - for ( sal_uIntPtr z = nStartNode+1; z < nEndNode; z++ ) + for ( sal_uLong z = nStartNode+1; z < nEndNode; z++ ) { // Immer nStartNode+1, wegen Remove()! ImpRemoveParagraph( nStartNode+1 ); @@ -688,7 +688,7 @@ TextPaM TextEngine::ImpDeleteText( const TextSelection& rSel ) return aStartPaM; } -void TextEngine::ImpRemoveParagraph( sal_uIntPtr nPara ) +void TextEngine::ImpRemoveParagraph( sal_uLong nPara ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPara ); @@ -878,7 +878,7 @@ TextPaM TextEngine::ImpInsertText( const TextSelection& rCurSel, const XubString // Start == End => Leerzeile if ( nEnd > nStart ) { - sal_uIntPtr nL = aPaM.GetIndex(); + sal_uLong nL = aPaM.GetIndex(); nL += ( nEnd-nStart ); if ( nL > STRING_MAXLEN ) { @@ -966,7 +966,7 @@ Rectangle TextEngine::PaMtoEditCursor( const TextPaM& rPaM, sal_Bool bSpecial ) } else { - for ( sal_uIntPtr nPortion = 0; nPortion < rPaM.GetPara(); nPortion++ ) + for ( sal_uLong nPortion = 0; nPortion < rPaM.GetPara(); nPortion++ ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject(nPortion); nY += pPortion->GetLines().Count() * mnCharHeight; @@ -1036,7 +1036,7 @@ Rectangle TextEngine::GetEditCursor( const TextPaM& rPaM, sal_Bool bSpecial, sal return aEditCursor; } -long TextEngine::ImpGetXPos( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart ) +long TextEngine::ImpGetXPos( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_Bool bPreferPortionStart ) { DBG_ASSERT( ( nIndex >= pLine->GetStart() ) && ( nIndex <= pLine->GetEnd() ) , "ImpGetXPos muss richtig gerufen werden!" ); @@ -1138,7 +1138,7 @@ const TextCharAttrib* TextEngine::FindCharAttrib( const TextPaM& rPaM, sal_uInt1 sal_Bool TextEngine::HasAttrib( sal_uInt16 nWhich ) const { sal_Bool bAttr = sal_False; - for ( sal_uIntPtr n = mpDoc->GetNodes().Count(); --n && !bAttr; ) + for ( sal_uLong n = mpDoc->GetNodes().Count(); --n && !bAttr; ) { TextNode* pNode = mpDoc->GetNodes().GetObject( n ); bAttr = pNode->GetCharAttribs().HasAttrib( nWhich ); @@ -1151,7 +1151,7 @@ TextPaM TextEngine::GetPaM( const Point& rDocPos, sal_Bool bSmart ) DBG_ASSERT( GetUpdateMode(), "Darf bei Update=sal_False nicht erreicht werden: GetPaM" ); long nY = 0; - for ( sal_uIntPtr nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ ) + for ( sal_uLong nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPortion ); long nTmpHeight = pPortion->GetLines().Count() * mnCharHeight; @@ -1169,12 +1169,12 @@ TextPaM TextEngine::GetPaM( const Point& rDocPos, sal_Bool bSmart ) } // Nicht gefunden - Dann den letzten sichtbare... - sal_uIntPtr nLastNode = mpDoc->GetNodes().Count() - 1; + sal_uLong nLastNode = mpDoc->GetNodes().Count() - 1; TextNode* pLast = mpDoc->GetNodes().GetObject( nLastNode ); return TextPaM( nLastNode, pLast->GetText().Len() ); } -sal_uInt16 TextEngine::ImpFindIndex( sal_uIntPtr nPortion, const Point& rPosInPara, sal_Bool bSmart ) +sal_uInt16 TextEngine::ImpFindIndex( sal_uLong nPortion, const Point& rPosInPara, sal_Bool bSmart ) { DBG_ASSERT( IsFormatted(), "GetPaM: Nicht formatiert" ); TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPortion ); @@ -1208,7 +1208,7 @@ sal_uInt16 TextEngine::ImpFindIndex( sal_uIntPtr nPortion, const Point& rPosInPa return nCurIndex; } -sal_uInt16 TextEngine::GetCharPos( sal_uIntPtr nPortion, sal_uInt16 nLine, long nXPos, sal_Bool ) +sal_uInt16 TextEngine::GetCharPos( sal_uLong nPortion, sal_uInt16 nLine, long nXPos, sal_Bool ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPortion ); @@ -1248,7 +1248,7 @@ sal_uInt16 TextEngine::GetCharPos( sal_uIntPtr nPortion, sal_uInt16 nLine, long } -sal_uIntPtr TextEngine::GetTextHeight() const +sal_uLong TextEngine::GetTextHeight() const { DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=sal_False nicht verwendet werden: GetTextHeight" ); @@ -1258,7 +1258,7 @@ sal_uIntPtr TextEngine::GetTextHeight() const return mnCurTextHeight; } -sal_uIntPtr TextEngine::GetTextHeight( sal_uIntPtr nParagraph ) const +sal_uLong TextEngine::GetTextHeight( sal_uLong nParagraph ) const { DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=sal_False nicht verwendet werden: GetTextHeight" ); @@ -1268,13 +1268,13 @@ sal_uIntPtr TextEngine::GetTextHeight( sal_uIntPtr nParagraph ) const return CalcParaHeight( nParagraph ); } -sal_uIntPtr TextEngine::CalcTextWidth( sal_uIntPtr nPara ) +sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara ) { - sal_uIntPtr nParaWidth = 0; + sal_uLong nParaWidth = 0; TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPara ); for ( sal_uInt16 nLine = pPortion->GetLines().Count(); nLine; ) { - sal_uIntPtr nLineWidth = 0; + sal_uLong nLineWidth = 0; TextLine* pLine = pPortion->GetLines().GetObject( --nLine ); for ( sal_uInt16 nTP = pLine->GetStartPortion(); nTP <= pLine->GetEndPortion(); nTP++ ) { @@ -1287,7 +1287,7 @@ sal_uIntPtr TextEngine::CalcTextWidth( sal_uIntPtr nPara ) return nParaWidth; } -sal_uIntPtr TextEngine::CalcTextWidth() +sal_uLong TextEngine::CalcTextWidth() { if ( !IsFormatted() && !IsFormatting() ) FormatAndUpdate(); @@ -1295,9 +1295,9 @@ sal_uIntPtr TextEngine::CalcTextWidth() if ( mnCurTextWidth == 0xFFFFFFFF ) { mnCurTextWidth = 0; - for ( sal_uIntPtr nPara = mpTEParaPortions->Count(); nPara; ) + for ( sal_uLong nPara = mpTEParaPortions->Count(); nPara; ) { - sal_uIntPtr nParaWidth = CalcTextWidth( --nPara ); + sal_uLong nParaWidth = CalcTextWidth( --nPara ); if ( nParaWidth > mnCurTextWidth ) mnCurTextWidth = nParaWidth; } @@ -1305,25 +1305,25 @@ sal_uIntPtr TextEngine::CalcTextWidth() return mnCurTextWidth+1;// Ein breiter, da in CreateLines bei >= umgebrochen wird. } -sal_uIntPtr TextEngine::CalcTextHeight() +sal_uLong TextEngine::CalcTextHeight() { DBG_ASSERT( GetUpdateMode(), "Sollte bei Update=sal_False nicht verwendet werden: CalcTextHeight" ); - sal_uIntPtr nY = 0; - for ( sal_uIntPtr nPortion = mpTEParaPortions->Count(); nPortion; ) + sal_uLong nY = 0; + for ( sal_uLong nPortion = mpTEParaPortions->Count(); nPortion; ) nY += CalcParaHeight( --nPortion ); return nY; } -sal_uIntPtr TextEngine::CalcTextWidth( sal_uIntPtr nPara, sal_uInt16 nPortionStart, sal_uInt16 nLen, const Font* pFont ) +sal_uLong TextEngine::CalcTextWidth( sal_uLong nPara, sal_uInt16 nPortionStart, sal_uInt16 nLen, const Font* pFont ) { // Innerhalb des Textes darf es keinen Portionwechsel (Attribut/Tab) geben! DBG_ASSERT( mpDoc->GetNodes().GetObject( nPara )->GetText().Search( '\t', nPortionStart ) >= (nPortionStart+nLen), "CalcTextWidth: Tab!" ); - sal_uIntPtr nWidth; + sal_uLong nWidth; if ( mnFixCharWidth100 ) { - nWidth = (sal_uIntPtr)nLen*mnFixCharWidth100/100; + nWidth = (sal_uLong)nLen*mnFixCharWidth100/100; } else { @@ -1339,14 +1339,14 @@ sal_uIntPtr TextEngine::CalcTextWidth( sal_uIntPtr nPara, sal_uInt16 nPortionSta mpRefDev->SetFont( aFont ); } TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); - nWidth = (sal_uIntPtr)mpRefDev->GetTextWidth( pNode->GetText(), nPortionStart, nLen ); + nWidth = (sal_uLong)mpRefDev->GetTextWidth( pNode->GetText(), nPortionStart, nLen ); } return nWidth; } -sal_uInt16 TextEngine::GetLineCount( sal_uIntPtr nParagraph ) const +sal_uInt16 TextEngine::GetLineCount( sal_uLong nParagraph ) const { DBG_ASSERT( nParagraph < mpTEParaPortions->Count(), "GetLineCount: Out of range" ); @@ -1357,7 +1357,7 @@ sal_uInt16 TextEngine::GetLineCount( sal_uIntPtr nParagraph ) const return 0xFFFF; } -sal_uInt16 TextEngine::GetLineLen( sal_uIntPtr nParagraph, sal_uInt16 nLine ) const +sal_uInt16 TextEngine::GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const { DBG_ASSERT( nParagraph < mpTEParaPortions->Count(), "GetLineCount: Out of range" ); @@ -1371,9 +1371,9 @@ sal_uInt16 TextEngine::GetLineLen( sal_uIntPtr nParagraph, sal_uInt16 nLine ) co return 0xFFFF; } -sal_uIntPtr TextEngine::CalcParaHeight( sal_uIntPtr nParagraph ) const +sal_uLong TextEngine::CalcParaHeight( sal_uLong nParagraph ) const { - sal_uIntPtr nHeight = 0; + sal_uLong nHeight = 0; TEParaPortion* pPPortion = mpTEParaPortions->GetObject( nParagraph ); DBG_ASSERT( pPPortion, "Absatz nicht gefunden: GetParaHeight" ); @@ -1387,7 +1387,7 @@ void TextEngine::UpdateSelections() { } -Range TextEngine::GetInvalidYOffsets( sal_uIntPtr nPortion ) +Range TextEngine::GetInvalidYOffsets( sal_uLong nPortion ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion ); sal_uInt16 nLines = pTEParaPortion->GetLines().Count(); @@ -1416,7 +1416,7 @@ Range TextEngine::GetInvalidYOffsets( sal_uIntPtr nPortion ) return Range( nFirstInvalid*mnCharHeight, ((nLastInvalid+1)*mnCharHeight)-1 ); } -sal_uIntPtr TextEngine::GetParagraphCount() const +sal_uLong TextEngine::GetParagraphCount() const { return mpDoc->GetNodes().Count(); } @@ -1465,7 +1465,7 @@ void TextEngine::ResetUndo() mpUndoManager->Clear(); } -void TextEngine::InsertContent( TextNode* pNode, sal_uIntPtr nPara ) +void TextEngine::InsertContent( TextNode* pNode, sal_uLong nPara ) { DBG_ASSERT( pNode, "NULL-Pointer in InsertContent! " ); DBG_ASSERT( IsInUndo(), "InsertContent nur fuer Undo()!" ); @@ -1475,7 +1475,7 @@ void TextEngine::InsertContent( TextNode* pNode, sal_uIntPtr nPara ) ImpParagraphInserted( nPara ); } -TextPaM TextEngine::SplitContent( sal_uIntPtr nNode, sal_uInt16 nSepPos ) +TextPaM TextEngine::SplitContent( sal_uLong nNode, sal_uInt16 nSepPos ) { #ifdef DBG_UTIL TextNode* pNode = mpDoc->GetNodes().GetObject( nNode ); @@ -1487,13 +1487,13 @@ TextPaM TextEngine::SplitContent( sal_uIntPtr nNode, sal_uInt16 nSepPos ) return ImpInsertParaBreak( aPaM ); } -TextPaM TextEngine::ConnectContents( sal_uIntPtr nLeftNode ) +TextPaM TextEngine::ConnectContents( sal_uLong nLeftNode ) { DBG_ASSERT( IsInUndo(), "ConnectContent nur fuer Undo()!" ); return ImpConnectParagraphs( nLeftNode, nLeftNode+1 ); } -void TextEngine::SeekCursor( sal_uIntPtr nPara, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev ) +void TextEngine::SeekCursor( sal_uLong nPara, sal_uInt16 nPos, Font& rFont, OutputDevice* pOutDev ) { rFont = maFont; if ( pOutDev ) @@ -1647,7 +1647,7 @@ void TextEngine::CheckIdleFormatter() void TextEngine::FormatFullDoc() { - for ( sal_uIntPtr nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ ) + for ( sal_uLong nPortion = 0; nPortion < mpTEParaPortions->Count(); nPortion++ ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPortion ); sal_uInt16 nLen = pTEParaPortion->GetNode()->GetText().Len(); pTEParaPortion->MarkSelectionInvalid( 0, nLen ); @@ -1668,12 +1668,12 @@ void TextEngine::FormatDoc() sal_Bool bGrow = sal_False; maInvalidRec = Rectangle(); // leermachen - for ( sal_uIntPtr nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) + for ( sal_uLong nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); if ( pTEParaPortion->IsInvalid() ) { - sal_uIntPtr nOldParaWidth = 0xFFFFFFFF; + sal_uLong nOldParaWidth = 0xFFFFFFFF; if ( mnCurTextWidth != 0xFFFFFFFF ) nOldParaWidth = CalcTextWidth( nPara ); @@ -1700,7 +1700,7 @@ void TextEngine::FormatDoc() if ( mnCurTextWidth != 0xFFFFFFFF ) { - sal_uIntPtr nNewParaWidth = CalcTextWidth( nPara ); + sal_uLong nNewParaWidth = CalcTextWidth( nPara ); if ( nNewParaWidth >= mnCurTextWidth ) mnCurTextWidth = nNewParaWidth; else if ( ( nOldParaWidth != 0xFFFFFFFF ) && ( nOldParaWidth >= mnCurTextWidth ) ) @@ -1718,7 +1718,7 @@ void TextEngine::FormatDoc() if ( !maInvalidRec.IsEmpty() ) { - sal_uIntPtr nNewHeight = CalcTextHeight(); + sal_uLong nNewHeight = CalcTextHeight(); long nDiff = nNewHeight - mnCurTextHeight; if ( nNewHeight < mnCurTextHeight ) { @@ -1746,7 +1746,7 @@ void TextEngine::FormatDoc() ImpTextFormatted(); } -void TextEngine::CreateAndInsertEmptyLine( sal_uIntPtr nPara ) +void TextEngine::CreateAndInsertEmptyLine( sal_uLong nPara ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); @@ -1782,7 +1782,7 @@ void TextEngine::CreateAndInsertEmptyLine( sal_uIntPtr nPara ) } } -void TextEngine::ImpBreakLine( sal_uIntPtr nPara, TextLine* pLine, TETextPortion*, sal_uInt16 nPortionStart, long nRemainingWidth ) +void TextEngine::ImpBreakLine( sal_uLong nPara, TextLine* pLine, TETextPortion*, sal_uInt16 nPortionStart, long nRemainingWidth ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); @@ -1832,7 +1832,7 @@ void TextEngine::ImpBreakLine( sal_uIntPtr nPara, TextLine* pLine, TETextPortion pLine->SetEndPortion( nEndPortion ); } -sal_uInt16 TextEngine::SplitTextPortion( sal_uIntPtr nPara, sal_uInt16 nPos ) +sal_uInt16 TextEngine::SplitTextPortion( sal_uLong nPara, sal_uInt16 nPos ) { // Die Portion bei nPos wird geplittet, wenn bei nPos nicht @@ -1869,14 +1869,14 @@ sal_uInt16 TextEngine::SplitTextPortion( sal_uIntPtr nPara, sal_uInt16 nPos ) return nSplitPortion; } -void TextEngine::CreateTextPortions( sal_uIntPtr nPara, sal_uInt16 nStartPos ) +void TextEngine::CreateTextPortions( sal_uLong nPara, sal_uInt16 nStartPos ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); TextNode* pNode = pTEParaPortion->GetNode(); DBG_ASSERT( pNode->GetText().Len(), "CreateTextPortions sollte nicht fuer leere Absaetze verwendet werden!" ); TESortedPositions aPositions; - sal_uIntPtr nZero = 0; + sal_uLong nZero = 0; aPositions.Insert( nZero ); sal_uInt16 nAttribs = pNode->GetCharAttribs().Count(); @@ -1965,7 +1965,7 @@ void TextEngine::CreateTextPortions( sal_uIntPtr nPara, sal_uInt16 nStartPos ) #endif } -void TextEngine::RecalcTextPortion( sal_uIntPtr nPara, sal_uInt16 nStartPos, short nNewChars ) +void TextEngine::RecalcTextPortion( sal_uLong nPara, sal_uInt16 nStartPos, short nNewChars ) { TEParaPortion* pTEParaPortion = mpTEParaPortions->GetObject( nPara ); DBG_ASSERT( pTEParaPortion->GetTextPortions().Count(), "Keine Portions!" ); @@ -2090,14 +2090,14 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan // -------------------------------------------------- // Ueber alle Absaetze... // -------------------------------------------------- - for ( sal_uIntPtr nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) + for ( sal_uLong nPara = 0; nPara < mpTEParaPortions->Count(); nPara++ ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPara ); // falls beim Tippen Idle-Formatierung, asynchrones Paint. if ( pPortion->IsInvalid() ) return; - sal_uIntPtr nParaHeight = CalcParaHeight( nPara ); + sal_uLong nParaHeight = CalcParaHeight( nPara ); sal_uInt16 nIndex = 0; if ( ( !pPaintArea || ( ( nY + (long)nParaHeight ) > pPaintArea->Top() ) ) && ( !pPaintRange || ( ( nPara >= pPaintRange->GetStart().GetPara() ) && ( nPara <= pPaintRange->GetEnd().GetPara() ) ) ) ) @@ -2282,7 +2282,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan } } -sal_Bool TextEngine::CreateLines( sal_uIntPtr nPara ) +sal_Bool TextEngine::CreateLines( sal_uLong nPara ) { // sal_Bool: Aenderung der Hoehe des Absatzes Ja/Nein - sal_True/sal_False @@ -2646,7 +2646,7 @@ sal_Bool TextEngine::Read( SvStream& rInput, const TextSelection* pSel ) aSel = *pSel; else { - sal_uIntPtr nParas = mpDoc->GetNodes().Count(); + sal_uLong nParas = mpDoc->GetNodes().Count(); TextNode* pNode = mpDoc->GetNodes().GetObject( nParas - 1 ); aSel = TextPaM( nParas-1 , pNode->GetText().Len() ); } @@ -2687,7 +2687,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo aSel = *pSel; else { - sal_uIntPtr nParas = mpDoc->GetNodes().Count(); + sal_uLong nParas = mpDoc->GetNodes().Count(); TextNode* pNode = mpDoc->GetNodes().GetObject( nParas - 1 ); aSel.GetStart() = TextPaM( 0, 0 ); aSel.GetEnd() = TextPaM( nParas-1, pNode->GetText().Len() ); @@ -2699,7 +2699,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo rOutput.WriteLine( "<BODY>" ); } - for ( sal_uIntPtr nPara = aSel.GetStart().GetPara(); nPara <= aSel.GetEnd().GetPara(); nPara++ ) + for ( sal_uLong nPara = aSel.GetStart().GetPara(); nPara <= aSel.GetEnd().GetPara(); nPara++ ) { TextNode* pNode = mpDoc->GetNodes().GetObject( nPara ); @@ -2767,7 +2767,7 @@ sal_Bool TextEngine::Write( SvStream& rOutput, const TextSelection* pSel, sal_Bo return rOutput.GetError() ? sal_False : sal_True; } -void TextEngine::RemoveAttribs( sal_uIntPtr nPara, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::RemoveAttribs( sal_uLong nPara, sal_Bool bIdleFormatAndUpdate ) { if ( nPara < mpDoc->GetNodes().Count() ) { @@ -2788,7 +2788,7 @@ void TextEngine::RemoveAttribs( sal_uIntPtr nPara, sal_Bool bIdleFormatAndUpdate } } } -void TextEngine::RemoveAttribs( sal_uIntPtr nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::RemoveAttribs( sal_uLong nPara, sal_uInt16 nWhich, sal_Bool bIdleFormatAndUpdate ) { if ( nPara < mpDoc->GetNodes().Count() ) { @@ -2812,7 +2812,7 @@ void TextEngine::RemoveAttribs( sal_uIntPtr nPara, sal_uInt16 nWhich, sal_Bool b } } } -void TextEngine::RemoveAttrib( sal_uIntPtr nPara, const TextCharAttrib& rAttrib ) +void TextEngine::RemoveAttrib( sal_uLong nPara, const TextCharAttrib& rAttrib ) { if ( nPara < mpDoc->GetNodes().Count() ) { @@ -2837,7 +2837,7 @@ void TextEngine::RemoveAttrib( sal_uIntPtr nPara, const TextCharAttrib& rAttrib } } -void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uIntPtr nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate ) +void TextEngine::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd, sal_Bool bIdleFormatAndUpdate ) { // Es wird hier erstmal nicht geprueft, ob sich Attribute ueberlappen! // Diese Methode ist erstmal nur fuer einen Editor, der fuer eine Zeile @@ -2887,7 +2887,7 @@ void TextEngine::ValidateSelection( TextSelection& rSel ) const void TextEngine::ValidatePaM( TextPaM& rPaM ) const { - sal_uIntPtr nMaxPara = mpDoc->GetNodes().Count() - 1; + sal_uLong nMaxPara = mpDoc->GetNodes().Count() - 1; if ( rPaM.GetPara() > nMaxPara ) { rPaM.GetPara() = nMaxPara; @@ -2902,7 +2902,7 @@ void TextEngine::ValidatePaM( TextPaM& rPaM ) const // Status & Selektionsanpassung -void TextEngine::ImpParagraphInserted( sal_uIntPtr nPara ) +void TextEngine::ImpParagraphInserted( sal_uLong nPara ) { // Die aktive View braucht nicht angepasst werden, aber bei allen // passiven muss die Selektion angepasst werden: @@ -2933,7 +2933,7 @@ void TextEngine::ImpParagraphInserted( sal_uIntPtr nPara ) Broadcast( TextHint( TEXT_HINT_PARAINSERTED, nPara ) ); } -void TextEngine::ImpParagraphRemoved( sal_uIntPtr nPara ) +void TextEngine::ImpParagraphRemoved( sal_uLong nPara ) { if ( mpViews->Count() > 1 ) { @@ -2942,7 +2942,7 @@ void TextEngine::ImpParagraphRemoved( sal_uIntPtr nPara ) TextView* pView = mpViews->GetObject( --nView ); if ( pView != GetActiveView() ) { - sal_uIntPtr nParas = mpDoc->GetNodes().Count(); + sal_uLong nParas = mpDoc->GetNodes().Count(); for ( int n = 0; n <= 1; n++ ) { TextPaM& rPaM = n ? pView->GetSelection().GetStart(): pView->GetSelection().GetEnd(); @@ -2961,7 +2961,7 @@ void TextEngine::ImpParagraphRemoved( sal_uIntPtr nPara ) Broadcast( TextHint( TEXT_HINT_PARAREMOVED, nPara ) ); } -void TextEngine::ImpCharsRemoved( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16 nChars ) +void TextEngine::ImpCharsRemoved( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ) { if ( mpViews->Count() > 1 ) { @@ -2988,7 +2988,7 @@ void TextEngine::ImpCharsRemoved( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16 Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, nPara ) ); } -void TextEngine::ImpCharsInserted( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16 nChars ) +void TextEngine::ImpCharsInserted( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16 nChars ) { if ( mpViews->Count() > 1 ) { @@ -3012,7 +3012,7 @@ void TextEngine::ImpCharsInserted( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt1 Broadcast( TextHint( TEXT_HINT_PARACONTENTCHANGED, nPara ) ); } -void TextEngine::ImpFormattingParagraph( sal_uIntPtr nPara ) +void TextEngine::ImpFormattingParagraph( sal_uLong nPara ) { Broadcast( TextHint( TEXT_HINT_FORMATPARA, nPara ) ); } @@ -3085,7 +3085,7 @@ void TextEngine::SetRightToLeft( sal_Bool bR2L ) } } -void TextEngine::ImpInitWritingDirections( sal_uIntPtr nPara ) +void TextEngine::ImpInitWritingDirections( sal_uLong nPara ) { TEParaPortion* pParaPortion = mpTEParaPortions->GetObject( nPara ); TEWritingDirectionInfos& rInfos = pParaPortion->GetWritingDirectionInfos(); @@ -3128,7 +3128,7 @@ void TextEngine::ImpInitWritingDirections( sal_uIntPtr nPara ) } -sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uIntPtr nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd ) +sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uLong nPara, sal_uInt16 nPos, sal_uInt16* pStart, sal_uInt16* pEnd ) { sal_uInt8 nRightToLeft = 0; @@ -3156,7 +3156,7 @@ sal_uInt8 TextEngine::ImpGetRightToLeft( sal_uIntPtr nPara, sal_uInt16 nPos, sal return nRightToLeft; } -long TextEngine::ImpGetPortionXOffset( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nTextPortion ) +long TextEngine::ImpGetPortionXOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nTextPortion ) { long nX = pLine->GetStartX(); @@ -3238,7 +3238,7 @@ long TextEngine::ImpGetPortionXOffset( sal_uIntPtr nPara, TextLine* pLine, sal_u void TextEngine::ImpInitLayoutMode( OutputDevice* pOutDev, sal_Bool bDrawingR2LPortion ) { - sal_uIntPtr nLayoutMode = pOutDev->GetLayoutMode(); + sal_uLong nLayoutMode = pOutDev->GetLayoutMode(); nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED | TEXT_LAYOUT_BIDI_STRONG ); if ( bDrawingR2LPortion ) @@ -3260,7 +3260,7 @@ TxtAlign TextEngine::ImpGetAlign() const return eAlign; } -long TextEngine::ImpGetOutputOffset( sal_uIntPtr nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ) +long TextEngine::ImpGetOutputOffset( sal_uLong nPara, TextLine* pLine, sal_uInt16 nIndex, sal_uInt16 nIndex2 ) { TEParaPortion* pPortion = mpTEParaPortions->GetObject( nPara ); diff --git a/svtools/source/edit/textund2.hxx b/svtools/source/edit/textund2.hxx index ca8961f300c3..ba559c3dc98c 100644 --- a/svtools/source/edit/textund2.hxx +++ b/svtools/source/edit/textund2.hxx @@ -34,12 +34,12 @@ class TextUndoDelPara : public TextUndo { private: sal_Bool mbDelObject; - sal_uIntPtr mnPara; + sal_uLong mnPara; TextNode* mpNode; // Zeigt auf das gueltige, nicht zerstoerte Objekt! public: TYPEINFO(); - TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uIntPtr nPara ); + TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara ); ~TextUndoDelPara(); virtual void Undo(); @@ -50,12 +50,12 @@ public: class TextUndoConnectParas : public TextUndo { private: - sal_uIntPtr mnPara; + sal_uLong mnPara; sal_uInt16 mnSepPos; public: TYPEINFO(); - TextUndoConnectParas( TextEngine* pTextEngine, sal_uIntPtr nPara, sal_uInt16 nSepPos ); + TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoConnectParas(); virtual void Undo(); @@ -66,12 +66,12 @@ public: class TextUndoSplitPara : public TextUndo { private: - sal_uIntPtr mnPara; + sal_uLong mnPara; sal_uInt16 mnSepPos; public: TYPEINFO(); - TextUndoSplitPara( TextEngine* pTextEngine, sal_uIntPtr nPara, sal_uInt16 nSepPos ); + TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nSepPos ); ~TextUndoSplitPara(); virtual void Undo(); diff --git a/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx index 137fb4c04db1..70e5bc309ee2 100644 --- a/svtools/source/edit/textundo.cxx +++ b/svtools/source/edit/textundo.cxx @@ -139,7 +139,7 @@ void TextUndo::SetSelection( const TextSelection& rSel ) } -TextUndoDelPara::TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uIntPtr nPara ) +TextUndoDelPara::TextUndoDelPara( TextEngine* pTextEngine, TextNode* pNode, sal_uLong nPara ) : TextUndo( TEXTUNDO_DELCONTENT, pTextEngine ) { mpNode = pNode; @@ -180,8 +180,8 @@ void __EXPORT TextUndoDelPara::Redo() mbDelObject = sal_True; // gehoert wieder dem Undo - sal_uIntPtr nParas = GetDoc()->GetNodes().Count(); - sal_uIntPtr n = mnPara < nParas ? mnPara : (nParas-1); + sal_uLong nParas = GetDoc()->GetNodes().Count(); + sal_uLong n = mnPara < nParas ? mnPara : (nParas-1); TextNode* pN = GetDoc()->GetNodes().GetObject( n ); TextPaM aPaM( n, pN->GetText().Len() ); SetSelection( aPaM ); @@ -190,7 +190,7 @@ void __EXPORT TextUndoDelPara::Redo() // ----------------------------------------------------------------------- // TextUndoConnectParas // ------------------------------------------------------------------------ -TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uIntPtr nPara, sal_uInt16 nPos ) +TextUndoConnectParas::TextUndoConnectParas( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nPos ) : TextUndo( TEXTUNDO_CONNECTPARAS, pTextEngine ) { mnPara = nPara; @@ -214,7 +214,7 @@ void __EXPORT TextUndoConnectParas::Redo() } -TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, sal_uIntPtr nPara, sal_uInt16 nPos ) +TextUndoSplitPara::TextUndoSplitPara( TextEngine* pTextEngine, sal_uLong nPara, sal_uInt16 nPos ) : TextUndo( TEXTUNDO_SPLITPARA, pTextEngine ) { mnPara = nPara; @@ -320,7 +320,7 @@ TextUndoSetAttribs::~TextUndoSetAttribs() void __EXPORT TextUndoSetAttribs::Undo() { - for ( sal_uIntPtr nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ ) + for ( sal_uLong nPara = maSelection.GetStart().GetPara(); nPara <= maSelection.GetEnd().GetPara(); nPara++ ) { // ContentAttribsInfo* pInf = aPrevAttribs[ (sal_uInt16)(nPara-aESel.nStartPara) ]; // GetTextEngine()->RemoveCharAttribs( nPara ); diff --git a/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx index 2eba6731b3f0..f54111ca45b7 100644 --- a/svtools/source/edit/textview.cxx +++ b/svtools/source/edit/textview.cxx @@ -124,7 +124,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla { uno::Any aAny; - sal_uIntPtr nT = SotExchange::GetFormat( rFlavor ); + sal_uLong nT = SotExchange::GetFormat( rFlavor ); if ( nT == SOT_FORMAT_STRING ) { aAny <<= (::rtl::OUString)GetText(); @@ -132,7 +132,7 @@ uno::Any TETextDataObject::getTransferData( const datatransfer::DataFlavor& rFla else if ( nT == SOT_FORMATSTR_ID_HTML ) { GetHTMLStream().Seek( STREAM_SEEK_TO_END ); - sal_uIntPtr nLen = GetHTMLStream().Tell(); + sal_uLong nLen = GetHTMLStream().Tell(); GetHTMLStream().Seek(0); uno::Sequence< sal_Int8 > aSeq( nLen ); @@ -159,7 +159,7 @@ uno::Sequence< datatransfer::DataFlavor > TETextDataObject::getTransferDataFlavo sal_Bool TETextDataObject::isDataFlavorSupported( const datatransfer::DataFlavor& rFlavor ) throw(uno::RuntimeException) { - sal_uIntPtr nT = SotExchange::GetFormat( rFlavor ); + sal_uLong nT = SotExchange::GetFormat( rFlavor ); return ( nT == SOT_FORMAT_STRING ); } @@ -428,9 +428,9 @@ void TextView::ImpHighlight( const TextSelection& rSel ) Rectangle aVisArea( mpImpl->maStartDocPos, mpImpl->mpWindow->GetOutputSizePixel() ); long nY = 0; - sal_uIntPtr nStartPara = aSel.GetStart().GetPara(); - sal_uIntPtr nEndPara = aSel.GetEnd().GetPara(); - for ( sal_uIntPtr nPara = 0; nPara <= nEndPara; nPara++ ) + sal_uLong nStartPara = aSel.GetStart().GetPara(); + sal_uLong nEndPara = aSel.GetEnd().GetPara(); + for ( sal_uLong nPara = 0; nPara <= nEndPara; nPara++ ) { long nParaHeight = (long)mpImpl->mpTextEngine->CalcParaHeight( nPara ); if ( ( nPara >= nStartPara ) && ( ( nY + nParaHeight ) > aVisArea.Top() ) ) @@ -1740,7 +1740,7 @@ TextPaM TextView::CursorStartOfDoc() TextPaM TextView::CursorEndOfDoc() { - sal_uIntPtr nNode = mpImpl->mpTextEngine->mpDoc->GetNodes().Count() - 1; + sal_uLong nNode = mpImpl->mpTextEngine->mpDoc->GetNodes().Count() - 1; TextNode* pNode = mpImpl->mpTextEngine->mpDoc->GetNodes().GetObject( nNode ); TextPaM aPaM( nNode, pNode->GetText().Len() ); return aPaM; @@ -1872,7 +1872,7 @@ void TextView::ImpShowCursor( sal_Bool bGotoCursor, sal_Bool bForceVisCursor, sa } // X kann durch das 'bischen mehr' falsch sein: -// sal_uIntPtr nMaxTextWidth = mpImpl->mpTextEngine->GetMaxTextWidth(); +// sal_uLong nMaxTextWidth = mpImpl->mpTextEngine->GetMaxTextWidth(); // if ( !nMaxTextWidth || ( nMaxTextWidth > 0x7FFFFFFF ) ) // nMaxTextWidth = 0x7FFFFFFF; // long nMaxX = (long)nMaxTextWidth - aOutSz.Width(); @@ -1961,9 +1961,9 @@ sal_Bool TextView::IsInSelection( const TextPaM& rPaM ) TextSelection aSel = mpImpl->maSelection; aSel.Justify(); - sal_uIntPtr nStartNode = aSel.GetStart().GetPara(); - sal_uIntPtr nEndNode = aSel.GetEnd().GetPara(); - sal_uIntPtr nCurNode = rPaM.GetPara(); + sal_uLong nStartNode = aSel.GetStart().GetPara(); + sal_uLong nEndNode = aSel.GetEnd().GetPara(); + sal_uLong nCurNode = rPaM.GetPara(); if ( ( nCurNode > nStartNode ) && ( nCurNode < nEndNode ) ) return sal_True; @@ -2047,17 +2047,17 @@ bool TextView::ImplTruncateNewText( rtl::OUString& rNewText ) const bTruncated = true; } - sal_uIntPtr nMaxLen = mpImpl->mpTextEngine->GetMaxTextLen(); + sal_uLong nMaxLen = mpImpl->mpTextEngine->GetMaxTextLen(); // 0 means unlimited, there is just the String API limit handled above if( nMaxLen != 0 ) { - sal_uIntPtr nCurLen = mpImpl->mpTextEngine->GetTextLen(); + sal_uLong nCurLen = mpImpl->mpTextEngine->GetTextLen(); sal_uInt32 nNewLen = rNewText.getLength(); if ( nCurLen + nNewLen > nMaxLen ) { // see how much text will be replaced - sal_uIntPtr nSelLen = mpImpl->mpTextEngine->GetTextLen( mpImpl->maSelection ); + sal_uLong nSelLen = mpImpl->mpTextEngine->GetTextLen( mpImpl->maSelection ); if ( nCurLen + nNewLen - nSelLen > nMaxLen ) { sal_uInt32 nTruncatedLen = static_cast<sal_uInt32>(nMaxLen - (nCurLen - nSelLen)); @@ -2074,7 +2074,7 @@ sal_Bool TextView::ImplCheckTextLen( const String& rNewText ) sal_Bool bOK = sal_True; if ( mpImpl->mpTextEngine->GetMaxTextLen() ) { - sal_uIntPtr n = mpImpl->mpTextEngine->GetTextLen(); + sal_uLong n = mpImpl->mpTextEngine->GetTextLen(); n += rNewText.Len(); if ( n > mpImpl->mpTextEngine->GetMaxTextLen() ) { @@ -2159,7 +2159,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv // Daten fuer das loeschen nach einem DROP_MOVE: TextSelection aPrevSel( mpImpl->maSelection ); aPrevSel.Justify(); - sal_uIntPtr nPrevParaCount = mpImpl->mpTextEngine->GetParagraphCount(); + sal_uLong nPrevParaCount = mpImpl->mpTextEngine->GetParagraphCount(); sal_uInt16 nPrevStartParaLen = mpImpl->mpTextEngine->GetTextLen( aPrevSel.GetStart().GetPara() ); sal_Bool bStarterOfDD = sal_False; @@ -2210,7 +2210,7 @@ void TextView::drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEv ( ( mpImpl->mpDDInfo->maDropPos.GetPara() == aPrevSel.GetStart().GetPara() ) && ( mpImpl->mpDDInfo->maDropPos.GetIndex() < aPrevSel.GetStart().GetIndex() ) ) ) { - sal_uIntPtr nNewParasBeforeSelection = + sal_uLong nNewParasBeforeSelection = mpImpl->mpTextEngine->GetParagraphCount() - nPrevParaCount; aPrevSel.GetStart().GetPara() += nNewParasBeforeSelection; diff --git a/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx index 43158d6caf83..4fbc298ff81c 100644 --- a/svtools/source/edit/xtextedt.cxx +++ b/svtools/source/edit/xtextedt.cxx @@ -53,8 +53,8 @@ TextSelection ExtTextEngine::MatchGroup( const TextPaM& rCursor ) const { TextSelection aSel( rCursor ); sal_uInt16 nPos = rCursor.GetIndex(); - sal_uIntPtr nPara = rCursor.GetPara(); - sal_uIntPtr nParas = GetParagraphCount(); + sal_uLong nPara = rCursor.GetPara(); + sal_uLong nParas = GetParagraphCount(); if ( ( nPara < nParas ) && ( nPos < GetTextLen( nPara ) ) ) { sal_uInt16 nMatchChar = maGroupChars.Search( GetText( rCursor.GetPara() ).GetChar( nPos ) ); @@ -162,7 +162,7 @@ sal_Bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& } bool bFound = false; - sal_uIntPtr nStartNode, nEndNode; + sal_uLong nStartNode, nEndNode; if ( bSearchInSelection ) nEndNode = bForward ? aSel.GetEnd().GetPara() : aSel.GetStart().GetPara(); @@ -176,7 +176,7 @@ sal_Bool ExtTextEngine::Search( TextSelection& rSel, const util::SearchOptions& utl::TextSearch aSearcher( rSearchOptions ); // ueber die Absaetze iterieren... - for ( sal_uIntPtr nNode = nStartNode; + for ( sal_uLong nNode = nStartNode; bForward ? ( nNode <= nEndNode) : ( nNode >= nEndNode ); bForward ? nNode++ : nNode-- ) { @@ -357,14 +357,14 @@ sal_Bool ExtTextView::ImpIndentBlock( sal_Bool bRight ) HideSelection(); GetTextEngine()->UndoActionStart( bRight ? XTEXTUNDO_INDENTBLOCK : XTEXTUNDO_UNINDENTBLOCK ); - sal_uIntPtr nStartPara = aSel.GetStart().GetPara(); - sal_uIntPtr nEndPara = aSel.GetEnd().GetPara(); + sal_uLong nStartPara = aSel.GetStart().GetPara(); + sal_uLong nEndPara = aSel.GetEnd().GetPara(); if ( aSel.HasRange() && !aSel.GetEnd().GetIndex() ) { nEndPara--; // den dann nicht einruecken... } - for ( sal_uIntPtr nPara = nStartPara; nPara <= nEndPara; nPara++ ) + for ( sal_uLong nPara = nStartPara; nPara <= nEndPara; nPara++ ) { if ( bRight ) { diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx index 312f62af9d84..4e09ea3f51aa 100644 --- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx +++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx @@ -428,7 +428,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue ) Any aAny; if ( ImplGetPropertyValue( aAny, xPropSet, rKey, sal_True ) ) { - sal_Bool bOldValue; + sal_Bool bOldValue(sal_True); if ( aAny >>= bOldValue ) { if ( bOldValue != bNewValue ) diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx index c14407f1c21a..9c2c28dfbe3b 100644 --- a/svtools/source/filter.vcl/filter/filter.cxx +++ b/svtools/source/filter.vcl/filter/filter.cxx @@ -188,11 +188,11 @@ void ImplDirEntryHelper::Kill( const String& rMainUrl ) //-------------------------------------------------------------------------- -sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uIntPtr nComp, sal_uIntPtr nSize ) +sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nComp, sal_uLong nSize ) { while ( nComp-- >= nSize ) { - sal_uIntPtr i; + sal_uLong i; for ( i = 0; i < nSize; i++ ) { if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) ) @@ -252,11 +252,11 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio { sal_uInt16 i; sal_uInt8 sFirstBytes[ 256 ]; - sal_uIntPtr nFirstLong,nSecondLong; - sal_uIntPtr nStreamPos = rStream.Tell(); + sal_uLong nFirstLong,nSecondLong; + sal_uLong nStreamPos = rStream.Tell(); rStream.Seek( STREAM_SEEK_TO_END ); - sal_uIntPtr nStreamLen = rStream.Tell() - nStreamPos; + sal_uLong nStreamLen = rStream.Tell() - nStreamPos; rStream.Seek( nStreamPos ); if ( !nStreamLen ) @@ -287,8 +287,8 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio // Big-Endian: for( i = 0, nFirstLong = 0L, nSecondLong = 0L; i < 4; i++ ) { - nFirstLong=(nFirstLong<<8)|(sal_uIntPtr)sFirstBytes[i]; - nSecondLong=(nSecondLong<<8)|(sal_uIntPtr)sFirstBytes[i+4]; + nFirstLong=(nFirstLong<<8)|(sal_uLong)sFirstBytes[i]; + nSecondLong=(nSecondLong<<8)|(sal_uLong)sFirstBytes[i+4]; } // Folgende Variable ist nur bei bTest==sal_True interessant. Sie @@ -653,7 +653,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio //--------------------------- XBM ------------------------------------ if( !bTest ) { - sal_uIntPtr nSize = ( nStreamLen > 2048 ) ? 2048 : nStreamLen; + sal_uLong nSize = ( nStreamLen > 2048 ) ? 2048 : nStreamLen; sal_uInt8* pBuf = new sal_uInt8 [ nSize ]; rStream.Seek( nStreamPos ); @@ -1079,7 +1079,7 @@ void GraphicFilter::ImplInit() // ------------------------------------------------------------------------ -sal_uIntPtr GraphicFilter::ImplSetError( sal_uIntPtr nError, const SvStream* pStm ) +sal_uLong GraphicFilter::ImplSetError( sal_uLong nError, const SvStream* pStm ) { pErrorEx->nFilterError = nError; pErrorEx->nStreamError = pStm ? pStm->GetError() : ERRCODE_NONE; @@ -1278,7 +1278,7 @@ sal_uInt16 GraphicFilter::CanImportGraphic( const INetURLObject& rPath, sal_uInt16 GraphicFilter::CanImportGraphic( const String& rMainUrl, SvStream& rIStream, sal_uInt16 nFormat, sal_uInt16* pDeterminedFormat ) { - sal_uIntPtr nStreamPos = rIStream.Tell(); + sal_uLong nStreamPos = rIStream.Tell(); sal_uInt16 nRes = ImpTestOrFindFormat( rMainUrl, rIStream, nFormat ); rIStream.Seek(nStreamPos); @@ -1320,7 +1320,7 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) { String aFilterName; - sal_uIntPtr nStmBegin; + sal_uLong nStmBegin; sal_uInt16 nStatus; GraphicReader* pContext = rGraphic.GetContext(); GfxLinkType eLinkType = GFX_LINK_TYPE_NONE; @@ -1637,8 +1637,8 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath, if( nStatus == GRFILTER_OK && bCreateNativeLink && ( eLinkType != GFX_LINK_TYPE_NONE ) && !rGraphic.GetContext() && !bLinkSet ) { - const sal_uIntPtr nStmEnd = rIStream.Tell(); - const sal_uIntPtr nBufSize = nStmEnd - nStmBegin; + const sal_uLong nStmEnd = rIStream.Tell(); + const sal_uLong nBufSize = nStmEnd - nStmBegin; if( nBufSize ) { @@ -1743,7 +1743,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& if( eType != GRAPHIC_BITMAP ) { Size aSizePixel; - sal_uIntPtr nColorCount,nBitsPerPixel,nNeededMem,nMaxMem; + sal_uLong nColorCount,nBitsPerPixel,nNeededMem,nMaxMem; VirtualDevice aVirDev; // Maximalen Speicherbedarf fuer das Bildes holen: @@ -1765,14 +1765,14 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String& else if (nColorCount<=256) nBitsPerPixel=8; else if (nColorCount<=65536) nBitsPerPixel=16; else nBitsPerPixel=24; - nNeededMem=((sal_uIntPtr)aSizePixel.Width()*(sal_uIntPtr)aSizePixel.Height()*nBitsPerPixel+7)/8; + nNeededMem=((sal_uLong)aSizePixel.Width()*(sal_uLong)aSizePixel.Height()*nBitsPerPixel+7)/8; // ggf. Groesse des Bildes einschraenken: if (nMaxMem<nNeededMem) { double fFak=sqrt(((double)nMaxMem)/((double)nNeededMem)); - aSizePixel.Width()=(sal_uIntPtr)(((double)aSizePixel.Width())*fFak); - aSizePixel.Height()=(sal_uIntPtr)(((double)aSizePixel.Height())*fFak); + aSizePixel.Width()=(sal_uLong)(((double)aSizePixel.Width())*fFak); + aSizePixel.Height()=(sal_uLong)(((double)aSizePixel.Height())*fFak); } aVirDev.SetMapMode(MapMode(MAP_PIXEL)); diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx index 39e83dfbfe5e..9b655c732036 100644 --- a/svtools/source/filter.vcl/filter/filter2.cxx +++ b/svtools/source/filter.vcl/filter/filter2.cxx @@ -40,7 +40,7 @@ #define DATA_SIZE 640 -sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uIntPtr , sal_uIntPtr ); +sal_uInt8* ImplSearchEntry( sal_uInt8* , sal_uInt8* , sal_uLong , sal_uLong ); /************************************************************************* |* @@ -654,8 +654,8 @@ sal_Bool GraphicDescriptor::ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo if ( nTemp32 == 0x70485973 ) { - sal_uIntPtr nXRes; - sal_uIntPtr nYRes; + sal_uLong nXRes; + sal_uLong nYRes; // horizontale Aufloesung rStm >> nTemp32; @@ -728,8 +728,8 @@ sal_Bool GraphicDescriptor::ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo if ( bExtendedInfo ) { - sal_uIntPtr nCount; - sal_uIntPtr nMax = DATA_SIZE - 48; + sal_uLong nCount; + sal_uLong nMax = DATA_SIZE - 48; sal_uInt32 nTemp32; sal_Bool bOk = sal_False; diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx index e8bc8dacce5b..9b981f8c0d94 100644 --- a/svtools/source/filter.vcl/filter/sgfbram.cxx +++ b/svtools/source/filter.vcl/filter/sgfbram.cxx @@ -295,7 +295,7 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr sal_uInt8 pl1 = 0,pl2= 0; // Masken fuer die Planes sal_uInt8* pBuf=NULL; // Buffer fuer eine Pixelzeile PcxExpand aPcx; - sal_uIntPtr nOfs; + sal_uLong nOfs; sal_uInt8 cRGB[4]; if (rHead.Planes<=1) nColBits=1; else nColBits=4; if (rHead.Typ==4) nColBits=8; @@ -335,7 +335,7 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr pBuf[i]=aPcx.GetByte(rInp); } for(i=nWdtInp;i<nWdtOut;i++) pBuf[i]=0; // noch bis zu 3 Bytes - rOut.Seek(nOfs+((sal_uIntPtr)rHead.Ysize-j-1L)*(sal_uIntPtr)nWdtOut); // rueckwaerts schreiben! + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // rueckwaerts schreiben! rOut.Write((char*)pBuf,nWdtOut); } } else if (nColors==16) { @@ -381,7 +381,7 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr } } for(i=nWdtInp*4;i<nWdtOut;i++) pBuf[i]=0; // noch bis zu 3 Bytes - rOut.Seek(nOfs+((sal_uIntPtr)rHead.Ysize-j-1L)*(sal_uIntPtr)nWdtOut); // rueckwaerts schreiben! + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // rueckwaerts schreiben! rOut.Write((char*)pBuf,nWdtOut); } } else if (nColors==256) { @@ -401,7 +401,7 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr for(i=0;i<rHead.Xsize;i++) pBuf[i]=aPcx.GetByte(rInp); for(i=rHead.Xsize;i<nWdtOut;i++) pBuf[i]=0; // noch bis zu 3 Bytes - rOut.Seek(nOfs+((sal_uIntPtr)rHead.Ysize-j-1L)*(sal_uIntPtr)nWdtOut); // rueckwaerts schreiben! + rOut.Seek(nOfs+((sal_uLong)rHead.Ysize-j-1L)*(sal_uLong)nWdtOut); // rueckwaerts schreiben! rOut.Write((char*)pBuf,nWdtOut); } } @@ -421,10 +421,10 @@ sal_Bool SgfFilterBMap(SvStream& rInp, SvStream& rOut, SgfHeader& rHead, SgfEntr *************************************************************************/ sal_Bool SgfBMapFilter(SvStream& rInp, SvStream& rOut) { - sal_uIntPtr nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. + sal_uLong nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. SgfHeader aHead; SgfEntry aEntr; - sal_uIntPtr nNext; + sal_uLong nNext; sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ? sal_Bool bRet=sal_False; // Returncode @@ -472,7 +472,7 @@ sal_Bool SgfVectScal=sal_False; Color Hpgl2SvFarbe( sal_uInt8 nFarb ) { - sal_uIntPtr nColor = COL_BLACK; + sal_uLong nColor = COL_BLACK; switch (nFarb & 0x07) { case 0: nColor=COL_WHITE; break; @@ -576,10 +576,10 @@ sal_Bool SgfFilterVect(SvStream& rInp, SgfHeader& rHead, SgfEntry&, GDIMetaFile& *************************************************************************/ sal_Bool SgfVectFilter(SvStream& rInp, GDIMetaFile& rMtf) { - sal_uIntPtr nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. + sal_uLong nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. SgfHeader aHead; SgfEntry aEntr; - sal_uIntPtr nNext; + sal_uLong nNext; sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ? sal_Bool bRet=sal_False; // Returncode @@ -638,7 +638,7 @@ sal_uInt8 CheckSgfTyp(SvStream& rInp, sal_uInt16& nVersion) sizeof(RGBQuad )!=RGBQuadSize ) return SGF_DONTKNOW; #endif - sal_uIntPtr nPos; + sal_uLong nPos; SgfHeader aHead; nVersion=0; nPos=rInp.Tell(); diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx index 561392973011..3b0f3ebd2912 100644 --- a/svtools/source/filter.vcl/filter/sgvmain.cxx +++ b/svtools/source/filter.vcl/filter/sgvmain.cxx @@ -167,10 +167,10 @@ SvStream& operator>>(SvStream& rIStream, DtHdType& rDtHd) void DtHdOverSeek(SvStream& rInp) { - sal_uIntPtr FPos=rInp.Tell(); - FPos+=(sal_uIntPtr)DtHdSize; + sal_uLong FPos=rInp.Tell(); + FPos+=(sal_uLong)DtHdSize; rInp.Seek(FPos); -// rInp.seekg(rInp.tellg()+(sal_uIntPtr)DtHdSize); +// rInp.seekg(rInp.tellg()+(sal_uLong)DtHdSize); } @@ -185,21 +185,21 @@ SvStream& operator>>(SvStream& rIStream, PageType& rPage) void ObjkOverSeek(SvStream& rInp, ObjkType& rObjk) { - sal_uIntPtr Siz; - Siz=(sal_uIntPtr)rObjk.MemSize+rObjk.Last; // ObjSize+ObjAnhSize + sal_uLong Siz; + Siz=(sal_uLong)rObjk.MemSize+rObjk.Last; // ObjSize+ObjAnhSize rInp.Seek(rInp.Tell()+Siz); } SvStream& operator>>(SvStream& rInp, ObjkType& rObjk) { // Die Fileposition im Stream bleibt unveraendert! - sal_uIntPtr nPos; + sal_uLong nPos; nPos=rInp.Tell(); rInp.Read((char*)&rObjk.Last,ObjkSize); #if defined OSL_BIGENDIAN SWAPOBJK(rObjk); #endif #ifdef InArbeit - sal_uIntPtr nPos1=rInp.Tell(); + sal_uLong nPos1=rInp.Tell(); if(nPos == nPos1) InfoBox( NULL, "tellg funkt nich" ).Execute(); #endif rInp.Seek(nPos); @@ -991,8 +991,8 @@ sal_Bool SgfFilterSDrw( SvStream& rInp, SgfHeader&, SgfEntry&, GDIMetaFile& rMtf PageType aPage; VirtualDevice aOutDev; OutputDevice* pOutDev; - sal_uIntPtr nStdPos; - sal_uIntPtr nZchPos; + sal_uLong nStdPos; + sal_uLong nZchPos; sal_uInt16 Num; pOutDev=&aOutDev; @@ -1051,10 +1051,10 @@ sal_Bool SgfSDrwFilter(SvStream& rInp, GDIMetaFile& rMtf, INetURLObject aIniPath if (sizeof(ObjTextType)!=ObjTextTypeSize) return sal_False; #endif - sal_uIntPtr nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. + sal_uLong nFileStart; // Offset des SgfHeaders. Im allgemeinen 0. SgfHeader aHead; SgfEntry aEntr; - sal_uIntPtr nNext; + sal_uLong nNext; sal_Bool bRdFlag=sal_False; // Grafikentry gelesen ? sal_Bool bRet=sal_False; // Returncode diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx index ba3a37199815..aac7e1f04e0a 100644 --- a/svtools/source/filter.vcl/filter/sgvspln.cxx +++ b/svtools/source/filter.vcl/filter/sgvspln.cxx @@ -140,10 +140,6 @@ short basis() /* BASIS maschinenunabhaengig bestimmen */ #define NEGMAX -POSMIN /* groesste negative Zahl */ #define NEGMIN -POSMAX /* kleinste negative Zahl */ -#define sal_True 1 -#define sal_False 0 - - /* Definition von Funktionsmakros: */ diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx index 76afd92829fe..f0130b21c9d6 100644 --- a/svtools/source/filter.vcl/filter/sgvtext.cxx +++ b/svtools/source/filter.vcl/filter/sgvtext.cxx @@ -421,7 +421,7 @@ UCHAR ProcessOne(UCHAR* TBuf, sal_uInt16& Index, q=!CheckTextOutl(AktAtr.F,AktAtr.L); switch (Ident) { - case EscFont : AktAtr.SetFont(sal_uIntPtr (ChgValue(Atr0.GetFont(),0,0 ,FlgVal,NumVal)));break; + case EscFont : AktAtr.SetFont(sal_uLong (ChgValue(Atr0.GetFont(),0,0 ,FlgVal,NumVal)));break; case EscGrad : AktAtr.Grad =sal_uInt16(ChgValue(Atr0.Grad, 2,2000 ,FlgVal,NumVal)); break; case EscBreit: AktAtr.Breite =sal_uInt16(ChgValue(Atr0.Breite, 1,1000 ,FlgVal,NumVal)); break; case EscKaptS: AktAtr.Kapit =(sal_uInt8)(ChgValue(Atr0.Kapit, 1,255 ,FlgVal,NumVal)); break; @@ -535,8 +535,8 @@ sal_uInt16 GetLineFeed(UCHAR* TBuf, sal_uInt16 Index, ObjTextType Atr0, ObjTextT { UCHAR c=0; sal_Bool AbsEnd=sal_False; - sal_uIntPtr LF100=0; - sal_uIntPtr MaxLF100=0; + sal_uLong LF100=0; + sal_uLong MaxLF100=0; sal_Bool LFauto=0; sal_Bool First=sal_True; sal_uInt16 Grad; @@ -594,8 +594,8 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s SgfFontOne* pSgfFont; // Font aus dem IniFile Font aFont; Color aColor; - sal_uIntPtr Grad; - sal_uIntPtr Brei; + sal_uLong Grad; + sal_uLong Brei; String FNam; sal_uInt16 StdBrei=50; // Durchschnittliche Zeichenbreite in % von Schriftgrad sal_Bool bFit=(FitXMul!=1 || FitXDiv!=1 || FitYMul!=1 || FitYDiv!=1); @@ -649,17 +649,17 @@ sal_uInt16 SetTextContext(OutputDevice& rOut, ObjTextType& Atr, sal_Bool Kapt, s //aFont.SetCharSet(CHARSET_SYSTEM); } - Grad=sal_uIntPtr(Atr.Grad); - if ((Atr.Schnitt & TextKaptBit) !=0 && Kapt) Grad=Grad*sal_uIntPtr(Atr.Kapit)/100; + Grad=sal_uLong(Atr.Grad); + if ((Atr.Schnitt & TextKaptBit) !=0 && Kapt) Grad=Grad*sal_uLong(Atr.Kapit)/100; if ((Atr.Schnitt & TextSupSBit) !=0 || (Atr.Schnitt & TextSubSBit) !=0) Grad=Grad*SuperSubFact/100; Brei=Grad; if (Atr.Breite!=100 || bFit) { if (bFit) { - Grad=Grad*sal_uIntPtr(FitYMul)/sal_uIntPtr(FitYDiv); - Brei=Brei*sal_uIntPtr(FitXMul)/sal_uIntPtr(FitXDiv); + Grad=Grad*sal_uLong(FitYMul)/sal_uLong(FitYDiv); + Brei=Brei*sal_uLong(FitXMul)/sal_uLong(FitXDiv); } - Brei=Brei*sal_uIntPtr(Atr.Breite)/100; - Brei=Brei*sal_uIntPtr(StdBrei)/100; + Brei=Brei*sal_uLong(Atr.Breite)/100; + Brei=Brei*sal_uLong(StdBrei)/100; aFont.SetSize(Size(hPoint2Sgf(sal_uInt16(Brei)),hPoint2Sgf(sal_uInt16(Grad)))); } else { aFont.SetSize(Size(0,hPoint2Sgf(sal_uInt16(Grad)))); @@ -784,8 +784,8 @@ UCHAR ProcessChar(OutputDevice& rOut, UCHAR* TBuf, ProcChrSta& R, ObjTextType& A ChrWidth=GetCharWidth(rOut,c1); if (R.Attrib.ZAbst!=100) { // Spezial-Zeichenabstand ? - sal_uIntPtr Temp; - Temp=sal_uIntPtr(ChrWidth)*sal_uIntPtr(R.Attrib.ZAbst)/100; + sal_uLong Temp; + Temp=sal_uLong(ChrWidth)*sal_uLong(R.Attrib.ZAbst)/100; ChrWidth=sal_uInt16(Temp); } nChars++; @@ -1164,21 +1164,21 @@ void TextType::Draw(OutputDevice& rOut) // (DEC Alpha hat naemlich 64Bit-Pointer!) //UCHAR* TextType::GetBufPtr() //{ -// sal_uIntPtr Temp; -// Temp=sal_uIntPtr(BufLo)+0x00010000*sal_uIntPtr(BufHi); +// sal_uLong Temp; +// Temp=sal_uLong(BufLo)+0x00010000*sal_uLong(BufHi); // return (UCHAR*)Temp; //} // //void TextType::SetBufPtr(UCHAR* Ptr) //{ -// sal_uIntPtr Temp=(sal_uIntPtr)Ptr; +// sal_uLong Temp=(sal_uLong)Ptr; // BufLo=sal_uInt16(Temp & 0x0000FFFF); // BufHi=sal_uInt16((Temp & 0xFFFF0000)>>16); //} sal_uInt32 ObjTextType::GetFont() { - return sal_uIntPtr(FontLo)+0x00010000*sal_uIntPtr(FontHi); + return sal_uLong(FontLo)+0x00010000*sal_uLong(FontHi); } void ObjTextType::SetFont(sal_uInt32 FontID) diff --git a/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter.vcl/igif/decode.cxx index 5c0f70b2b7f2..ddea94a5555e 100644 --- a/svtools/source/filter.vcl/igif/decode.cxx +++ b/svtools/source/filter.vcl/igif/decode.cxx @@ -78,10 +78,10 @@ GIFLZWDecompressor::~GIFLZWDecompressor() // ------------------------------------------------------------------------ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, - sal_uIntPtr& rCount, sal_Bool& rEOI ) + sal_uLong& rCount, sal_Bool& rEOI ) { - sal_uIntPtr nTargetSize = 4096; - sal_uIntPtr nCount = 0; + sal_uLong nTargetSize = 4096; + sal_uLong nCount = 0; HPBYTE pTarget = (HPBYTE) rtl_allocateMemory( nTargetSize ); HPBYTE pTmpTarget = pTarget; @@ -95,8 +95,8 @@ HPBYTE GIFLZWDecompressor::DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, if( nCount > nTargetSize ) { - sal_uIntPtr nNewSize = nTargetSize << 1; - sal_uIntPtr nOffset = pTmpTarget - pTarget; + sal_uLong nNewSize = nTargetSize << 1; + sal_uLong nOffset = pTmpTarget - pTarget; HPBYTE pTmp = (HPBYTE) rtl_allocateMemory( nNewSize ); memcpy( pTmp, pTarget, nTargetSize ); @@ -157,7 +157,7 @@ sal_Bool GIFLZWDecompressor::ProcessOneCode() break; } - nInputBitsBuf |= ( (sal_uIntPtr) pBlockBuf[ nBlockBufPos++ ] ) << nInputBitsBufSize; + nInputBitsBuf |= ( (sal_uLong) pBlockBuf[ nBlockBufPos++ ] ) << nInputBitsBufSize; nInputBitsBufSize += 8; } diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx index 91b3a59a0243..e85cc30eaf9e 100644 --- a/svtools/source/filter.vcl/igif/decode.hxx +++ b/svtools/source/filter.vcl/igif/decode.hxx @@ -40,7 +40,7 @@ class GIFLZWDecompressor HPBYTE pOutBuf; HPBYTE pOutBufData; HPBYTE pBlockBuf; - sal_uIntPtr nInputBitsBuf; + sal_uLong nInputBitsBuf; sal_uInt16 nTableSize; sal_uInt16 nClearCode; sal_uInt16 nEOICode; @@ -62,7 +62,7 @@ public: GIFLZWDecompressor( sal_uInt8 cDataSize ); ~GIFLZWDecompressor(); - HPBYTE DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, sal_uIntPtr& rCount, sal_Bool& rEOI ); + HPBYTE DecompressBlock( HPBYTE pSrc, sal_uInt8 cBufSize, sal_uLong& rCount, sal_Bool& rEOI ); }; #endif diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter.vcl/igif/gifread.cxx index 84c6e4b251cb..16318e5b143e 100644 --- a/svtools/source/filter.vcl/igif/gifread.cxx +++ b/svtools/source/filter.vcl/igif/gifread.cxx @@ -176,9 +176,9 @@ sal_Bool GIFReader::ReadGlobalHeader() // ------------------------------------------------------------------------ -void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uIntPtr nCount ) +void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ) { - const sal_uIntPtr nLen = 3UL * nCount; + const sal_uLong nLen = 3UL * nCount; sal_uInt8* pBuf = new sal_uInt8[ nLen ]; rIStm.Read( pBuf, nLen ); @@ -186,7 +186,7 @@ void GIFReader::ReadPaletteEntries( BitmapPalette* pPal, sal_uIntPtr nCount ) { sal_uInt8* pTmp = pBuf; - for( sal_uIntPtr i = 0UL; i < nCount; ) + for( sal_uLong i = 0UL; i < nCount; ) { BitmapColor& rColor = (*pPal)[ (sal_uInt16) i++ ]; @@ -399,10 +399,10 @@ sal_Bool GIFReader::ReadLocalHeader() // ------------------------------------------------------------------------ -sal_uIntPtr GIFReader::ReadNextBlock() +sal_uLong GIFReader::ReadNextBlock() { - sal_uIntPtr nRet = 0UL; - sal_uIntPtr nRead; + sal_uLong nRet = 0UL; + sal_uLong nRead; sal_uInt8 cBlockSize; rIStm >> cBlockSize; @@ -442,9 +442,9 @@ sal_uIntPtr GIFReader::ReadNextBlock() // ------------------------------------------------------------------------ -void GIFReader::FillImages( HPBYTE pBytes, sal_uIntPtr nCount ) +void GIFReader::FillImages( HPBYTE pBytes, sal_uLong nCount ) { - for( sal_uIntPtr i = 0UL; i < nCount; i++ ) + for( sal_uLong i = 0UL; i < nCount; i++ ) { if( nImageX >= nImageWidth ) { @@ -463,9 +463,9 @@ void GIFReader::FillImages( HPBYTE pBytes, sal_uIntPtr nCount ) if( ( nMinY > nLastImageY ) && ( nLastImageY < ( nImageHeight - 1 ) ) ) { HPBYTE pScanline8 = pAcc8->GetScanline( nYAcc ); - sal_uIntPtr nSize8 = pAcc8->GetScanlineSize(); + sal_uLong nSize8 = pAcc8->GetScanlineSize(); HPBYTE pScanline1 = 0; - sal_uIntPtr nSize1 = 0; + sal_uLong nSize1 = 0; if( bGCTransparent ) { @@ -716,7 +716,7 @@ sal_Bool GIFReader::ProcessGIF() { sal_uInt16 nLastX = nImageX; sal_uInt16 nLastY = nImageY; - sal_uIntPtr nRet = ReadNextBlock(); + sal_uLong nRet = ReadNextBlock(); // Return: 0:Pending / 1:OK; / 2:OK und letzter Block: / 3:EOI / 4:HardAbort if( nRet ) diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx index b84b5fdc7545..425ed6323bcc 100644 --- a/svtools/source/filter.vcl/ixpm/xpmread.cxx +++ b/svtools/source/filter.vcl/ixpm/xpmread.cxx @@ -121,7 +121,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) mpColMap = new sal_uInt8[ mnColors * ( 4 + mnCpp ) ]; if ( mpColMap ) { - for ( sal_uIntPtr i = 0; i < mnColors; i++ ) + for ( sal_uLong i = 0; i < mnColors; i++ ) { if ( ImplGetColor( i ) == sal_False ) { @@ -158,7 +158,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) } if( mpAcc && mbStatus ) { - sal_uIntPtr i; + sal_uLong i; if ( mnColors <=256 ) // palette is only needed by using less than 257 { // colors @@ -175,7 +175,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) mpFastColorTable = new sal_uInt8[ 256 * 256 ]; for ( pPtr = mpColMap, i = 0; i < mnColors; i++, pPtr += mnCpp + 4 ) { - sal_uIntPtr j = pPtr[ 0 ] << 8; + sal_uLong j = pPtr[ 0 ] << 8; j += pPtr[ 1 ]; mpFastColorTable[ j ] = (sal_uInt8)i; } @@ -240,7 +240,7 @@ ReadState XPMReader::ReadXPM( Graphic& rGraphic ) // ImplGetColor ermittelt saemtliche Farbwerte, // die Rueckgabe ist sal_True wenn saemtliche Farben zugeordnet werden konnten -sal_Bool XPMReader::ImplGetColor( sal_uIntPtr nNumb ) +sal_Bool XPMReader::ImplGetColor( sal_uLong nNumb ) { sal_uInt8* pString = mpStringBuf; sal_uInt8* pPtr = ( mpColMap + nNumb * ( 4 + mnCpp ) ); @@ -248,7 +248,7 @@ sal_Bool XPMReader::ImplGetColor( sal_uIntPtr nNumb ) if ( bStatus ) { - for ( sal_uIntPtr i = 0; i < mnCpp; i++ ) + for ( sal_uLong i = 0; i < mnCpp; i++ ) *pPtr++ = *pString++; bStatus = ImplGetColSub ( pPtr ); } @@ -259,7 +259,7 @@ sal_Bool XPMReader::ImplGetColor( sal_uIntPtr nNumb ) // ImpGetScanLine liest den String mpBufSize aus und schreibt die Pixel in die // Bitmap. Der Parameter nY gibt die horizontale Position an. -sal_Bool XPMReader::ImplGetScanLine( sal_uIntPtr nY ) +sal_Bool XPMReader::ImplGetScanLine( sal_uLong nY ) { sal_Bool bStatus = ImplGetString(); sal_uInt8* pString = mpStringBuf; @@ -278,7 +278,7 @@ sal_Bool XPMReader::ImplGetScanLine( sal_uIntPtr nY ) bStatus = sal_False; else { - sal_uIntPtr i, j; + sal_uLong i, j; if ( mpFastColorTable ) { for ( i = 0; i < mnWidth; i++ ) @@ -365,7 +365,7 @@ sal_Bool XPMReader::ImplGetColSub( sal_uInt8* pDest ) // last we will try to get the colorname else if ( mnParaSize > 2 ) // name must enlarge the minimum size { - sal_uIntPtr i = 0; + sal_uLong i = 0; while ( sal_True ) { if ( pRGBTable[ i ].name == NULL ) @@ -442,12 +442,12 @@ sal_Bool XPMReader::ImplGetColKey( sal_uInt8 nKey ) // 6 : '#12345678abcdefab12345678' " " " " -void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uIntPtr nAdd ) +void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uLong nAdd ) { sal_uInt8* pPtr = mpPara+1; sal_uInt8 nHex, nTemp; - for ( sal_uIntPtr i = 0; i < 3; i++ ) + for ( sal_uLong i = 0; i < 3; i++ ) { nHex = (*pPtr++) - '0'; if ( nHex > 9 ) @@ -466,15 +466,15 @@ void XPMReader::ImplGetRGBHex( sal_uInt8* pDest,sal_uIntPtr nAdd ) // ------------------------------------------------------------------------ // ImplGetUlong gibt den wert einer bis zu 6stelligen ASCII-Dezimalzahl zurueck. -sal_uIntPtr XPMReader::ImplGetULONG( sal_uIntPtr nPara ) +sal_uLong XPMReader::ImplGetULONG( sal_uLong nPara ) { if ( ImplGetPara ( nPara ) ) { - sal_uIntPtr nRetValue = 0; + sal_uLong nRetValue = 0; sal_uInt8* pPtr = mpPara; if ( ( mnParaSize > 6 ) || ( mnParaSize == 0 ) ) return 0; - for ( sal_uIntPtr i = 0; i < mnParaSize; i++ ) + for ( sal_uLong i = 0; i < mnParaSize; i++ ) { sal_uInt8 j = (*pPtr++) - 48; if ( j > 9 ) return 0; // ascii is invalid @@ -488,13 +488,13 @@ sal_uIntPtr XPMReader::ImplGetULONG( sal_uIntPtr nPara ) // ------------------------------------------------------------------------ -sal_Bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uIntPtr nSize, sal_uIntPtr nMode ) +sal_Bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uLong nSize, sal_uLong nMode ) { sal_Bool bRet = sal_True; if ( nMode == XPMCASENONSENSITIVE ) { - for ( sal_uIntPtr i = 0; i < nSize; i++ ) + for ( sal_uLong i = 0; i < nSize; i++ ) { if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) ) { @@ -505,7 +505,7 @@ sal_Bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uIntP } else { - for ( sal_uIntPtr i = 0; i < nSize; i++ ) + for ( sal_uLong i = 0; i < nSize; i++ ) { if ( pSource[i] != pDest[i] ) { @@ -523,12 +523,12 @@ sal_Bool XPMReader::ImplCompare( sal_uInt8* pSource, sal_uInt8* pDest, sal_uIntP // Konnte der Parameter gefunden werden ist der Rueckgabewert sal_True und mpPara + mnParaSize // werden gesetzt. -sal_Bool XPMReader::ImplGetPara ( sal_uIntPtr nNumb ) +sal_Bool XPMReader::ImplGetPara ( sal_uLong nNumb ) { sal_uInt8 nByte; - sal_uIntPtr pSize = 0; + sal_uLong pSize = 0; sal_uInt8* pPtr = mpStringBuf; - sal_uIntPtr nCount = 0; + sal_uLong nCount = 0; if ( ( *pPtr != ' ' ) && ( *pPtr != 0x09 ) ) { diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter.vcl/jpeg/jpeg.cxx index 905a31662faf..dff6ec8ff51f 100644 --- a/svtools/source/filter.vcl/jpeg/jpeg.cxx +++ b/svtools/source/filter.vcl/jpeg/jpeg.cxx @@ -384,7 +384,7 @@ void* JPEGReader::CreateBitmap( void* pParam ) { long nAlignedWidth; - const sal_uIntPtr nFormat = pAcc->GetScanlineFormat(); + const sal_uLong nFormat = pAcc->GetScanlineFormat(); if( ( bGray && ( BMP_FORMAT_8BIT_PAL == nFormat ) ) || diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx index a2af40354879..d82f11cdce5a 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.cxx +++ b/svtools/source/filter.vcl/wmf/emfwr.cxx @@ -170,7 +170,7 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfigItem* pFilterConfigItem ) { - const sal_uIntPtr nHeaderPos = rOStm.Tell(); + const sal_uLong nHeaderPos = rOStm.Tell(); mpHandlesUsed = new sal_Bool[ MAXHANDLES ]; memset( mpHandlesUsed, 0, MAXHANDLES * sizeof( sal_Bool ) ); @@ -233,7 +233,7 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterCo // write header - const sal_uIntPtr nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos ); + const sal_uLong nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos ); (*mpStm) << (sal_uInt32) 0x00000001 << (sal_uInt32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) ( aMtfSizePix.Width() - 1 ) << (sal_Int32) ( aMtfSizePix.Height() - 1 ) @@ -253,11 +253,11 @@ sal_Bool EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterCo // ----------------------------------------------------------------------------- -sal_uIntPtr EMFWriter::ImplAcquireHandle() +sal_uLong EMFWriter::ImplAcquireHandle() { - sal_uIntPtr nHandle = HANDLE_INVALID; + sal_uLong nHandle = HANDLE_INVALID; - for( sal_uIntPtr i = 0; i < MAXHANDLES && ( HANDLE_INVALID == nHandle ); i++ ) + for( sal_uLong i = 0; i < MAXHANDLES && ( HANDLE_INVALID == nHandle ); i++ ) { if( !mpHandlesUsed[ i ] ) { @@ -274,7 +274,7 @@ sal_uIntPtr EMFWriter::ImplAcquireHandle() // ----------------------------------------------------------------------------- -void EMFWriter::ImplReleaseHandle( sal_uIntPtr nHandle ) +void EMFWriter::ImplReleaseHandle( sal_uLong nHandle ) { DBG_ASSERT( nHandle && ( nHandle < MAXHANDLES ), "Handle out of range" ); mpHandlesUsed[ nHandle - 1 ] = sal_False; @@ -321,7 +321,7 @@ void EMFWriter::ImplEndRecord() // ----------------------------------------------------------------------------- -sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uIntPtr nSelectType ) +sal_Bool EMFWriter::ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ) { if( rHandle != HANDLE_INVALID ) { @@ -750,7 +750,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, (*mpStm) << (sal_Int32) 0 << (sal_Int32) 0 << (sal_Int32) aBmpSizePixel.Width() << (sal_Int32) aBmpSizePixel.Height(); // write offset positions and sizes later - const sal_uIntPtr nOffPos = mpStm->Tell(); + const sal_uLong nOffPos = mpStm->Tell(); mpStm->SeekRel( 16 ); (*mpStm) << (sal_uInt32) 0 << ( ( ROP_XOR == maVDev.GetRasterOp() && WIN_SRCCOPY == nROP ) ? WIN_SRCINVERT : nROP ); @@ -774,7 +774,7 @@ void EMFWriter::ImplWriteBmpRecord( const Bitmap& rBmp, const Point& rPt, mpStm->Write( aMemStm.GetData(), nDIBSize ); - const sal_uIntPtr nEndPos = mpStm->Tell(); + const sal_uLong nEndPos = mpStm->Tell(); mpStm->Seek( nOffPos ); (*mpStm) << (sal_uInt32) 80 << (sal_uInt32)( nHeaderSize + ( nPalCount << 2 ) ); (*mpStm) << (sal_uInt32)( 80 + ( nHeaderSize + ( nPalCount << 2 ) ) ) << nImageSize; @@ -902,7 +902,7 @@ void EMFWriter::Impl_handleLineInfoPolyPolygons(const LineInfo& rInfo, const bas void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) { - for( sal_uIntPtr j = 0, nActionCount = rMtf.GetActionCount(); j < nActionCount; j++ ) + for( sal_uLong j = 0, nActionCount = rMtf.GetActionCount(); j < nActionCount; j++ ) { const MetaAction* pAction = rMtf.GetAction( j ); const sal_uInt16 nType = pAction->GetType(); @@ -1156,7 +1156,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf ) const MetaEPSAction* pA = (const MetaEPSAction*) pAction; const GDIMetaFile aSubstitute( pA->GetSubstitute() ); - for( sal_uIntPtr i = 0, nCount = aSubstitute.GetActionCount(); i < nCount; i++ ) + for( sal_uLong i = 0, nCount = aSubstitute.GetActionCount(); i < nCount; i++ ) { const MetaAction* pSubstAct = aSubstitute.GetAction( i ); if( pSubstAct->GetType() == META_BMPSCALE_ACTION ) diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter.vcl/wmf/emfwr.hxx index 3b785a6ab5d0..8c65e91e5f73 100644 --- a/svtools/source/filter.vcl/wmf/emfwr.hxx +++ b/svtools/source/filter.vcl/wmf/emfwr.hxx @@ -51,10 +51,10 @@ private: FilterConfigItem* mpFilterConfigItem; SvStream* mpStm; sal_Bool* mpHandlesUsed; - sal_uIntPtr mnHandleCount; - sal_uIntPtr mnLastPercent; - sal_uIntPtr mnRecordCount; - sal_uIntPtr mnRecordPos; + sal_uLong mnHandleCount; + sal_uLong mnLastPercent; + sal_uLong mnRecordCount; + sal_uLong mnRecordPos; sal_Bool mbRecordOpen; sal_Bool mbLineChanged; sal_uInt32 mnLineHandle; @@ -67,10 +67,10 @@ private: void ImplBeginRecord( sal_uInt32 nType ); void ImplEndRecord(); - sal_uIntPtr ImplAcquireHandle(); - void ImplReleaseHandle( sal_uIntPtr nHandle ); + sal_uLong ImplAcquireHandle(); + void ImplReleaseHandle( sal_uLong nHandle ); - sal_Bool ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uIntPtr nSelectType ); + sal_Bool ImplPrepareHandleSelect( sal_uInt32& rHandle, sal_uLong nSelectType ); void ImplCheckLineAttr(); void ImplCheckFillAttr(); void ImplCheckTextAttr(); diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx index ae5b7c41dc85..880841cd36f8 100644 --- a/svtools/source/filter.vcl/wmf/winwmf.cxx +++ b/svtools/source/filter.vcl/wmf/winwmf.cxx @@ -1070,7 +1070,7 @@ sal_Bool WMFReader::ReadHeader() void WMFReader::ReadWMF() { sal_uInt16 nFunction; - sal_uIntPtr nPos, nPercent, nLastPercent; + sal_uLong nPos, nPercent, nLastPercent; nSkipActions = 0; nCurrentAction = 0; diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx index a1ee788f631f..36b84316271b 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.cxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx @@ -281,7 +281,7 @@ void WMFWriter::MayCallback() { if ( xStatusIndicator.is() ) { - sal_uIntPtr nPercent; + sal_uLong nPercent; // Wir gehen mal einfach so davon aus, dass 16386 Actions einer Bitmap entsprechen // (in der Regel wird ein Metafile entweder nur Actions oder einige Bitmaps und fast @@ -302,7 +302,7 @@ void WMFWriter::MayCallback() void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF ) { - sal_uIntPtr nAction, nActionCount; + sal_uLong nAction, nActionCount; nActionCount = rMTF.GetActionCount(); @@ -384,7 +384,7 @@ void WMFWriter::WriteRecordHeader(sal_uInt32 nSizeWords, sal_uInt16 nType) void WMFWriter::UpdateRecordHeader() { - sal_uIntPtr nPos; + sal_uLong nPos; sal_uInt32 nSize; nPos=pWMF->Tell(); nSize=nPos-nActRecordPos; @@ -758,7 +758,7 @@ void WMFWriter::WMFRecord_Polygon(const Polygon & rPoly) else aSimplePoly = rPoly; nSize = aSimplePoly.GetSize(); - WriteRecordHeader(((sal_uIntPtr)nSize)*2+4,W_META_POLYGON); + WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYGON); *pWMF << nSize; for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } @@ -773,7 +773,7 @@ void WMFWriter::WMFRecord_PolyLine(const Polygon & rPoly) else aSimplePoly = rPoly; nSize=aSimplePoly.GetSize(); - WriteRecordHeader(((sal_uIntPtr)nSize)*2+4,W_META_POLYLINE); + WriteRecordHeader(((sal_uLong)nSize)*2+4,W_META_POLYLINE); *pWMF << nSize; for (i=0; i<nSize; i++) WritePointXY(aSimplePoly.GetPoint(i)); } @@ -925,7 +925,7 @@ void WMFWriter::WMFRecord_SetWindowOrg(const Point & rPoint) void WMFWriter::WMFRecord_StretchDIB( const Point & rPoint, const Size & rSize, const Bitmap & rBitmap, sal_uInt32 nROP ) { - sal_uIntPtr nPosAnf,nPosEnd; + sal_uLong nPosAnf,nPosEnd; nActBitmapPercent=50; MayCallback(); @@ -1180,7 +1180,7 @@ void WMFWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx: void WMFWriter::WriteRecords( const GDIMetaFile & rMTF ) { - sal_uIntPtr nA, nACount; + sal_uLong nA, nACount; MetaAction* pMA; if( bStatus ) @@ -1848,7 +1848,7 @@ void WMFWriter::WriteHeader( const GDIMetaFile &, sal_Bool bPlaceable ) void WMFWriter::UpdateHeader() { - sal_uIntPtr nPos; + sal_uLong nPos; sal_uInt32 nFileSize; nPos=pWMF->Tell(); // Endposition = Gesammtgroesse der Datei diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter.vcl/wmf/wmfwr.hxx index b215b4f138a7..c5830b3bab8f 100644 --- a/svtools/source/filter.vcl/wmf/wmfwr.hxx +++ b/svtools/source/filter.vcl/wmf/wmfwr.hxx @@ -71,7 +71,7 @@ private: sal_Bool bStatus; - sal_uIntPtr nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde. + sal_uLong nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde. FilterConfigItem* pFilterConfigItem; com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator; @@ -83,9 +83,9 @@ private: Size aTargetSize; sal_uInt16 nTargetDivisor; - sal_uIntPtr nMetafileHeaderPos; + sal_uLong nMetafileHeaderPos; sal_uInt32 nMaxRecordSize; // in Worten - sal_uIntPtr nActRecordPos; + sal_uLong nActRecordPos; // Aktuelle Attribute im Quell-Metafile: Color aSrcLineColor; @@ -122,11 +122,11 @@ private: // Damit nicht bei jeder Operation alle Attribute verglichen werden muessen: - sal_uIntPtr nNumberOfActions; // Anzahl der Actions im GDIMetafile - sal_uIntPtr nNumberOfBitmaps; // Anzahl der Bitmaps - sal_uIntPtr nWrittenActions; // Anzahl der bereits verarbeiteten Actions beim Schreiben der Orders - sal_uIntPtr nWrittenBitmaps; // Anzahl der bereits geschriebenen Bitmaps - sal_uIntPtr nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist. + sal_uLong nNumberOfActions; // Anzahl der Actions im GDIMetafile + sal_uLong nNumberOfBitmaps; // Anzahl der Bitmaps + sal_uLong nWrittenActions; // Anzahl der bereits verarbeiteten Actions beim Schreiben der Orders + sal_uLong nWrittenBitmaps; // Anzahl der bereits geschriebenen Bitmaps + sal_uLong nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist. sal_Bool bEmbedEMF; // optionally embedd EMF data into WMF diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 3768bab7f739..cd8125a6cc79 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -86,7 +86,7 @@ GraphicID::GraphicID( const GraphicObject& rObj ) { const Graphic& rGraphic = rObj.GetGraphic(); - mnID1 = ( (sal_uIntPtr) rGraphic.GetType() ) << 28; + mnID1 = ( (sal_uLong) rGraphic.GetType() ) << 28; switch( rGraphic.GetType() ) { @@ -105,7 +105,7 @@ GraphicID::GraphicID( const GraphicObject& rObj ) { const BitmapEx aBmpEx( rGraphic.GetBitmapEx() ); - mnID1 |= ( ( ( (sal_uIntPtr) aBmpEx.GetTransparentType() << 8 ) | ( aBmpEx.IsAlpha() ? 1 : 0 ) ) & 0x0fffffff ); + mnID1 |= ( ( ( (sal_uLong) aBmpEx.GetTransparentType() << 8 ) | ( aBmpEx.IsAlpha() ? 1 : 0 ) ) & 0x0fffffff ); mnID2 = aBmpEx.GetSizePixel().Width(); mnID3 = aBmpEx.GetSizePixel().Height(); mnID4 = rGraphic.GetChecksum(); @@ -182,7 +182,7 @@ public: void AddGraphicObjectReference( const GraphicObject& rObj, Graphic& rSubstitute ); sal_Bool ReleaseGraphicObjectReference( const GraphicObject& rObj ); - sal_uIntPtr GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); } + sal_uLong GetGraphicObjectReferenceCount() { return maGraphicObjectList.Count(); } sal_Bool HasGraphicObjectReference( const GraphicObject& rObj ); void TryToSwapIn(); @@ -277,7 +277,7 @@ void GraphicCacheEntry::ImplFillSubstitute( Graphic& rSubstitute ) const MapMode aPrefMapMode( rSubstitute.GetPrefMapMode() ); const Link aAnimationNotifyHdl( rSubstitute.GetAnimationNotifyHdl() ); const String aDocFileName( rSubstitute.GetDocFileName() ); - const sal_uIntPtr nDocFilePos = rSubstitute.GetDocFilePos(); + const sal_uLong nDocFilePos = rSubstitute.GetDocFilePos(); const GraphicType eOldType = rSubstitute.GetType(); const sal_Bool bDefaultType = ( rSubstitute.GetType() == GRAPHIC_DEFAULT ); @@ -415,13 +415,13 @@ private: BitmapEx* mpBmpEx; GraphicAttr maAttr; Size maOutSizePix; - sal_uIntPtr mnCacheSize; - sal_uIntPtr mnOutDevDrawMode; + sal_uLong mnCacheSize; + sal_uLong mnOutDevDrawMode; sal_uInt16 mnOutDevBitCount; public: - static sal_uIntPtr GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz, + static sal_uLong GetNeededSize( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ); public: @@ -457,9 +457,9 @@ public: const GraphicAttr& GetAttr() const { return maAttr; } const Size& GetOutputSizePixel() const { return maOutSizePix; } - sal_uIntPtr GetCacheSize() const { return mnCacheSize; } + sal_uLong GetCacheSize() const { return mnCacheSize; } const GraphicCacheEntry* GetReferencedCacheEntry() const { return mpRefCacheEntry; } - sal_uIntPtr GetOutDevDrawMode() const { return mnOutDevDrawMode; } + sal_uLong GetOutDevDrawMode() const { return mnOutDevDrawMode; } sal_uInt16 GetOutDevBitCount() const { return mnOutDevBitCount; } void SetReleaseTime( const ::vos::TTimeValue& rReleaseTime ) { maReleaseTime = rReleaseTime; } @@ -486,12 +486,12 @@ public: // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& /*rPt*/, const Size& rSz, +sal_uLong GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point& /*rPt*/, const Size& rSz, const GraphicObject& rObj, const GraphicAttr& rAttr ) { const Graphic& rGraphic = rObj.GetGraphic(); const GraphicType eType = rGraphic.GetType(); - sal_uIntPtr nNeededSize; + sal_uLong nNeededSize; if( GRAPHIC_BITMAP == eType ) { @@ -560,7 +560,7 @@ void GraphicDisplayCacheEntry::Draw( OutputDevice* pOut, const Point& rPt, const // - GraphicCache - // ----------------------- -GraphicCache::GraphicCache( GraphicManager& rMgr, sal_uIntPtr nDisplayCacheSize, sal_uIntPtr nMaxObjDisplayCacheSize ) : +GraphicCache::GraphicCache( GraphicManager& rMgr, sal_uLong nDisplayCacheSize, sal_uLong nMaxObjDisplayCacheSize ) : mrMgr ( rMgr ), mnReleaseTimeoutSeconds ( 0UL ), mnMaxDisplaySize ( nDisplayCacheSize ), @@ -759,7 +759,7 @@ void GraphicCache::GraphicObjectWasSwappedIn( const GraphicObject& rObj ) // ----------------------------------------------------------------------------- -void GraphicCache::SetMaxDisplayCacheSize( sal_uIntPtr nNewCacheSize ) +void GraphicCache::SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ) { mnMaxDisplaySize = nNewCacheSize; @@ -769,7 +769,7 @@ void GraphicCache::SetMaxDisplayCacheSize( sal_uIntPtr nNewCacheSize ) // ----------------------------------------------------------------------------- -void GraphicCache::SetMaxObjDisplayCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) +void GraphicCache::SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) { const sal_Bool bDestroy = ( bDestroyGreaterCached && ( nNewMaxObjSize < mnMaxObjDisplaySize ) ); @@ -796,7 +796,7 @@ void GraphicCache::SetMaxObjDisplayCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bo // ----------------------------------------------------------------------------- -void GraphicCache::SetCacheTimeout( sal_uIntPtr nTimeoutSeconds ) +void GraphicCache::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { if( mnReleaseTimeoutSeconds != nTimeoutSeconds ) { @@ -884,7 +884,7 @@ sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& r const GraphicObject& rObj, const GraphicAttr& rAttr, const BitmapEx& rBmpEx ) { - const sal_uIntPtr nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); + const sal_uLong nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); sal_Bool bRet = sal_False; if( nNeededSize <= GetMaxObjDisplayCacheSize() ) @@ -918,7 +918,7 @@ sal_Bool GraphicCache::CreateDisplayCacheObj( OutputDevice* pOut, const Point& r const GraphicObject& rObj, const GraphicAttr& rAttr, const GDIMetaFile& rMtf ) { - const sal_uIntPtr nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); + const sal_uLong nNeededSize = GraphicDisplayCacheEntry::GetNeededSize( pOut, rPt, rSz, rObj, rAttr ); sal_Bool bRet = sal_False; if( nNeededSize <= GetMaxObjDisplayCacheSize() ) @@ -987,9 +987,9 @@ sal_Bool GraphicCache::DrawDisplayCacheObj( OutputDevice* pOut, const Point& rPt // ----------------------------------------------------------------------------- -sal_Bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uIntPtr nSizeToFree ) +sal_Bool GraphicCache::ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ) { - sal_uIntPtr nFreedSize = 0UL; + sal_uLong nFreedSize = 0UL; if( nSizeToFree ) { diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 99df81b1d32e..0885667aa2b7 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -47,12 +47,12 @@ private: Timer maReleaseTimer; List maGraphicCache; List maDisplayCache; - sal_uIntPtr mnReleaseTimeoutSeconds; - sal_uIntPtr mnMaxDisplaySize; - sal_uIntPtr mnMaxObjDisplaySize; - sal_uIntPtr mnUsedDisplaySize; + sal_uLong mnReleaseTimeoutSeconds; + sal_uLong mnMaxDisplaySize; + sal_uLong mnMaxObjDisplaySize; + sal_uLong mnUsedDisplaySize; - sal_Bool ImplFreeDisplayCacheSpace( sal_uIntPtr nSizeToFree ); + sal_Bool ImplFreeDisplayCacheSpace( sal_uLong nSizeToFree ); GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); @@ -61,8 +61,8 @@ private: public: GraphicCache( GraphicManager& rMgr, - sal_uIntPtr nDisplayCacheSize = 10000000UL, - sal_uIntPtr nMaxObjDisplayCacheSize = 2400000UL ); + sal_uLong nDisplayCacheSize = 10000000UL, + sal_uLong nMaxObjDisplayCacheSize = 2400000UL ); ~GraphicCache(); public: @@ -79,17 +79,17 @@ public: public: - void SetMaxDisplayCacheSize( sal_uIntPtr nNewCacheSize ); - sal_uIntPtr GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; }; + void SetMaxDisplayCacheSize( sal_uLong nNewCacheSize ); + sal_uLong GetMaxDisplayCacheSize() const { return mnMaxDisplaySize; }; - void SetMaxObjDisplayCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); - sal_uIntPtr GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; } + void SetMaxObjDisplayCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached = sal_False ); + sal_uLong GetMaxObjDisplayCacheSize() const { return mnMaxObjDisplaySize; } - sal_uIntPtr GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; } - sal_uIntPtr GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); } + sal_uLong GetUsedDisplayCacheSize() const { return mnUsedDisplaySize; } + sal_uLong GetFreeDisplayCacheSize() const { return( mnMaxDisplaySize - mnUsedDisplaySize ); } - void SetCacheTimeout( sal_uIntPtr nTimeoutSeconds ); - sal_uIntPtr GetCacheTimeout() const { return mnReleaseTimeoutSeconds; } + void SetCacheTimeout( sal_uLong nTimeoutSeconds ); + sal_uLong GetCacheTimeout() const { return mnReleaseTimeoutSeconds; } void ClearDisplayCache(); sal_Bool IsDisplayCacheable( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 93ef8489412d..77a582e5ae20 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -460,7 +460,7 @@ ByteString GraphicObject::GetUniqueID() const // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicObject::GetChecksum() const +sal_uLong GraphicObject::GetChecksum() const { return( ( maGraphic.IsSupportedGraphic() && !maGraphic.IsSwapOut() ) ? maGraphic.GetChecksum() : 0 ); } @@ -475,7 +475,7 @@ SvStream* GraphicObject::GetSwapStream() const // ----------------------------------------------------------------------------- // !!! to be removed -sal_uIntPtr GraphicObject::GetReleaseFromCache() const +sal_uLong GraphicObject::GetReleaseFromCache() const { return 0; } @@ -553,7 +553,7 @@ void GraphicObject::SetSwapStreamHdl() // ----------------------------------------------------------------------------- -void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const sal_uIntPtr nSwapOutTimeout ) +void GraphicObject::SetSwapStreamHdl( const Link& rHdl, const sal_uLong nSwapOutTimeout ) { delete mpSwapStreamHdl, mpSwapStreamHdl = new Link( rHdl ); @@ -615,7 +615,7 @@ void GraphicObject::SetGraphicManager( const GraphicManager& rMgr ) // ----------------------------------------------------------------------------- sal_Bool GraphicObject::IsCached( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr, sal_uIntPtr nFlags ) const + const GraphicAttr* pAttr, sal_uLong nFlags ) const { sal_Bool bRet; @@ -666,7 +666,7 @@ List* GraphicObject::GetAnimationInfoList() const // ----------------------------------------------------------------------------- sal_Bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, - const GraphicAttr* pAttr, sal_uIntPtr nFlags ) + const GraphicAttr* pAttr, sal_uLong nFlags ) { GraphicAttr aAttr( pAttr ? *pAttr : GetAttr() ); Point aPt( rPt ); @@ -746,7 +746,7 @@ sal_Bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, const Point& rPt, const Size& rSz, const GraphicAttr* pGrfAttr, - const sal_uIntPtr nFlags ) + const sal_uLong nFlags ) { const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() ); @@ -807,7 +807,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev, // ----------------------------------------------------------------------------- sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize, - const Size& rOffset, const GraphicAttr* pAttr, sal_uIntPtr nFlags, int nTileCacheSize1D ) + const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ) { if( pOut == NULL || rSize.Width() == 0 || rSize.Height() == 0 ) return sal_False; @@ -831,7 +831,7 @@ sal_Bool GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, c // ----------------------------------------------------------------------------- sal_Bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const Size& rSz, - long nExtraData, const GraphicAttr* pAttr, sal_uIntPtr /*nFlags*/, + long nExtraData, const GraphicAttr* pAttr, sal_uLong /*nFlags*/, OutputDevice* pFirstFrameOutDev ) { sal_Bool bRet = sal_False; diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index c0ed79a417d2..9c86c7e44130 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -113,7 +113,7 @@ BitmapEx muckWithBitmap( const BitmapEx& rBmpEx, // - GraphicManager - // ------------------ -GraphicManager::GraphicManager( sal_uIntPtr nCacheSize, sal_uIntPtr nMaxObjCacheSize ) : +GraphicManager::GraphicManager( sal_uLong nCacheSize, sal_uLong nMaxObjCacheSize ) : mpCache( new GraphicCache( *this, nCacheSize, nMaxObjCacheSize ) ) { } @@ -130,56 +130,56 @@ GraphicManager::~GraphicManager() // ----------------------------------------------------------------------------- -void GraphicManager::SetMaxCacheSize( sal_uIntPtr nNewCacheSize ) +void GraphicManager::SetMaxCacheSize( sal_uLong nNewCacheSize ) { mpCache->SetMaxDisplayCacheSize( nNewCacheSize ); } // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicManager::GetMaxCacheSize() const +sal_uLong GraphicManager::GetMaxCacheSize() const { return mpCache->GetMaxDisplayCacheSize(); } // ----------------------------------------------------------------------------- -void GraphicManager::SetMaxObjCacheSize( sal_uIntPtr nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) +void GraphicManager::SetMaxObjCacheSize( sal_uLong nNewMaxObjSize, sal_Bool bDestroyGreaterCached ) { mpCache->SetMaxObjDisplayCacheSize( nNewMaxObjSize, bDestroyGreaterCached ); } // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicManager::GetMaxObjCacheSize() const +sal_uLong GraphicManager::GetMaxObjCacheSize() const { return mpCache->GetMaxObjDisplayCacheSize(); } // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicManager::GetUsedCacheSize() const +sal_uLong GraphicManager::GetUsedCacheSize() const { return mpCache->GetUsedDisplayCacheSize(); } // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicManager::GetFreeCacheSize() const +sal_uLong GraphicManager::GetFreeCacheSize() const { return mpCache->GetFreeDisplayCacheSize(); } // ----------------------------------------------------------------------------- -void GraphicManager::SetCacheTimeout( sal_uIntPtr nTimeoutSeconds ) +void GraphicManager::SetCacheTimeout( sal_uLong nTimeoutSeconds ) { mpCache->SetCacheTimeout( nTimeoutSeconds ); } // ----------------------------------------------------------------------------- -sal_uIntPtr GraphicManager::GetCacheTimeout() const +sal_uLong GraphicManager::GetCacheTimeout() const { return mpCache->GetCacheTimeout(); } @@ -211,7 +211,7 @@ sal_Bool GraphicManager::IsInCache( OutputDevice* pOut, const Point& rPt, sal_Bool GraphicManager::DrawObj( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, sal_Bool& rCached ) + const sal_uLong nFlags, sal_Bool& rCached ) { Point aPt( rPt ); Size aSz( rSz ); @@ -316,7 +316,7 @@ void GraphicManager::ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj ) sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz, GraphicObject& rObj, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, sal_Bool& rCached ) + const sal_uLong nFlags, sal_Bool& rCached ) { const Graphic& rGraphic = rObj.GetGraphic(); sal_Bool bRet = sal_False; @@ -397,7 +397,7 @@ sal_Bool GraphicManager::ImplDraw( OutputDevice* pOut, const Point& rPt, sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx, const GraphicAttr& rAttr, - const sal_uIntPtr nFlags, BitmapEx* pBmpEx ) + const sal_uLong nFlags, BitmapEx* pBmpEx ) { sal_uInt16 nRot10 = rAttr.GetRotation() % 3600; Point aOutPtPix; @@ -627,7 +627,7 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, const GDIMetaFile& rMtf, const GraphicAttr& rAttr, - const sal_uIntPtr /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) + const sal_uLong /*nFlags*/, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx ) { const Size aNewSize( rMtf.GetPrefSize() ); @@ -1652,7 +1652,7 @@ sal_Bool GraphicManager::ImplCreateRotatedScaled( const BitmapEx& rBmpEx, // ----------------------------------------------------------------------------- -void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ) +void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) { GraphicAttr aAttr( rAttr ); @@ -1716,7 +1716,7 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal if( pA ) { - sal_uIntPtr nTrans = cTrans, nNewTrans; + sal_uLong nTrans = cTrans, nNewTrans; const long nWidth = pA->Width(), nHeight = pA->Height(); if( pA->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL ) @@ -1757,7 +1757,7 @@ void GraphicManager::ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, sal // ----------------------------------------------------------------------------- -void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ) +void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) { GraphicAttr aAttr( rAttr ); @@ -1810,7 +1810,7 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, sa // ----------------------------------------------------------------------------- -void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uIntPtr nAdjustmentFlags ) +void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, sal_uLong nAdjustmentFlags ) { GraphicAttr aAttr( rAttr ); @@ -1924,7 +1924,7 @@ struct ImplTileInfo bool GraphicObject::ImplRenderTempTile( VirtualDevice& rVDev, int nExponent, int nNumTilesX, int nNumTilesY, const Size& rTileSizePixel, - const GraphicAttr* pAttr, sal_uIntPtr nFlags ) + const GraphicAttr* pAttr, sal_uLong nFlags ) { if( nExponent <= 1 ) return false; @@ -1968,7 +1968,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent int nNumOrigTilesX, int nNumOrigTilesY, int nRemainderTilesX, int nRemainderTilesY, const Size& rTileSizePixel, const GraphicAttr* pAttr, - sal_uIntPtr nFlags, ImplTileInfo& rTileInfo ) + sal_uLong nFlags, ImplTileInfo& rTileInfo ) { // gets loaded with our tile bitmap GraphicObject aTmpGraphic; @@ -2143,7 +2143,7 @@ bool GraphicObject::ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent // ----------------------------------------------------------------------------- bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel, - const Size& rOffset, const GraphicAttr* pAttr, sal_uIntPtr nFlags, int nTileCacheSize1D ) + const Size& rOffset, const GraphicAttr* pAttr, sal_uLong nFlags, int nTileCacheSize1D ) { // how many tiles to generate per recursion step enum{ SubdivisionExponent=2 }; @@ -2254,7 +2254,7 @@ bool GraphicObject::ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, c bool GraphicObject::ImplDrawTiled( OutputDevice& rOut, const Point& rPosPixel, int nNumTilesX, int nNumTilesY, - const Size& rTileSizePixel, const GraphicAttr* pAttr, sal_uIntPtr nFlags ) + const Size& rTileSizePixel, const GraphicAttr* pAttr, sal_uLong nFlags ) { Point aCurrPos( rPosPixel ); Size aTileSizeLogic( rOut.PixelToLogic( rTileSizePixel ) ); diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx index 64ed6c2b8cb1..89e6c8e0df4b 100644 --- a/svtools/source/inc/gifread.hxx +++ b/svtools/source/inc/gifread.hxx @@ -113,14 +113,14 @@ class GIFReader : public GraphicReader sal_uInt8 cTransIndex1; sal_uInt8 cNonTransIndex1; - void ReadPaletteEntries( BitmapPalette* pPal, sal_uIntPtr nCount ); + void ReadPaletteEntries( BitmapPalette* pPal, sal_uLong nCount ); void ClearImageExtensions(); sal_Bool CreateBitmaps( long nWidth, long nHeight, BitmapPalette* pPal, sal_Bool bWatchForBackgroundColor ); sal_Bool ReadGlobalHeader(); sal_Bool ReadExtension(); sal_Bool ReadLocalHeader(); - sal_uIntPtr ReadNextBlock(); - void FillImages( HPBYTE pBytes, sal_uIntPtr nCount ); + sal_uLong ReadNextBlock(); + void FillImages( HPBYTE pBytes, sal_uLong nCount ); void CreateNewBitmaps(); sal_Bool ProcessGIF(); diff --git a/svtools/source/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx index 90337f57fa75..21c0460a1c0b 100644 --- a/svtools/source/inc/msgrd.hxx +++ b/svtools/source/inc/msgrd.hxx @@ -31,7 +31,7 @@ sal_Bool ConvertMSGToGDIMetaFile( SvStream & rMSG, GDIMetaFile & rGDIMetaFile, sal_Bool(*pCallback)(void *, sal_uInt16), void * pCallerData, - sal_uIntPtr nMinPercent, sal_uIntPtr nMaxPercent); + sal_uLong nMinPercent, sal_uLong nMaxPercent); #endif // _MSGRD_HXX diff --git a/svtools/source/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx index a2e6cdbf5f70..d133031673e7 100644 --- a/svtools/source/inc/msgwr.hxx +++ b/svtools/source/inc/msgwr.hxx @@ -31,7 +31,7 @@ sal_Bool ConvertGraphicToMSG(const Graphic & rGraphic, SvStream & rTargetStream, sal_Bool(*pCallback)(void *, sal_uInt16), void * pCallerData, - sal_uIntPtr nMinPercent, sal_uIntPtr nMaxPercent); + sal_uLong nMinPercent, sal_uLong nMaxPercent); #endif // _MSGWR_HXX diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 2e10fabf461e..d90329afb28d 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -147,8 +147,8 @@ private: long nNodeBmpWidth; long nNextVerVisSize; long nMostRight; - sal_uIntPtr nVisibleCount; // Anzahl Zeilen im Control - sal_uIntPtr nCurUserEvent; //-1 == kein Userevent amn Laufen + sal_uLong nVisibleCount; // Anzahl Zeilen im Control + sal_uLong nCurUserEvent; //-1 == kein Userevent amn Laufen short nHorSBarHeight, nVerSBarWidth; sal_uInt16 nFlags; sal_uInt16 nCurTabPos; @@ -363,7 +363,7 @@ public: void SetTabBar( TabBar* pTabBar ); void CancelPendingEdit(); - void CallEventListeners( sal_uIntPtr nEvent, void* pData = NULL ); + void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); /** Enables, that one cell of a tablistbox entry can be focused */ inline sal_Bool IsCellFocusEnabled() const { return bIsCellFocusEnabled; } diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx index c81368dbcbc5..b516ca9bfe25 100644 --- a/svtools/source/inc/svimpicn.hxx +++ b/svtools/source/inc/svimpicn.hxx @@ -103,8 +103,8 @@ class SvImpIconView long nMaxBmpHeight; long nMaxTextWidth; long nMaxBoundHeight; // Hoehe des hoechsten BoundRects - sal_uIntPtr nFlags; - sal_uIntPtr nCurUserEvent; + sal_uLong nFlags; + sal_uLong nCurUserEvent; SvLBoxEntry* pCurParent; SvLBoxEntry* pCursor; SvLBoxEntry* pNextCursor; // wird in MovingEntry gesetzt und ist @@ -267,9 +267,9 @@ public: void ShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow ); SvLBoxEntry* GetDropTarget( const Point& rPosPixel ); sal_Bool NotifyMoving( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos ); + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ); sal_Bool NotifyCopying( SvLBoxEntry* pTarget, SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, sal_uIntPtr& rNewChildPos ); + SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos ); void WriteDragServerInfo( const Point&, SvLBoxDDInfo* ); void ReadDragServerInfo( const Point&, SvLBoxDDInfo* ); diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx index 1fff44fbc7ea..aea09db7596e 100644 --- a/svtools/source/inc/xpmread.hxx +++ b/svtools/source/inc/xpmread.hxx @@ -83,35 +83,35 @@ private: BitmapWriteAccess* mpMaskAcc; long mnLastPos; - sal_uIntPtr mnWidth; - sal_uIntPtr mnHeight; - sal_uIntPtr mnColors; - sal_uIntPtr mnCpp; // characters per pix + sal_uLong mnWidth; + sal_uLong mnHeight; + sal_uLong mnColors; + sal_uLong mnCpp; // characters per pix sal_Bool mbTransparent; sal_Bool mbStatus; - sal_uIntPtr mnStatus; - sal_uIntPtr mnIdentifier; + sal_uLong mnStatus; + sal_uLong mnIdentifier; sal_uInt8 mcThisByte; sal_uInt8 mcLastByte; - sal_uIntPtr mnTempAvail; + sal_uLong mnTempAvail; sal_uInt8* mpTempBuf; sal_uInt8* mpTempPtr; sal_uInt8* mpFastColorTable; sal_uInt8* mpColMap; - sal_uIntPtr mnStringSize; + sal_uLong mnStringSize; sal_uInt8* mpStringBuf; - sal_uIntPtr mnParaSize; + sal_uLong mnParaSize; sal_uInt8* mpPara; sal_Bool ImplGetString( void ); - sal_Bool ImplGetColor( sal_uIntPtr ); - sal_Bool ImplGetScanLine( sal_uIntPtr ); + sal_Bool ImplGetColor( sal_uLong ); + sal_Bool ImplGetScanLine( sal_uLong ); sal_Bool ImplGetColSub( sal_uInt8* ); sal_Bool ImplGetColKey( sal_uInt8 ); - void ImplGetRGBHex( sal_uInt8*, sal_uIntPtr ); - sal_Bool ImplGetPara( sal_uIntPtr numb ); - sal_Bool ImplCompare( sal_uInt8*, sal_uInt8*, sal_uIntPtr, sal_uIntPtr nmode = XPMCASENONSENSITIVE ); - sal_uIntPtr ImplGetULONG( sal_uIntPtr nPara ); + void ImplGetRGBHex( sal_uInt8*, sal_uLong ); + sal_Bool ImplGetPara( sal_uLong numb ); + sal_Bool ImplCompare( sal_uInt8*, sal_uInt8*, sal_uLong, sal_uLong nmode = XPMCASENONSENSITIVE ); + sal_uLong ImplGetULONG( sal_uLong nPara ); public: XPMReader( SvStream& rStm ); diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 3f1896554bdd..e2ecdd5ec843 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -160,7 +160,7 @@ static sal_uInt16 aWndFunc( //------------------------------------------------------------------------- -SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uIntPtr lStartP, sal_uIntPtr lEndP, ResMgr *pMgrP) : +SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong lEndP, ResMgr *pMgrP) : lStart(lStartP), lEnd(lEndP), nId(nIdP), pMgr(pMgrP), pFreeMgr( NULL ) @@ -193,7 +193,7 @@ sal_Bool SfxErrorHandler::CreateString( */ { - sal_uIntPtr nErrCode = pErr->GetErrorCode() & ERRCODE_ERROR_MASK; + sal_uLong nErrCode = pErr->GetErrorCode() & ERRCODE_ERROR_MASK; if( nErrCode>=lEnd || nErrCode<=lStart ) return sal_False; MessageInfo *pMsgInfo=PTR_CAST(MessageInfo,pErr); @@ -308,7 +308,7 @@ struct ErrorResource_Impl : private Resource }; -sal_Bool SfxErrorHandler::GetClassString(sal_uIntPtr lClassId, String &rStr) const +sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, String &rStr) const /* [Beschreibung] @@ -338,7 +338,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uIntPtr lClassId, String &rStr) con //------------------------------------------------------------------------- sal_Bool SfxErrorHandler::GetMessageString( - sal_uIntPtr lErrId, String &rStr, sal_uInt16 &nFlags) const + sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const /* [Beschreibung] @@ -368,7 +368,7 @@ sal_Bool SfxErrorHandler::GetMessageString( //------------------------------------------------------------------------- sal_Bool SfxErrorHandler::GetErrorString( - sal_uIntPtr lErrId, String &rStr, sal_uInt16 &nFlags) const + sal_uLong lErrId, String &rStr, sal_uInt16 &nFlags) const /* [Beschreibung] Erzeugt den Fehlerstring fuer den eigentlichen Fehler ohne @@ -437,7 +437,7 @@ SfxErrorContext::SfxErrorContext( //------------------------------------------------------------------------- -sal_Bool SfxErrorContext::GetString(sal_uIntPtr nErrId, String &rStr) +sal_Bool SfxErrorContext::GetString(sal_uLong nErrId, String &rStr) /* [Beschreibung] diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index a9109bf17656..3eb1712ffcac 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -572,7 +572,7 @@ static Image GetOfficeImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig, sa static ImageList* _pBigOfficeImgList = NULL; static ImageList* _pSmallHCOfficeImgList = NULL; static ImageList* _pBigHCOfficeImgList = NULL; - static sal_uIntPtr nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + static sal_uLong nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); // If the style has been changed, throw away our cache of the older images if ( nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle() ) @@ -651,7 +651,7 @@ static Image GetImageFromList_Impl( sal_uInt16 nImageId, sal_Bool bBig, sal_Bool static ImageList* _pBigImageList = NULL; static ImageList* _pSmallHCImageList = NULL; static ImageList* _pBigHCImageList = NULL; - static sal_uIntPtr nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); + static sal_uLong nStyle = Application::GetSettings().GetStyleSettings().GetSymbolsStyle(); // If the style has been changed, throw away our cache of the older images if ( nStyle != Application::GetSettings().GetStyleSettings().GetSymbolsStyle() ) diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx index bf81b59530a0..425eb0ac8481 100644 --- a/svtools/source/misc/imap.cxx +++ b/svtools/source/misc/imap.cxx @@ -340,7 +340,7 @@ sal_Bool IMapRectangleObject::IsEqual( const IMapRectangleObject& rEqObj ) /******************************************************************************/ /******************************************************************************/ -IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uIntPtr nCircleRadius, +IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uLong nCircleRadius, const String& rURL, const String& rAltText, const String& rDesc, @@ -360,7 +360,7 @@ IMapCircleObject::IMapCircleObject( const Point& rCenter, sal_uIntPtr nCircleRad |* \******************************************************************************/ -void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uIntPtr nRad, sal_Bool bPixel ) +void IMapCircleObject::ImpConstruct( const Point& rCenter, sal_uLong nRad, sal_Bool bPixel ) { if ( bPixel ) { @@ -432,7 +432,7 @@ sal_Bool IMapCircleObject::IsHit( const Point& rPoint ) const const Point aPoint( aCenter - rPoint ); sal_Bool bRet = sal_False; - if ( (sal_uIntPtr) sqrt( (double) aPoint.X() * aPoint.X() + + if ( (sal_uLong) sqrt( (double) aPoint.X() * aPoint.X() + aPoint.Y() * aPoint.Y() ) <= nRadius ) { bRet = sal_True; @@ -467,9 +467,9 @@ Point IMapCircleObject::GetCenter( sal_Bool bPixelCoords ) const |* \******************************************************************************/ -sal_uIntPtr IMapCircleObject::GetRadius( sal_Bool bPixelCoords ) const +sal_uLong IMapCircleObject::GetRadius( sal_Bool bPixelCoords ) const { - sal_uIntPtr nNewRadius; + sal_uLong nNewRadius; if ( bPixelCoords ) nNewRadius = Application::GetDefaultDevice()->LogicToPixel( Size( nRadius, 0 ), MapMode( MAP_100TH_MM ) ).Width(); @@ -987,7 +987,7 @@ void ImageMap::InsertIMapObject( const IMapObject& rIMapObject ) IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize, const Size& rDisplaySize, const Point& rRelHitPoint, - sal_uIntPtr nFlags ) + sal_uLong nFlags ) { Point aRelPoint( rTotalSize.Width() * rRelHitPoint.X() / rDisplaySize.Width(), rTotalSize.Height() * rRelHitPoint.Y() / rDisplaySize.Height() ); @@ -1026,9 +1026,9 @@ IMapObject* ImageMap::GetHitIMapObject( const Size& rTotalSize, Rectangle ImageMap::GetBoundRect() const { Rectangle aBoundRect; - sal_uIntPtr nCount = maList.Count(); + sal_uLong nCount = maList.Count(); - for ( sal_uIntPtr i = 0; i < nCount; i++ ) + for ( sal_uLong i = 0; i < nCount; i++ ) aBoundRect.Union( ( (IMapObject*) maList.GetObject( i ) )->GetBoundRect() ); return aBoundRect; diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index c13d8104d878..dedfb22532cb 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -253,7 +253,7 @@ void IMapPolygonObject::WriteNCSA( SvStream& rOStm, const String& rBaseURL ) co |* \******************************************************************************/ -void ImageMap::Write( SvStream& rOStm, sal_uIntPtr nFormat, const String& rBaseURL ) const +void ImageMap::Write( SvStream& rOStm, sal_uLong nFormat, const String& rBaseURL ) const { switch( nFormat ) { @@ -345,9 +345,9 @@ void ImageMap::ImpWriteNCSA( SvStream& rOStm, const String& rBaseURL ) const |* \******************************************************************************/ -sal_uIntPtr ImageMap::Read( SvStream& rIStm, sal_uIntPtr nFormat, const String& rBaseURL ) +sal_uLong ImageMap::Read( SvStream& rIStm, sal_uLong nFormat, const String& rBaseURL ) { - sal_uIntPtr nRet = IMAP_ERR_FORMAT; + sal_uLong nRet = IMAP_ERR_FORMAT; if ( nFormat == IMAP_FORMAT_DETECT ) nFormat = ImpDetectFormat( rIStm ); @@ -375,7 +375,7 @@ sal_uIntPtr ImageMap::Read( SvStream& rIStm, sal_uIntPtr nFormat, const String& |* \******************************************************************************/ -sal_uIntPtr ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) +sal_uLong ImageMap::ImpReadCERN( SvStream& rIStm, const String& rBaseURL ) { ByteString aStr; @@ -553,7 +553,7 @@ String ImageMap::ImpReadCERNURL( const char** ppStr, const String& rBaseURL ) |* \******************************************************************************/ -sal_uIntPtr ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) +sal_uLong ImageMap::ImpReadNCSA( SvStream& rIStm, const String& rBaseURL ) { ByteString aStr; @@ -708,10 +708,10 @@ Point ImageMap::ImpReadNCSACoords( const char** ppStr ) |* \******************************************************************************/ -sal_uIntPtr ImageMap::ImpDetectFormat( SvStream& rIStm ) +sal_uLong ImageMap::ImpDetectFormat( SvStream& rIStm ) { - sal_uIntPtr nPos = rIStm.Tell(); - sal_uIntPtr nRet = IMAP_FORMAT_BIN; + sal_uLong nPos = rIStm.Tell(); + sal_uLong nRet = IMAP_FORMAT_BIN; char cMagic[6]; rIStm.Read( cMagic, sizeof( cMagic ) ); diff --git a/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx index 3ff6d41fac39..49d5f4c5984e 100644 --- a/svtools/source/misc/imap3.cxx +++ b/svtools/source/misc/imap3.cxx @@ -77,7 +77,7 @@ IMapCompat::~IMapCompat() { if ( nStmMode == STREAM_WRITE ) { - const sal_uIntPtr nEndPos = pRWStm->Tell(); + const sal_uLong nEndPos = pRWStm->Tell(); pRWStm->Seek( nCompatPos ); *pRWStm << (sal_uInt32) ( nEndPos - nTotalSize ); @@ -85,7 +85,7 @@ IMapCompat::~IMapCompat() } else { - const sal_uIntPtr nReadSize = pRWStm->Tell() - nCompatPos; + const sal_uLong nReadSize = pRWStm->Tell() - nCompatPos; if ( nTotalSize > nReadSize ) pRWStm->SeekRel( nTotalSize - nReadSize ); diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 8603cf317de7..841ac4d38135 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -434,7 +434,7 @@ sal_Bool TransferDataContainer::GetData( const TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), aEnd( pImpl->aFmtList.end() ); sal_Bool bFnd = sal_False; - sal_uIntPtr nFmtId = SotExchange::GetFormat( rFlavor ); + sal_uLong nFmtId = SotExchange::GetFormat( rFlavor ); // test first the list for( ; aIter != aEnd; ++aIter ) @@ -500,8 +500,8 @@ void TransferDataContainer::CopyINetBookmark( const INetBookmark& rBkmk ) // ----------------------------------------------------------------------------- -void TransferDataContainer::CopyAnyData( sal_uIntPtr nFormatId, - const sal_Char* pData, sal_uIntPtr nLen ) +void TransferDataContainer::CopyAnyData( sal_uLong nFormatId, + const sal_Char* pData, sal_uLong nLen ) { if( nLen ) { @@ -518,7 +518,7 @@ void TransferDataContainer::CopyAnyData( sal_uIntPtr nFormatId, // ----------------------------------------------------------------------------- -void TransferDataContainer::CopyByteString( sal_uIntPtr nFormatId, +void TransferDataContainer::CopyByteString( sal_uLong nFormatId, const ByteString& rStr ) { CopyAnyData( nFormatId, rStr.GetBuffer(), rStr.Len() ); diff --git a/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx index 3a654bd4d719..2c949c1a6c4e 100644 --- a/svtools/source/svhtml/htmlkywd.cxx +++ b/svtools/source/svhtml/htmlkywd.cxx @@ -860,7 +860,7 @@ struct HTML_ColorEntry const sal_Char* sName; const String *pUName; }; - sal_uIntPtr nColor; + sal_uLong nColor; }; static int __FAR_DATA bSortColorKeyWords = sal_False; @@ -1052,7 +1052,7 @@ static int } -sal_uIntPtr GetHTMLColor( const String& rName ) +sal_uLong GetHTMLColor( const String& rName ) { if( !bSortColorKeyWords ) { @@ -1063,7 +1063,7 @@ sal_uIntPtr GetHTMLColor( const String& rName ) bSortColorKeyWords = sal_True; } - sal_uIntPtr nRet = ULONG_MAX; + sal_uLong nRet = ULONG_MAX; void* pFound; HTML_ColorEntry aSrch; aSrch.pUName = &rName; diff --git a/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx index c43deba25c15..6fa096937e7b 100644 --- a/svtools/source/svhtml/htmlout.cxx +++ b/svtools/source/svhtml/htmlout.cxx @@ -569,7 +569,7 @@ SvStream& HTMLOutFuncs::FlushToAscii( SvStream& rStream, return rStream; } -SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uIntPtr nHex, sal_uInt8 nLen, +SvStream& HTMLOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen, rtl_TextEncoding ) { // in einen Stream aus sal_Char aNToABuf[] = "0000000000000000"; @@ -928,7 +928,7 @@ SvStream& HTMLOutFuncs::Out_Events( SvStream& rStrm, ByteString& HTMLOutFuncs::CreateTableDataOptionsValNum( ByteString& aStrTD, sal_Bool bValue, - double fVal, sal_uIntPtr nFormat, SvNumberFormatter& rFormatter, + double fVal, sal_uLong nFormat, SvNumberFormatter& rFormatter, rtl_TextEncoding eDestEnc, String* pNonConvertableChars ) { if ( bValue ) diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx index 75e6f1d8507f..b31f7285b15c 100644 --- a/svtools/source/svhtml/parhtml.cxx +++ b/svtools/source/svhtml/parhtml.cxx @@ -191,7 +191,7 @@ void HTMLOption::GetNumbers( SvULongs &rLongs, sal_Bool bSpaceDelim ) const // das ist ein sehr stark vereinfachter Scanner. Er sucht einfach // alle Tiffern aus dem String sal_Bool bInNum = sal_False; - sal_uIntPtr nNum = 0; + sal_uLong nNum = 0; for( xub_StrLen i=0; i<aValue.Len(); i++ ) { register sal_Unicode c = aValue.GetChar( i ); @@ -227,7 +227,7 @@ void HTMLOption::GetNumbers( SvULongs &rLongs, sal_Bool bSpaceDelim ) const nPos++; if( nPos==aValue.Len() ) - rLongs.Insert( sal_uIntPtr(0), rLongs.Count() ); + rLongs.Insert( sal_uLong(0), rLongs.Count() ); else { xub_StrLen nEnd = aValue.Search( (sal_Unicode)',', nPos ); @@ -258,7 +258,7 @@ void HTMLOption::GetColor( Color& rColor ) const String aTmp( aValue ); aTmp.ToUpperAscii(); - sal_uIntPtr nColor = ULONG_MAX; + sal_uLong nColor = ULONG_MAX; if( '#'!=aTmp.GetChar( 0 ) ) nColor = GetHTMLColor( aTmp ); @@ -463,8 +463,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) sTmpBuffer.append( (sal_Unicode)'&' ); else { - sal_uIntPtr nStreamPos = rInput.Tell(); - sal_uIntPtr nLinePos = GetLinePos(); + sal_uLong nStreamPos = rInput.Tell(); + sal_uLong nLinePos = GetLinePos(); sal_Unicode cChar = 0U; if( '#' == (nNextCh = GetNextChar()) ) @@ -545,7 +545,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( 0U == cChar && ';' != nNextCh ) { DBG_ASSERT( rInput.Tell() - nStreamPos == - (sal_uIntPtr)(nPos+1L)*GetCharSize(), + (sal_uLong)(nPos+1L)*GetCharSize(), "UTF-8 geht hier schief" ); for( xub_StrLen i=nPos-1L; i>1L; i-- ) { @@ -575,10 +575,10 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) // rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); // nlLinePos -= nPos; DBG_ASSERT( rInput.Tell()-nStreamPos == - (sal_uIntPtr)(nPos+1)*GetCharSize(), + (sal_uLong)(nPos+1)*GetCharSize(), "Falsche Stream-Position" ); DBG_ASSERT( nlLinePos-nLinePos == - (sal_uIntPtr)(nPos+1), + (sal_uLong)(nPos+1), "Falsche Zeilen-Position" ); rInput.Seek( nStreamPos ); nlLinePos = nLinePos; @@ -620,10 +620,10 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) // rInput.SeekRel( -(long)(++nPos*GetCharSize()) ); // nlLinePos -= nPos; DBG_ASSERT( rInput.Tell()-nStreamPos == - (sal_uIntPtr)(nPos+1)*GetCharSize(), + (sal_uLong)(nPos+1)*GetCharSize(), "Falsche Stream-Position" ); DBG_ASSERT( nlLinePos-nLinePos == - (sal_uIntPtr)(nPos+1), + (sal_uLong)(nPos+1), "Falsche Zeilen-Position" ); rInput.Seek( nStreamPos ); nlLinePos = nLinePos; @@ -828,7 +828,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) default: bEqSignFound = sal_False; if( (nNextCh==cBreak && !cQuote) || - (sal_uIntPtr(aToken.Len()) + MAX_LEN) > sal_uIntPtr(STRING_MAXLEN & ~1 )) + (sal_uLong(aToken.Len()) + MAX_LEN) > sal_uLong(STRING_MAXLEN & ~1 )) bWeiter = sal_False; else { @@ -838,8 +838,8 @@ int HTMLParser::ScanText( const sal_Unicode cBreak ) if( MAX_LEN == sTmpBuffer.getLength() ) { aToken += String(sTmpBuffer.makeStringAndClear()); - if( (sal_uIntPtr(aToken.Len()) + MAX_LEN) > - sal_uIntPtr(STRING_MAXLEN & ~1 ) ) + if( (sal_uLong(aToken.Len()) + MAX_LEN) > + sal_uLong(STRING_MAXLEN & ~1 ) ) { nNextCh = GetNextChar(); return HTML_TEXTTOKEN; @@ -904,9 +904,9 @@ int HTMLParser::_GetNextRawToken() aToken += String(sTmpBuffer.makeStringAndClear()); // und die Position im Stream merken - sal_uIntPtr nStreamPos = rInput.Tell(); - sal_uIntPtr nLineNr = GetLineNr(); - sal_uIntPtr nLinePos = GetLinePos(); + sal_uLong nStreamPos = rInput.Tell(); + sal_uLong nLineNr = GetLineNr(); + sal_uLong nLinePos = GetLinePos(); // Start eines End-Token? int bOffState = sal_False; @@ -1136,9 +1136,9 @@ int __EXPORT HTMLParser::_GetNextToken() { case '<': { - sal_uIntPtr nStreamPos = rInput.Tell(); - sal_uIntPtr nLineNr = GetLineNr(); - sal_uIntPtr nLinePos = GetLinePos(); + sal_uLong nStreamPos = rInput.Tell(); + sal_uLong nLineNr = GetLineNr(); + sal_uLong nLinePos = GetLinePos(); int bOffState = sal_False; if( '/' == (nNextCh = GetNextChar()) ) @@ -1203,9 +1203,9 @@ int __EXPORT HTMLParser::_GetNextToken() aToken = sSaveToken; if( '>'!=nNextCh ) aToken += (sal_Unicode)' '; - sal_uIntPtr nCStreamPos = 0; - sal_uIntPtr nCLineNr = 0; - sal_uIntPtr nCLinePos = 0; + sal_uLong nCStreamPos = 0; + sal_uLong nCLineNr = 0; + sal_uLong nCLinePos = 0; xub_StrLen nCStrLen = 0; sal_Bool bDone = sal_False; @@ -1301,8 +1301,8 @@ int __EXPORT HTMLParser::_GetNextToken() { nRet = HTML_UNKNOWNCONTROL_ON; - sal_uIntPtr nCStreamPos = rInput.Tell(); - sal_uIntPtr nCLineNr = GetLineNr(), nCLinePos = GetLinePos(); + sal_uLong nCStreamPos = rInput.Tell(); + sal_uLong nCLineNr = GetLineNr(), nCLinePos = GetLinePos(); sal_Bool bDone = sal_False; // bis zum schliessenden %> lesen. wenn keins gefunden @@ -2236,8 +2236,8 @@ bool HTMLParser::ParseMetaOptionsImpl( if ( i_xDocProps.is() && aContent.Len() && aContent.GetTokenCount() == 2 ) { - Date aDate( (sal_uIntPtr)aContent.GetToken(0).ToInt32() ); - Time aTime( (sal_uIntPtr)aContent.GetToken(1).ToInt32() ); + Date aDate( (sal_uLong)aContent.GetToken(0).ToInt32() ); + Time aTime( (sal_uLong)aContent.GetToken(1).ToInt32() ); DateTime aDateTime( aDate, aTime ); ::util::DateTime uDT(aDateTime.Get100Sec(), aDateTime.GetSec(), aDateTime.GetMin(), diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx index 3428a339c71f..2f00fd896168 100644 --- a/svtools/source/svrtf/rtfout.cxx +++ b/svtools/source/svrtf/rtfout.cxx @@ -185,7 +185,7 @@ SvStream& RTFOutFuncs::Out_Fontname(SvStream& rStream, const String& rStr, return rStream; } -SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uIntPtr nHex, sal_uInt8 nLen ) +SvStream& RTFOutFuncs::Out_Hex( SvStream& rStream, sal_uLong nHex, sal_uInt8 nLen ) { sal_Char aNToABuf[] = "0000000000000000"; diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index 082ffc5b98cd..fee520714493 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -50,9 +50,9 @@ struct SvParser_Impl { String aToken; // gescanntes Token - sal_uIntPtr nFilePos; // akt. Position im Stream - sal_uIntPtr nlLineNr; // akt. Zeilen Nummer - sal_uIntPtr nlLinePos; // akt. Spalten Nummer + sal_uLong nFilePos; // akt. Position im Stream + sal_uLong nlLineNr; // akt. Zeilen Nummer + sal_uLong nlLinePos; // akt. Spalten Nummer long nTokenValue; // zusaetzlicher Wert (RTF) sal_Bool bTokenHasValue; // indicates whether nTokenValue is valid int nToken; // akt. Token diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index e678daf48c03..5fb61a9f385e 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -113,8 +113,8 @@ namespace svt { namespace table _rDevice.SetTextColor(m_pImpl->rModel.getTextColor()); else _rDevice.SetTextColor(_rStyle.GetFieldTextColor()); - sal_uIntPtr nHorFlag = TEXT_DRAW_LEFT; - sal_uIntPtr nVerFlag = TEXT_DRAW_TOP; + sal_uLong nHorFlag = TEXT_DRAW_LEFT; + sal_uLong nVerFlag = TEXT_DRAW_TOP; if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) @@ -207,8 +207,8 @@ namespace svt { namespace table _rDevice.SetTextColor(m_pImpl->rModel.getTextColor()); else _rDevice.SetTextColor(_rStyle.GetFieldTextColor()); - sal_uIntPtr nHorFlag = TEXT_DRAW_LEFT; - sal_uIntPtr nVerFlag = TEXT_DRAW_TOP; + sal_uLong nHorFlag = TEXT_DRAW_LEFT; + sal_uLong nVerFlag = TEXT_DRAW_TOP; if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) @@ -342,8 +342,8 @@ namespace svt { namespace table _rDevice.SetTextColor(m_pImpl->rModel.getTextColor()); else _rDevice.SetTextColor(_rStyle.GetFieldTextColor()); - sal_uIntPtr nHorFlag = TEXT_DRAW_LEFT; - sal_uIntPtr nVerFlag = TEXT_DRAW_TOP; + sal_uLong nHorFlag = TEXT_DRAW_LEFT; + sal_uLong nVerFlag = TEXT_DRAW_TOP; if(m_pImpl->rModel.getVerticalAlign() == 1) nVerFlag = TEXT_DRAW_VCENTER; else if(m_pImpl->rModel.getVerticalAlign() == 2) diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 2d4b4ce84426..e67123ed83ef 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -704,7 +704,7 @@ namespace svt { namespace table } //................................................................ - void lcl_setButtonRepeat( Window& _rWindow, sal_uIntPtr _nDelay ) + void lcl_setButtonRepeat( Window& _rWindow, sal_uLong _nDelay ) { AllSettings aSettings = _rWindow.GetSettings(); MouseSettings aMouseSettings = aSettings.GetMouseSettings(); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index 526193aaa97f..d6809635e5e5 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -106,7 +106,7 @@ public: UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle ); ~UnoTreeListBoxImpl(); - sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uIntPtr nPos=LIST_APPEND ); + sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos=LIST_APPEND ); virtual void RequestingChilds( SvLBoxEntry* pParent ); @@ -259,7 +259,7 @@ void TreeControlPeer::SetWindow( Window* pWindow ) // -------------------------------------------------------------------- -UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uIntPtr nPos /* = LIST_APPEND */ ) +UnoTreeListEntry* TreeControlPeer::createEntry( const Reference< XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos /* = LIST_APPEND */ ) { UnoTreeListEntry* pEntry = 0; if( mpTreeImpl ) @@ -563,7 +563,7 @@ Any SAL_CALL TreeControlPeer::getSelection() throw (RuntimeException) Any aRet; - sal_uIntPtr nSelectionCount = rTree.GetSelectionCount(); + sal_uLong nSelectionCount = rTree.GetSelectionCount(); if( nSelectionCount == 1 ) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( rTree.FirstSelected() ); @@ -1104,7 +1104,7 @@ void TreeControlPeer::updateNode( UnoTreeListBoxImpl& rTree, const Reference< XT { Reference< XTreeNode > xParentNode( xNode->getParent() ); UnoTreeListEntry* pParentEntry = 0; - sal_uIntPtr nChild = LIST_APPEND; + sal_uLong nChild = LIST_APPEND; if( xParentNode.is() ) { @@ -1581,7 +1581,7 @@ IMPL_LINK(UnoTreeListBoxImpl, OnExpandedHdl, UnoTreeListBoxImpl*, EMPTYARG ) // -------------------------------------------------------------------- -sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uIntPtr nPos ) +sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos ) { if( pParent ) return SvTreeListBox::Insert( pEntry, pParent, nPos ); diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 518d59cb469c..66ab96c60ff1 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -129,7 +129,7 @@ private: void fillTree( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeDataModel >& xDataModel ); void addNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParentEntry ); - UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uIntPtr nPos = LIST_APPEND ); + UnoTreeListEntry* createEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, UnoTreeListEntry* pParent, sal_uLong nPos = LIST_APPEND ); bool updateEntry( UnoTreeListEntry* pEntry ); void updateTree( const ::com::sun::star::awt::tree::TreeDataModelEvent& rEvent, bool bRecursive ); diff --git a/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx index 57d13e865c50..87ff86afa7fc 100644 --- a/svtools/source/urlobj/inetimg.cxx +++ b/svtools/source/urlobj/inetimg.cxx @@ -35,7 +35,7 @@ #define TOKEN_SEPARATOR '\001' -sal_Bool INetImage::Write( SvStream& rOStm, sal_uIntPtr nFormat ) const +sal_Bool INetImage::Write( SvStream& rOStm, sal_uLong nFormat ) const { sal_Bool bRet = sal_False; switch( nFormat ) @@ -65,7 +65,7 @@ sal_Bool INetImage::Write( SvStream& rOStm, sal_uIntPtr nFormat ) const return bRet; } -sal_Bool INetImage::Read( SvStream& rIStm, sal_uIntPtr nFormat ) +sal_Bool INetImage::Read( SvStream& rIStm, sal_uLong nFormat ) { sal_Bool bRet = sal_False; switch( nFormat ) diff --git a/svtools/workben/browser.cxx b/svtools/workben/browser.cxx index 98d3534b587c..f69eaa76e401 100644 --- a/svtools/workben/browser.cxx +++ b/svtools/workben/browser.cxx @@ -151,7 +151,7 @@ class AppWindow: public WorkWindow Browser aBrowser; BrowserMode eCurMode; FloatingWindow *pEventView; - sal_uIntPtr nNewRowNo; + sal_uLong nNewRowNo; private: DECL_LINK( Modify, void * ); @@ -591,7 +591,7 @@ IMPL_LINK_INLINE_END( AppWindow, Modify, void *, pCaller ) IMPL_LINK( AppWindow, MenuSelect, Menu *, pMenu ) { - sal_uIntPtr nPos; + sal_uLong nPos; switch ( pMenu->GetCurItemId() ) { |