[Libreoffice-commits] core.git: include/sfx2 sw/sdi

[Julien Nabet]

 include/sfx2/groupid.hxx |    3 +--
 sw/sdi/swriter.sdi       |    5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 66e8f52d10eb6ff779d177e61899e83f6a3b5a60
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Feb 26 22:31:53 2018 +0100

    Replace the 2 occurences of Navigation by Navigator
    
    and get rid of:
    warn:legacy.osl:10410:10410:sfx2/source/control/msgpool.cxx:211: GroupId-Name not defined in SFX!
    
    Indeed "Navigation" isn't taken into account in getGidResId from msgpool.cxx (sfx2)
    
    Change-Id: Ie5d54175106c1ca835a487ccfe2a38f3f21dc93d
    Reviewed-on: https://gerrit.libreoffice.org/50400
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/include/sfx2/groupid.hxx b/include/sfx2/groupid.hxx
index 0fc3a0b1b659..1e6823c85af8 100644
--- a/include/sfx2/groupid.hxx
+++ b/include/sfx2/groupid.hxx
@@ -49,8 +49,7 @@ enum class SfxGroupId {
     Connector,
     Modify,
     Drawing,
-    Controls,
-    Navigation
+    Controls
 };
 
 // make it hashable for storing in maps
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 3bd3026c9c21..00fa29d6abfc 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7397,7 +7397,7 @@ SfxVoidItem NavigateBack FN_NAVIGATION_BACK
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
-    GroupId = SfxGroupId::Navigation;
+    GroupId = SfxGroupId::Navigator;
 ]
 
 SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD
@@ -7415,7 +7415,8 @@ SfxVoidItem NavigateForward FN_NAVIGATION_FORWARD
     AccelConfig = TRUE,
     MenuConfig = TRUE,
     ToolBoxConfig = TRUE,
-    GroupId = SfxGroupId::Navigation;
+    GroupId = SfxGroupId::Navigator;
+
 ]
 
 SfxStringItem OpenFromWriter FN_OPEN_FILE