[Libreoffice-commits] core.git: 2 commits - helpcontent2 sw/inc sw/source

[Caolán McNamara]

 helpcontent2                         |    2 +-
 sw/inc/helpid.h                      |    2 --
 sw/source/uibase/ribbar/inputwin.src |    1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit c8054c1d6885067caf557b5b3179975793cf80f7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 16:19:56 2016 +0100

    HID_CALC_TOOLBOX goes nowhere
    
    Change-Id: I812f56c53487b2bf115bc2803337176941baf49b

diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 6583313..3319a90 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -148,8 +148,6 @@
 // More Help-IDs
 #define HID_EDIT_FORMULA                                        "SW_HID_EDIT_FORMULA"
 
-#define HID_CALC_TOOLBOX                                        "SW_HID_CALC_TOOLBOX"
-
 #define HID_AUTOFORMAT_REJECT                                   "SW_HID_AUTOFORMAT_REJECT"
 #define HID_AUTOFORMAT_ACCEPT                                   "SW_HID_AUTOFORMAT_ACCEPT"
 #define HID_AUTOFORMAT_EDIT_CHG                                 "SW_HID_AUTOFORMAT_EDIT_CHG"
diff --git a/sw/source/uibase/ribbar/inputwin.src b/sw/source/uibase/ribbar/inputwin.src
index 0e00305..444c255 100644
--- a/sw/source/uibase/ribbar/inputwin.src
+++ b/sw/source/uibase/ribbar/inputwin.src
@@ -30,7 +30,6 @@ ToolBox RID_TBX_FORMULA
 {
     Pos = MAP_APPFONT ( 0 , 0 ) ;
     Size = MAP_APPFONT ( 600 , 14 ) ;
-    HelpID = HID_CALC_TOOLBOX ;
     SVLook = TRUE ;
     Border = TRUE ;
     ItemList =
commit ccafebf67147d272a911b6ff0411249f96ae5864
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Oct 11 16:19:06 2016 +0100

    Updated core
    Project: help  5d912ed85e9c4103fe37b1299999a56493c7c3c5
    
    drop unused HID_CALC_TOOLBOX hid
    
    Change-Id: I08ba38e7446e62fd712e53a1969e38d8b3fb653a

diff --git a/helpcontent2 b/helpcontent2
index b223bd2..5d912ed 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b223bd2e0ccf3c09d69b0cbf4da063f15ca453ef
+Subproject commit 5d912ed85e9c4103fe37b1299999a56493c7c3c5