You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2024/04/02 18:51:07 UTC
(openoffice) branch AOO42X updated (4200b705c1 -> 636491ffbd)
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 4200b705c1 Fix spelling in code comments (#210)
new 0bf5032ba1 Fix for issue 60859
new 636491ffbd Search forward or backward for a visible slide
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/sd/source/ui/slideshow/slideshowimpl.cxx | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
(openoffice) 02/02: Search forward or backward for a visible slide
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 636491ffbdbd1e0cf8ddfd8b9f1182475f3d96b8
Author: Arrigo Marchiori <ar...@yahoo.it>
AuthorDate: Fri Mar 29 21:25:07 2024 +0100
Search forward or backward for a visible slide
Fixes bug #60859
(cherry picked from commit 4ac3bde70fd91802a5ddff308c1ad71e97d33629)
---
main/sd/source/ui/slideshow/slideshowimpl.cxx | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/main/sd/source/ui/slideshow/slideshowimpl.cxx b/main/sd/source/ui/slideshow/slideshowimpl.cxx
index ef000f8d7b..0c18b3b676 100644
--- a/main/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/main/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -238,13 +238,23 @@ AnimationSlideController::AnimationSlideController( Reference< XIndexAccess > xS
void AnimationSlideController::setStartSlideNumber( sal_Int32 nSlideNumber )
{
- while( ( !maSlideVisible[nSlideNumber] )
- || ( nSlideNumber > maSlideVisible.size() ) ) nSlideNumber++;
-
- if(nSlideNumber > maSlideVisible.size())
- mnStartSlideNumber = 0;
- else
- mnStartSlideNumber = nSlideNumber;
+ mnStartSlideNumber = nSlideNumber;
+ if ( maSlideVisible[mnStartSlideNumber] )
+ return;
+ // Search forward for the first visible slide
+ for ( ; ( (size_t)mnStartSlideNumber < maSlideVisible.size() ) ;
+ mnStartSlideNumber++ ) {
+ if ( maSlideVisible[mnStartSlideNumber] )
+ return;
+ }
+ // Search backward for the first visible slide
+ for (mnStartSlideNumber = nSlideNumber ;
+ ( mnStartSlideNumber >= 0 ) ; mnStartSlideNumber-- ) {
+ if ( maSlideVisible[mnStartSlideNumber] )
+ return;
+ }
+ // No visible slides! Surrender to the request
+ mnStartSlideNumber = nSlideNumber;
}
sal_Int32 AnimationSlideController::getStartSlideIndex() const
(openoffice) 01/02: Fix for issue 60859
Posted by ar...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0bf5032ba1f95101d5061f6098031c3d21b0cea1
Author: Bidouille <oo...@free.fr>
AuthorDate: Tue Jan 23 10:27:43 2024 +0100
Fix for issue 60859
If 1st slide is hidden and selected, show presentation does start after this.
Thanks to iammisc for this patch
(cherry picked from commit c284e3b5539f1e21c0e1f245cefd20d28959206c)
---
main/sd/source/ui/slideshow/slideshowimpl.cxx | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/main/sd/source/ui/slideshow/slideshowimpl.cxx b/main/sd/source/ui/slideshow/slideshowimpl.cxx
index c6280438be..ef000f8d7b 100644
--- a/main/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/main/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -145,7 +145,7 @@ public:
public:
AnimationSlideController( Reference< XIndexAccess > xSlides, Mode eMode );
- void setStartSlideNumber( sal_Int32 nSlideNumber ) { mnStartSlideNumber = nSlideNumber; }
+ void setStartSlideNumber( sal_Int32 nSlideNumber );
sal_Int32 getStartSlideIndex() const;
sal_Int32 getCurrentSlideNumber() const;
@@ -236,6 +236,17 @@ AnimationSlideController::AnimationSlideController( Reference< XIndexAccess > xS
mnSlideCount = xSlides->getCount();
}
+void AnimationSlideController::setStartSlideNumber( sal_Int32 nSlideNumber )
+{
+ while( ( !maSlideVisible[nSlideNumber] )
+ || ( nSlideNumber > maSlideVisible.size() ) ) nSlideNumber++;
+
+ if(nSlideNumber > maSlideVisible.size())
+ mnStartSlideNumber = 0;
+ else
+ mnStartSlideNumber = nSlideNumber;
+}
+
sal_Int32 AnimationSlideController::getStartSlideIndex() const
{
if( mnStartSlideNumber >= 0 )