diff --git a/SOURCES/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch b/SOURCES/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch new file mode 100644 index 0000000..62e19ae --- /dev/null +++ b/SOURCES/0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch @@ -0,0 +1,30 @@ +From d59960d5de3f07726594d980152a3bfeb58bace9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 2 Nov 2020 19:27:04 +0000 +Subject: [PATCH 1/8] Resolves: rhbz#1893846 if last close had insert, index + dialog open + +when starting a new writer document + +Change-Id: I83131c01aa53208a321abade48d48a6f7965d0ff +--- + sw/source/ui/index/swuiidxmrk.cxx | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx +index 33a0eab8cd69..5eca069b963b 100644 +--- a/sw/source/ui/index/swuiidxmrk.cxx ++++ b/sw/source/ui/index/swuiidxmrk.cxx +@@ -955,7 +955,8 @@ SwIndexMarkFloatDlg::SwIndexMarkFloatDlg(SfxBindings* _pBindings, + "modules/swriter/ui/indexentry.ui", "IndexEntryDialog") + , m_aContent(m_xDialog, *m_xBuilder, bNew, *::GetActiveWrtShell()) + { +- m_aContent.ReInitDlg(*::GetActiveWrtShell()); ++ if (SwWrtShell* pSh = ::GetActiveWrtShell()) ++ m_aContent.ReInitDlg(*pSh); + Initialize(pInfo); + } + +-- +2.28.0 + diff --git a/SOURCES/0002-resource-leak.patch b/SOURCES/0002-resource-leak.patch new file mode 100644 index 0000000..3823e8a --- /dev/null +++ b/SOURCES/0002-resource-leak.patch @@ -0,0 +1,25 @@ +From abaf73f99c300ffe6c38dc7d1ce93ab09043f88a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 Nov 2020 11:02:21 +0000 +Subject: [PATCH 2/8] resource leak + +Change-Id: I1abd8acef55d5bdb4744ecf1a62d8e1396de0e3f +--- + vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx +index 52f0a34cd3a2..483283cadab5 100644 +--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx ++++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx +@@ -987,6 +987,7 @@ TabStopList2String( const uno::Any& rAny, bool default_tabs ) + { + gchar * old_tab_str = ret; + ret = g_strconcat(old_tab_str, " ", tab_str, nullptr); ++ g_free( tab_str ); + g_free( old_tab_str ); + } + else +-- +2.28.0 + diff --git a/SOURCES/0003-copy_paste_error-data1-looks-like-a-copy-paste-error.patch b/SOURCES/0003-copy_paste_error-data1-looks-like-a-copy-paste-error.patch new file mode 100644 index 0000000..6f00608 --- /dev/null +++ b/SOURCES/0003-copy_paste_error-data1-looks-like-a-copy-paste-error.patch @@ -0,0 +1,37 @@ +From 22eb26fe2f4ecf57bff0e1bb377f7af2e7a9e7e4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 Nov 2020 09:28:02 +0000 +Subject: [PATCH 3/8] copy_paste_error data1 looks like a copy-paste error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: I937743f8d1789c68ed960c6a5aede0508dfa7bcd +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105282 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +(cherry picked from commit 1aa5e450f065bfdae8c354344f23b897f48a166f) +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105457 +Tested-by: Jean-Pierre Ledure +Reviewed-by: Jean-Pierre Ledure +(cherry picked from commit 4a6ca8920afc0bbb8e36869416745d5b0163313c) +--- + wizards/source/access2base/access2base.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wizards/source/access2base/access2base.py b/wizards/source/access2base/access2base.py +index af14a880cb3d..3cdc758e820d 100644 +--- a/wizards/source/access2base/access2base.py ++++ b/wizards/source/access2base/access2base.py +@@ -902,7 +902,7 @@ class Basic(object, metaclass = _Singleton): + @classmethod + def DateDiff(cls, add, date1, date2, weekstart = 1, yearstart = 1): + if isinstance(date1, datetime.datetime): date1 = date1.isoformat() +- if isinstance(date2, datetime.datetime): date2 = date1.isoformat() ++ if isinstance(date2, datetime.datetime): date2 = date2.isoformat() + return cls.M('PyDateDiff', _WRAPPERMODULE, add, date1, date2, weekstart, yearstart) + + @classmethod +-- +2.28.0 + diff --git a/SOURCES/0004-Fix-use-of-uninitialized-SwFEShell-bTableCopied.patch b/SOURCES/0004-Fix-use-of-uninitialized-SwFEShell-bTableCopied.patch new file mode 100644 index 0000000..5c8a9c6 --- /dev/null +++ b/SOURCES/0004-Fix-use-of-uninitialized-SwFEShell-bTableCopied.patch @@ -0,0 +1,74 @@ +From cba3b6a12c9f0dc67a93bc3b708497a8f5eea5a5 Mon Sep 17 00:00:00 2001 +From: Stephan Bergmann +Date: Sun, 15 Dec 2019 10:03:56 +0100 +Subject: [PATCH 4/8] Fix use of uninitialized SwFEShell::bTableCopied + +...which had been introduced with 1e278d1d0cfb1d5375195aa764739f00633f21e8 +"tdf#37156 Writer menu: Paste as Nested table", during +`make CppunitTest_sw_uiwriter CPPUNIT_TEST_NAME=SwUiWriterTest::testDde +VALGRIND=memcheck`: + +> Conditional jump or move depends on uninitialised value(s) +> at 0x1EBBFAF8: SwTransferable::PrepareForCopy(bool) (sw/source/uibase/dochdl/swdtflvr.cxx:896) +> by 0x1EBC22BA: SwTransferable::Copy(bool) (sw/source/uibase/dochdl/swdtflvr.cxx:1144) +> by 0x1ECB552D: SwBaseShell::ExecClpbrd(SfxRequest&) (sw/source/uibase/shells/basesh.cxx:277) +> by 0x1C0D0BB0: SfxDispatcher::Call_Impl(SfxShell&, SfxSlot const&, SfxRequest&, bool) (include/sfx2/shell.hxx:197) +> by 0x1C0D72EB: SfxDispatcher::Execute_(SfxShell&, SfxSlot const&, SfxRequest&, SfxCallMode) (sfx2/source/control/dispatch.cxx:764) +> by 0x1C153977: SfxDispatchController_Impl::dispatch(com::sun::star::util::URL const&, com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&) (sfx2/source/control/unoctitm.cxx:760) +> by 0x1C154916: SfxOfficeDispatch::dispatchWithNotification(com::sun::star::util::URL const&, com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&) (sfx2/source/control/unoctitm.cxx:245) +> by 0x21FDE395: framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference const&, com::sun::star::util::URL const&, bool, com::sun::star::uno::Sequence const&) (framework/source/services/dispatchhelper.cxx:151) +> by 0x21FDEC95: framework::DispatchHelper::executeDispatch(com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) (framework/source/services/dispatchhelper.cxx:109) +> by 0x19BF89C7: lcl_dispatchCommand(com::sun::star::uno::Reference const&, rtl::OUString const&, com::sun::star::uno::Sequence const&) (sw/qa/extras/uiwriter/uiwriter.cxx:4048) +> by 0x19C1F3EC: SwUiWriterTest::testDde() (sw/qa/extras/uiwriter/uiwriter.cxx:4060) +> Uninitialised value was created by a heap allocation +> at 0x4839E86: operator new(unsigned long) (/builddir/build/BUILD/valgrind-3.15.0/coregrind/m_replacemalloc/vg_replace_malloc.c:344) +> by 0x1ED6DA43: SwView::SwView(SfxViewFrame*, SfxViewShell*) (sw/source/uibase/uiview/view.cxx:864) +> by 0x1ED70065: SwView::CreateInstance(SfxViewFrame*, SfxViewShell*) (sw/source/uibase/uiview/view0.cxx:79) +> by 0x1C347941: SfxBaseModel::createViewController(rtl::OUString const&, com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&) (sfx2/source/doc/sfxbasemodel.cxx:4233) +> by 0x1C458D81: (anonymous namespace)::SfxFrameLoader_Impl::load(com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&) (sfx2/source/view/frmload.cxx:587) +> by 0x2401FAD0: framework::LoadEnv::impl_loadContent() (framework/source/loadenv/loadenv.cxx:1159) +> by 0x24020735: framework::LoadEnv::start() (framework/source/loadenv/loadenv.cxx:392) +> by 0x24020F89: framework::LoadEnv::startLoading(rtl::OUString const&, com::sun::star::uno::Sequence const&, com::sun::star::uno::Reference const&, rtl::OUString const&, int, LoadEnvFeatures) (framework/source/loadenv/loadenv.cxx:297) +> by 0x2402175B: framework::LoadEnv::loadComponentFromURL(com::sun::star::uno::Reference const&, com::sun::star::uno::Reference const&, rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) (framework/source/loadenv/loadenv.cxx:166) +> by 0x24058172: framework::Desktop::loadComponentFromURL(rtl::OUString const&, rtl::OUString const&, int, com::sun::star::uno::Sequence const&) (framework/source/services/desktop.cxx:610) +> by 0x1F5F7306: unotest::MacrosTest::loadFromDesktop(rtl::OUString const&, rtl::OUString const&, com::sun::star::uno::Sequence const&) (unotest/source/cpp/macros_test.cxx:48) +> by 0x19C646A7: SwModelTestBase::loadURL(rtl::OUString const&, char const*, char const*) (sw/qa/inc/swmodeltestbase.hxx:764) +> by 0x19BD3792: SwUiWriterTest::createDoc(char const*) (sw/qa/extras/uiwriter/uiwriter.cxx:576) +> by 0x19C1F352: SwUiWriterTest::testDde() (sw/qa/extras/uiwriter/uiwriter.cxx:4055) + +(produced with a --enable-optimized build, so some inline frames are elided; see +also for the same issue +detected with UBSan). + +Change-Id: I080d296006bad4726942fb95a1338ea46c12bed4 +Reviewed-on: https://gerrit.libreoffice.org/85162 +Tested-by: Jenkins +Reviewed-by: Stephan Bergmann +(cherry picked from commit bcc74f619bf87ab97ffc48ab33e031d357952a70) +--- + sw/source/core/frmedt/fews.cxx | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx +index 2ad7ec20a86f..0c4e097287c2 100644 +--- a/sw/source/core/frmedt/fews.cxx ++++ b/sw/source/core/frmedt/fews.cxx +@@ -665,6 +665,7 @@ SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOp + , m_bCheckForOLEInCaption(false) + , m_aPasteListeners(GetPasteMutex()) + , m_eTableInsertMode(SwTable::SEARCH_NONE) ++ , bTableCopied(false) + { + } + +@@ -673,6 +674,7 @@ SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow ) + , m_bCheckForOLEInCaption(false) + , m_aPasteListeners(GetPasteMutex()) + , m_eTableInsertMode(SwTable::SEARCH_NONE) ++ , bTableCopied(false) + { + } + +-- +2.28.0 + diff --git a/SOURCES/0005-cid-1460969-Uninitialized-scalar-field.patch b/SOURCES/0005-cid-1460969-Uninitialized-scalar-field.patch new file mode 100644 index 0000000..7afbdff --- /dev/null +++ b/SOURCES/0005-cid-1460969-Uninitialized-scalar-field.patch @@ -0,0 +1,35 @@ +From 2ebea3e9f3504ef97ecf8af198cd803a56240fe4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 27 Mar 2020 09:03:20 +0000 +Subject: [PATCH 5/8] cid#1460969 Uninitialized scalar field +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +multiple ctor's strikes again + +Change-Id: Ieaae6d5c9e76a3ade17289ce7d1bdffad1168cc9 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91191 +Tested-by: Jenkins +Tested-by: Caolán McNamara +Reviewed-by: Caolán McNamara +(cherry picked from commit 698ecd52e4ca14b5ce633a3358a95992b0dd638c) +--- + dbaccess/source/core/dataaccess/ModelImpl.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx +index d5c3b9b3e086..1f11f3679289 100644 +--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx ++++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx +@@ -407,6 +407,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( + ,m_aEmbeddedMacros() + ,m_bModificationLock( false ) + ,m_bDocumentInitialized( false ) ++ ,m_nScriptingSignatureState(SignatureState::UNKNOWN) + ,m_aContext( _rxContext ) + ,m_sName(_rRegistrationName) + ,m_nLoginTimeout(0) +-- +2.28.0 + diff --git a/SOURCES/0006-tdf-137897-scRetypePassInputDlg-re-allow-password-re.patch b/SOURCES/0006-tdf-137897-scRetypePassInputDlg-re-allow-password-re.patch new file mode 100644 index 0000000..03951f7 --- /dev/null +++ b/SOURCES/0006-tdf-137897-scRetypePassInputDlg-re-allow-password-re.patch @@ -0,0 +1,45 @@ +From 81618bd69088436eb60fd07b944effb178d788ae Mon Sep 17 00:00:00 2001 +From: Justin Luth +Date: Sat, 31 Oct 2020 15:36:44 +0300 +Subject: [PATCH 6/8] tdf#137897 scRetypePassInputDlg: re-allow password + removal +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This weld-conversion logic error caused a LO 6.1 regression +in commit 0e4f93e88bfae3489d2de84fc2febed100880628. + +- m_pPasswordGrid->Disable(); ++ m_xPasswordGrid->set_sensitive(false); //disable == false +- m_pBtnOk->Enable(); ++ m_xBtnOk->set_sensitive(false); //enable == true + +The result is that attempting to remove the password did not +enable the OK button, so it was impossible. + +Change-Id: I4067b2ec6b89e86b21968d33c8850cca6d067e71 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105049 +Tested-by: Jenkins +Reviewed-by: Caolán McNamara +(cherry picked from commit 9eeaff5fa9070bea685db8b6bbd2dfc1565756ac) +--- + sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx +index 84f8ef182b54..fa31ea77e392 100644 +--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx ++++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx +@@ -372,7 +372,7 @@ IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void) + else + { + m_xPasswordGrid->set_sensitive(false); +- m_xBtnOk->set_sensitive(false); ++ m_xBtnOk->set_sensitive(true); + } + } + +-- +2.28.0 + diff --git a/SOURCES/0007-tdf-137982-m_xFrame-is-already-disposed.patch b/SOURCES/0007-tdf-137982-m_xFrame-is-already-disposed.patch new file mode 100644 index 0000000..0d1098f --- /dev/null +++ b/SOURCES/0007-tdf-137982-m_xFrame-is-already-disposed.patch @@ -0,0 +1,137 @@ +From 7efe51c401ee469ae4835994e5f11b158fd354b9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 4 Nov 2020 13:01:53 +0000 +Subject: [PATCH 7/8] tdf#137982 m_xFrame is already disposed + +move the frame cleanup into a helper that listens to see if it got +disposed by the preview itself + +Change-Id: I523285268118300f18b0f0f0a10fab7a9cced9c6 +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105221 +Tested-by: Jenkins +Reviewed-by: Michael Stahl +(cherry picked from commit a986db4b2d24669e502e447036851e118cc23036) +--- + sw/source/ui/dbui/dbtablepreviewdialog.cxx | 53 ++++++++++++++++++---- + sw/source/ui/dbui/dbtablepreviewdialog.hxx | 4 +- + 2 files changed, 46 insertions(+), 11 deletions(-) + +diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.cxx b/sw/source/ui/dbui/dbtablepreviewdialog.cxx +index 23e7984623d8..8f2d92b1c7d5 100644 +--- a/sw/source/ui/dbui/dbtablepreviewdialog.cxx ++++ b/sw/source/ui/dbui/dbtablepreviewdialog.cxx +@@ -20,6 +20,8 @@ + #include + #include "dbtablepreviewdialog.hxx" + #include ++#include ++#include + #include + #include + +@@ -32,6 +34,34 @@ using namespace ::com::sun::star::beans; + using namespace ::com::sun::star::lang; + using namespace ::com::sun::star::util; + ++class DBTablePreviewFrame ++ : public cppu::WeakImplHelper ++{ ++private: ++ css::uno::Reference m_xFrame; ++ ++ virtual void SAL_CALL disposing(const lang::EventObject& /*Source*/) override ++ { ++ m_xFrame.clear(); ++ } ++ ++public: ++ DBTablePreviewFrame(css::uno::Reference& rFrame) ++ : m_xFrame(rFrame) ++ { ++ } ++ ++ void cleanup() ++ { ++ if (m_xFrame.is()) ++ { ++ m_xFrame->setComponent(nullptr, nullptr); ++ m_xFrame->dispose(); ++ m_xFrame.clear(); ++ } ++ } ++}; ++ + SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Sequence< beans::PropertyValue> const & rValues) + : SfxDialogController(pParent, "modules/swriter/ui/tablepreviewdialog.ui", "TablePreviewDialog") + , m_xDescriptionFI(m_xBuilder->weld_label("description")) +@@ -51,22 +81,26 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Seque + m_xDescriptionFI->set_label(sDescription.replaceFirst("%1", sTemp)); + } + ++ css::uno::Reference xFrame; + try + { + // create a frame wrapper for myself +- m_xFrame = frame::Frame::create( comphelper::getProcessComponentContext() ); +- m_xFrame->initialize(m_xBeamerWIN->CreateChildFrame()); ++ xFrame = frame::Frame::create( comphelper::getProcessComponentContext() ); ++ xFrame->initialize(m_xBeamerWIN->CreateChildFrame()); + } + catch (uno::Exception const &) + { +- m_xFrame.clear(); ++ xFrame.clear(); + } +- if (m_xFrame.is()) ++ if (xFrame.is()) + { ++ m_xFrameListener.set(new DBTablePreviewFrame(xFrame)); ++ xFrame->addEventListener(m_xFrameListener.get()); ++ + util::URL aURL; + aURL.Complete = ".component:DB/DataSourceBrowser"; +- uno::Reference xD = m_xFrame->queryDispatch(aURL, "", 0x0C); +- if(xD.is()) ++ uno::Reference xD = xFrame->queryDispatch(aURL, "", 0x0C); ++ if (xD.is()) + { + xD->dispatch(aURL, rValues); + m_xBeamerWIN->show(); +@@ -76,11 +110,10 @@ SwDBTablePreviewDialog::SwDBTablePreviewDialog(weld::Window* pParent, uno::Seque + + SwDBTablePreviewDialog::~SwDBTablePreviewDialog() + { +- if(m_xFrame.is()) ++ if (m_xFrameListener) + { +- m_xFrame->setComponent(nullptr, nullptr); +- m_xFrame->dispose(); +- m_xFrame.clear(); ++ m_xFrameListener->cleanup(); ++ m_xFrameListener.clear(); + } + } + +diff --git a/sw/source/ui/dbui/dbtablepreviewdialog.hxx b/sw/source/ui/dbui/dbtablepreviewdialog.hxx +index ec2c58d92bf3..27e6e83d39ca 100644 +--- a/sw/source/ui/dbui/dbtablepreviewdialog.hxx ++++ b/sw/source/ui/dbui/dbtablepreviewdialog.hxx +@@ -27,12 +27,14 @@ namespace com{ namespace sun{ namespace star{ + namespace frame{ class XFrame2; } + }}} + ++class DBTablePreviewFrame; ++ + class SwDBTablePreviewDialog : public SfxDialogController + { + std::unique_ptr m_xDescriptionFI; + std::unique_ptr m_xBeamerWIN; + +- css::uno::Reference< css::frame::XFrame2 > m_xFrame; ++ rtl::Reference m_xFrameListener; + public: + SwDBTablePreviewDialog(weld::Window* pParent, + css::uno::Sequence< css::beans::PropertyValue> const & rValues ); +-- +2.28.0 + diff --git a/SOURCES/0008-Resolves-tdf-137215-restore-original-modality-before.patch b/SOURCES/0008-Resolves-tdf-137215-restore-original-modality-before.patch new file mode 100644 index 0000000..42f512f --- /dev/null +++ b/SOURCES/0008-Resolves-tdf-137215-restore-original-modality-before.patch @@ -0,0 +1,52 @@ +From fa0371ce0456bfe355c36df0741ff23daeccb3a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 3 Nov 2020 14:04:37 +0000 +Subject: [PATCH 8/8] Resolves: tdf#137215 restore original modality before + dialog loop ends + +Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105214 +Tested-by: Jenkins +Reviewed-by: Adolfo Jayme Barrientos +(cherry picked from commit 022c11602d2101b49724b5cf104cc6c70b5a5e4b) + +Change-Id: I83467e28534b781c51b8d75a023e41f3c6a03903 +--- + sc/source/ui/dbgui/validate.cxx | 8 ++++++++ + sc/source/ui/inc/validate.hxx | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx +index 41bc913db911..73e04cc44706 100644 +--- a/sc/source/ui/dbgui/validate.cxx ++++ b/sc/source/ui/dbgui/validate.cxx +@@ -95,6 +95,14 @@ ScValidationDlg::ScValidationDlg(weld::Window* pParent, const SfxItemSet* pArgSe + AddTabPage("erroralert", ScTPValidationError::Create, nullptr); + } + ++void ScValidationDlg::EndDialog() ++{ ++ // tdf#137215 ensure original modalality of true is restored before dialog loop ends ++ if (m_bOwnRefHdlr) ++ RemoveRefDlg(true); ++ ScValidationDlgBase::EndDialog(); ++} ++ + ScValidationDlg::~ScValidationDlg() + { + if (m_bOwnRefHdlr) +diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx +index 2c562717f921..cb88b9e8b40e 100644 +--- a/sc/source/ui/inc/validate.hxx ++++ b/sc/source/ui/inc/validate.hxx +@@ -176,6 +176,8 @@ public: + + void SetModal(bool bModal) { m_xDialog->set_modal(bModal); } + ++ virtual void EndDialog() override; ++ + virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ) override + { + if ( m_pHandler && m_pSetReferenceHdl ) +-- +2.28.0 + diff --git a/SPECS/libreoffice.spec b/SPECS/libreoffice.spec index 603bca2..1550594 100644 --- a/SPECS/libreoffice.spec +++ b/SPECS/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 3%{?libo_prerelease}%{?dist} +Release: 4%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -256,6 +256,14 @@ Patch14: 0001-munge-cmis-headers-to-remove-exception-specs.patch Patch15: 0001-1.2.25-is-sufficient.patch Patch16: 0001-replace-Palatino-Linotype-with-Liberation-Serif.patch Patch17: 0001-Revert-tdf-69060-lock-refreshing-font-data-when-load.patch +Patch18: 0001-Resolves-rhbz-1893846-if-last-close-had-insert-index.patch +Patch19: 0002-resource-leak.patch +Patch20: 0003-copy_paste_error-data1-looks-like-a-copy-paste-error.patch +Patch21: 0004-Fix-use-of-uninitialized-SwFEShell-bTableCopied.patch +Patch22: 0005-cid-1460969-Uninitialized-scalar-field.patch +Patch23: 0006-tdf-137897-scRetypePassInputDlg-re-allow-password-re.patch +Patch24: 0007-tdf-137982-m_xFrame-is-already-disposed.patch +Patch25: 0008-Resolves-tdf-137215-restore-original-modality-before.patch %if 0%{?rhel} # not upstreamed @@ -2238,6 +2246,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Mon Nov 09 2020 Caolán McNamara - 1:6.4.7.2-4 +- Resolves: rhbz#1889801 rebuild for poppler + * Thu Oct 29 2020 Caolán McNamara - 1:6.4.7.2-3 - Related: rhbz#1874234 fix upgrade dependency problems