diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-11-25 14:53:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-11-25 15:49:05 +0100 |
| commit | 4f9f1ac33366817df61c488a9f36b09c592ee939 (patch) | |
| tree | b11c7dda23f40d60f833c0c991851d79ea4d5cc6 /include | |
| parent | 9bc77b5107917ffe96b7ddf2c4d6d739a5e60c5b (diff) | |
sw: allow viewing OLE objects in protected sections
The problem was that we don't allow even opening embedded objects in
protected sections, which means the content of multi-page embedded
objects can't even be viewed in protected sections, which probably goes
too far.
Fix this relaxing the condition in SwEditWin::MouseButtonDown() to allow
launching the OLE object on double-click, and then make sure that the
native data is not updated in SfxInPlaceClient_Impl::saveObject() and
the replacement image is not updated in
svt::EmbedEventListener_Impl::stateChanged().
This is complicated by only the Writer layout knowing if a given OLE
object is anchored in a protected frame, so pass down a callback to
sfx2/ and svtools/ to check if the OLE object is protected.
Not copying the protected bit has the benefit of behaving correctly if
the section turns into non-protected: copying would not work properly,
as SfxInPlaceClient is created on demand, so not re-created when the
protectedness of the section is changed.
Change-Id: Ib3a8f2092d27dc1ebd3ef355c95a4a473988b163
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125815
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/ipclient.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/embedhlp.hxx | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index 180f67b54588..3e219514a6f1 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -88,6 +88,8 @@ public: bool IsUIActive() const; virtual void FormatChanged(); // object format was changed (used for StarMath formulas aligning) + + virtual bool IsProtected() const; }; #endif diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index 43d0b64461dd..05b0b5644122 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -107,6 +107,10 @@ public: bool is() const; bool IsLocked() const; + + void SetIsProtectedHdl(const Link<LinkParamNone*, bool>& rProtectedHdl); + Link<LinkParamNone*, bool> GetIsProtectedHdl() const; + bool IsChart() const; OUString GetChartType(); |