sw/source/uibase/uiview/view2.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 3bd5ff846120f65d21a8dfdf9cf5253669c68554
Author: Michael Stahl <michael.st...@cib.de>
Date: Mon Jul 9 17:57:13 2018 +0200
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.st...@cib.de>
(cherry picked from commit 572b298e636612416b8223ff6e6f2d26ab51a243)
Reviewed-on: https://gerrit.libreoffice.org/57223
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/source/uibase/uiview/view2.cxx
b/sw/source/uibase/uiview/view2.cxx
index 4cb021a90f3c..2bcc735e0bbf 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -2084,7 +2084,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
);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
