diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 15:17:15 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 15:17:15 +0000 |
commit | 84da16beffb96a865956c782bcfbd542c4396cca (patch) | |
tree | 3d673f8336c4c5d578f7d90559860c9213a4cc7b /sd/source/ui/accessibility | |
parent | 5716cd93c842b10178e867fdcb515866ee307e01 (diff) |
INTEGRATION: CWS impress89 (1.7.64); FILE MERGED
2006/03/20 10:16:59 af 1.7.64.1: #132646# Using shared_ptr to slidesorter PageDescriptor.
Diffstat (limited to 'sd/source/ui/accessibility')
-rw-r--r-- | sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 335ed9f01176..1bc2eff3facf 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AccessibleSlideSorterView.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-01-19 12:50:34 $ + * last change: $Author: vg $ $Date: 2006-04-06 16:17:15 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -466,9 +466,9 @@ Reference<XAccessible> SAL_CALL const vos::OGuard aSolarGuard (Application::GetSolarMutex()); const Point aTestPoint (aPoint.X, aPoint.Y); - ::sd::slidesorter::model::PageDescriptor* pHitDescriptor - = mrSlideSorterController.GetPageAt(aTestPoint); - if (pHitDescriptor != NULL) + ::sd::slidesorter::model::SharedPageDescriptor pHitDescriptor ( + mrSlideSorterController.GetPageAt(aTestPoint)); + if (pHitDescriptor.get() != NULL) xAccessible = mpImpl->GetAccessibleChild( (pHitDescriptor->GetPage()->GetPageNum()-1)/2); @@ -902,9 +902,9 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::Implementation::GetAcces { if (maPageObjects[nIndex] == NULL) { - ::sd::slidesorter::model::PageDescriptor* pDescriptor - = mrController.GetModel().GetPageDescriptor(nIndex); - if (pDescriptor != NULL) + ::sd::slidesorter::model::SharedPageDescriptor pDescriptor( + mrController.GetModel().GetPageDescriptor(nIndex)); + if (pDescriptor.get() != NULL) maPageObjects[nIndex] = new AccessibleSlideSorterObject( &mrAccessibleSlideSorter, mrController, |