svx/CppunitTest_svx_unit.mk | 1
svx/qa/unit/data/3d-object-fallback.odp |binary
svx/qa/unit/xml.cxx | 68 ++++++++++++++++++++++++++++++++
svx/source/xml/xmlgrhlp.cxx | 40 ++++++++++++++----
4 files changed, 100 insertions(+), 9 deletions(-)
New commits:
commit dc41ee96197b6b3901f1db51bed0bc2f694ca98a
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Aug 30 15:14:10 2021 +0200
Commit: Tomaž Vajngerl <qui...@gmail.com>
CommitDate: Thu Sep 2 02:27:43 2021 +0200
tdf#137310 ODF import: fix loading of images with multiple slashes in path
Regression from commit 1b02ba03bd62a712e15c15384a3d105d2c088120 (shapes:
don't use "GraphicURL" property, always use "Graphic", 2018-02-13), the
problem was that now the loading of Models/Fallbacks/duck.png goes via
SvXMLGraphicHelper::ImplGetGraphicStream(), which assumed that the
directory part of the picture path contains no slashes, so can be
handled via ImplGetGraphicStorage().
That functions works with Pictures/something.png, but not with
Models/Fallbacks/duck.png.
Fix the problem by using openStreamElementByHierarchicalName() to open
the picture stream in case we got no stream and the storage name
contains a slash.
(cherry picked from commit 56f593c9aa00f87fb8780060fece991b91b5c0a7)
Change-Id: I0e04fb4286777b04286c4979af31e6df19988873
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121348
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <qui...@gmail.com>
diff --git a/svx/CppunitTest_svx_unit.mk b/svx/CppunitTest_svx_unit.mk
index 598d788392b4..d24d8fde39bc 100644
--- a/svx/CppunitTest_svx_unit.mk
+++ b/svx/CppunitTest_svx_unit.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,svx_unit, \
svx/qa/unit/svdraw \
svx/qa/unit/unodraw \
svx/qa/unit/xoutdev \
+ svx/qa/unit/xml \
svx/qa/unit/XTableImportExportTest \
))
diff --git a/svx/qa/unit/data/3d-object-fallback.odp
b/svx/qa/unit/data/3d-object-fallback.odp
new file mode 100644
index 000000000000..5ced0be475d7
Binary files /dev/null and b/svx/qa/unit/data/3d-object-fallback.odp differ
diff --git a/svx/qa/unit/xml.cxx b/svx/qa/unit/xml.cxx
new file mode 100644
index 000000000000..de16b39be5a3
--- /dev/null
+++ b/svx/qa/unit/xml.cxx
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include <test/bootstrapfixture.hxx>
+#include <unotest/macros_test.hxx>
+
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <com/sun/star/frame/Desktop.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+
+#include <rtl/ustring.hxx>
+
+using namespace ::com::sun::star;
+
+namespace
+{
+/// Tests for svx/source/xml/ code.
+class Test : public test::BootstrapFixture, public unotest::MacrosTest
+{
+protected:
+ uno::Reference<lang::XComponent> mxComponent;
+
+public:
+ virtual void setUp() override
+ {
+ test::BootstrapFixture::setUp();
+ mxDesktop.set(frame::Desktop::create(m_xContext));
+ }
+
+ virtual void tearDown() override
+ {
+ if (mxComponent.is())
+ {
+ mxComponent->dispose();
+ }
+ test::BootstrapFixture::tearDown();
+ }
+ uno::Reference<lang::XComponent>& getComponent() { return mxComponent; }
+};
+
+CPPUNIT_TEST_FIXTURE(Test, test3DObjectFallback)
+{
+ // Load a document which has a 3D model we don't understand, but has a
fallback PNG.
+ test::Directories aDirectories;
+ OUString aURL =
aDirectories.getURLFromSrc(u"svx/qa/unit/data/3d-object-fallback.odp");
+ getComponent() = loadFromDesktop(aURL);
+ uno::Reference<drawing::XDrawPagesSupplier>
xDrawPagesSupplier(getComponent(), uno::UNO_QUERY);
+ uno::Reference<drawing::XDrawPage>
xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+ uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0),
uno::UNO_QUERY);
+ uno::Reference<graphic::XGraphic> xGraphic;
+ xShape->getPropertyValue("Graphic") >>= xGraphic;
+ // Without the accompanying fix in place, this test would have failed, we
could not read
+ // Models/Fallbacks/duck.png, as we assumed a format like
Pictures/something.png, i.e. a single
+ // slash in the path.
+ CPPUNIT_ASSERT(xGraphic.is());
+}
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index aca660892e61..b911b880339a 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XCancellable.hpp>
+#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
#include <comphelper/fileformat.h>
#include <comphelper/graphicmimetype.hxx>
#include <cppuhelper/compbase.hxx>
@@ -448,22 +449,43 @@ SvxGraphicHelperStream_Impl
SvXMLGraphicHelper::ImplGetGraphicStream( const OUSt
SvxGraphicHelperStream_Impl aRet;
aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName );
- if( aRet.xStorage.is() )
+ sal_Int32 nMode = embed::ElementModes::READ;
+ if (SvXMLGraphicHelperMode::Write == meCreateMode)
{
- sal_Int32 nMode = embed::ElementModes::READ;
- if ( SvXMLGraphicHelperMode::Write == meCreateMode )
- {
- nMode = embed::ElementModes::READWRITE;
- }
+ nMode = embed::ElementModes::READWRITE;
+ }
+ if (aRet.xStorage.is())
+ {
aRet.xStream = aRet.xStorage->openStreamElement( rPictureStreamName,
nMode );
- if( aRet.xStream.is() && ( SvXMLGraphicHelperMode::Write ==
meCreateMode ) )
+ }
+ else if (rPictureStorageName.indexOf('/') != -1)
+ {
+ uno::Reference<embed::XHierarchicalStorageAccess>
xHierRootStorage(mxRootStorage,
+
uno::UNO_QUERY);
+ if (xHierRootStorage.is())
{
- uno::Reference < beans::XPropertySet > xProps( aRet.xStream,
uno::UNO_QUERY );
- xProps->setPropertyValue( "UseCommonStoragePasswordEncryption",
uno::makeAny( true) );
+ try
+ {
+ aRet.xStream =
xHierRootStorage->openStreamElementByHierarchicalName(
+ rPictureStorageName + "/" + rPictureStreamName, nMode);
+ aRet.xStorage = mxRootStorage;
+ }
+ catch (const uno::Exception&)
+ {
+ TOOLS_WARN_EXCEPTION("svx",
+
"SvXMLGraphicHelper::ImplGetGraphicStream: failed to open "
+ << rPictureStreamName);
+ }
}
}
+ if (aRet.xStream.is() && (SvXMLGraphicHelperMode::Write == meCreateMode))
+ {
+ uno::Reference<beans::XPropertySet> xProps(aRet.xStream,
uno::UNO_QUERY);
+ xProps->setPropertyValue("UseCommonStoragePasswordEncryption",
uno::makeAny(true));
+ }
+
return aRet;
}
