extensions/source/activex/SOActiveX.cxx | 7 ------- 1 file changed, 7 deletions(-)
New commits: commit 9e8789f2186d16a895cd659b321e5001ea239658 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Dec 9 15:22:22 2021 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Dec 10 10:03:02 2021 +0100 remove use of non-existing slot:6661 seeing as this call does nothing since ~2006 see: commit 01552f1e77c67f70ffd879294288612f9ab64e3b Author: Stephan Bergmann <[email protected]> Date: Fri Oct 17 16:58:26 2014 +0200 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." these uses remain outstanding: odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java odk/examples/OLE/activex/SOActiveX.cpp Change-Id: Iad43b5adc6ae24e6d794ebef10ed7df476b4e5dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126622 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 6e102cf51202..2d8dc2a73b91 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -801,13 +801,6 @@ HRESULT CSOActiveX::LoadURLToFrame( ) HRESULT hr = CallDispatchMethod( mCurFileUrl, aArgNames, aArgVals, nCount ); if( !SUCCEEDED( hr ) ) return hr; - CComVariant aBarName( L"MenuBarVisible" ); - CComVariant aBarVis; - aBarVis.vt = VT_BOOL; aBarVis.boolVal = VARIANT_FALSE; - hr = CallDispatchMethod( L"slot:6661", &aBarName, &aBarVis, 1 ); - // does not work for some documents, but it is no error - // if( !SUCCEEDED( hr ) ) return hr; - // try to get the model and set the presentation specific property, the setting will fail for other document formats CComPtr<IDispatch> pdispController; hr = GetIDispByFunc( mpDispFrame, L"getController", nullptr, 0, pdispController );
