diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2023-11-13 11:01:39 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-13 13:18:41 +0100 |
| commit | 52c0ed891630c8eebf5fd19eb7ee7c8d1070f9ae (patch) | |
| tree | f0123ed27b5149c1e7f25c0d3d31f8097f20e5d7 | |
| parent | tdf#157363 add HTML format when pasting into draw text (diff) | |
| download | core-feature/cib_contract49b.tar.gz core-feature/cib_contract49b.zip | |
tdf#157363 remove pre text when pasting simple HTML
feature/cib_contract49b
appends to https://gerrit.libreoffice.org/c/core/+/158659
handling of pre text didn't make it into sd code
Change-Id: Ie396b487f451e163b9e59b585c988f9b1b5b669e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159361
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 3f04c25d5900..e92a0ddfea4a 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -29,6 +29,7 @@ #include <svx/xlnclit.hxx> #include <svx/svdpagv.hxx> #include <sfx2/docfile.hxx> +#include <sfx2/mieclip.hxx> #include <svx/svdoole2.hxx> #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> @@ -1502,6 +1503,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, xStm->Seek(0); OutlinerView* pOLV = GetTextEditOutlinerView(); + MSE40HTMLClipFormatObj aMSE40HTMLClipFormatObj; if (pOLV) { @@ -1511,7 +1513,8 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if (aRect.Contains(aPos) || (!bDrag && IsTextEdit())) { // mba: clipboard always must contain absolute URLs (could be from alien source) - pOLV->Read(*xStm, EETextFormat::Html, mpDocSh->GetHeaderAttributes()); + SvStream* pHtmlStream = aMSE40HTMLClipFormatObj.IsValid(*xStm); + pOLV->Read(*pHtmlStream, EETextFormat::Html, mpDocSh->GetHeaderAttributes()); bReturn = true; } } |