diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-17 16:58:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-17 16:58:26 +0200 |
| commit | 01552f1e77c67f70ffd879294288612f9ab64e3b (patch) | |
| tree | d74e06c26d86df1079eaa4895d3fe742109de408 | |
| parent | 5bdfa8c12472eb9ff6ca054c2ada7150b1869fff (diff) | |
SID_TOGGLE_MENUBAR (aka slot:6661, .uno:MenuBarVisible) is dead
...since introduction of XLayoutManager's private:resource/menubar/menubar in
3fb2acf5b77bff59909f616c44c7de17048b64d7 "INTEGRATION: CWS layoutmanager
(1.52.10); FILE MERGED" etc. and final removal of SID_TOGGLE_MENUBAR bits in
f605b16e395e8ccc3d1aba7907b0792039016f69 "INTEGRATION: CWS sfxcleanup (1.119.8);
FILE MERGED" etc.
What still needs fixing are
extensions/source/activex/SOActiveX.cxx
odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java
odk/examples/OLE/activex/SOActiveX.cpp
in a similar way as e.g. 0273d3d81d29d5c1f6c387cca633cd99722c100e "INTEGRATION:
CWS jl18 (1.6.8); FILE MERGED."
Change-Id: I52a43fc7186a4f60929ab6246a2da2e715be7510
| -rw-r--r-- | configmgr/qa/unit/data.xcd | 5 | ||||
| -rw-r--r-- | include/sfx2/sfxsids.hrc | 1 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5 |
3 files changed, 0 insertions, 11 deletions
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd index 4236cf9e356e..caaf6ec02512 100644 --- a/configmgr/qa/unit/data.xcd +++ b/configmgr/qa/unit/data.xcd @@ -4063,11 +4063,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:MenuBarVisible" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Menu On/Off</value> - </prop> - </node> <node oor:name=".uno:MacroRecorder" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="x-no-translate"></value><value xml:lang="en-US">Record Macro</value> diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc index 5eec506383f1..3d54a52fd409 100644 --- a/include/sfx2/sfxsids.hrc +++ b/include/sfx2/sfxsids.hrc @@ -208,7 +208,6 @@ // FREE (was: SID_BACKTOWEBTOP) #define SID_SEGMENTSIZE (SID_SFX_START + 1659) #define SID_VIEW_DATA_SOURCE_BROWSER (SID_SFX_START + 1660) -#define SID_TOGGLE_MENUBAR (SID_SFX_START + 1661) #define SID_UNPACK (SID_SFX_START + 1662) // (SID_SFX_START + 1663) used further down #define SID_MACRO_WARNING (SID_SFX_START + 1664) diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu index 2bc9158460fc..91734b081faf 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu @@ -4179,11 +4179,6 @@ <value>9</value> </prop> </node> - <node oor:name=".uno:MenuBarVisible" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Menu On/Off</value> - </prop> - </node> <node oor:name=".uno:MacroRecorder" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Record Macro</value> |