summaryrefslogtreecommitdiffstats
path: root/basctl
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2021-10-17 13:18:11 +0200
committerJulien Nabet <serval2412@yahoo.fr>2021-10-17 14:13:10 +0200
commitcf3971a9414f52b116c1c21f267128ffa67f171b (patch)
tree5f1b959f1df7842b3c87c359c96c97b1bbb0bc66 /basctl
parenttdf#144988 correct font size in multiline Fontwork text (diff)
downloadcore-cf3971a9414f52b116c1c21f267128ffa67f171b.tar.gz
core-cf3971a9414f52b116c1c21f267128ffa67f171b.zip
Simplify Sequence in b*
Change-Id: I0817d9a35a9c3fc43badb6cc60727de69849b063 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123720 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/source/dlged/dlged.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 34467260c140..203fa9cc44b9 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -763,10 +763,8 @@ void DlgEditor::Copy()
xStream2->closeInput();
// Old format contains dialog with replaced ids
- Sequence< Any > aSeqData(2);
Any aNoResourceDialogModelBytesAny;
aNoResourceDialogModelBytesAny <<= NoResourceDialogModelBytes;
- aSeqData[0] = aNoResourceDialogModelBytesAny;
// New format contains dialog and resource
Sequence< sal_Int8 > aResData = xStringResourcePersistence->exportBinary();
@@ -792,18 +790,18 @@ void DlgEditor::Copy()
memcpy( pCombinedData + 4, DialogModelBytes.getConstArray(), nDialogDataLen );
memcpy( pCombinedData + nResOffset, aResData.getConstArray(), nResDataLen );
- aSeqData[1] <<= aCombinedData;
+ Sequence< Any > aSeqData
+ {
+ aNoResourceDialogModelBytesAny,
+ makeAny(aCombinedData)
+ };
pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavorsResource, aSeqData );
}
else
{
// No resource, support only old format
- Sequence< Any > aSeqData(1);
- Any aDialogModelBytesAny;
- aDialogModelBytesAny <<= DialogModelBytes;
- aSeqData[0] = aDialogModelBytesAny;
- pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavors , aSeqData );
+ pTrans = new DlgEdTransferableImpl( m_ClipboardDataFlavors , { makeAny(DialogModelBytes) } );
}
SolarMutexReleaser aReleaser;
xClipboard->setContents( pTrans , pTrans );