diff options
| author | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-29 18:02:50 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedricbosdo@openoffice.org> | 2011-03-29 18:07:03 +0200 |
| commit | 169dfdcb3629a1e4e2b17dd4b7a1307dc8ca7b45 (patch) | |
| tree | 8a012585715128117f12507c529167ab414cecab /sw | |
| parent | c059a601b149a0c44df9384648a70f08fd0c4df7 (diff) | |
Fixed the writer navigation toolbar after DEV300 merge
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/Package_uiconfig.mk | 1 | ||||
| -rw-r--r-- | sw/inc/helpid.h | 2 | ||||
| -rw-r--r-- | sw/inc/shellid.hxx | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk index 2cad9784eb92..c5ee34505af0 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 61761fe8db14..785c18cfef10 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 a8f247ef2a7d..76dbe0456d96 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: */ |