[Libreoffice-commits] .: sw/inc sw/Package_uiconfig.mk

[Cédric Bosdonnat]

 sw/Package_uiconfig.mk |    1 +
 sw/inc/helpid.h        |    2 +-
 sw/inc/shellid.hxx     |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8af6911f096ba9e0578afe6df5f4cd34524005d9
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date:   Tue Mar 29 18:02:50 2011 +0200

    Fixed the writer navigation toolbar after DEV300 merge

diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 2cad978..c5ee345 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -208,6 +208,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolb
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml))
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml))
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/navigationobjectbar.xml,swriter/toolbar/navigationobjectbar.xml))
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml))
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml))
 $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml))
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index f1c42e6..15ed1bc 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -993,6 +993,6 @@
 
 #define HID_TITLEPAGE 						  		            "SW_HID_TITLEPAGE"
 
-#define HID_NAVIGATION_TOOLBOX                      (HID_BASE + 2282)
+#define HID_NAVIGATION_TOOLBOX                                  "SW_HID_NAVIGATION_TOOLBOX"
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/shellid.hxx b/sw/inc/shellid.hxx
index 3c639ae..9794ebf 100644
--- a/sw/inc/shellid.hxx
+++ b/sw/inc/shellid.hxx
@@ -71,7 +71,7 @@
 #define SW_MEDIASHELL 			(SFX_INTERFACE_SW_START + 31)
 #define SW_ANNOTATIONSHELL 		(SFX_INTERFACE_SW_START + 32)
 
-#define SW_NAVIGATIONSHELL              (SFX_INTERFACE_SW_START + 33)
+#define SW_NAVIGATIONSHELL      (SFX_INTERFACE_SW_START + 33)
 #endif // _UIPARAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */