summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2015-12-22 18:31:19 +1000
committerAndras Timar <andras.timar@collabora.com>2016-01-07 10:35:37 +0000
commit30eaaad63faca5908c4c8e30e0967ee262fd7e3f (patch)
treed6c6bd03d4a24626c11ca376e31a27be3dba3ded /svl
parentab1eed777a2e5fa94fdde1cc8260cf8ad264c145 (diff)
tdf#96708: don't modify document while copying to clipboard
I.e., don't try to create auto-layout for clipboard pages which don't contain one; don't resize objects to text. Also, don't invalidate items that are equal to defaults, because explicitly set items are not the same as absent items: pasting an object without an item makes the property to inherit new target's default, while when the item is present, the default doesn't apply. Also, don't consider selected state of the page while stringifying - this makes selected page string to differ from not-selected clipboard page. Change-Id: I172e03e1a8c428e5fcae3a116cc9ad8de79f1a87 Reviewed-on: https://gerrit.libreoffice.org/20871 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 3b4059dc53ec764be5423517363223043d6dbfad) Reviewed-on: https://gerrit.libreoffice.org/21104
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/itemset.cxx4
1 files changed, 1 insertions, 3 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 352019f1c57c..8707c02a96ee 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -1579,9 +1579,7 @@ sal_Int32 SfxItemSet::getHash() const
OString SfxItemSet::stringify() const
{
SvMemoryStream aStream;
- SfxItemSet aSet(*this);
- aSet.InvalidateDefaultItems();
- aSet.Store(aStream, true);
+ Store(aStream, true);
aStream.Flush();
return OString(
static_cast<char const *>(aStream.GetData()), aStream.GetEndOfData());