commit 323d10c7975c34125009694a42c476ce83f031c4
author Stephan Bergmann <sbergman@redhat.com> Wed Jan 15 12:07:06 2014 +0100
committer Stephan Bergmann <sbergman@redhat.com> Wed Jan 15 13:59:25 2014 +0100
tree 28fb15bd43f9ee0af3c5b7890c89d037128cb652
parent d9904d199c7a3fd5b14051aa9bbae160603ca9a7

Assume nPageNum shall be compared against 0 or 1 here

...depending on DOCUMENT_TYPE_IMPRESS, similar to how the nPgNum argument to the
SdDrawDocument::GetMasterSdPage call a few lines up is computed.

Change-Id: I8a13ac72868d96d486c071a4a705268dd888c1eb

sd/source/ui/annotations/annotationmanager.cxx

diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index a74608c..fdcba15 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -1171,7 +1171,7 @@ SdPage* AnnotationManagerImpl::GetNextPage( SdPage* pPage, bool bForeward )
        }
        else
        {
            if( nPageNum == (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS) ? 0 : 1 )
            if( nPageNum == (mpDoc->GetDocumentType() == DOCUMENT_TYPE_IMPRESS ? 0 : 1) )
            {
                // we reached beginning of master pages, start with end if pages
                return mpDoc->GetSdPage( mpDoc->GetSdPageCount(PK_STANDARD)-1, PK_STANDARD );