package/source/zippackage/ZipPackageStream.cxx | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
New commits:
commit c16cbc8aac87bc7d7a98d6b667f5b8d4c440c8dd
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Sep 7 11:13:49 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Sep 7 13:16:10 2024 +0200
Simplify a bit
Change-Id: Iec00d4a2499c92f853a7942ed0659973663819eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172961
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
Tested-by: Jenkins
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index 04c853e6ae32..0779827f13b0 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -308,8 +308,7 @@ uno::Reference< io::XInputStream >
ZipPackageStream::TryToGetRawFromDataStream(
Any aRoot = pPackage->getByHierarchicalName(u"/"_ustr);
auto xRootNameContainer =
aRoot.queryThrow<container::XNameContainer>();
- uno::Reference< XInterface > xNPSDummy( xNewPackStream, UNO_QUERY );
- xRootNameContainer->insertByName(u"dummy"_ustr, Any( xNPSDummy ) );
+ xRootNameContainer->insertByName(u"dummy"_ustr, Any( xNewPackStream )
);
// commit the temporary package
pPackage->commitChanges();
@@ -333,7 +332,6 @@ uno::Reference< io::XInputStream >
ZipPackageStream::TryToGetRawFromDataStream(
// close raw stream, package stream and folder
xInRaw.clear();
xNewPSProps.clear();
- xNPSDummy.clear();
xNewPackStream.clear();
xRootNameContainer.clear();
commit edd0e3ac9f9728ff88d63113d64911cee1e29a06
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Sep 7 11:02:26 2024 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Sep 7 13:16:04 2024 +0200
Simplify a bit
Change-Id: I8756f02ca9cb641528d621704cbed09d964c6ef9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172959
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/package/source/zippackage/ZipPackageStream.cxx
b/package/source/zippackage/ZipPackageStream.cxx
index d8d71b1ffe8f..04c853e6ae32 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -305,10 +305,8 @@ uno::Reference< io::XInputStream >
ZipPackageStream::TryToGetRawFromDataStream(
}
// insert a new stream in the package
- uno::Reference< XInterface > xTmp;
Any aRoot = pPackage->getByHierarchicalName(u"/"_ustr);
- aRoot >>= xTmp;
- uno::Reference< container::XNameContainer > xRootNameContainer( xTmp,
UNO_QUERY_THROW );
+ auto xRootNameContainer =
aRoot.queryThrow<container::XNameContainer>();
uno::Reference< XInterface > xNPSDummy( xNewPackStream, UNO_QUERY );
xRootNameContainer->insertByName(u"dummy"_ustr, Any( xNPSDummy ) );
@@ -337,7 +335,6 @@ uno::Reference< io::XInputStream >
ZipPackageStream::TryToGetRawFromDataStream(
xNewPSProps.clear();
xNPSDummy.clear();
xNewPackStream.clear();
- xTmp.clear();
xRootNameContainer.clear();
// return the stream representing the first temporary file
