diff options
| author | Oliver-Rainer Wittmann <od@openoffice.org> | 2011-03-11 15:17:48 +0100 |
|---|---|---|
| committer | Oliver-Rainer Wittmann <od@openoffice.org> | 2011-03-11 15:17:48 +0100 |
| commit | 77540cbbaa808ed8326e31c8532f29624a4526b5 (patch) | |
| tree | 6e1361ce48a67814d71a49e0d4a111040ed2dd16 /sw/source/core/graphic/ndgrf.cxx | |
| parent | a8664689ece5a4329c9786f1b666e3ab701d908b (diff) | |
sw34bf05: #i85105# trigger load of linked graphic on requesting com.sun.star.text.TextGraphicObject.ActualSize
Diffstat (limited to 'sw/source/core/graphic/ndgrf.cxx')
| -rwxr-xr-x[-rw-r--r--] | sw/source/core/graphic/ndgrf.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx index 1f8dc1ee488b..bb7198ed3358 100644..100755 --- a/sw/source/core/graphic/ndgrf.cxx +++ b/sw/source/core/graphic/ndgrf.cxx @@ -1183,7 +1183,10 @@ void SwGrfNode::ApplyInputStream( void SwGrfNode::UpdateLinkWithInputStream() { - if ( IsLinkedFile() ) + // --> OD #i85105# + // do not work on link, if a <SwapIn> has been triggered. + if ( !bInSwapIn && IsLinkedFile() ) + // <-- { GetLink()->setStreamToLoadFrom( mxInputStream, mbIsStreamReadOnly ); GetLink()->Update(); |