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

Eike Rathke erack at redhat.com
Thu Oct 27 10:01:01 UTC 2016


 sc/source/filter/oox/externallinkbuffer.cxx |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit d12c7aee5cb7e8e1d6971f0cbb392d4b48b007d4
Author: Eike Rathke <erack at redhat.com>
Date:   Thu Oct 27 11:59:59 2016 +0200

    remove non-sensical OSL_ENSURE
    
    That started as
    OSL_ENSURE( (nTabId == 0) || (getFilterType() == FILTER_OOXML) || (getBiff() == BIFF8),
    then with c4cb83504faa1d241a116001fd27f7148de300ba became
    OSL_ENSURE( (nTabId == 0) || (getBiff() == BIFF8),
    then with e73c4d5013d7a0bf7d72db1773d7125ab91cf269 became
    OSL_ENSURE( nTabId == 0,
    which makes no sense anymore and gets hit in ~every call.
    
    Change-Id: I5dfe3dd53310ab2f977ad574acb1ec9874775020

diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 45444ee..0530a7b 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -435,8 +435,6 @@ sal_Int32 ExternalLink::getDocumentLinkIndex() const
 sal_Int32 ExternalLink::getSheetCacheIndex( sal_Int32 nTabId ) const
 {
     OSL_ENSURE( meLinkType == LINKTYPE_EXTERNAL, "ExternalLink::getSheetCacheIndex - invalid link type" );
-    OSL_ENSURE( nTabId == 0,
-        "ExternalLink::getSheetCacheIndex - invalid sheet index" );
     return ContainerHelper::getVectorElement( maSheetCaches, nTabId, -1 );
 }
 


More information about the Libreoffice-commits mailing list