cui/source/factory/dlgfact.cxx | 2 +-
cui/source/factory/dlgfact.hxx | 2 +-
unoxml/qa/unit/domtest.cxx | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 30f4044ff45403b7f69df4f49c3d58ccc8b3fdce
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 4 16:05:52 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 5 09:51:39 2024 +0100
Resolves: tdf#158965 Find Record: Similarities dialog doesn't appear
and assert in DBG_UTIL mode
regression since:
commit 36343165c251e30c700360cc5c4266f576d4ac00
Date: Wed Jan 25 11:07:28 2023 +0000
cui: Make SimilaritySearch dialog async and enable use for jsdialog
Change-Id: Iee2071874836ccf8a1ab10fbc6d6b3c491fd04ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161624
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index fbdea49672ef..ffb5fd301069 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -125,7 +125,7 @@ IMPL_ABSTDLG_CLASS(AbstractSvxObjectNameDialog)
IMPL_ABSTDLG_CLASS(AbstractSvxObjectTitleDescDialog)
IMPL_ABSTDLG_CLASS(AbstractSvxPathSelectDialog)
IMPL_ABSTDLG_CLASS(AbstractSvxPostItDialog)
-IMPL_ABSTDLG_CLASS(AbstractSvxSearchSimilarityDialog)
+IMPL_ABSTDLG_CLASS_ASYNC(AbstractSvxSearchSimilarityDialog,SvxSearchSimilarityDialog)
IMPL_ABSTDLG_CLASS(AbstractSvxZoomDialog)
IMPL_ABSTDLG_CLASS(AbstractTitleDialog)
IMPL_ABSTDLG_CLASS(AbstractURLDlg)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index b6120dcfb2ef..1da0ec35ec38 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -220,7 +220,7 @@ DECL_ABSTDLG_CLASS(AbstractURLDlg, URLDlg)
};
// AbstractSvxSearchSimilarityDialog_Impl
-DECL_ABSTDLG_CLASS(AbstractSvxSearchSimilarityDialog,SvxSearchSimilarityDialog)
+DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxSearchSimilarityDialog,SvxSearchSimilarityDialog)
virtual sal_uInt16 GetOther() override;
virtual sal_uInt16 GetShorter() override;
virtual sal_uInt16 GetLonger() override;
commit cbb17a548b5cc6a99b6ed7735479bb4f2bc40f26
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jan 4 17:00:06 2024 +0000
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jan 5 09:51:27 2024 +0100
std::size/SAL_N_ELEMENTS also counts the null terminator
which libxml2 2.12 will fail on with error:
'Extra content at the end of the document'
Change-Id: I9d5da9fdd826cce8462ede8c510eaea7281b760f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161627
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx
index 479ff3fea697..a97248167f60 100644
--- a/unoxml/qa/unit/domtest.cxx
+++ b/unoxml/qa/unit/domtest.cxx
@@ -204,9 +204,9 @@ struct BasicTest : public test::BootstrapFixture
mxErrHandler.set( new ErrorHandler() );
uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"),
uno::UNO_QUERY_THROW );
mxDomBuilder.set( xDB );
- mxValidInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile))) );
- mxWarningInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(warningTestFile), std::size(warningTestFile))) );
- mxErrorInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(errorTestFile), std::size(errorTestFile))) );
+ mxValidInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile) - 1)) );
+ mxWarningInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(warningTestFile), std::size(warningTestFile) - 1)) );
+ mxErrorInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(errorTestFile), std::size(errorTestFile) - 1)) );
mxDomBuilder->setErrorHandler(mxErrHandler);
}
@@ -288,7 +288,7 @@ struct SerializerTest : public test::BootstrapFixture
mxErrHandler.set( new ErrorHandler() );
uno::Reference<XDocumentBuilder> xDB(
getMultiServiceFactory()->createInstance("com.sun.star.xml.dom.DocumentBuilder"),
uno::UNO_QUERY_THROW );
mxDomBuilder.set( xDB );
- mxInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile))) );
+ mxInStream.set( new
SequenceInputStream(css::uno::Sequence<sal_Int8>(reinterpret_cast<sal_Int8
const *>(validTestFile), std::size(validTestFile) - 1)) );
mxDomBuilder->setErrorHandler(mxErrHandler);
mxHandler.set( new DocumentHandler );
mxTokHandler.set( new TokenHandler );
