[Libreoffice-commits] core.git: 3 commits - sd/source

[Stephan Bergmann]

 sd/source/ui/annotations/annotationmanager.cxx |    2 +-
 sd/source/ui/func/futempl.cxx                  |    2 +-
 sd/source/ui/slideshow/slideshow.cxx           |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 472285e742db5fed6d901162076d42c7d7c175af
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 12:16:59 2014 +0100

    StartPresentationMode nFlags takes PRESENTATION_* values
    
    Change-Id: Ib922ebf1e547ff4d02c4fbaac6e6a81313a036ec

diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index c736531..8453275 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -718,7 +718,7 @@ void SAL_CALL SlideShow::end() throw(RuntimeException)
                 WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pShell->GetViewFrame()->GetTopFrame().GetWindow().GetParent());
                 if( pWorkWindow )
                 {
-                    pWorkWindow->StartPresentationMode( sal_False, isAlwaysOnTop() );
+                    pWorkWindow->StartPresentationMode( sal_False, isAlwaysOnTop() ? PRESENTATION_HIDEALLAPPS : 0 );
                 }
             }
         }
commit 323d10c7975c34125009694a42c476ce83f031c4
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 12:07:06 2014 +0100

    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

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 );
commit d9904d199c7a3fd5b14051aa9bbae160603ca9a7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 15 12:04:20 2014 +0100

    Apparent typo when adding braces
    
    ...in 4707f7bb54d143e642ad5df5eedf56d5d2b08385 "CWS-TOOLING: integrate CWS
    cmcfixes51"
    
    Change-Id: Icc8b2ed48d73f3f03c2820f554f896f6edb15e23

diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index bf83047..a6147f1 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -239,7 +239,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
                     pStyleSheet->GetFamily() == pOldStyleSheet->GetFamily() ||
 
                     // allow if old was background objects and new is graphics
-                    pStyleSheet->GetFamily() == (SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
+                    (pStyleSheet->GetFamily() == SD_STYLE_FAMILY_GRAPHICS && pOldStyleSheet->GetHelpId( aStr ) == HID_PSEUDOSHEET_BACKGROUNDOBJECTS) ||
 
                     // allow if old was presentation and we are a drawing document
                     (pOldStyleSheet->GetFamily() == SD_STYLE_FAMILY_MASTERPAGE && mpDoc->GetDocumentType() == DOCUMENT_TYPE_DRAW) )