commit 2ec0cf500222aef55d02df80154b47fbb92970c9
author Justin Luth <justin.luth@collabora.com> Thu Oct 18 21:15:13 2018 +0300
committer Justin Luth <justin_luth@sil.org> Fri Oct 19 11:05:38 2018 +0200
tree 46c5b47da19c901aff9ba7eab18cc244845e26f0
parent 59a55475af8e4f6ce4f0976a73a605b012165d3a

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@sil.org>

sw/source/filter/ww8/wrtww8.cxx

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 6451b5c..2925900 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();
    }

sw/source/filter/ww8/ww8par.cxx

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 54bf8e6..70f3cdf 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));
        }
    }