diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-01 12:29:37 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-01 14:59:58 +0100 |
| commit | 0d2c2ab55a20bfebd87f2296bb8b2d79508de082 (patch) | |
| tree | f8537724c5b62e8175b16bcd4de8d5f6c4968687 /svx/source/fmcomp | |
| parent | 0b35970ffb46075d19f1a65391dde8182f322ef0 (diff) | |
tdf#145964 related: also drop special-casing in TransferableHelper::SetString
Follow-up to commit 5fb9f4ffa9284c7248e2e82210506babaad4044d
Change-Id: I46d5ea404f77ac5ff67b6ee6a42afee13274a481
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126174
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'svx/source/fmcomp')
| -rw-r--r-- | svx/source/fmcomp/dbaexchange.cxx | 4 | ||||
| -rw-r--r-- | svx/source/fmcomp/xmlexchg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 4fecfac95696..26eaf9ad4894 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -218,7 +218,7 @@ namespace svx { case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE: case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE: - return SetString(m_sCompatibleFormat, _rFlavor); + return SetString(m_sCompatibleFormat); default: break; } if (nFormatId == getDescriptorFormatId()) @@ -432,7 +432,7 @@ namespace svx return SetAny( makeAny(m_aDescriptor.createPropertyValueSequence()) ); case SotClipboardFormatId::SBA_DATAEXCHANGE: - return SetString(m_sCompatibleObjectDescription, rFlavor); + return SetString(m_sCompatibleObjectDescription); default: break; } return false; diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 7fe8e4b88bd7..1f8d44ee7d3a 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -42,7 +42,7 @@ namespace svx const SotClipboardFormatId nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SotClipboardFormatId::XFORMS == nFormatId ) { - return SetString("XForms-Transferable", _rFlavor); + return SetString("XForms-Transferable"); } return false; } |