[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_filters_test.mk sc/qa sc/RdbTarget_sc_filters_test.mk

[Markus Mohrhard]

 sc/CppunitTest_sc_filters_test.mk                    |    4 ----
 sc/RdbTarget_sc_filters_test.mk                      |    3 ---
 sc/qa/unit/data/contentCSV/information-functions.csv |   18 ++++++++++++++++++
 sc/qa/unit/data/ods/functions.ods                    |binary
 sc/qa/unit/filters-test.cxx                          |   12 ++++--------
 5 files changed, 22 insertions(+), 15 deletions(-)

New commits:
commit 651aa258c9f2b58e241b1fab7bfb4fc0dae9fbb2
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 4 03:46:56 2011 +0100

    remove some unneeded dependencies
    
    they are no longer used because we separated macros_test and
    filters-test

diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 3260d32..a8aed81 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
     sal \
     salhelper \
     sax \
-    sb \
     sc \
     sfx \
     sot \
@@ -65,7 +64,6 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test, \
     ucbhelper \
 	unotest \
     utl \
-    vbahelper \
     vcl \
     xo \
 	$(gb_STDLIBS) \
@@ -81,14 +79,12 @@ $(eval $(call gb_CppunitTest_set_include,sc_filters_test,\
 
 $(eval $(call gb_CppunitTest_add_api,sc_filters_test,\
     offapi \
-    oovbaapi \
     udkapi \
 ))
 
 $(eval $(call gb_CppunitTest_uses_ure,sc_filters_test))
 
 $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
-    oovbaapi \
     types \
 ))
 
diff --git a/sc/RdbTarget_sc_filters_test.mk b/sc/RdbTarget_sc_filters_test.mk
index 2c0cb1b..cd25567 100644
--- a/sc/RdbTarget_sc_filters_test.mk
+++ b/sc/RdbTarget_sc_filters_test.mk
@@ -46,9 +46,6 @@ $(eval $(call gb_RdbTarget_add_components,sc_filters_test,\
     sax/source/fastparser/fastsax \
     sc/util/sc \
     sc/util/scfilt \
-    sc/util/vbaobj \
-    scripting/source/basprov/basprov \
-    scripting/util/scriptframe \
     sfx2/util/sfx \
     sot/util/sot \
     toolkit/util/tk \
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 857f386..0c9482a 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -37,12 +37,10 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
-#include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
 
 #include <editeng/brshitem.hxx>
 #include <editeng/justifyitem.hxx>
-#include <basic/sbxdef.hxx>
 
 #define CALC_DEBUG_OUTPUT 0
 
commit 989ee5998b99497caa619341fb4f3d8e32fd0765
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 4 03:46:27 2011 +0100

    add test cases for "Informations" functions to functions.ods

diff --git a/sc/qa/unit/data/contentCSV/information-functions.csv b/sc/qa/unit/data/contentCSV/information-functions.csv
new file mode 100644
index 0000000..e332b8f
--- /dev/null
+++ b/sc/qa/unit/data/contentCSV/information-functions.csv
@@ -0,0 +1,18 @@
+27, 1, 4, $E$1, $Logical.$A$1, 4, b, v, l
+6
+"=CELL(""ROW"",AA1)", "=ADDRESS(2,3)"
+FALSE, TRUE, FALSE
+FALSE, TRUE, FALSE, TRUE
+TRUE, FALSE, TRUE, TRUE
+1, 0, 0, 1
+TRUE, FALSE, FALSE
+FALSE, FALSE, FALSE, TRUE
+TRUE, FALSE, FALSE, FALSE
+TRUE, TRUE, FALSE
+TRUE, FALSE, TRUE
+1, 0, 0, 1, 0
+TRUE, TRUE, FALSE, FALSE, FALSE, FALSE
+FALSE, TRUE, FALSE, TRUE
+0, 1, 42, 0
+#N/A
+1, 2, 8, 64, 16
diff --git a/sc/qa/unit/data/ods/functions.ods b/sc/qa/unit/data/ods/functions.ods
index cfdd263..22ebf65 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and b/sc/qa/unit/data/ods/functions.ods differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 487ee22..857f386 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -44,7 +44,7 @@
 #include <editeng/justifyitem.hxx>
 #include <basic/sbxdef.hxx>
 
-#define CALC_DEBUG_OUTPUT 1
+#define CALC_DEBUG_OUTPUT 0
 
 #include "helper/csv_handler.hxx"
 #include "helper/debughelper.hxx"
@@ -219,11 +219,6 @@ ScDocShellRef ScFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUStr
         // load failed.
         xDocShRef.Clear();
     }
-    else if (nFormatType)
-    {
-        pSrcMed->GetItemSet()->Put( SfxUInt16Item( SID_MACROEXECMODE, 4));
-        SfxObjectShell::SetCurrentComponent( xDocShRef->GetModel() );
-    }
 
     return xDocShRef;
 }
@@ -408,6 +403,9 @@ void ScFiltersTest::testFunctions()
     //test mathematical functions
     createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("mathematical-functions.")), aCSVFileName);
     testFile(aCSVFileName, pDoc, 2, PureString);
+    //test informations functions
+    createCSVPath(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("information-functions.")), aCSVFileName);
+    testFile(aCSVFileName, pDoc, 3);
 
     xDocSh->DoClose();
 }