diff options
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/inc/DrawController.hxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index 6aafeb2fc804..a13736b16c22 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -4,9 +4,9 @@ * * $RCSfile: DrawController.hxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: kz $ $Date: 2007-05-10 09:44:15 $ + * last change: $Author: kz $ $Date: 2007-05-15 12:14:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -90,7 +90,7 @@ typedef ::cppu::ImplInheritanceHelper7 < ::com::sun::star::lang::XServiceInfo, ::com::sun::star::drawing::XDrawView, ::com::sun::star::view::XSelectionChangeListener, - ::com::sun::star::view::XFormLayerAccess + ::com::sun::star::view::XFormLayerAccess, ::com::sun::star::drawing::framework::XControllerManager, ::com::sun::star::lang::XUnoTunnel > DrawControllerInterfaceBase; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 92e68b3f45b4..cb2d535436c8 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -4,9 +4,9 @@ * * $RCSfile: DrawController.cxx,v $ * - * $Revision: 1.23 $ + * $Revision: 1.24 $ * - * last change: $Author: kz $ $Date: 2007-05-10 09:44:40 $ + * last change: $Author: kz $ $Date: 2007-05-15 12:14:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1059,9 +1059,9 @@ uno::Reference< form::XFormController > SAL_CALL DrawController::getFormControll { OGuard aGuard( Application::GetSolarMutex() ); - FmFormShell* pFormShell = mrBase.GetFormShellManager().GetFormShell(); - SdrView* pSdrView = mrBase.GetDrawView(); - ViewShell* pViewShell = mrBase.GetMainViewShell(); + FmFormShell* pFormShell = mpBase->GetFormShellManager().GetFormShell(); + SdrView* pSdrView = mpBase->GetDrawView(); + ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell(); ::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL; uno::Reference< form::XFormController > xController( NULL ); @@ -1076,7 +1076,7 @@ uno::Reference< form::XFormController > SAL_CALL DrawController::getFormControll sal_Bool bIsDesignMode = sal_True; - FmFormShell* pFormShell = mrBase.GetFormShellManager().GetFormShell(); + FmFormShell* pFormShell = mpBase->GetFormShellManager().GetFormShell(); if ( pFormShell ) bIsDesignMode = pFormShell->IsDesignMode(); @@ -1087,7 +1087,7 @@ void SAL_CALL DrawController::setFormDesignMode( ::sal_Bool _DesignMode ) throw { OGuard aGuard( Application::GetSolarMutex() ); - FmFormShell* pFormShell = mrBase.GetFormShellManager().GetFormShell(); + FmFormShell* pFormShell = mpBase->GetFormShellManager().GetFormShell(); if ( pFormShell ) pFormShell->SetDesignMode( _DesignMode ); } @@ -1096,9 +1096,9 @@ uno::Reference< awt::XControl > SAL_CALL DrawController::getControl( const uno:: { OGuard aGuard( Application::GetSolarMutex() ); - FmFormShell* pFormShell = mrBase.GetFormShellManager().GetFormShell(); - SdrView* pSdrView = mrBase.GetDrawView(); - ViewShell* pViewShell = mrBase.GetMainViewShell(); + FmFormShell* pFormShell = mpBase->GetFormShellManager().GetFormShell(); + SdrView* pSdrView = mpBase->GetDrawView(); + ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell(); ::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL; uno::Reference< awt::XControl > xControl( NULL ); |