diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2015-12-22 18:31:19 +1000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-01-05 07:18:17 +0000 |
| commit | 3b4059dc53ec764be5423517363223043d6dbfad (patch) | |
| tree | 27fb3c23df9725572628b8c6f39c4d3fba5186e2 /include/svx | |
| parent | 26eb0debda788d996d9bd63d72947652a5066087 (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>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/svdmodel.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index c400c669b90b..4a246d90de13 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -198,14 +198,14 @@ protected: bool bInfoChanged:1; bool bPagNumsDirty:1; bool bMPgNumsDirty:1; - bool bPageNotValid:1; // TRUE=Doc is only object container. Page is invalid. + bool bTransportContainer:1; // doc is temporary object container, no display (e.g. clipboard) bool bSavePortable:1; // save metafiles portably bool bNoBitmapCaching:1; // cache bitmaps for screen output bool bReadOnly:1; bool bTransparentTextFrames:1; bool bSaveCompressed:1; bool bSwapGraphics:1; - bool bPasteResize:1; // Objects are beingresized due to Paste with different MapMode + bool bPasteResize:1; // Objects are being resized due to Paste with different MapMode bool bSaveOLEPreview:1; // save preview metafile of OLE objects bool bSaveNative:1; bool bStarDrawPreviewMode:1; @@ -274,6 +274,8 @@ private: css::uno::Reference< css::uno::XInterface > mxUnoModel; public: + SVX_DLLPRIVATE virtual bool IsCreatingDataObj() const { return false; } + bool IsTransportContainer() const { return bTransportContainer; } bool IsPasteResize() const { return bPasteResize; } void SetPasteResize(bool bOn) { bPasteResize=bOn; } // If a custom Pool is put here, the class will call methods |