sc/source/filter/xcl97/xcl97esc.cxx | 4 ----
1 file changed, 4 deletions(-)
New commits:
commit ed1bf9d4166ee62adffd4ec8ed3b4d9c765a2965
Author: Aron Budea <aron.bu...@collabora.com>
AuthorDate: Mon Apr 21 16:57:28 2025 +0930
Commit: Aron Budea <aron.bu...@collabora.com>
CommitDate: Thu May 8 05:26:41 2025 +0200
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 <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Aron Budea <aron.bu...@collabora.com>
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 )
