diff options
author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
---|---|---|
committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2010-01-15 09:16:51 +0100 |
commit | c3686d2b02c551d3dc144b1f0188aee6fcc35e84 (patch) | |
tree | f8e78f0b5f24f508ac19eedc2c8416ab853d1d46 /sd/source/ui/unoidl/DrawController.cxx | |
parent | 63c6c5d78c2712b824c9194269d13422d4835487 (diff) | |
parent | c5a3b3f07931b4bba47c4cb327dd394c85272f45 (diff) |
dba33b: merge m69
Diffstat (limited to 'sd/source/ui/unoidl/DrawController.cxx')
-rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 51caedee6f6f..65fa2dbf0206 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -737,7 +737,7 @@ Reference < beans::XPropertySetInfo > DrawController::getPropertySetInfo() } -uno::Reference< form::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException) +uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFormController( const uno::Reference< form::XForm >& Form ) throw (uno::RuntimeException) { OGuard aGuard( Application::GetSolarMutex() ); @@ -746,7 +746,7 @@ uno::Reference< form::XFormController > SAL_CALL DrawController::getFormControll ::boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell(); ::sd::Window* pWindow = pViewShell ? pViewShell->GetActiveWindow() : NULL; - uno::Reference< form::XFormController > xController( NULL ); + uno::Reference< form::runtime::XFormController > xController( NULL ); if ( pFormShell && pSdrView && pWindow ) xController = pFormShell->GetFormController( Form, *pSdrView, *pWindow ); return xController; |