diff options
Diffstat (limited to 'dbaccess/qa/extras/nolib-save.cxx')
| -rw-r--r-- | dbaccess/qa/extras/nolib-save.cxx | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/dbaccess/qa/extras/nolib-save.cxx b/dbaccess/qa/extras/nolib-save.cxx index f64e0fbece10..614c4f03794a 100644 --- a/dbaccess/qa/extras/nolib-save.cxx +++ b/dbaccess/qa/extras/nolib-save.cxx @@ -9,16 +9,12 @@ #include <sal/config.h> #include <test/unoapi_test.hxx> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <vcl/svapp.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -47,24 +43,18 @@ DialogSaveTest::DialogSaveTest() void DialogSaveTest::test() { - // UnoApiTest::setUp (via InitVCL) puts each test under a locked SolarMutex, - // but at least the below xDocCloseable->close call could lead to a deadlock - // then, and it looks like none of the code here requires the SolarMutex to - // be locked anyway: - SolarMutexReleaser rel; - const OUString aFileName(m_directories.getURLFromWorkdir(u"CppunitTest/testNolibSave.odb")); { - uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); - uno::Reference< frame::XStorable > xDocStorable(xComponent, UNO_QUERY_THROW); - uno::Reference< document::XEmbeddedScripts > xDocScr(xComponent, UNO_QUERY_THROW); + mxComponent = loadFromDesktop(aFileName); + uno::Reference< frame::XStorable > xDocStorable(mxComponent, UNO_QUERY_THROW); + uno::Reference< document::XEmbeddedScripts > xDocScr(mxComponent, UNO_QUERY_THROW); uno::Reference< script::XStorageBasedLibraryContainer > xStorBasLib(xDocScr->getBasicLibraries()); CPPUNIT_ASSERT(xStorBasLib.is()); uno::Reference< script::XLibraryContainer > xBasLib(xStorBasLib, UNO_QUERY_THROW); uno::Reference< script::XStorageBasedLibraryContainer > xStorDlgLib(xDocScr->getDialogLibraries()); CPPUNIT_ASSERT(xStorDlgLib.is()); uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, UNO_QUERY_THROW); - static const OUStringLiteral sStandard(u"Standard"); + static constexpr OUString sStandard(u"Standard"_ustr); xBasLib->loadLibrary(sStandard); xDlgLib->loadLibrary(sStandard); CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard)); @@ -79,7 +69,7 @@ void DialogSaveTest::test() // uno::Reference< util::XModifiable > xScrMod(xDocScr, UNO_QUERY_THROW); // xScrMod->setModified(sal_True); - // uno::Reference< util::XModifiable > xDocMod(xComponent, UNO_QUERY_THROW); + // uno::Reference< util::XModifiable > xDocMod(mxComponent, UNO_QUERY_THROW); // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl; // xDocMod->setModified(sal_True); // std::cerr << "** Modified: " << static_cast<bool>(xDocMod->isModified()) << std::endl; @@ -89,10 +79,6 @@ void DialogSaveTest::test() // do *not* change to store(As|To|URL)! xDocStorable->store(); - // close - uno::Reference< util::XCloseable > xDocCloseable(xComponent, UNO_QUERY_THROW); - xDocCloseable->close(false); - // All our uno::References are (should?) be invalid now -> let them go out of scope } { |