diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 16:21:55 +0200 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2011-07-26 23:39:04 +0200 |
| commit | 4385e82288e9008a932f8d3289955ad1cb14b888 (patch) | |
| tree | c2bd5c27953fb8bd063b6b5a8b36366144101362 | |
| parent | b7442df1e96a6238425c5dc4ca2a92121fff094f (diff) | |
callcatcher: actually remove the right one
| -rw-r--r-- | vcl/inc/vcl/window.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/window2.cxx | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 573ea16a0f22..bc93404d5c63 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -427,7 +427,7 @@ public: SAL_DLLPRIVATE void ImplPointToLogic( Font& rFont ) const; SAL_DLLPRIVATE void ImplLogicToPoint( Font& rFont ) const; SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); - SAL_DLLPRIVATE void ImplFrameToOutput( Rectangle& rRect ); + SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos ); SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion ); SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip(); SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip(); diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index c1d29e1c3334..ee607c4dbd27 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1434,12 +1434,9 @@ Point Window::ImplOutputToFrame( const Point& rPos ) return Point( rPos.X()+mnOutOffX, rPos.Y()+mnOutOffY ); } -void Window::ImplFrameToOutput( Rectangle& rRect ) +Point Window::ImplFrameToOutput( const Point& rPos ) { - rRect.Left()-=mnOutOffX; - rRect.Top()-=mnOutOffY; - rRect.Right()-=mnOutOffX; - rRect.Bottom()-=mnOutOffY; + return Point( rPos.X()-mnOutOffX, rPos.Y()-mnOutOffY ); } void Window::SetCompoundControl( sal_Bool bCompound ) |