diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-08-23 18:11:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-08-24 09:28:32 +0200 |
| commit | 66604baf08c47cc0c77ab3b9ee7e77f987c64722 (patch) | |
| tree | 7bef8f275ffcb9557b97e84707478f0be880406a /sd | |
| parent | 844b3c067ccef7c8fcd38f4456689065dee5a447 (diff) | |
Consistently use OUString in test::Directories
Change-Id: Ia5fd8af34ee9d2f37e4450ab241f6bb9a06445b2
Reviewed-on: https://gerrit.libreoffice.org/41466
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/SVGExportTests.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/import-tests.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/qa/unit/SVGExportTests.cxx b/sd/qa/unit/SVGExportTests.cxx index c976436a6f89..9afc5cb42a01 100644 --- a/sd/qa/unit/SVGExportTests.cxx +++ b/sd/qa/unit/SVGExportTests.cxx @@ -37,7 +37,7 @@ protected: xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("svg"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0")); } - void load(const char* pDir, const char* pName) + void load(const OUString& pDir, const char* pName) { return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName); } diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 8040997bc8a7..e4258b161730 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -1370,7 +1370,7 @@ void SdImportTest::testTdf93124() void SdImportTest::testTdf99729() { - const char* filenames[] = { "/sd/qa/unit/data/odp/tdf99729-new.odp", "/sd/qa/unit/data/odp/tdf99729-legacy.odp" }; + const OUString filenames[] = { "/sd/qa/unit/data/odp/tdf99729-new.odp", "/sd/qa/unit/data/odp/tdf99729-legacy.odp" }; int nonwhitecounts[] = { 0, 0 }; for (unsigned int i = 0; i < SAL_N_ELEMENTS(filenames); ++i) { diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index b5c2e0107639..7f85c8892d9e 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -52,7 +52,7 @@ using namespace css; -static const char* const DATA_DIRECTORY = "/sd/qa/unit/tiledrendering/data/"; +static char const DATA_DIRECTORY[] = "/sd/qa/unit/tiledrendering/data/"; static std::ostream& operator<<(std::ostream& os, ViewShellId id) { |