diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 16:13:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 16:13:24 +0000 |
| commit | 5ed43dea04cceb2c650870f5d0265b30d68c446f (patch) | |
| tree | 26b3587aaf8dc994d47dff44ed337818a5a4b3cb /sd/source/ui/docshell | |
| parent | a3b401f9180242778ef9ce6d7704da50ed7d8dd2 (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.17.10); FILE MERGED
2006/11/22 15:03:29 cl 1.17.10.2: RESYNC: (1.17-1.18); FILE MERGED
2006/11/22 12:41:50 cl 1.17.10.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/docshell')
| -rw-r--r-- | sd/source/ui/docshell/sdclient.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/docshell/sdclient.cxx b/sd/source/ui/docshell/sdclient.cxx index a921b5f48..8a6f0f487 100644 --- a/sd/source/ui/docshell/sdclient.cxx +++ b/sd/source/ui/docshell/sdclient.cxx @@ -4,9 +4,9 @@ * * $RCSfile: sdclient.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: ihi $ $Date: 2006-11-14 14:26:56 $ + * last change: $Author: kz $ $Date: 2006-12-12 17:13:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -92,7 +92,7 @@ namespace sd { Client::Client(SdrOle2Obj* pObj, ViewShell* pViewShell, ::Window* pWindow) : SfxInPlaceClient(pViewShell->GetViewShell(), pWindow, pObj->GetAspect() ), - pViewShell(pViewShell), + mpViewShell(pViewShell), pSdrOle2Obj(pObj), pSdrGrafObj(NULL), pOutlinerParaObj (NULL) @@ -121,7 +121,7 @@ Client::~Client() void Client::RequestNewObjectArea( Rectangle& aObjRect ) { - ::sd::View* pView = pViewShell->GetView(); + ::sd::View* pView = mpViewShell->GetView(); Rectangle aWorkArea( pView->GetWorkArea() ); if (!aWorkArea.IsInside(aObjRect)) { @@ -142,7 +142,7 @@ void Client::RequestNewObjectArea( Rectangle& aObjRect ) void Client::ObjectAreaChanged() { - ::sd::View* pView = pViewShell->GetView(); + ::sd::View* pView = mpViewShell->GetView(); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); if (rMarkList.GetMarkCount() == 1) { @@ -174,9 +174,9 @@ void Client::ViewChanged() //TODO/LATER: should we try to avoid the recalculation of the visareasize //if we know that it didn't change? - if (pViewShell->GetActiveWindow()) + if (mpViewShell->GetActiveWindow()) { - ::sd::View* pView = pViewShell->GetView(); + ::sd::View* pView = mpViewShell->GetView(); if (pView) { // TODO/LEAN: maybe we can do this without requesting the VisualArea? @@ -216,11 +216,11 @@ void Client::ViewChanged() void Client::MakeVisible() { - if (pViewShell->ISA(DrawViewShell)) + if (mpViewShell->ISA(DrawViewShell)) { - static_cast<DrawViewShell*>(pViewShell)->MakeVisible( + static_cast<DrawViewShell*>(mpViewShell)->MakeVisible( pSdrOle2Obj->GetLogicRect(), - *pViewShell->GetActiveWindow()); + *mpViewShell->GetActiveWindow()); } } |