summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-08-23 18:11:38 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-08-24 09:28:32 +0200
commit66604baf08c47cc0c77ab3b9ee7e77f987c64722 (patch)
tree7bef8f275ffcb9557b97e84707478f0be880406a /sw
parent844b3c067ccef7c8fcd38f4456689065dee5a447 (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 'sw')
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx4
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx6
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx2
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index cc152f422c2f..51f021c5c83a 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -771,10 +771,10 @@ void Test::testSkipImages()
uno::Sequence<beans::PropertyValue> args( comphelper::InitPropertySequence({
{ "FilterOptions", uno::Any(OUString::createFromAscii(aFilterNames[nFilter][1])) }
}));
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aFilterNames[nFilter][0]), "com.sun.star.text.TextDocument", args);
+ mxComponent = loadFromDesktop(m_directories.getURLFromSrc(OUString::createFromAscii(aFilterNames[nFilter][0])), "com.sun.star.text.TextDocument", args);
sFailedMessage = sFailedMessage + " - " + aFilterNames[nFilter][1];
} else
- mxComponent = loadFromDesktop(m_directories.getURLFromSrc(aFilterNames[nFilter][0]), "com.sun.star.text.TextDocument");
+ mxComponent = loadFromDesktop(m_directories.getURLFromSrc(OUString::createFromAscii(aFilterNames[nFilter][0])), "com.sun.star.text.TextDocument");
// Check shapes (images, textboxes, custom shapes)
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 7f258ab1baf7..80874da95810 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -142,7 +142,7 @@ protected:
rtl::Reference<TestInteractionHandler> xInteractionHandler;
xmlBufferPtr mpXmlBuffer;
- const char* mpTestDocumentPath;
+ const OUString mpTestDocumentPath;
const char* mpFilter;
sal_uInt32 mnStartTime;
@@ -183,7 +183,7 @@ public:
maFilterOptions = rFilterOptions;
}
- SwModelTestBase(const char* pTestDocumentPath = "", const char* pFilter = "")
+ SwModelTestBase(const OUString& pTestDocumentPath = OUString(), const char* pFilter = "")
: mpXmlBuffer(nullptr)
, mpTestDocumentPath(pTestDocumentPath)
, mpFilter(pFilter)
@@ -614,7 +614,7 @@ protected:
std::cout << "File tested,Execution Time (ms)" << std::endl;
}
- void load(const char* pDir, const char* pName, const char* pPassword = nullptr)
+ void load(const OUString& pDir, const char* pName, const char* pPassword = nullptr)
{
return loadURL(m_directories.getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName, pPassword);
}
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index e3541c4898c7..b83881d0d1da 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -35,7 +35,7 @@
#include <IDocumentRedlineAccess.hxx>
#include <vcl/scheduler.hxx>
-static const char* const DATA_DIRECTORY = "/sw/qa/extras/tiledrendering/data/";
+static char const DATA_DIRECTORY[] = "/sw/qa/extras/tiledrendering/data/";
static std::ostream& operator<<(std::ostream& os, ViewShellId id)
{
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index cb01dfc812d9..340cb2ac99cf 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -111,7 +111,7 @@
#include <sfx2/watermarkitem.hxx>
#include <fmthdft.hxx>
-static const char* const DATA_DIRECTORY = "/sw/qa/extras/uiwriter/data/";
+static char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
class SwUiWriterTest : public SwModelTestBase
{