diff options
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 9846c1748e1f..d918df4b3a37 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -222,7 +222,7 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) SW_MOD()->SetEmbeddedLoadSave( SfxObjectCreateMode::EMBEDDED == GetCreateMode() ); - pRdr->GetDoc()->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, dynamic_cast< const SwWebDocShell *>( this ) != nullptr); + pRdr->GetDoc().getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, dynamic_cast< const SwWebDocShell *>( this ) != nullptr); // Restore the pool default if reading a saved document. m_xDoc->RemoveAllFormatLanguageDependencies(); @@ -230,10 +230,10 @@ bool SwDocShell::ConvertFrom( SfxMedium& rMedium ) ErrCode nErr = pRdr->Read( *pRead ); // Maybe put away one old Doc - if (m_xDoc.get() != pRdr->GetDoc()) + if (m_xDoc.get() != &pRdr->GetDoc()) { RemoveLink(); - m_xDoc = pRdr->GetDoc(); + m_xDoc = &pRdr->GetDoc(); AddLink(); diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index ec1f31610a71..0cfea4721e42 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -393,7 +393,7 @@ void SwDocShell::AddLink() if (!m_xDoc) { SwDocFac aFactory; - m_xDoc = aFactory.GetDoc(); + m_xDoc = &aFactory.GetDoc(); m_xDoc->getIDocumentSettingAccess().set(DocumentSettingId::HTML_MODE, dynamic_cast< const SwWebDocShell *>( this ) != nullptr ); } m_xDoc->SetDocShell( this ); // set the DocShell-Pointer for Doc |