diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-12-30 16:47:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2017-01-26 12:01:21 +0000 |
| commit | a6f3ca06100bc23eee5017d6cf53e89282dc580d (patch) | |
| tree | aacf736ec60852bf8b72599e33afe479bc23d896 /svtools | |
| parent | 5891a45fa08729ba01f78bece9312b2c01d3a214 (diff) | |
tdf#101828 handle rtf/richtext correctly
Change-Id: Id894f62a918bd6e6fa59f8d546307343bf2bd4b0
Reviewed-on: https://gerrit.libreoffice.org/32682
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 048e30c1f8231e6cd144a9251061f6fa127b353e)
Reviewed-on: https://gerrit.libreoffice.org/33567
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/formats.src | 4 | ||||
| -rw-r--r-- | svtools/source/dialogs/insdlg.cxx | 3 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 4 |
3 files changed, 10 insertions, 1 deletions
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src index b9451a1f51a4..3ecaff7ac772 100644 --- a/svtools/source/dialogs/formats.src +++ b/svtools/source/dialogs/formats.src @@ -35,6 +35,10 @@ String STR_FORMAT_RTF { Text [ en-US ] = "Formatted text [RTF]" ; }; +String STR_FORMAT_ID_RICHTEXT +{ + Text [ en-US ] = "Formatted text [Richtext]" ; +}; String STR_FORMAT_ID_DRAWING { Text [ en-US ] = "Drawing format"; diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index b9a6f535a1a3..5d76ec22de3b 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -263,7 +263,8 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( SotClipboardFormatId nId ) { SotClipboardFormatId::DBACCESS_COMMAND, STR_FORMAT_ID_DBACCESS_COMMAND }, { SotClipboardFormatId::DIALOG_60, STR_FORMAT_ID_DIALOG_60 }, { SotClipboardFormatId::FILEGRPDESCRIPTOR, STR_FORMAT_ID_FILEGRPDESCRIPTOR }, - { SotClipboardFormatId::HTML_NO_COMMENT, STR_FORMAT_ID_HTML_NO_COMMENT } + { SotClipboardFormatId::HTML_NO_COMMENT, STR_FORMAT_ID_HTML_NO_COMMENT }, + { SotClipboardFormatId::RICHTEXT, STR_FORMAT_ID_RICHTEXT }, }; OUString aUIName; diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 1f7fcb7ad3ff..78849fa5dd8b 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1271,6 +1271,10 @@ void TransferableDataHelper::FillDataFlavorExVector( const Sequence< DataFlavor { rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SotClipboardFormatId::RTF; } + else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( "text/richtext" ) ) + { + rDataFlavorExVector[ rDataFlavorExVector.size() - 1 ].mnSotId = SotClipboardFormatId::RICHTEXT; + } else if( xMimeType.is() && xMimeType->getFullMediaType().equalsIgnoreAsciiCase( "text/html" ) ) { |