INTEGRATION: CWS aw024 (1.8.174); FILE MERGED

2006/09/21 23:39:14 aw 1.8.174.4: RESYNC: (1.9-1.10); FILE MERGED
2005/09/17 13:55:25 aw 1.8.174.3: RESYNC: (1.8-1.9); FILE MERGED
2005/05/26 11:24:42 aw 1.8.174.2: #i39531#
2005/05/19 12:11:36 aw 1.8.174.1: #i39529#
This commit is contained in:
Ivo Hinkelmann 2006-11-14 13:38:32 +00:00
parent 4efae6e344
commit ea23398519

View file

@ -4,9 +4,9 @@
*
* $RCSfile: unolayer.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: obo $ $Date: 2006-09-16 19:26:36 $
* last change: $Author: ihi $ $Date: 2006-11-14 14:38:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -101,6 +101,10 @@
#include "unokywds.hxx"
#include "unowcntr.hxx"
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
using namespace ::rtl;
using namespace ::vos;
using namespace ::com::sun::star;
@ -338,7 +342,7 @@ sal_Bool SdLayer::get( LayerAttribute what ) throw()
::sd::View *pView = pLayerManager->GetView();
SdrPageView* pSdrPageView = NULL;
if(pView)
pSdrPageView = pView->GetPageViewPvNum(0);
pSdrPageView = pView->GetSdrPageView();
if(pSdrPageView)
{
@ -377,7 +381,7 @@ void SdLayer::set( LayerAttribute what, sal_Bool flag ) throw()
::sd::View *pView = pLayerManager->GetView();
SdrPageView* pSdrPageView = NULL;
if(pView)
pSdrPageView = pView->GetPageViewPvNum(0);
pSdrPageView = pView->GetSdrPageView();
if(pSdrPageView)
{