[Libreoffice-commits] .: 2 commits - sc/qa

Markus Mohrhard mmohrhard at kemper.freedesktop.org
Thu Sep 8 20:26:47 PDT 2011


 sc/qa/unit/data/xls/named-ranges-global.xls |binary
 sc/qa/unit/filters-test.cxx                 |   16 ++++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 5b54933202e6fef61365dec1112314c0517dc424
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 9 05:22:21 2011 +0200

    forgot to add the file for the unit test

diff --git a/sc/qa/unit/data/xls/named-ranges-global.xls b/sc/qa/unit/data/xls/named-ranges-global.xls
new file mode 100644
index 0000000..ff2028e
Binary files /dev/null and b/sc/qa/unit/data/xls/named-ranges-global.xls differ
commit 5bd732bf8f40d4d3f89fee967593096117f325ca
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Sep 9 05:18:18 2011 +0200

    prevent warning

diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 170713f..0c5812e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -71,16 +71,16 @@ const int indeterminate = 2;
 #define XLS_FORMAT_TYPE 318767171
 #define XLSX_FORMAT_TYPE 268959811
 
-struct {
-    const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType;
-} aFileFormats[] = {
-    { "ods" , "calc8", "", ODS_FORMAT_TYPE },
-    { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE },
-    { "xlsx", "Calc MS Excel 2007 XML" , "MS Excel 2007 XML", XLSX_FORMAT_TYPE }
-};
-
 namespace {
 
+    struct {
+        const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType;
+    } aFileFormats[] = {
+        { "ods" , "calc8", "", ODS_FORMAT_TYPE },
+        { "xls" , "MS Excel 97", "calc_MS_EXCEL_97", XLS_FORMAT_TYPE },
+        { "xlsx", "Calc MS Excel 2007 XML" , "MS Excel 2007 XML", XLSX_FORMAT_TYPE }
+    };
+
     void loadFile(const rtl::OUString& aFileName, std::string& aContent)
     {
         rtl::OString aOFileName = rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);


More information about the Libreoffice-commits mailing list