summaryrefslogtreecommitdiff
path: root/sw/source/core/tox/txmsrt.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-05-21 15:21:49 +0200
committerMichael Stahl <mst@openoffice.org>2010-05-21 15:21:49 +0200
commitd20b81017eb53c5c19a8aed6d5f785c469f91808 (patch)
treeff3d806335bf62299455ced753b5e9d4049eff56 /sw/source/core/tox/txmsrt.cxx
parent047c38908df32c7de6634b1d5963b0df71d4e6e8 (diff)
sw33bf04: #i85766#: prevent field expansion in clipboard:
SwField: add a String member to cache the value. SwField: wrap Expand() and Copy() methods to use/update cache. update all callers to pass the clipboard flag to new SwField::ExpandField().
Diffstat (limited to 'sw/source/core/tox/txmsrt.cxx')
-rw-r--r--sw/source/core/tox/txmsrt.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 5cfffeaf5229..61f873b010b7 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -870,8 +870,9 @@ USHORT SwTOXAuthority::GetLevel() const
-----------------------------------------------------------------------*/
void SwTOXAuthority::_GetText( String& rTxt, String& )
{
- //
- rTxt = m_rField.GetFld()->Expand();
+ bool const isClipBoard(
+ m_rField.GetTxtFld()->GetTxtNode().GetDoc()->IsClipBoard());
+ rTxt = m_rField.GetFld()->ExpandField(isClipBoard);
}
/* -----------------21.09.99 12:50-------------------