[Libreoffice-commits] core.git: sd/source

[Oliver Specht (via logerrit)]

 sd/source/ui/view/sdview3.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 418af212a7f506784d88f5a7a7800140f4f9dd30
Author:     Oliver Specht <oliver.spe...@cib.de>
AuthorDate: Mon Nov 20 11:09:45 2023 +0100
Commit:     Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Fri Nov 24 15:55:34 2023 +0100

    tdf#157363 remove HTML prefix always
    
    when pasting simple HTML the prefix has to removed also if content is pasted
    without an active drawing object
    
    Change-Id: I038771c3d0338f16b74bd45275f4637eab00cfdf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159738
    Tested-by: Jenkins
    Tested-by: Gabor Kelemen <kelem...@ubuntu.com>
    Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>

diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 3656f6481242..ddd0ad28ece5 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1504,6 +1504,7 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 
                 OutlinerView* pOLV = GetTextEditOutlinerView();
                 MSE40HTMLClipFormatObj aMSE40HTMLClipFormatObj;
+                SvStream* pHtmlStream = aMSE40HTMLClipFormatObj.IsValid(*xStm);
 
                 if (pOLV)
                 {
@@ -1513,7 +1514,6 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
                     if (aRect.Contains(aPos) || (!bDrag && IsTextEdit()))
                     {
                         // mba: clipboard always must contain absolute URLs 
(could be from alien source)
-                        SvStream* pHtmlStream = 
aMSE40HTMLClipFormatObj.IsValid(*xStm);
                         pOLV->Read(*pHtmlStream, EETextFormat::Html, 
mpDocSh->GetHeaderAttributes());
                         bReturn = true;
                     }
@@ -1521,7 +1521,7 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 
                 if (!bReturn)
                     // mba: clipboard always must contain absolute URLs (could 
be from alien source)
-                    bReturn = SdrView::Paste(*xStm, EETextFormat::Html, 
maDropPos, pPage, nPasteOptions);
+                    bReturn = SdrView::Paste(*pHtmlStream, EETextFormat::Html, 
maDropPos, pPage, nPasteOptions);
             }
         }
     }