diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 15:20:27 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-04-06 15:20:27 +0000 |
| commit | 8369e91057aa2f02d333c3ef3483cecf0920a6c6 (patch) | |
| tree | 61824837f28bbc28c5b5ed4246afd09c7949db86 /sd | |
| parent | 6a4f0def69e3f866052a03ba000b8987a855b376 (diff) | |
INTEGRATION: CWS impress89 (1.3.156); FILE MERGED
2006/03/20 10:35:13 af 1.3.156.1: #132646# Using shared_ptr to slidesorter PageDescriptor.
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx index b4b91128499b..037bbcf98117 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionCommand.cxx @@ -4,9 +4,9 @@ * * $RCSfile: SlsSelectionCommand.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-09 06:16:00 $ + * last change: $Author: vg $ $Date: 2006-04-06 16:20:27 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -68,8 +68,8 @@ void SelectionCommand::AddPages (::std::auto_ptr<PageSelector::PageSelection> pS void SelectionCommand::AddPage (USHORT nPageIndex) { - model::PageDescriptor* pDescriptor = mrModel.GetPageDescriptor(nPageIndex); - if (pDescriptor != NULL) + model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); + if (pDescriptor.get() != NULL) { maPagesToSelect.push_back(pDescriptor->GetPage()); if (mpCurrentPage == NULL) @@ -82,8 +82,8 @@ void SelectionCommand::AddPage (USHORT nPageIndex) void SelectionCommand::SetCurrentPage (USHORT nPageIndex) { - model::PageDescriptor* pDescriptor = mrModel.GetPageDescriptor(nPageIndex); - if (pDescriptor != NULL) + model::SharedPageDescriptor pDescriptor (mrModel.GetPageDescriptor(nPageIndex)); + if (pDescriptor.get() != NULL) mpCurrentPage = pDescriptor->GetPage(); } |