Kaydet (Commit) 27b0d723 authored tarafından Caolán McNamara's avatar Caolán McNamara

clarify this code a little

Change-Id: I10a9f29add5cefa866cbe87e5c6164738ca57d04
Reviewed-on: https://gerrit.libreoffice.org/62019
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f0edf93f
......@@ -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 ====================
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment