ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Use ScopedConfigValue instead of manual configuration management

Browse Source 
Use of the RAII method is more robust, including restoration of the
correct previous values (in many cases, the restored values are
hardcoded, which could get out-of-sync in case of changing defaults).

Change-Id: I4f8f5109116c621aae3412171db8bded2b066ffa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198504
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
This commit is contained in:
Mike Kaganski
2026-02-02 08:43:17 +01:00
parent 6437d0c99f
commit 9d51fa1028
10 changed files with 110 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
embeddedobj/qa/cppunit/general.cxx
+8 -33
View File
@@ -8,6 +8,7 @@
*/
#include <config_poppler.h>
#include <test/commontesttools.hxx>
#include <test/unoapi_test.hxx>
#include <com/sun/star/embed/XStorage.hpp>
@@ -36,17 +37,8 @@ public:
CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfig)
{
// Explicitly disable Word->Writer mapping for this test.
std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::set(false, pBatch);
pBatch->commit();
comphelper::ScopeGuard g([]() {
std::shared_ptr<comphelper::ConfigurationChanges> pBatchReset(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter::set(true,
pBatchReset);
pBatchReset->commit();
});
ScopedConfigValue<officecfg::Office::Common::Filter::Microsoft::Import::WinWordToWriter> aCfg(
false);
loadFromURL(u"private:factory/swriter"_ustr);
// Insert a file as an embedded object.
@@ -68,17 +60,9 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfig)
CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfigVsdx)
{
// Explicitly disable Word->Writer mapping for this test.
std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Microsoft::Import::VisioToDraw::set(false, pBatch);
pBatch->commit();
comphelper::ScopeGuard g([]() {
std::shared_ptr<comphelper::ConfigurationChanges> pBatchReset(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Microsoft::Import::VisioToDraw::set(true, pBatchReset);
pBatchReset->commit();
});
// Explicitly disable Visio->Draw mapping for this test.
ScopedConfigValue<officecfg::Office::Common::Filter::Microsoft::Import::VisioToDraw> aCfg(
false);
loadFromURL(u"private:factory/swriter"_ustr);
// Insert a file as an embedded object.
@@ -101,17 +85,8 @@ CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfigVsdx)
#if ENABLE_PDFIMPORT
CPPUNIT_TEST_FIXTURE(Test, testInsertFileConfigPdf)
{
// Explicitly disable Word->Writer mapping for this test.
std::shared_ptr<comphelper::ConfigurationChanges> pBatch(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::set(false, pBatch);
pBatch->commit();
comphelper::ScopeGuard g([]() {
std::shared_ptr<comphelper::ConfigurationChanges> pBatchReset(
comphelper::ConfigurationChanges::create());
officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw::set(true, pBatchReset);
pBatchReset->commit();
});
// Explicitly disable PDF->Draw mapping for this test.
ScopedConfigValue<officecfg::Office::Common::Filter::Adobe::Import::PDFToDraw> aCfg(false);
loadFromURL(u"private:factory/swriter"_ustr);
// Insert a PDF file as an embedded object.