diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-01-08 13:17:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-03-03 17:53:57 +0100 |
| commit | 36788e95fdbe96ac27c71197fdbfee178b53f52c (patch) | |
| tree | 31c45984896a72ee3c1aaaeca2a5ba0d1ad06104 /sc/qa | |
| parent | 0035b3218d8652652e62afe89eddfd28a9021b75 (diff) | |
upgrade liborcus
Conflicts:
external/boost/StaticLibrary_boost_system.mk
Change-Id: Ie4af26c87a100b67baeedbaa7fb1ac428845f92b
Diffstat (limited to 'sc/qa')
| -rw-r--r-- | sc/qa/unit/helper/qahelper.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx index 35f5bc92f369..237bbce72f03 100644 --- a/sc/qa/unit/helper/qahelper.cxx +++ b/sc/qa/unit/helper/qahelper.cxx @@ -112,7 +112,7 @@ void loadFile(const OUString& aFileName, std::string& aContent) void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStringFormat) { csv_handler aHandler(pDoc, nTab, aStringFormat); - orcus::csv_parser_config aConfig; + orcus::csv::parser_config aConfig; aConfig.delimiters.push_back(','); aConfig.delimiters.push_back(';'); aConfig.text_qualifier = '"'; @@ -126,7 +126,7 @@ void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStr { parser.parse(); } - catch (const orcus::csv_parse_error& e) + catch (const orcus::csv::parse_error& e) { std::cout << "reading csv content file failed: " << e.what() << std::endl; OStringBuffer aErrorMsg("csv parser error: "); @@ -138,7 +138,7 @@ void testFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab, StringType aStr void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab) { conditional_format_handler aHandler(pDoc, nTab); - orcus::csv_parser_config aConfig; + orcus::csv::parser_config aConfig; aConfig.delimiters.push_back(','); aConfig.delimiters.push_back(';'); aConfig.text_qualifier = '"'; @@ -149,7 +149,7 @@ void testCondFile(OUString& aFileName, ScDocument* pDoc, SCTAB nTab) { parser.parse(); } - catch (const orcus::csv_parse_error& e) + catch (const orcus::csv::parse_error& e) { std::cout << "reading csv content file failed: " << e.what() << std::endl; OStringBuffer aErrorMsg("csv parser error: "); |