diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-09 17:57:13 +0200 |
|---|---|---|
| committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-07-10 10:25:16 +0200 |
| commit | 572b298e636612416b8223ff6e6f2d26ab51a243 (patch) | |
| tree | f43bde0ca2a65316b7cc9e09d20153f20a7860de | |
| parent | 87b621a1262d2e57b770bc4c6e80e51f99441f58 (diff) | |
tdf#118578 sw: allow inserting only TextDocument
There are 3 sw document services: TextDocument, WebDocument and
GlobalDocument.
The current logic in SwView::InsertDoc() and
SwView_Impl::StartDocumentInserter() is to request a filter with the
same document service as the existing target document, so you can insert
only a GlobalDocument into a GlobalDocument, which doesn't make much
sense.
As it happens there are 2 different HTML import filters: "HTML" and
"HTML (StarWriter)", the latter using the TextDocument service.
So just hard-code to allow TextDocument regardless of the target
document.
(regression from 805fd1ca343d6295b8114a24cc29bdac332f266d)
Change-Id: I7dc0dd4789fba8b61625ca8eae74a864aea383b0
Reviewed-on: https://gerrit.libreoffice.org/57193
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
| -rw-r--r-- | sw/source/uibase/uiview/view2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx index 6dd361e72559..c71011b737a4 100644 --- a/sw/source/uibase/uiview/view2.cxx +++ b/sw/source/uibase/uiview/view2.cxx @@ -2093,7 +2093,8 @@ long SwView::InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName, const OUS else { m_pViewImpl->StartDocumentInserter( - pDocSh->GetFactory().GetFactoryName(), + // tdf#118578 allow inserting any Writer document except GlobalDoc + SwDocShell::Factory().GetFactoryName(), LINK( this, SwView, DialogClosedHdl ), nSlotId ); |