diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-30 15:22:30 +0100 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-11-20 11:55:56 +0100 |
commit | 67d7d8be25819a291a6363fed0112146ba436619 (patch) | |
tree | 03df6f12b9e605128c1983252a45dbb40dd1ce71 /sd | |
parent | 52fd6a3169b3f0343eb3319dee6f9350e1df2a3c (diff) |
ScTabViewShell::InnerResizePixel must not mark document as modified...
...when merely toggling the edit mode of a Calc document embedded in another
document (via "Insert - Object - OLE Object... - LibreOffice 5.4 Spreadsheet").
Interestingly, none of the other document kinds seem to have this problem.
(Maybe it's even unhelpful that ScTabViewShell::InnerResizePixel calls
SetDocumentModified() at all?) Anyway, pass this inplaceEditModeChange
information down there.
Change-Id: Iffb24b068419e3608c9f4b5e9645e44e1716aafe
Reviewed-on: https://gerrit.libreoffice.org/63582
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/ViewShellBase.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 8a5d2c8337fd..606fe99722a1 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -118,7 +118,7 @@ public: virtual bool HasSelection(bool) const override; SvBorder GetBorder (bool bOuterResize); - virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize) override; + virtual void InnerResizePixel (const Point& rOrigin, const Size& rSize, bool inplaceEditModeChange) override; virtual void OuterResizePixel (const Point& rOrigin, const Size& rSize) override; /** This call is forwarded to the main sub-shell. diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx index ae01eb9f3bc7..b080fae77167 100644 --- a/sd/source/ui/view/ViewShellBase.cxx +++ b/sd/source/ui/view/ViewShellBase.cxx @@ -457,7 +457,7 @@ bool ViewShellBase::HasSelection(bool bText) const : SfxViewShell::HasSelection(bText); } -void ViewShellBase::InnerResizePixel (const Point& rOrigin, const Size &rSize) +void ViewShellBase::InnerResizePixel (const Point& rOrigin, const Size &rSize, bool) { Size aObjSize = GetObjectShell()->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) |