[Libreoffice-commits] core.git: oox/source

[Noel Grandin (via logerrit)]

 oox/source/ole/vbacontrol.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit a15fe37bf1dc50fcf88cea9c0038b217119671b8
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jun 27 16:30:19 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jun 27 18:23:06 2022 +0200

    tdf#149692 crash importing document with vba forms
    
    This bug appears to date back to
        commit a43cc9ec8dde4f311bcf8ff96e6a26d56b2abdcf
        Author: Noel Power <noel.po...@suse.com>
        Date:   Wed Apr 17 17:08:59 2013 +0100
        implement MultiPage, Page & TabStrip import for oox
    
    Change-Id: Ia4784e4c34189f05e516704fa2e2485e4560fa4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136500
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/oox/source/ole/vbacontrol.cxx b/oox/source/ole/vbacontrol.cxx
index 88d7f28617ef..9c2a301635d9 100644
--- a/oox/source/ole/vbacontrol.cxx
+++ b/oox/source/ole/vbacontrol.cxx
@@ -446,13 +446,17 @@ void VbaFormControl::importStorage( StorageBase& rStrg, 
const AxClassTable& rCla
                 if ( xPageSiteRef )
                     idToPage[ xPageSiteRef->getId() ] = control;
             }
-            else
+            else if (elem->getControlType() == API_CONTROL_TABSTRIP)
             {
                 AxTabStripModel* pTabStrip = 
static_cast<AxTabStripModel*>(elem.get());
                 sCaptions = pTabStrip->maItems;
                 pMultiPage->mnActiveTab = pTabStrip->mnListIndex;
                 pMultiPage->mnTabStyle = pTabStrip->mnTabStyle;
             }
+            else
+            {
+                SAL_WARN("oox", "unexpected control type " << 
elem->getControlType());
+            }
         }
         // apply caption/titles to pages