diff options
Diffstat (limited to 'dbaccess/qa/extras/dialog-save.cxx')
-rw-r--r-- | dbaccess/qa/extras/dialog-save.cxx | 30 |
1 files changed, 7 insertions, 23 deletions
diff --git a/dbaccess/qa/extras/dialog-save.cxx b/dbaccess/qa/extras/dialog-save.cxx index 5eac41e67041..04c12b1c5e8b 100644 --- a/dbaccess/qa/extras/dialog-save.cxx +++ b/dbaccess/qa/extras/dialog-save.cxx @@ -10,17 +10,13 @@ #include <sal/config.h> #include <test/unoapi_test.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#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/XModifiable.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; @@ -49,25 +45,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/testDialogSave.odb")); { - uno::Reference< lang::XComponent > xComponent = loadFromDesktop(aFileName); - CPPUNIT_ASSERT(xComponent.is()); - 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); - const OUString sStandard("Standard"); + static constexpr OUString sStandard(u"Standard"_ustr); xBasLib->loadLibrary(sStandard); CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard)); // the whole point of this test is to test the "save" operation @@ -75,26 +64,21 @@ void DialogSaveTest::test() CPPUNIT_ASSERT(!xDlgLib->isLibraryLoaded(sStandard)); // make some change to enable a save - // uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSuppl(xComponent, UNO_QUERY_THROW); + // uno::Reference< document::XDocumentPropertiesSupplier > xDocPropSuppl(mxComponent, UNO_QUERY_THROW); // uno::Reference< document::XDocumentPropertiesSupplier > xDocProps(xDocPropSuppl->getDocumentProperties()); // CPPUNIT_ASSERT(xDocProps.is()); // xDocProps.setTitle(xDocProps.getTitle() + " suffix"); - uno::Reference< util::XModifiable > xDocMod(xComponent, UNO_QUERY_THROW); + uno::Reference< util::XModifiable > xDocMod(mxComponent, UNO_QUERY_THROW); xDocMod->setModified(true); // now save; the code path to exercise in this test is the "store to same location" // 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 } { - uno::Sequence<uno::Any> args(1); - args[0] <<= aFileName; + uno::Sequence<uno::Any> args{ uno::Any(aFileName) }; Reference<container::XHierarchicalNameAccess> xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package", args), UNO_QUERY_THROW); Reference< beans::XPropertySet > xPS(xHNA->getByHierarchicalName("Dialogs/Standard/Dialog1.xml"), UNO_QUERY_THROW); sal_Int64 nSize = 0; |