diff options
author | Michael Stahl <mst@openoffice.org> | 2010-12-21 16:48:30 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2010-12-21 16:48:30 +0100 |
commit | f9ab560c8b9bb08d3ad7e6b72ea8a8ecbedcdf47 (patch) | |
tree | 7b0e30f5f3e8d37aedf937195a56744d6fc5fa5d /sw/inc/swtypes.hxx | |
parent | c6d658988ed10b4bdfe4d66b4deb4e1f79df33ff (diff) |
sw34bf03: #i115315#: refactor the copying of meta/meta-field:
no longer delay the call to DoCopy() until after the new hint is inserted,
but do it before; this fixes a crash on drag&drop in the same text node.
this is also quite a bit less ugly, but there are still some hacks required:
DoCopy() is now called by a new factory CreateTxtMeta().
DoCopy() needs to know the text node where the hint will be inserted.
so the MakeTxtAttr() function needs to know whether it should insert a copy,
and the target text node.
this requires a new bit in the SetAttrMode enum: SETATTR_IS_COPY.
also, sw::Meta can no longer get the text node from SwTxtMeta, because it is
copied before the SwTxtMeta is inserted, so it now has a SwTxtNode* member.
furthermore the notification stuff is refactored a bit.
Diffstat (limited to 'sw/inc/swtypes.hxx')
-rw-r--r-- | sw/inc/swtypes.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 0d37e63c367d..d754b450b3b4 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -228,6 +228,8 @@ namespace nsSetAttrMode // functionality will be disabled) /// force hint expand (only matters for hints with CH_TXTATR) const SetAttrMode SETATTR_FORCEHINTEXPAND= 0x0080; + /// the inserted item is a copy -- intended for use in ndtxt.cxx + const SetAttrMode SETATTR_IS_COPY = 0x0100; } //Umrechnung Twip<-> 1/100 mm fuer UNO |