commit bfca51d9035000e518e4938ceb145cb92cc17b1f
author Caolán McNamara <caolanm@redhat.com> Thu Aug 11 09:06:49 2022 +0100
committer Caolán McNamara <caolanm@redhat.com> Thu Aug 11 21:48:15 2022 +0200
tree cad2459696fb88b8b3fa1eeb5ef9ba4061ba294a
parent 5dbe2a1488de444c4af23a6009f9f16bba399052

turn off font combobox preview if SAL_ABORT_ON_NON_APPLICATION_FONT_USE set

Change-Id: Ib9c74599afb2b85564de85bf64340315ca0ba4f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138108
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

sw/qa/inc/swmodeltestbase.hxx

diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index 5b3cde8..c102e75 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -105,6 +105,7 @@ protected:
    sal_uInt32 mnStartTime;
    utl::TempFile maTempFile;
    bool mbExported; ///< Does maTempFile already contain something useful?
    bool mbFontNameWYSIWYG;

protected:

sw/qa/unit/swmodeltestbase.cxx

diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index cdbdf6c..374e18b 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -21,6 +21,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/propertyvalue.hxx>
#include <comphelper/sequence.hxx>
#include <officecfg/Office/Common.hxx>
#include <rtl/ustrbuf.hxx>
#include <sfx2/app.hxx>
#include <unotools/mediadescriptor.hxx>
@@ -58,6 +59,7 @@ SwModelTestBase::SwModelTestBase(const OUString& pTestDocumentPath, const char* 
    , mpFilter(pFilter)
    , mnStartTime(0)
    , mbExported(false)
    , mbFontNameWYSIWYG(officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::get())
{
    maTempFile.EnableKillingFile();
}
@@ -68,13 +70,20 @@ void SwModelTestBase::setUp()
    mxDesktop.set(
        css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory())));
    SfxApplication::GetOrCreate();
    std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
        comphelper::ConfigurationChanges::create());
    officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(false, xChanges);
    xChanges->commit();
}

void SwModelTestBase::tearDown()
{
    if (mxComponent.is())
        mxComponent->dispose();

    std::shared_ptr<comphelper::ConfigurationChanges> xChanges(
        comphelper::ConfigurationChanges::create());
    officecfg::Office::Common::Font::View::ShowFontBoxWYSIWYG::set(mbFontNameWYSIWYG, xChanges);
    xChanges->commit();
    test::BootstrapFixture::tearDown();
}