diff options
| author | mst <mst@openoffice.org> | 2011-09-17 22:42:12 +0000 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@suse.com> | 2011-11-29 17:57:32 +0100 |
| commit | 86e093007b4f87caa785455abae043d6427c7070 (patch) | |
| tree | 489e4a1435e18c7c6b1a840de8bd0b3da7ad7a3d /sd | |
| parent | f215333002882872129066828228d3343a903331 (diff) | |
slidesorter1: #i114107# Temporarily reset StartWithActualPaget to make startWithArguments use FirstPage property.
# HG changeset patch
# User Andre Fischer<andre.f.fischer@oracle.com>
# Date 1283353420 -7200
# Node ID 770385ae0c265c62134bf57eeca8283f7fe80b48
# Parent 2ebd15d9e8a637b5c563f1ae49768668412e2baa
* found as LGPLv3-only fix at svn rev 1172126 (http://svn.apache.org/viewvc?view=revision&revision=1172126)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx index ba0838384824..5ecdad5a6d73 100644 --- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx +++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx @@ -43,6 +43,8 @@ #include "controller/SlsAnimationFunction.hxx" #include "app.hrc" #include "drawdoc.hxx" +#include "sddll.hxx" +#include "optsitem.hxx" #include <svx/svxids.hrc> #include <sfx2/dispatch.hxx> #include <vcl/bmpacc.hxx> @@ -1337,7 +1339,18 @@ void StartShowButton::ProcessClick (const model::SharedPageDescriptor& rpDescrip aProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FirstPage")); const ::rtl::OUString sName (rpDescriptor->GetPage()->GetName()); aProperties[0].Value = Any(sName); + + // We have to temporarily change the options value + // StartWithActualPage to make the slide show use the + // specified first page. + const DocumentType eType (mrSlideSorter.GetModel().GetDocument()->GetDocumentType()); + const BOOL bSavedState (SD_MOD()->GetSdOptions(eType)->IsStartWithActualPage()); + SD_MOD()->GetSdOptions(eType)->SetStartWithActualPage(FALSE); + xPresentation->startWithArguments(aProperties); + + // Restore previous StartWithActualPage value. + SD_MOD()->GetSdOptions(eType)->SetStartWithActualPage(bSavedState); } } |