incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r1172126 - /incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
Date Sat, 17 Sep 2011 22:42:13 GMT
Author: mst
Date: Sat Sep 17 22:42:12 2011
New Revision: 1172126

URL: http://svn.apache.org/viewvc?rev=1172126&view=rev
Log:
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

Modified:
    incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx

Modified: incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx?rev=1172126&r1=1172125&r2=1172126&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx (original)
+++ incubator/ooo/trunk/main/sd/source/ui/slidesorter/view/SlsButtonBar.cxx Sat Sep 17 22:42:12
2011
@@ -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>
@@ -1452,7 +1454,18 @@ void StartShowButton::ProcessClick (cons
         aProperties[0].Name = ::rtl::OUString::createFromAscii("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);
     }
 }
 



Mime
View raw message