diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-02-07 16:00:55 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-02-07 16:00:55 +0100 |
commit | c397ebdd863e7ee3d59a0aa77b42c20b8ff9b810 (patch) | |
tree | 13a4e8b73cd123950e9df281fb972f796fa8ce92 | |
parent | 31c7fdb84ac0fbed29a06b3a6410cee962d770a8 (diff) |
removetooltypes01: #i112600# Fix build problem after rebase in vcl
-rw-r--r-- | vcl/inc/vcl/imgctrl.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/imgctrl.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx index 559cd4d2873b..456b6b599a1c 100644 --- a/vcl/inc/vcl/imgctrl.hxx +++ b/vcl/inc/vcl/imgctrl.hxx @@ -51,7 +51,7 @@ public: ::sal_Int16 GetScaleMode() const { return mnScaleMode; } virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Paint( const Rectangle& rRect ); virtual void GetFocus(); virtual void LoseFocus(); diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx index 173ac14be9af..faeb460c46e4 100644 --- a/vcl/source/control/imgctrl.cxx +++ b/vcl/source/control/imgctrl.cxx @@ -95,7 +95,7 @@ namespace // ----------------------------------------------------------------------- -void ImageControl::ImplDraw( OutputDevice& rDev, ULONG nDrawFlags, const Point& rPos, const Size& rSize ) const +void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const { sal_uInt16 nStyle = 0; if ( !(nDrawFlags & WINDOW_DRAW_NODISABLE) ) @@ -193,7 +193,7 @@ void ImageControl::Paint( const Rectangle& /*rRect*/ ) } // ----------------------------------------------------------------------- -void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ) +void ImageControl::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { const Point aPos = pDev->LogicToPixel( rPos ); const Size aSize = pDev->LogicToPixel( rSize ); |