summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-07-09 15:24:42 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-07-09 17:04:27 +0200
commit9a11e59e5699c5eb0854355d3dd3848bc895545c (patch)
treeeef0db7191d5b3c07541733df1f8abd86e3b364b /sd
parent78c73f42c8079ed6d37784e68da5170c86a68616 (diff)
SdrPaintView::AddWindowToPaintView: take a vcl::Window, too
Change-Id: Iedb296732c0819a1d6cdc1c59b3f1718e2cd6d38
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/inc/OutlineView.hxx2
-rw-r--r--sd/source/ui/slideshow/showwin.cxx2
-rw-r--r--sd/source/ui/slideshow/slideshowimpl.cxx4
-rw-r--r--sd/source/ui/view/outlview.cxx4
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 030d6c9283ed..68756dc14e73 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -77,7 +77,7 @@ public:
static SdrTextObj* CreateTitleTextObject(SdPage* pPage);
static SdrTextObj* CreateOutlineTextObject(SdPage* pPage);
- virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE;
+ virtual void AddWindowToPaintView(OutputDevice* pWin, vcl::Window* pWindow) SAL_OVERRIDE;
virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE;
OutlinerView* GetViewByWindow(vcl::Window* pWin) const;
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx
index fbf685fbfda2..a0c3745d0c8a 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -614,7 +614,7 @@ void ShowWindow::DeleteWindowFromPaintView()
void ShowWindow::AddWindowToPaintView()
{
if( mpViewShell->GetView() )
- mpViewShell->GetView()->AddWindowToPaintView( this );
+ mpViewShell->GetView()->AddWindowToPaintView( this, 0 );
sal_uInt16 nChild = GetChildCount();
while( nChild-- )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 20cf5cfe3c30..6abb3ac2963b 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -812,7 +812,7 @@ bool SlideshowImpl::startPreview(
if( mpView )
{
- mpView->AddWindowToPaintView( mpShowWindow );
+ mpView->AddWindowToPaintView( mpShowWindow, 0 );
mpView->SetAnimationPause( true );
}
@@ -1006,7 +1006,7 @@ bool SlideshowImpl::startShow( PresentationSettingsEx* pPresSettings )
if( mpView )
{
- mpView->AddWindowToPaintView( mpShowWindow );
+ mpView->AddWindowToPaintView( mpShowWindow, 0 );
mpView->SetAnimationPause( true );
}
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 7d985036bcec..59e790cdff6b 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -235,7 +235,7 @@ void OutlineView::Paint(const Rectangle& rRect, ::sd::Window* pWin)
}
}
-void OutlineView::AddWindowToPaintView(OutputDevice* pWin)
+void OutlineView::AddWindowToPaintView(OutputDevice* pWin, vcl::Window* pWindow)
{
bool bAdded = false;
bool bValidArea = false;
@@ -269,7 +269,7 @@ void OutlineView::AddWindowToPaintView(OutputDevice* pWin)
// white background in Outliner
pWin->SetBackground( Wallpaper( aWhiteColor ) );
- ::sd::View::AddWindowToPaintView(pWin);
+ ::sd::View::AddWindowToPaintView(pWin, pWindow);
}
void OutlineView::DeleteWindowFromPaintView(OutputDevice* pWin)