diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2023-11-21 17:32:23 +0100 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2023-11-24 15:55:50 +0100 |
| commit | c47100e478301085ffb1e71bed41b9e5c39377fd (patch) | |
| tree | 85dfa1236d3f9fe57813e3a3dfade142151aa811 /sw/source/uibase/shells/drwtxtex.cxx | |
| parent | 418af212a7f506784d88f5a7a7800140f4f9dd30 (diff) | |
tdf#158294 HTML simple format also added to paste special toolbox
adds the format HTML simple to the paste special toolbox controller
in impress and with draw text selection in calc and writer
Change-Id: Ibdca5d3cd5ab4640320cff3b03b30f6575e8fec8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159791
Tested-by: Jenkins
Tested-by: Gabor Kelemen <kelemeng@ubuntu.com>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'sw/source/uibase/shells/drwtxtex.cxx')
| -rw-r--r-- | sw/source/uibase/shells/drwtxtex.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sw/source/uibase/shells/drwtxtex.cxx b/sw/source/uibase/shells/drwtxtex.cxx index 3d7eecab6f07..a94016747ee8 100644 --- a/sw/source/uibase/shells/drwtxtex.cxx +++ b/sw/source/uibase/shells/drwtxtex.cxx @@ -1113,7 +1113,7 @@ void SwDrawTextShell::ExecClpbrd(SfxRequest const &rReq) if (nFormat == SotClipboardFormatId::STRING) pOLV->Paste(); else - pOLV->PasteSpecial(); + pOLV->PasteSpecial(nFormat); } break; @@ -1138,7 +1138,8 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( &GetView().GetEditWin() ) ); const bool bPaste = aDataHelper.HasFormat( SotClipboardFormatId::STRING ) || aDataHelper.HasFormat( SotClipboardFormatId::RTF ) || - aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ); + aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) || + aDataHelper.HasFormat( SotClipboardFormatId::HTML_SIMPLE); SfxWhichIter aIter(rSet); sal_uInt16 nWhich = aIter.FirstWhich(); @@ -1171,6 +1172,8 @@ void SwDrawTextShell::StateClpbrd(SfxItemSet &rSet) aFormats.AddClipbrdFormat( SotClipboardFormatId::RTF ); if ( aDataHelper.HasFormat( SotClipboardFormatId::RICHTEXT ) ) aFormats.AddClipbrdFormat( SotClipboardFormatId::RICHTEXT ); + if (aDataHelper.HasFormat(SotClipboardFormatId::HTML_SIMPLE)) + aFormats.AddClipbrdFormat(SotClipboardFormatId::HTML_SIMPLE); rSet.Put( aFormats ); } |