summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2018-01-19 10:14:07 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2018-02-19 17:53:38 +0100
commit533cace45be6b5429f5bbfad47049deb8d301495 (patch)
tree73bebce4f12593b7fccbb62b24d73171eaa24a85
parentc26995f9d725a317e9ba27310ac64f5e25bb570f (diff)
Don't create database files in $HOME
Regression from commit 46b3202bf883618f1585850191c19776861013ed Change-Id: If8e0b309274ea14e996e0dde2d1ee9b49ff0f737 Reviewed-on: https://gerrit.libreoffice.org/48173 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/49981
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 3c6e0a04afd7..a1380685553d 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -5688,13 +5688,16 @@ void SwUiWriterTest::testTdf115013()
{
const OUString sColumnName("Name with spaces, \"quotes\" and \\backslashes");
+ utl::TempFile aTempDir(nullptr, true);
+ const OUString aWorkDir = aTempDir.GetURL();
+
//create new writer document
SwDoc* pDoc = createDoc();
{
// Load and register data source
const OUString aDataSourceURI(m_directories.getURLFromSrc(DATA_DIRECTORY) + "datasource.ods");
- OUString sDataSource = SwDBManager::LoadAndRegisterDataSource(aDataSourceURI, nullptr);
+ OUString sDataSource = SwDBManager::LoadAndRegisterDataSource(aDataSourceURI, &aWorkDir);
CPPUNIT_ASSERT(!sDataSource.isEmpty());
// Insert a new field type for the mailmerge field
@@ -5728,6 +5731,8 @@ void SwUiWriterTest::testTdf115013()
OUString sColumn = static_cast<SwDBFieldType*>(pField->GetTyp())->GetColumnName();
// The column name must come correct after round trip
CPPUNIT_ASSERT_EQUAL(sColumnName, sColumn);
+
+ utl::removeTree(aWorkDir);
}
CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest);