diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 13:22:34 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-07 13:22:34 +0000 |
| commit | 3e4ede0b356b8dcb88d74aa2e745de42f674e9f7 (patch) | |
| tree | d17f90787c1d5ee6437d31facf1617da6cd2277f /sd/source/ui/unoidl | |
| parent | 51500ebea50b24d5d2508f68c249c9b83426e657 (diff) | |
INTEGRATION: CWS impressa11y (1.26.42); FILE MERGED
2008/06/25 08:39:31 af 1.26.42.1: #130728# getCurrentPage() now returns the current page even when no sub controller is (yet) set.
Diffstat (limited to 'sd/source/ui/unoidl')
| -rw-r--r-- | sd/source/ui/unoidl/DrawController.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 21db745cc277..c6a156cdc9ae 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DrawController.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.27 $ * * This file is part of OpenOffice.org. * @@ -405,9 +405,15 @@ Reference< drawing::XDrawPage > SAL_CALL DrawController::getCurrentPage (void) ::vos::OGuard aGuard( Application::GetSolarMutex() ); Reference<drawing::XDrawPage> xPage; + // Get current page from sub controller. if (mxSubController.is()) xPage = mxSubController->getCurrentPage(); + // When there is not yet a sub controller (during initialization) then fall back + // to the current page in mpCurrentPage. + if ( ! xPage.is() && mpCurrentPage != NULL) + xPage = Reference<drawing::XDrawPage>(mpCurrentPage->getUnoPage(), UNO_QUERY); + return xPage; } |