sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 3 +++
solenv/gbuild/UITest.mk | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 125053348935ab307978037abaa459acd509c4c7
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 20 09:01:38 2025 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 20 12:39:30 2025 +0200
tdf#167599: check the result of UNO_QUERY
Not all objects implement XServiceInfo. Any query must either be
UNO_QUERY_THROW, or check its result after UNO_QUERY.
Change-Id: I8b1d7c719c4a43a4d658957ad5a91181dc265186
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188080
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
index b037d746f5a5..f09817851886 100644
--- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
+++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx
@@ -1275,6 +1275,9 @@ void
ObjectInspectorTreeHandler::appendServices(uno::Reference<uno::XInterface>
return;
auto xServiceInfo = uno::Reference<lang::XServiceInfo>(xInterface,
uno::UNO_QUERY);
+ if (!xServiceInfo)
+ return;
+
const uno::Sequence<OUString>
aServiceNames(xServiceInfo->getSupportedServiceNames());
for (auto const& aServiceName : aServiceNames)
{
commit 32ba891829955b19506ef2133e84fb88389fec8d
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jul 20 10:29:36 2025 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 20 12:39:20 2025 +0200
Drop slashes after $(dir ...) in UITest.mk
GNU make's dir guarantees trailing slash. With these extra slashes,
I see this when running UITests on Windows:
C:/lo/build/workdir/UITest/calc_tests8//soffice.out.log: <<<
cat: 'C:/lo/build/workdir/UITest/calc_tests8//soffice.out.log': No such
file or directory
>>>
Change-Id: Iee51a8efe654c083da6361d5789774755be79641
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188081
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/solenv/gbuild/UITest.mk b/solenv/gbuild/UITest.mk
index 328216d2c259..b00c9c504bd0 100644
--- a/solenv/gbuild/UITest.mk
+++ b/solenv/gbuild/UITest.mk
@@ -62,7 +62,7 @@ else
$(call gb_Trace_StartRange,$*,UIT)
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_UITest_get_target,$*)) && \
- mkdir -p $(dir $(call gb_UITest_get_target,$*))/user/user && \
+ mkdir -p $(dir $(call gb_UITest_get_target,$*))user/user && \
cp $(if $(filter-out MACOSX,$(OS)),-T) $(if
$(gb_UITest_use_config),$(gb_UITest_use_config),$(SRCDIR)/qadevOOo/qa/registrymodifications.xcu)
$(dir $(call gb_UITest_get_target,$*))/user/user/registrymodifications.xcu && \
$(if $(gb_UITest__interactive),, \
rm -fr $@.core && mkdir -p $(dir $(call
gb_UITest_get_target,$*))user/ && mkdir $@.core && cd $@.core && ) \
@@ -71,7 +71,7 @@ else
$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
$(if
$(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
$(DEFS) \
- $(if $(filter WNT,$(OS)),SAL_LOG_FILE="$(dir $(call
gb_UITest_get_target,$*))/soffice.out.log") \
+ $(if $(filter WNT,$(OS)),SAL_LOG_FILE="$(dir $(call
gb_UITest_get_target,$*))soffice.out.log") \
TEST_LIB=$(call gb_Library_get_target,test) \
UNOTEST_LIB=$(call gb_Library_get_target,unotest) \
URE_BOOTSTRAP=vnd.sun.star.pathname:$(call
gb_Helper_get_rcfile,$(INSTROOT)/$(LIBO_ETC_FOLDER)/fundamental) \
@@ -94,8 +94,8 @@ else
RET=$$?; \
$(call
gb_CppunitTest_postprocess,$(gb_UITest_EXECUTABLE_GDB),$@.core,$$RET) >> $@.log
2>&1;) \
$(if $(filter WNT,$(OS)), \
- printf '%s: <<<
' $(dir $(call gb_UITest_get_target,$*))/soffice.out.log; \
- cat $(dir $(call
gb_UITest_get_target,$*))/soffice.out.log; \
+ printf '%s: <<<
' $(dir $(call gb_UITest_get_target,$*))soffice.out.log; \
+ cat $(dir $(call gb_UITest_get_target,$*))soffice.out.log;
\
printf ' >>>
';) \
cat $@.log; $(gb_UITest_UNITTESTFAILED) UI $*))))
$(call gb_Trace_EndRange,$*,UIT)
