diff options
Diffstat (limited to 'vcl/unx/inc')
-rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkframe.hxx | 10 | ||||
-rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkinst.hxx | 6 | ||||
-rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkobject.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/inc/plugins/kde/kdedata.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/inc/pspgraphics.h | 16 | ||||
-rw-r--r-- | vcl/unx/inc/salbmp.h | 8 | ||||
-rw-r--r-- | vcl/unx/inc/saldata.hxx | 4 | ||||
-rw-r--r-- | vcl/unx/inc/saldisp.hxx | 12 | ||||
-rw-r--r-- | vcl/unx/inc/salframe.h | 10 | ||||
-rw-r--r-- | vcl/unx/inc/salgdi.h | 20 | ||||
-rw-r--r-- | vcl/unx/inc/salinst.h | 12 | ||||
-rw-r--r-- | vcl/unx/inc/salobj.h | 4 | ||||
-rw-r--r-- | vcl/unx/inc/salprn.h | 14 | ||||
-rw-r--r-- | vcl/unx/inc/saltimer.h | 2 | ||||
-rw-r--r-- | vcl/unx/inc/salunx.h | 4 |
16 files changed, 65 insertions, 65 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx index a623472df797..528b08925ad4 100644 --- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx @@ -167,7 +167,7 @@ class GtkSalFrame : public SalFrame GdkWindow* m_pForeignTopLevel; GdkNativeWindow m_aForeignTopLevelWindow; Pixmap m_hBackgroundPixmap; - sal_uInt32 m_nStyle; + sal_uIntPtr m_nStyle; SalExtStyle m_nExtStyle; GtkFixed* m_pFixedContainer; GtkSalFrame* m_pParent; @@ -199,7 +199,7 @@ class GtkSalFrame : public SalFrame GdkRegion* m_pRegion; - void Init( SalFrame* pParent, sal_uInt32 nStyle ); + void Init( SalFrame* pParent, sal_uIntPtr nStyle ); void Init( SystemParentData* pSysData ); void InitCommon(); @@ -251,7 +251,7 @@ class GtkSalFrame : public SalFrame bool isChild( bool bPlug = true, bool bSysChild = true ) { - sal_uInt32 nMask = 0; + sal_uIntPtr nMask = 0; if( bPlug ) nMask |= SAL_FRAME_STYLE_PLUG; if( bSysChild ) @@ -270,7 +270,7 @@ class GtkSalFrame : public SalFrame DECL_LINK( ImplDelayedFullScreenHdl, void* ); public: - GtkSalFrame( SalFrame* pParent, sal_uInt32 nStyle ); + GtkSalFrame( SalFrame* pParent, sal_uIntPtr nStyle ); GtkSalFrame( SystemParentData* pSysData ); // dispatches an event, returns true if dispatched @@ -386,7 +386,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 8fb17371d90c..57e36ca5a2ed 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -79,7 +79,7 @@ public: void updateSettings( AllSettings& rSettings ); virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx index a6a508118865..58c485ce6e20 100644 --- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkinst.hxx @@ -63,7 +63,7 @@ class GtkHookedYieldMutex : public GtkYieldMutex { virtual int Grab() { return 0; }; virtual void Ungrab(int ) {}; - std::list<sal_uInt32> aYieldStack; + std::list<sal_uIntPtr> aYieldStack; public: GtkHookedYieldMutex(); virtual void acquire(); @@ -84,8 +84,8 @@ public: {} virtual ~GtkInstance(); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual SalSystem* CreateSalSystem(); virtual void AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType); diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx index 8188fcfd4b88..fdba1bb9fd38 100644 --- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkobject.hxx @@ -50,7 +50,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx index 501dbfbbb616..e31c4b7cc8e7 100644 --- a/vcl/unx/inc/plugins/kde/kdedata.hxx +++ b/vcl/unx/inc/plugins/kde/kdedata.hxx @@ -67,7 +67,7 @@ class KDESalFrame : public X11SalFrame GraphicsHolder m_aGraphics[ nMaxGraphics ]; public: - KDESalFrame( SalFrame* pParent, sal_uInt32 ); + KDESalFrame( SalFrame* pParent, sal_uIntPtr ); virtual ~KDESalFrame(); virtual SalGraphics* GetGraphics(); @@ -83,7 +83,7 @@ public: KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {} virtual ~KDESalInstance() {} - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); }; class KDEXLib : public SalXLib diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index f9c988dda908..08d5918cf7bd 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -87,7 +87,7 @@ public: virtual long GetGraphicsWidth() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -103,7 +103,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uInt32 GetKernPairs( sal_uInt32 nMaxPairs, ImplKernPairData* ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nMaxPairs, ImplKernPairData* ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -136,17 +136,17 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); virtual bool drawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin); - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -176,9 +176,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); virtual bool drawAlphaBitmap( const SalTwoRect&, diff --git a/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h index c0b5854e5c51..121966345f75 100644 --- a/vcl/unx/inc/salbmp.h +++ b/vcl/unx/inc/salbmp.h @@ -62,7 +62,7 @@ private: public: static ImplSalBitmapCache* mpCache; - static sal_uInt32 mnCacheInstCount; + static sal_uIntPtr mnCacheInstCount; static void ImplCreateCache(); static void ImplDestroyCache(); @@ -161,7 +161,7 @@ public: long ImplGetWidth() const { return maTwoRect.mnDestWidth; } long ImplGetHeight() const { return maTwoRect.mnDestHeight; } long ImplGetDepth() const { return mnDepth; } - sal_uInt32 ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } + sal_uIntPtr ImplGetMemSize() const { return( ( maTwoRect.mnDestWidth * maTwoRect.mnDestHeight * mnDepth ) >> 3 ); } int ImplGetScreen() const { return mnScreen; } bool ImplMatches( int nScreen, long nDepth, const SalTwoRect& rTwoRect ) const; @@ -178,14 +178,14 @@ class ImplSalBitmapCache private: List maBmpList; - sal_uInt32 mnTotalSize; + sal_uIntPtr mnTotalSize; public: ImplSalBitmapCache(); ~ImplSalBitmapCache(); - void ImplAdd( X11SalBitmap* pBmp, sal_uInt32 nMemSize = 0UL, sal_uInt32 nFlags = 0UL ); + void ImplAdd( X11SalBitmap* pBmp, sal_uIntPtr nMemSize = 0UL, sal_uIntPtr nFlags = 0UL ); void ImplRemove( X11SalBitmap* pBmp ); void ImplClear(); }; diff --git a/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx index 79c7ca277e82..34180474e256 100644 --- a/vcl/unx/inc/saldata.hxx +++ b/vcl/unx/inc/saldata.hxx @@ -85,7 +85,7 @@ public: inline SalXLib* GetLib() const { return pXLib_; } inline pthread_t GetMainThread() const { return hMainThread_; } - void StartTimer( sal_uInt32 nMS ); + void StartTimer( sal_uIntPtr nMS ); inline void StopTimer(); void Timeout() const; @@ -114,7 +114,7 @@ inline void X11SalData::XError( Display *pDisplay, XErrorEvent *pEvent ) const class YieldMutexReleaser { - sal_uInt32 m_nYieldCount; + sal_uIntPtr m_nYieldCount; public: inline YieldMutexReleaser(); inline ~YieldMutexReleaser(); diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index daff940b1f4e..2c35ce4445ed 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -212,7 +212,7 @@ class VCL_DLLPUBLIC SalXLib { protected: timeval m_aTimeout; - sal_uInt32 m_nTimeoutMS; + sal_uIntPtr m_nTimeoutMS; int m_pTimeoutFDS[2]; bool m_bHaveSystemChildFrames; @@ -254,7 +254,7 @@ public: void PushXErrorLevel( bool bIgnore ); void PopXErrorLevel(); - virtual void StartTimer( sal_uInt32 nMS ); + virtual void StartTimer( sal_uIntPtr nMS ); virtual void StopTimer(); bool CheckTimeout( bool bExecuteTimers = true ); @@ -358,11 +358,11 @@ protected: ScreenData m_aInvalidScreenData; Pair aResolution_; // [dpi] bool mbExactResolution; - sal_uInt32 nMaxRequestSize_; // [byte] + sal_uIntPtr nMaxRequestSize_; // [byte] srv_vendor_t meServerVendor; SalWM eWindowManager_; - sal_uInt32 nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE + sal_uIntPtr nProperties_; // PROPERTY_SUPPORT, BUG, FEATURE sal_Bool bLocal_; // Server==Client? Init // in SalDisplay::IsLocal() sal_Bool mbLocalIsValid; // bLocal_ is valid ? @@ -493,8 +493,8 @@ public: RenderEntryMap& GetRenderEntries( int nScreen ) const { return getDataForScreen(nScreen).m_aRenderData; } const Pair &GetResolution() const { return aResolution_; } bool GetExactResolution() const { return mbExactResolution; } - sal_uInt32 GetProperties() const { return nProperties_; } - sal_uInt32 GetMaxRequestSize() const { return nMaxRequestSize_; } + sal_uIntPtr GetProperties() const { return nProperties_; } + sal_uIntPtr GetMaxRequestSize() const { return nMaxRequestSize_; } XLIB_Time GetLastUserEventTime( bool bAlwaysReget = false ) const; bool XIfEventWithTimeout( XEvent*, XPointer, X_if_predicate, long i_nTimeout = 1000 ) const; diff --git a/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h index 076755cde8e8..dde04b79f3ac 100644 --- a/vcl/unx/inc/salframe.h +++ b/vcl/unx/inc/salframe.h @@ -98,7 +98,7 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame int nWidth_; // client width int nHeight_; // client height Rectangle maRestorePosSize; - sal_uInt32 nStyle_; + sal_uIntPtr nStyle_; SalExtStyle mnExtStyle; sal_Bool bAlwaysOnTop_; sal_Bool bViewable_; @@ -172,11 +172,11 @@ class VCL_DLLPUBLIC X11SalFrame : public SalFrame void setXEmbedInfo(); void askForXEmbedFocus( sal_Int32 i_nTimeCode ); public: - X11SalFrame( SalFrame* pParent, sal_uInt32 nSalFrameStyle, SystemParentData* pSystemParent = NULL ); + X11SalFrame( SalFrame* pParent, sal_uIntPtr nSalFrameStyle, SystemParentData* pSystemParent = NULL ); virtual ~X11SalFrame(); long Dispatch( XEvent *pEvent ); - void Init( sal_uInt32 nSalFrameStyle, int nScreen = -1, + void Init( sal_uIntPtr nSalFrameStyle, int nScreen = -1, SystemParentData* pParentData = NULL, bool bUseGeometry = false ); SalDisplay* GetDisplay() const { return pDisplay_; } @@ -189,7 +189,7 @@ public: XLIB_Window GetStackingWindow() const { return mhStackingWindow; } long ShutDown() const { return CallCallback( SALEVENT_SHUTDOWN, 0 ); } long Close() const { return CallCallback( SALEVENT_CLOSE, 0 ); } - sal_uInt32 GetStyle() const { return nStyle_; } + sal_uIntPtr GetStyle() const { return nStyle_; } inline XLIB_Cursor GetCursor() const { return hCursor_; } inline sal_Bool IsCaptured() const { return nCaptured_ == 1; } @@ -268,7 +268,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index 08da57182ac9..bb606b08bdf9 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -147,7 +147,7 @@ protected: unsigned long nMask = GCGraphicsExposures ); GC SelectPen(); GC SelectBrush(); - void DrawLines( sal_uInt32 nPoints, + void DrawLines( sal_uIntPtr nPoints, const SalPolyLine &rPoints, GC pGC, bool bClose @@ -235,7 +235,7 @@ public: virtual long GetGraphicsHeight() const; virtual void ResetClipRegion(); - virtual void BeginSetClipRegion( sal_uInt32 nCount ); + virtual void BeginSetClipRegion( sal_uIntPtr nCount ); virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); virtual void EndSetClipRegion(); @@ -254,7 +254,7 @@ public: virtual void SetTextColor( SalColor nSalColor ); virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); - virtual sal_uInt32 GetKernPairs( sal_uInt32 nMaxPairs, ImplKernPairData* ); + virtual sal_uIntPtr GetKernPairs( sal_uIntPtr nMaxPairs, ImplKernPairData* ); virtual const ImplFontCharMap* GetImplFontCharMap() const; virtual void GetDevFontList( ImplDevFontList* ); virtual void GetDevFontSubstList( OutputDevice* ); @@ -287,9 +287,9 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry, bool bClose ); - virtual void drawPolyLine( sal_uInt32 nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( sal_uInt32 nPoints, const SalPoint* pPtAry ); + void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry, bool bClose ); + virtual void drawPolyLine( sal_uIntPtr nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uIntPtr nPoints, const SalPoint* pPtAry ); virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ); @@ -298,10 +298,10 @@ public: virtual bool drawFilledTrapezoids( const ::basegfx::B2DTrapezoid*, int nTrapCount, double fTransparency ); #if 1 // TODO: remove these obselete methods - virtual sal_Bool drawPolyLineBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolyLineBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); - virtual sal_Bool drawPolygonBezier( sal_uInt32 nPoints, + virtual sal_Bool drawPolygonBezier( sal_uIntPtr nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, @@ -333,9 +333,9 @@ public: virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ); virtual SalColor getPixel( long nX, long nY ); virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags ); - virtual void invert( sal_uInt32 nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uIntPtr nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uInt32 nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uIntPtr nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h index fab34429afb2..2f53a979a485 100644 --- a/vcl/unx/inc/salinst.h +++ b/vcl/unx/inc/salinst.h @@ -42,7 +42,7 @@ class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex { protected: - sal_uInt32 mnCount; + sal_uIntPtr mnCount; vos::OThread::TThreadIdentifier mnThreadId; public: @@ -52,7 +52,7 @@ public: virtual void release(); virtual sal_Bool tryToAcquire(); - sal_uInt32 GetAcquireCount() const { return mnCount; } + sal_uIntPtr GetAcquireCount() const { return mnCount; } vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; @@ -70,8 +70,8 @@ public: {} virtual ~X11SalInstance(); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uInt32 nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uInt32 nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uIntPtr nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uIntPtr nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); @@ -100,8 +100,8 @@ public: virtual SalSession* CreateSalSession(); virtual vos::IMutex* GetYieldMutex(); - virtual sal_uInt32 ReleaseYieldMutex(); - virtual void AcquireYieldMutex( sal_uInt32 nCount ); + virtual sal_uIntPtr ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uIntPtr nCount ); virtual bool CheckYieldMutex(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); diff --git a/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h index 865b09f39a04..c843708f0c2e 100644 --- a/vcl/unx/inc/salobj.h +++ b/vcl/unx/inc/salobj.h @@ -41,7 +41,7 @@ public: SalClipRegion(); ~SalClipRegion(); - void BeginSetClipRegion( sal_uInt32 nRects ); + void BeginSetClipRegion( sal_uIntPtr nRects ); void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); XRectangle *EndSetClipRegion() { @@ -84,7 +84,7 @@ public: // overload all pure virtual methods virtual void ResetClipRegion(); virtual sal_uInt16 GetClipRegionType(); - virtual void BeginSetClipRegion( sal_uInt32 nRects ); + virtual void BeginSetClipRegion( sal_uIntPtr nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); diff --git a/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h index 8902f2efd497..7b42ad74c923 100644 --- a/vcl/unx/inc/salprn.h +++ b/vcl/unx/inc/salprn.h @@ -50,14 +50,14 @@ public: virtual void ReleaseGraphics( SalGraphics* pGraphics ); virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ); virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); - virtual sal_Bool SetData( sal_uInt32 nFlags, ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uIntPtr nFlags, ImplJobSetup* pSetupData ); virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ); - virtual sal_uInt32 GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); - virtual sal_uInt32 GetPaperBinCount( const ImplJobSetup* pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uInt32 nPaperBin ); + virtual sal_uIntPtr GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ); + virtual sal_uIntPtr GetPaperBinCount( const ImplJobSetup* pSetupData ); + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uIntPtr nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ); }; @@ -76,7 +76,7 @@ public: psp::PrinterJob m_aPrintJob; psp::JobData m_aJobData; psp::PrinterGfx m_aPrinterGfx; - sal_uInt32 m_nCopies; + sal_uIntPtr m_nCopies; bool m_bCollate; SalInfoPrinter* m_pInfoPrinter; @@ -88,7 +88,7 @@ public: virtual sal_Bool StartJob( const XubString* pFileName, const XubString& rJobName, const XubString& rAppName, - sal_uInt32 nCopies, + sal_uIntPtr nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ); @@ -101,7 +101,7 @@ public: virtual sal_Bool AbortJob(); virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ); virtual sal_Bool EndPage(); - virtual sal_uInt32 GetErrorCode(); + virtual sal_uIntPtr GetErrorCode(); }; class Timer; diff --git a/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h index 8f0512d47468..ba52b96c073a 100644 --- a/vcl/unx/inc/saltimer.h +++ b/vcl/unx/inc/saltimer.h @@ -37,7 +37,7 @@ public: virtual ~X11SalTimer(); // overload all pure virtual methods - void Start( sal_uInt32 nMS ); + void Start( sal_uIntPtr nMS ); void Stop(); }; diff --git a/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h index 8c543af39f29..8be91cbd3bce 100644 --- a/vcl/unx/inc/salunx.h +++ b/vcl/unx/inc/salunx.h @@ -95,7 +95,7 @@ inline timeval &operator += ( timeval &t1, const timeval &t2 ) return t1; } -inline timeval &operator += ( timeval &t1, sal_uInt32 t2 ) +inline timeval &operator += ( timeval &t1, sal_uIntPtr t2 ) { t1.tv_sec += t2 / 1000; t1.tv_usec += t2 ? (t2 % 1000) * 1000 : 500; @@ -113,7 +113,7 @@ inline timeval operator + ( const timeval &t1, const timeval &t2 ) return t0 += t2; } -inline timeval operator + ( const timeval &t1, sal_uInt32 t2 ) +inline timeval operator + ( const timeval &t1, sal_uIntPtr t2 ) { timeval t0 = t1; return t0 += t2; |