summaryrefslogtreecommitdiff
path: root/svtools/source/inc
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-12 15:56:50 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-12 15:56:50 +0100
commit1c90aa6d259d8ae21552856c1407ff6f1b3a13a1 (patch)
tree6390d42b808cbd3dc65dba8dde031b0342126563 /svtools/source/inc
parentb7f5f44df674c7e47a8c1597bf082a8292b14efd (diff)
removetooltypes01: Exchange misleading type sal_uIntPtr with sal_uLong
Diffstat (limited to 'svtools/source/inc')
-rw-r--r--svtools/source/inc/gifread.hxx6
-rw-r--r--svtools/source/inc/msgrd.hxx2
-rw-r--r--svtools/source/inc/msgwr.hxx2
-rw-r--r--svtools/source/inc/svimpbox.hxx6
-rw-r--r--svtools/source/inc/svimpicn.hxx8
-rw-r--r--svtools/source/inc/xpmread.hxx30
6 files changed, 27 insertions, 27 deletions
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 );