strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw054 (1.13.160); FILE MERGED

Browse source 
2007/11/05 17:39:50 aw 1.13.160.1: #i83183# need to use original target PaintWindow in getWindow(), may be called inside paint (SW and SC do that)
This commit is contained in:
Vladimir Glazounov 2008-02-12 15:36:01 +00:00
parent 7905fa16ef
commit 7639d8e1fb
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: viewobjectcontactofsdrmediaobj.cxx,v $ * $RCSfile: viewobjectcontactofsdrmediaobj.cxx,v $
* *
* $Revision: 1.13 $ * $Revision: 1.14 $
* *
* last change: $Author: hr $ $Date: 2007-06-27 18:48:06 $ * last change: $Author: vg $ $Date: 2008-02-12 16:36:01 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -183,7 +183,18 @@ Window* ViewObjectContactOfSdrMediaObj::getWindow() const
if(pObjectContactOfPageView) if(pObjectContactOfPageView)
{ {
OutputDevice& rOutDev = pObjectContactOfPageView->GetPageWindow().GetPaintWindow().GetOutputDevice(); const SdrPageWindow& rPageWindow = pObjectContactOfPageView->GetPageWindow();
const SdrPaintWindow* pPaintWindow = &rPageWindow.GetPaintWindow();
if(rPageWindow.GetOriginalPaintWindow())
{
// #i83183# prefer OriginalPaintWindow if set; this is
// the real target device. GetPaintWindow() may return
// the current buffer device instead
pPaintWindow = rPageWindow.GetOriginalPaintWindow();
}
OutputDevice& rOutDev = pPaintWindow->GetOutputDevice();
if(OUTDEV_WINDOW == rOutDev.GetOutDevType()) if(OUTDEV_WINDOW == rOutDev.GetOutDevType())
{ {