diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-19 14:34:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-10-20 14:29:59 +0200 |
| commit | 27b0d7237a7e2f32897fa52820c3aa382f6683e9 (patch) | |
| tree | 9bb72aca6a4e87f4ebf9981da1a0199cf093b022 | |
| parent | f0edf93fce53a726fec5167139513bc8420728e7 (diff) | |
clarify this code a little
Change-Id: I10a9f29add5cefa866cbe87e5c6164738ca57d04
Reviewed-on: https://gerrit.libreoffice.org/62019
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | embeddedobj/source/msole/oleembed.cxx | 5 | ||||
| -rw-r--r-- | sw/source/core/view/vnew.cxx | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/embeddedobj/source/msole/oleembed.cxx b/embeddedobj/source/msole/oleembed.cxx index 7f84b91ead18..72fb031d84a1 100644 --- a/embeddedobj/source/msole/oleembed.cxx +++ b/embeddedobj/source/msole/oleembed.cxx @@ -837,11 +837,8 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID ) uno::Reference< embed::XEmbeddedObject > xWrappedObject = m_xWrappedObject; if ( xWrappedObject.is() ) { - // open content in the window not in-place - nVerbID = embed::EmbedVerbs::MS_OLEVERB_OPEN; - // the object was converted to OOo embedded object, the current implementation is now only a wrapper - xWrappedObject->doVerb( nVerbID ); + xWrappedObject->doVerb(embed::EmbedVerbs::MS_OLEVERB_OPEN); // open content in the window not in-place return; } // end wrapping related part ==================== diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index f3ae2154993e..ba029c6c9f77 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -178,9 +178,9 @@ SwViewShell::SwViewShell( SwDoc& rDocument, vcl::Window *pWindow, // i#38810 Do not reset modified state of document, // if it's already been modified. const bool bIsDocModified( mxDoc->getIDocumentState().IsModified() ); - pOutput = mpOut; + OutputDevice* pOrigOut = mpOut; Init( pNewOpt ); // may change the Outdev (InitPrt()) - mpOut = pOutput; + mpOut = pOrigOut; // initialize print preview layout after layout // is created in <SwViewShell::Init(..)> - called above. @@ -253,9 +253,9 @@ SwViewShell::SwViewShell( SwViewShell& rShell, vcl::Window *pWindow, bool bModified = mxDoc->getIDocumentState().IsModified(); - pOutput = mpOut; + OutputDevice* pOrigOut = mpOut; Init( rShell.GetViewOptions() ); // might change Outdev (InitPrt()) - mpOut = pOutput; + mpOut = pOrigOut; if ( mbPreview ) mpImp->InitPagePreviewLayout(); |