[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - sd/source

Andras Timar andras.timar at collabora.com
Tue Mar 21 08:50:12 UTC 2017


 sd/source/ui/view/Outliner.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1b45f034b3051d6acdb2e591cf6c52516abb4ca4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue Mar 21 09:49:45 2017 +0100

    fixup for 'sd lok: Don't search on master pages & notes in Impress.'
    
    Change-Id: I7049e45b1f1f22e32cc4bcbda89586491c4c5d9b

diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index f3ff21a01449..1db238667469 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -1072,7 +1072,7 @@ void Outliner::ProvideNextTextObject()
             maCurrentPosition = *maObjectIterator;
 
             // LOK: do not descent to notes or master pages when searching
-            bool bForbiddenPage = comphelper::LibreOfficeKit::isActive() && (maCurrentPosition.mePageKind != PageKind::Standard || maCurrentPosition.meEditMode != EditMode::Page);
+            bool bForbiddenPage = comphelper::LibreOfficeKit::isActive() && (maCurrentPosition.mePageKind != PK_STANDARD || maCurrentPosition.meEditMode != EM_PAGE);
 
             // Switch to the current object only if it is a valid text object.
             if (!bForbiddenPage && IsValidTextObject(maCurrentPosition))


More information about the Libreoffice-commits mailing list