diff options
author | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-26 12:02:20 +0200 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@oracle.com> | 2010-08-26 12:02:20 +0200 |
commit | 93f90c4e7d40e142b57e6c8c08dc080ccf4b478e (patch) | |
tree | 36ba10cd796fd8a9219949b2df610dd22d3b83fb | |
parent | 96a48f7977616c3484d590c2bc3f70298af0cc94 (diff) |
dba33h: #i112659# ensure bound image controls never embed their image in the surrounding document
-rw-r--r-- | forms/source/component/ImageControl.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 13155d54cf48..b433dec92d70 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -800,6 +800,11 @@ bool OImageControlControl::implInsertGraphics() implClearGraphics( sal_False ); sal_Bool bIsLink = sal_False; xController->getValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0) >>= bIsLink; + // Force bIsLink to be TRUE if we're bound to a field. Though we initialized the file picker with IsLink=TRUE + // in this case, and disabled the respective control, there might be picker implementations which do not + // respect this, and return IsLink=FALSE here. In this case, "normalize" the flag. + // #i112659# / 2010-08-26 / frank.schoenheit@oracle.com + bIsLink |= bHasField; if ( !bIsLink ) { Graphic aGraphic; |