diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-12-30 16:47:17 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-01-09 00:34:30 +0000 |
| commit | 048e30c1f8231e6cd144a9251061f6fa127b353e (patch) | |
| tree | 712f9d5cf96f28e01eb980f6314df855b619a7eb /forms | |
| parent | 6f0993f2365cd8b6ce53f7a6e705c7fc9bd07ab6 (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>
Diffstat (limited to 'forms')
| -rw-r--r-- | forms/source/richtext/clipboarddispatcher.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index e8fe2321369b..9d068b428f26 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -137,7 +137,8 @@ namespace frm // initial state TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( _rView.GetWindow() ) ); - m_bPastePossible = ( aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || aDataHelper.HasFormat( SotClipboardFormatId::RTF ) ); + m_bPastePossible = ( aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || + aDataHelper.HasFormat( SotClipboardFormatId::RTF ) || aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) ); } @@ -155,7 +156,8 @@ namespace frm { OSL_ENSURE( _pDataHelper, "OPasteClipboardDispatcher::OnClipboardChanged: ooops!" ); m_bPastePossible = _pDataHelper->HasFormat( SotClipboardFormatId::STRING ) - || _pDataHelper->HasFormat( SotClipboardFormatId::RTF ); + || _pDataHelper->HasFormat( SotClipboardFormatId::RTF ) + || _pDataHelper->HasFormat( SotClipboardFormatId::RICHTEXT ); invalidate(); } |