diff options
-rw-r--r-- | include/vcl/cursor.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/annotations/annotationwindow.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/docvw/SidebarWin.cxx | 2 | ||||
-rw-r--r-- | vcl/source/window/cursor.cxx | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/include/vcl/cursor.hxx b/include/vcl/cursor.hxx index 42d741b84d14..1030406e437b 100644 --- a/include/vcl/cursor.hxx +++ b/include/vcl/cursor.hxx @@ -39,7 +39,6 @@ private: ImplCursorData* mpData; Window* mpWindow; // only for shadow cursor long mnSlant; - long mnOffsetY; // Offset for rotation Size maSize; Point maPos; short mnOrientation; @@ -74,7 +73,6 @@ public: void SetPos( const Point& rNewPos ); const Point& GetPos() const { return maPos; } - long GetOffsetY() const { return mnOffsetY; } void SetSize( const Size& rNewSize ); const Size& GetSize() const { return maSize; } diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx index 0ffcf5d591c7..2e1c6fd5d246 100644 --- a/sd/source/ui/annotations/annotationwindow.cxx +++ b/sd/source/ui/annotations/annotationwindow.cxx @@ -450,7 +450,7 @@ void AnnotationWindow::SetSizePixel( const Size& rNewSize ) void AnnotationWindow::SetScrollbar() { - mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY()); + mpVScrollbar->SetThumbPos(mpOutlinerView->GetVisArea().Top()); } void AnnotationWindow::ResizeIfNecessary(long aOldHeight, long aNewHeight) diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx index 503549e159a1..14553ad2e564 100644 --- a/sw/source/ui/docvw/SidebarWin.cxx +++ b/sw/source/ui/docvw/SidebarWin.cxx @@ -757,7 +757,7 @@ void SwSidebarWin::SetSizePixel( const Size& rNewSize ) void SwSidebarWin::SetScrollbar() { - mpVScrollbar->SetThumbPos( mpOutlinerView->GetVisArea().Top()+ mpOutlinerView->GetEditView().GetCursor()->GetOffsetY()); + mpVScrollbar->SetThumbPos(mpOutlinerView->GetVisArea().Top()); } void SwSidebarWin::ResizeIfNecessary(long aOldHeight, long aNewHeight) diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx index 16bc80b8705c..669b05406070 100644 --- a/vcl/source/window/cursor.cxx +++ b/vcl/source/window/cursor.cxx @@ -133,12 +133,9 @@ void Cursor::ImplDraw() mpData->mnPixSlant = pWindow->LogicToPixel( Size( mnSlant, 0 ) ).Width(); mpData->mnOrientation = mnOrientation; mpData->mnDirection = mnDirection; - long nOffsetY = pWindow->LogicToPixel( Size( 0, mnOffsetY ) ).Height(); // correct the position with the offset - mpData->maPixPos.Y() -= nOffsetY; mpData->maPixRotOff = mpData->maPixPos; - mpData->maPixRotOff.Y() += nOffsetY; // use width (as set in Settings) if size is 0, if ( !mpData->maPixSize.Width() ) @@ -278,7 +275,6 @@ Cursor::Cursor() mpData = NULL; mpWindow = NULL; mnSlant = 0; - mnOffsetY = 0; mnOrientation = 0; mnDirection = 0; mnStyle = 0; |