diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-09 15:24:42 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-10 10:13:39 +0200 |
| commit | b0bf7b57f7a311541631295411e9b504d493bc58 (patch) | |
| tree | eafe61fe77cc38b32dfdb4660d675566864fb997 /svx | |
| parent | c73a4299e898acf89ff43057eb64afbe3ccc566e (diff) | |
SdrPaintView::AddWindowToPaintView: take a vcl::Window, too
Change-Id: Iedb296732c0819a1d6cdc1c59b3f1718e2cd6d38
(cherry picked from commit 9a11e59e5699c5eb0854355d3dd3848bc895545c)
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmview.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdpntv.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 9fd3a38a7bea..26a0c09f8411 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -199,9 +199,9 @@ namespace } -void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin) +void FmFormView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window* pWindow) { - E3dView::AddWindowToPaintView(pNewWin); + E3dView::AddWindowToPaintView(pNewWin, pWindow); if ( !pNewWin ) return; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 8b51df00bd9d..14555581a327 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1667,9 +1667,9 @@ bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveH -void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) +void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWindow) { - SdrGlueEditView::AddWindowToPaintView(pNewWin); + SdrGlueEditView::AddWindowToPaintView(pNewWin, pWindow); if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 17e2b9dda5c3..e996c5c07426 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -216,7 +216,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) if(pOut) { - AddWindowToPaintView(pOut); + AddWindowToPaintView(pOut, 0); } // flag to visualize groups @@ -457,10 +457,10 @@ void SdrPaintView::HideSdrPage() } } -void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin) +void SdrPaintView::AddWindowToPaintView(OutputDevice* pNewWin, vcl::Window *pWindow) { DBG_ASSERT(pNewWin, "SdrPaintView::AddWindowToPaintView: No OutputDevice(!)"); - SdrPaintWindow* pNewPaintWindow = new SdrPaintWindow(*this, *pNewWin); + SdrPaintWindow* pNewPaintWindow = new SdrPaintWindow(*this, *pNewWin, pWindow); AppendPaintWindow(*pNewPaintWindow); if(mpPageView) |