From 15d134b4f57e66faa8bcf538a08db98dc9204c54 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 15 Dec 2017 15:26:27 +0100 Subject: Make temp copy of dbaccess/qa/unit/data/firebird_empty.odb for testing ...in CppunitTest_dbaccess_firebird_test. Otherwise, the test would fail with > Test name: FirebirdTest::testEmptyDBConnection > An uncaught exception of type com.sun.star.sdbc.SQLException > - The connection can not be established. No storage or URL was given. if dbaccess/qa/unit/data/firebird_empty.odb is read-only, as DocumentStorageAccess::impl_openSubStorage_nothrow (dbaccess/source/core/dataaccess/ModelImpl.cxx) takes m_pModelImplementation->m_bDocumentReadOnly into account and returns a null xStorage. Adds a move ctor to utl::TempFile (thus causing copy ctor and copy assignment op to be implicitly deleted), but leaves any move assignment op undeclared for now, as none happens to be needed (yet). Change-Id: I6f9eff07eb54f1364a0560ffa4cf1f676a319d16 Reviewed-on: https://gerrit.libreoffice.org/46561 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- unotools/source/ucbhelper/tempfile.cxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'unotools') diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx index 4df84af0cb6a..eb099a43dca9 100644 --- a/unotools/source/ucbhelper/tempfile.cxx +++ b/unotools/source/ucbhelper/tempfile.cxx @@ -20,6 +20,7 @@ #include #include +#include #include #include @@ -366,6 +367,14 @@ TempFile::TempFile( const OUString& rLeadingChars, bool _bStartWithZero, true, true, bCreateParentDirs ); } +TempFile::TempFile(TempFile && other): + aName(std::move(other.aName)), pStream(other.pStream), bIsDirectory(other.bIsDirectory), + bKillingFileEnabled(other.bKillingFileEnabled) +{ + other.pStream = nullptr; + other.bKillingFileEnabled = false; +} + TempFile::~TempFile() { delete pStream; -- cgit