summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@suse.com>2011-09-12 23:33:31 -0400
committerKohei Yoshida <kohei.yoshida@suse.com>2011-09-12 23:33:31 -0400
commit5440aa1e37b483d54fd44fe448cf57449bf6e42b (patch)
tree8c3e1a10e9bd2b173cdc365d389d2c5c661586b4 /sc
parentefebf5181c40c8ff85185b91d46ac356f8127089 (diff)
Let's not indent in namespace scopes.
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/filters-test.cxx71
1 files changed, 35 insertions, 36 deletions
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 956e989b4693..3c06e731e00c 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -78,49 +78,48 @@ const int indeterminate = 2;
namespace {
+struct FileFormats {
+ const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType;
+};
- struct FileFormats {
- const char* pName; const char* pFilterName; const char* pTypeName; sal_uLong nFormatType;
- };
+FileFormats 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 }
+};
- FileFormats 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);
+ std::ifstream aFile(aOFileName.getStr());
+
+ CPPUNIT_ASSERT_MESSAGE("could not open csv file", aFile);
+ std::ostringstream aOStream;
+ aOStream << aFile.rdbuf();
+ aFile.close();
+ aContent = aOStream.str();
+}
- void loadFile(const rtl::OUString& aFileName, std::string& aContent)
+void testFile(rtl::OUString& aFileName, ScDocument* pDoc, SCTAB nTab)
+{
+ csv_handler aHandler(pDoc, nTab);
+ orcus::csv_parser_config aConfig;
+ aConfig.delimiters.push_back(',');
+ aConfig.delimiters.push_back(';');
+ aConfig.text_qualifier = '"';
+ std::string aContent;
+ loadFile(aFileName, aContent);
+ orcus::csv_parser<csv_handler> parser ( &aContent[0], aContent.size() , aHandler, aConfig);
+ try
{
- rtl::OString aOFileName = rtl::OUStringToOString(aFileName, RTL_TEXTENCODING_UTF8);
- std::ifstream aFile(aOFileName.getStr());
-
- CPPUNIT_ASSERT_MESSAGE("could not open csv file", aFile);
- std::ostringstream aOStream;
- aOStream << aFile.rdbuf();
- aFile.close();
- aContent = aOStream.str();
+ parser.parse();
}
-
- void testFile(rtl::OUString& aFileName, ScDocument* pDoc, SCTAB nTab)
+ catch (const orcus::csv_parse_error& e)
{
- csv_handler aHandler(pDoc, nTab);
- orcus::csv_parser_config aConfig;
- aConfig.delimiters.push_back(',');
- aConfig.delimiters.push_back(';');
- aConfig.text_qualifier = '"';
- std::string aContent;
- loadFile(aFileName, aContent);
- orcus::csv_parser<csv_handler> parser ( &aContent[0], aContent.size() , aHandler, aConfig);
- try
- {
- parser.parse();
- }
- catch (const orcus::csv_parse_error& e)
- {
- std::cout << "reading csv content file failed" << e.what() << std::endl;
- CPPUNIT_ASSERT_MESSAGE("csv parser error", false);
- }
+ std::cout << "reading csv content file failed" << e.what() << std::endl;
+ CPPUNIT_ASSERT_MESSAGE("csv parser error", false);
}
+}
}