[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - editeng/source

[Michael Stahl]

 editeng/source/editeng/impedit2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bf2890a2f619b8cf885627ded1547cf0f5a6a10f
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Feb 13 22:45:57 2017 +0100

    editeng: presumed copypasta in 048e30c1f8231e6cd144a9251061f6fa127b353e
    
    Doesn't make sense to check for RTF twice in a row.
    
    Change-Id: I15a384adb4d9e65770d81c414b6f24cc0a2b75e8
    (cherry picked from commit 6ed7a9759fdf6affdb6ec81a9aae7a3398de8d9b)
    Reviewed-on: https://gerrit.libreoffice.org/34244
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index 579e29d..c08dde3 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3480,7 +3480,7 @@ EditSelection ImpEditEngine::InsertText( uno::Reference< 
datatransfer::XTransfer
             SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, 
aFlavor );
             // RICHTEXT
             datatransfer::DataFlavor aFlavorRichtext;
-            SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RTF, 
aFlavorRichtext );
+            SotExchange::GetFormatDataFlavor( SotClipboardFormatId::RICHTEXT, 
aFlavorRichtext );
             bool bRtfSupported = rxDataObj->isDataFlavorSupported( aFlavor );
             bool bRichtextSupported  = rxDataObj->isDataFlavorSupported( 
aFlavorRichtext );
             if ( bRtfSupported || bRichtextSupported )

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits