[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_test_filters.mk sc/source

[Caolán McNamara]

 sc/CppunitTest_sc_test_filters.mk |    8 ++++--
 sc/source/core/tool/interpr1.cxx  |   47 --------------------------------------
 2 files changed, 6 insertions(+), 49 deletions(-)

New commits:
commit c9959eb9caeb52a5722b1540367e6478e713a2b4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 10 23:22:18 2011 +0100

    make sure filters unit test depends on non-linked scfilt lib

diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
index 578d2b7..8dcd854 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -33,8 +33,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_filters_test, \
     sc/qa/unit/filters-test \
 ))
 
-$(call gb_CxxObject_get_target,sc/qa/unit/filters-test): $(WORKDIR)/AllLangRes/sc
-
 $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
     sc \
     sfx \
@@ -103,4 +101,10 @@ $(eval $(call gb_RdbTarget_add_old_components,sc_filters_test,\
     ucpfile1 \
 ))
 
+# we need to
+# a) explicitly depend on library msword because it is not implied by a link
+#    relation
+# b) explicitly depend on the sc resource files needed at unit-test runtime
+$(call gb_CppunitTest_get_target,sc_filters_test) : $(call gb_Library_get_target,scfilt) $(WORKDIR)/AllLangRes/sc
+
 # vim: set noet sw=4:
commit 3922a18693fcbfdf0b8cceb862f1780b496ef39f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 10 22:19:48 2011 +0100

    callcatcher: remove unused lcl_CreateExternalRefTokenArray

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f4a1796..eb28c10 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6525,53 +6525,6 @@ void ScInterpreter::ScDBVarP()
     PushDouble(fVal/fCount);
 }
 
-
-ScTokenArray* lcl_CreateExternalRefTokenArray( const ScAddress& rPos, ScDocument* pDoc,
-        const ScAddress::ExternalInfo& rExtInfo, const ScRefAddress& rRefAd1,
-        const ScRefAddress* pRefAd2 )
-{
-    ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager();
-    size_t nSheets = 1;
-    const OUString* pRealTab = pRefMgr->getRealTableName( rExtInfo.mnFileId, rExtInfo.maTabName);
-    ScTokenArray* pTokenArray = new ScTokenArray;
-    if (pRefAd2)
-    {
-        ScComplexRefData aRef;
-        aRef.InitRangeRel( ScRange( rRefAd1.GetAddress(), pRefAd2->GetAddress()), rPos);
-        aRef.Ref1.SetColRel( rRefAd1.IsRelCol());
-        aRef.Ref1.SetRowRel( rRefAd1.IsRelRow());
-        aRef.Ref1.SetTabRel( rRefAd1.IsRelTab());
-        aRef.Ref1.SetFlag3D( true);
-        aRef.Ref2.SetColRel( pRefAd2->IsRelCol());
-        aRef.Ref2.SetRowRel( pRefAd2->IsRelRow());
-        aRef.Ref2.SetTabRel( pRefAd2->IsRelTab());
-        nSheets = aRef.Ref2.nTab - aRef.Ref1.nTab + 1;
-        aRef.Ref2.SetFlag3D( nSheets > 1 );
-        pTokenArray->AddExternalDoubleReference( rExtInfo.mnFileId,
-                (pRealTab ? *pRealTab : rExtInfo.maTabName), aRef);
-    }
-    else
-    {
-        ScSingleRefData aRef;
-        aRef.InitAddressRel( rRefAd1.GetAddress(), rPos);
-        aRef.SetColRel( rRefAd1.IsRelCol());
-        aRef.SetRowRel( rRefAd1.IsRelRow());
-        aRef.SetTabRel( rRefAd1.IsRelTab());
-        aRef.SetFlag3D( true);
-        pTokenArray->AddExternalSingleReference( rExtInfo.mnFileId,
-                (pRealTab ? *pRealTab : rExtInfo.maTabName), aRef);
-    }
-    // The indirect usage of the external table can't be detected during the
-    // store-to-file cycle, mark it as permanently referenced so it gets stored
-    // even if not directly referenced anywhere.
-    pRefMgr->setCacheTableReferencedPermanently( rExtInfo.mnFileId,
-            rExtInfo.maTabName, nSheets);
-    ScCompiler aComp( pDoc, rPos, *pTokenArray);
-    aComp.CompileTokenArray();
-    return pTokenArray;
-}
-
-
 void ScInterpreter::ScIndirect()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScIndirect" );