Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2947

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2947/1

fdo#62665 always consider slide show settings

Change-Id: I710e17a36d43dffc6b625ab0f6b2156e498d3d8c
---
M sd/source/ui/slideshow/slideshowimpl.cxx
1 file changed, 2 insertions(+), 8 deletions(-)



diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 825bdf0..8119707 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -968,11 +968,9 @@
 
         if( bStartWithActualSlide )
         {
-            sal_Int32 nSlideNum = ( pStartPage->GetPageNum() - 1 ) >> 1;
-
             if( !maPresSettings.mbAll && !maPresSettings.mbCustomShow )
             {
-                // its start from dia, find out if it is located before our current Slide
+                // determine number of first presentation slide
                 const sal_Int32 nSlideCount = mpDoc->GetSdPageCount( PK_STANDARD );
                 sal_Int32 nSlide;
                 for( nSlide = 0; (nSlide < nSlideCount); nSlide++ )
@@ -981,12 +979,8 @@
                         break;
                 }
 
-                if( nSlide > nSlideNum )
-                    nSlideNum = -1;
+                mpSlideController->setStartSlideNumber( nSlide );
             }
-
-            if( nSlideNum != -1 )
-                mpSlideController->setStartSlideNumber( nSlideNum );
         }
 
         // remember Slide number from where the show was started

-- 
To view, visit https://gerrit.libreoffice.org/2947
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I710e17a36d43dffc6b625ab0f6b2156e498d3d8c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Borim <borim7@web.de>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.