summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2020-09-28 20:21:52 +0300
committerJustin Luth <justin_luth@sil.org>2020-10-19 12:40:10 +0200
commit1086654d6e8cc22f1f99195668db3f305437e570 (patch)
tree81bef65dae5797e14b9e91da47d44f8c0b9f4797 /sw/source/filter
parent6137de745606e9ccee94119fd1f8b7a90c4aa323 (diff)
tdf#136983 partial revert NFC ww8 cleanup: remove unused variables
This is a partial revert of LO 6.2 commit 2ec0cf500222aef55d02df80154b47fbb92970c9 I can't think of any excuse for how I possibly missed that xDocProps was being defined/used outside of this clause. Just plain stupid and blind. The good news is that the create and modified date still seem to be getting saved somehow/somewhere. So it isn't the disaster that it looks like it could have been. Change-Id: I72ef56fa50b9e92e4ce687b132b1919cfae6c1f6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103565 Tested-by: Jenkins Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 90152ceca99c..f853af98aa83 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -496,7 +496,11 @@ static void WriteDop( WW8Export& rWrt )
uno::Reference<beans::XPropertySet> xProps;
if ( pDocShell )
{
- xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
+ uno::Reference<lang::XComponent> xModelComp = pDocShell->GetModel();
+ xProps.set(xModelComp, uno::UNO_QUERY);
+ uno::Reference<document::XDocumentPropertiesSupplier> xDPS(xModelComp, uno::UNO_QUERY_THROW);
+ xDocProps = xDPS->getDocumentProperties();
+ OSL_ENSURE(xDocProps.is(), "DocumentProperties is null");
rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
}