summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2014-08-18 05:14:05 +0200
committerThomas Arnhold <thomas@arnhold.org>2014-08-18 05:22:54 +0200
commit3352a88c8c173acbb15dd95f4738362332107ab7 (patch)
treefec4c78bed42631fb2bb6154c69e45c42a07f1ac
parent83656eb5f7b5c56c973ed961a4d9d58f8b7516dd (diff)
remove dead ToolBox RID_HELPBAR
Change-Id: Ide31f67c346f9a82bf6aa8282caa7cfcee65d9fd
-rw-r--r--configmgr/qa/unit/data.xcd5
-rw-r--r--dbaccess/source/ui/app/AppController.cxx5
-rw-r--r--include/sfx2/sfxsids.hrc7
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu5
-rw-r--r--sfx2/sdi/sfx.sdi155
-rw-r--r--sfx2/source/appl/app.hrc1
-rw-r--r--sfx2/source/appl/app.src50
-rw-r--r--sfx2/source/inc/helpid.hrc1
8 files changed, 0 insertions, 229 deletions
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index da8707e20afd..4236cf9e356e 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -1644,11 +1644,6 @@
<value>7</value>
</prop>
</node>
- <node oor:name=".uno:HelpChooseFile" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Choose Help File</value>
- </prop>
- </node>
<node oor:name=".uno:SpacePara1" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">Line Spacing: 1</value>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 374cad94aead..4996d491ce68 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -614,7 +614,6 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = getContainer()->getElementType() == E_TABLE && !isDataSourceReadOnly() && !isConnectionReadOnly() && isTableFormat();
break;
case SID_OPENDOC:
- case SID_HELP_INDEX:
aReturn.bEnabled = true;
break;
case ID_BROWSER_SAVEDOC:
@@ -1101,7 +1100,6 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
}
break;
case SID_OPENDOC:
- case SID_HELP_INDEX:
{
Reference < XDispatchProvider > xProv( getFrame(), UNO_QUERY );
if ( xProv.is() )
@@ -1109,9 +1107,6 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa
URL aURL;
switch(_nId)
{
- case SID_HELP_INDEX:
- aURL.Complete = ".uno:HelpIndex";
- break;
case SID_OPENDOC:
aURL.Complete = ".uno:Open";
break;
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 1257b580f59b..0ecdffa827df 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -91,14 +91,7 @@
#define SID_HELPBALLOONS (SID_SFX_START + 403)
#define SID_HELPTIPS (SID_SFX_START + 404)
#define SID_HELPMENU (SID_SFX_START + 410)
-#define SID_HELP_INDEX (SID_SFX_START + 411)
-#define SID_HELP_SEARCH (SID_SFX_START + 412)
-#define SID_HELP_ANNOTATE (SID_SFX_START + 413)
-#define SID_HELP_BOOKMARK (SID_SFX_START + 414)
#define SID_HELP_DOWNLOAD (SID_SFX_START + 415)
-#define SID_HELP_ZOOMIN (SID_SFX_START + 417)
-#define SID_HELP_ZOOMOUT (SID_SFX_START + 418)
-#define SID_HELP_HELPFILEBOX (SID_SFX_START + 419)
#define SID_SEND_FEEDBACK (SID_SFX_START + 421)
#define SID_SHOW_LICENSE (SID_SFX_START + 1683)
#define SID_SHOW_CREDITS (SID_SFX_START + 1711)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index f9e33bf78594..60fed197e93f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1590,11 +1590,6 @@
<value>15</value>
</prop>
</node>
- <node oor:name=".uno:HelpChooseFile" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Choose Help File</value>
- </prop>
- </node>
<node oor:name=".uno:SpacePara1" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Spacing: 1</value>
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 4ce0378cd539..d5abfb81c131 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2696,86 +2696,6 @@ SfxVoidItem GoUpSel SID_CURSORUP_SEL
]
-SfxVoidItem HelpAnnotate SID_HELP_ANNOTATE
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxVoidItem HelpBookmark SID_HELP_BOOKMARK
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxStringItem HelpChooseFile SID_HELP_HELPFILEBOX
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* status: */
- SlotType = SfxStringItem
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_MACRO;
-]
-
-
SfxVoidItem HelpDownload SID_HELP_DOWNLOAD
()
[
@@ -2876,31 +2796,6 @@ SfxVoidItem HelpOnHelp SID_HELPONHELP
]
-SfxVoidItem HelpSearch SID_HELP_SEARCH
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
SfxBoolItem HelpTip SID_HELPTIPS
[
@@ -2928,56 +2823,6 @@ SfxBoolItem HelpTip SID_HELPTIPS
]
-SfxVoidItem HelpZoomIn SID_HELP_ZOOMIN
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
-SfxVoidItem HelpZoomOut SID_HELP_ZOOMOUT
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Asynchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_EXPLORER;
-]
-
-
SfxVoidItem HideCurPage SID_BASICIDE_HIDECURPAGE
()
[
diff --git a/sfx2/source/appl/app.hrc b/sfx2/source/appl/app.hrc
index 53cdbd488da0..f33bfc1f019a 100644
--- a/sfx2/source/appl/app.hrc
+++ b/sfx2/source/appl/app.hrc
@@ -35,7 +35,6 @@
#define RID_STR_HELP (RID_SFX_APP_START+79)
#define RID_STR_NOAUTOSTARTHELPAGENT (RID_SFX_APP_START+80)
-#define RID_HELPBAR (RID_SFX_APP_START+81)
#define CONFIG_PATH_START (RID_SFX_APP_START+98)
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 439b9342fb7c..501e41696b4e 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -265,56 +265,6 @@ String RID_STR_NOAUTOSTARTHELPAGENT
Text [ en-US ] = "No automatic start at 'XX'" ;
};
-String RID_HELPBAR
-{
- Text [ en-US ] = "Help Bar" ;
-};
-
-ToolBox RID_HELPBAR
-{
- HelpId = HID_HELPBAR ;
- Hide = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_HELP_INDEX ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_HELPFILEBOX ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ZOOMOUT;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ZOOMIN;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_SEARCH ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_BOOKMARK ;
- };
- ToolBoxItem
- {
- Identifier = SID_HELP_ANNOTATE ;
- };
- };
-};
-
String RID_STR_HLPFILENOTEXIST
{
Text [ en-US ] = "The help file for this topic is not installed." ;
diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc
index 89d395ef1c60..00600b043b69 100644
--- a/sfx2/source/inc/helpid.hrc
+++ b/sfx2/source/inc/helpid.hrc
@@ -27,7 +27,6 @@
#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE"
#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN"
#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX"
-#define HID_HELPBAR "SFX2_HID_HELPBAR"
#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW"
#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN"
#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN"