(openoffice) 02/02: 123197: Fixed selection problems when switching between normal and master mode.

[mseidel]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit feee4947275740b80b2c4c243c34e6e0bdb02436
Author: Andre Fischer <a...@apache.org>
AuthorDate: Fri Feb 21 11:55:33 2014 +0000

    123197: Fixed selection problems when switching between normal and master 
mode.
    
    git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1570539 
13f79535-47bb-0310-9956-ffa450edef68
    (cherry picked from commit 4799f5ba13c0140a13cf2e05fc58d1eb59f25ad2)
---
 main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx 
b/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
index 0da93988ad..d4d82b1dc4 100644
--- a/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
+++ b/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
@@ -406,6 +406,11 @@ void PageSelector::UpdateCurrentPage (const bool 
bUpdateOnlyWhenPending)
             break;
         }
     }
+    if ( ! pCurrentPageDescriptor && nPageCount>0)
+    {
+        // No page is selected.  Make the first slide the current page.
+        pCurrentPageDescriptor = mrModel.GetPageDescriptor(0);
+    }
 
     if (pCurrentPageDescriptor)
     {