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

Jochen Nitschke j.nitschke+logerrit at ok.de
Tue Jul 19 05:54:16 UTC 2016


 sc/source/filter/inc/externallinkbuffer.hxx |    5 ---
 sc/source/filter/oox/externallinkbuffer.cxx |   40 ----------------------------
 2 files changed, 45 deletions(-)

New commits:
commit d2ab8f8c33f0eb7c49c6ecb03da7b8616fce8db5
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Fri Jul 15 22:28:03 2016 +0200

    sc: remove commented out code
    
    this code does not work any more getFilterType() was removed along
    with meFilterType in commit c4cb83504faa1d241a116001fd27f7148de300ba
    
    Change-Id: I992a061d4eb6a1349377e6fc35f966999fb57ead
    Reviewed-on: https://gerrit.libreoffice.org/27244
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sc/source/filter/inc/externallinkbuffer.hxx b/sc/source/filter/inc/externallinkbuffer.hxx
index b343052..cfc647b 100644
--- a/sc/source/filter/inc/externallinkbuffer.hxx
+++ b/sc/source/filter/inc/externallinkbuffer.hxx
@@ -85,11 +85,6 @@ public:
     /** Imports the DDEITEM_STRING record containing a string in a link result. */
     void                importDdeItemString( SequenceInputStream& rStrm );
 
-#if 0
-    /** Returns the sheet cache index if this is a sheet-local external name. */
-    sal_Int32           getSheetCacheIndex() const;
-#endif
-
     /** Returns the DDE item info needed by the XML formula parser. */
     bool                getDdeItemInfo(
                             css::sheet::DDEItemInfo& orItemInfo ) const;
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index 2235906..6d921ca 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -169,46 +169,6 @@ void ExternalName::importDdeItemString( SequenceInputStream& rStrm )
     appendResultValue( BiffHelper::readString( rStrm ) );
 }
 
-#if 0
-sal_Int32 ExternalName::getSheetCacheIndex() const
-{
-    OSL_ENSURE( mrParentLink.getLinkType() == LINKTYPE_DDE, "ExternalName::getSheetCacheIndex - unexpected link type" );
-    sal_Int32 nCacheIdx = -1;
-    switch( getFilterType() )
-    {
-        case FILTER_OOXML:
-            // OOXML/BIFF12: zero-based index into sheet list, -1 means global name
-            if( maModel.mnSheet >= 0 )
-                nCacheIdx = mrParentLink.getSheetIndex( maModel.mnSheet );
-        break;
-        case FILTER_BIFF:
-            switch( getBiff() )
-            {
-                case BIFF2:
-                case BIFF3:
-                case BIFF4:
-                break;
-                case BIFF5:
-                    if( maModel.mnSheet > 0 )
-                        if( const ExternalLink* pExtLink = getExternalLinks().getExternalLink( maModel.mnSheet ).get() )
-                            if( pExtLink->getLinkType() == LINKTYPE_EXTERNAL )
-                                nCacheIdx = pExtLink->getSheetIndex();
-                break;
-                case BIFF8:
-                    if( maModel.mnSheet > 0 )
-                        nCacheIdx = mrParentLink.getSheetIndex( maModel.mnSheet - 1 );
-                break;
-                case BIFF_UNKNOWN:
-                break;
-            }
-        break;
-        case FILTER_UNKNOWN:
-        break;
-    }
-    return nCacheIdx;
-}
-#endif
-
 bool ExternalName::getDdeItemInfo( DDEItemInfo& orItemInfo ) const
 {
     if( (mrParentLink.getLinkType() == LINKTYPE_DDE) && !maModel.maName.isEmpty() )


More information about the Libreoffice-commits mailing list