sc/source/filter/xcl97/xcl97esc.cxx | 4 ---- 1 file changed, 4 deletions(-)
New commits: commit 9ec6929930527e8a4eb4d9b97e72cdbcf91d1ca0 Author: Aron Budea <[email protected]> AuthorDate: Mon Apr 21 16:57:28 2025 +0930 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Dec 12 11:23:39 2025 +0100 Revert "tdf#164141 Fix command button xls to xlsx convert problem." Exporting ActiveX objects is a big missing feature, and this was more of a workaround. The invalid export originating from fd238380ae7820f12ac1f7c52d0f7180a93f3ba3 ...has later been resolved differently in: ab45b8d9959f8f392a10d0874c50f26b816a4da8 This reverts commit ab62d75141192a73dcd6862e37753bc1c3f82576. Change-Id: I5e40759595e65a8778abbb521bdc146517afc949 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184975 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Aron Budea <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195195 Tested-by: Jenkins (cherry picked from commit 5c032407baf1952fab7a704b41b8ac8c18f978b0) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195250 Reviewed-by: Xisco Fauli <[email protected]> diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 525ddb1bf44e..b2f81453c667 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -240,11 +240,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape SAL_WARN("sc", "XclEscherEx::StartShape, this control can't get the property ControlTypeinMSO!"); } if( nMsCtlType == 2 ) //OCX Form Control - { pCurrXclObj = CreateOCXCtrlObj( rxShape, pChildAnchor ).release(); - if(!pCurrXclObj) // Give a chance to handle control object with XclExpTbxControlObj instead of XclObjAny - pCurrXclObj = CreateTBXCtrlObj( rxShape, pChildAnchor ).release(); - } else //TBX Form Control pCurrXclObj = CreateTBXCtrlObj( rxShape, pChildAnchor ).release(); if( !pCurrXclObj )
