summaryrefslogtreecommitdiff
path: root/embeddedobj/source/inc/commonembobj.hxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-10-18 16:22:45 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-10-19 12:27:32 +0200
commit1cc5c6587e72581c83f7289a95e906a3a1be38b6 (patch)
treeabfced16f6710885939b7dedbdab2354bdc273c7 /embeddedobj/source/inc/commonembobj.hxx
parent72669b98cf2c71fb0006b2d100248e8234b1b61b (diff)
sw: avoid popup window for the EmbeddedObject property of an UNO OLE object
The old behavior was that in case loading the native data of the embedded object failed, then we presented a popup to the user, but we still returned a valid com.sun.star.comp.embed.OCommonEmbeddedObject. Given that the return valid is desired even in the error case, don't turn the error popup into an UNO exception, rather redirect the popup to SAL_WARN(). This is meant to be consistent with other UNO API functions that pass down an "is API" boolean to internal code to control if interactive behavior is allowed or not. One extreme would be to do this only for the EmbeddedObject property of frames, the other one would be to do this for more object types. Go with a middle ground for now, so all properties of Writer frame objects use this, but leave other object types unchanged. (cherry picked from commit 86e07d951bc4fd16648fe10befb40dd953fcc208) Conflicts: sw/qa/core/unocore/unocore.cxx Change-Id: I655fcb3780e96cecc7ed3f01ded52948d013172e
Diffstat (limited to 'embeddedobj/source/inc/commonembobj.hxx')
0 files changed, 0 insertions, 0 deletions