[Libreoffice-commits] core.git: sw/source

[Libreoffice Gerrit user]

 sw/source/filter/ww8/wrtww8.cxx |   11 +++--------
 sw/source/filter/ww8/ww8par.cxx |   20 ++++++--------------
 2 files changed, 9 insertions(+), 22 deletions(-)

New commits:
commit 2ec0cf500222aef55d02df80154b47fbb92970c9
Author:     Justin Luth <justin.luth at collabora.com>
AuthorDate: Thu Oct 18 21:15:13 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Fri Oct 19 11:05:38 2018 +0200

    NFC ww8 cleanup: remove unused variables, simplify, whitespace
    
    Change-Id: Ib4f100d4019643cde893ef1d8643a5c08b55ff8f
    Reviewed-on: https://gerrit.libreoffice.org/61951
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6451b5c92377..29259003ab88 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -498,14 +498,9 @@ static void WriteDop( WW8Export& rWrt )
     OSL_ENSURE(pDocShell, "no SwDocShell");
     uno::Reference<document::XDocumentProperties> xDocProps;
     uno::Reference<beans::XPropertySet> xProps;
-    if (pDocShell) {
-        uno::Reference<lang::XComponent> xModelComp(pDocShell->GetModel(),
-           uno::UNO_QUERY);
-        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");
+    if ( pDocShell )
+    {
+        xProps.set(pDocShell->GetModel(), uno::UNO_QUERY);
 
         rDop.lKeyProtDoc = pDocShell->GetModifyPasswordHash();
     }
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 54bf8e6aeaa7..70f3cdf41f6c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1905,22 +1905,14 @@ void SwWW8ImplReader::ImportDop()
 
     // disable form design mode to be able to use imported controls directly
     // #i31239# always disable form design mode, not only in protected docs
+    uno::Reference<beans::XPropertySet> xDocProps(m_pDocShell->GetModel(), uno::UNO_QUERY);
+    if (xDocProps.is())
     {
-        uno::Reference<lang::XComponent> xModelComp(m_pDocShell->GetModel(),
-           uno::UNO_QUERY);
-        uno::Reference<beans::XPropertySet> xDocProps(xModelComp,
-           uno::UNO_QUERY);
-        if (xDocProps.is())
+        uno::Reference<beans::XPropertySetInfo> xInfo = xDocProps->getPropertySetInfo();
+        if (xInfo.is())
         {
-            uno::Reference<beans::XPropertySetInfo> xInfo =
-                xDocProps->getPropertySetInfo();
-            if (xInfo.is())
-            {
-                if (xInfo->hasPropertyByName("ApplyFormDesignMode"))
-                {
-                    xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::makeAny(false));
-                }
-            }
+            if (xInfo->hasPropertyByName("ApplyFormDesignMode"))
+                xDocProps->setPropertyValue("ApplyFormDesignMode", css::uno::makeAny(false));
         }
     }