diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-11-30 15:22:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-11-30 15:56:24 +0000 |
| commit | 7d7278427a4c0c7f66f054ed36d32824969c3e5b (patch) | |
| tree | def87098cce1aacf82ae21d66c1390756d6542dd /starmath | |
| parent | bc04956ca38c0100784845118cff43931956ae35 (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
(cherry picked from commit 424d17e62e0d670aa79a890f85bb98c19169f9f5)
Reviewed-on: https://gerrit.libreoffice.org/31428
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'starmath')
| -rw-r--r-- | starmath/inc/view.hxx | 2 | ||||
| -rw-r--r-- | starmath/source/view.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index e6bf3238bec5..a1a3b4964f13 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -263,7 +263,7 @@ protected: virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) override; virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize) override; - virtual void InnerResizePixel(const Point &rOfs, const Size &rSize) override; + virtual void InnerResizePixel(const Point &rOfs, const Size &rSize, bool inplaceEditModeChange) override; virtual void OuterResizePixel(const Point &rOfs, const Size &rSize) override; virtual void QueryObjAreaPixel( Rectangle& rRect ) const override; virtual void SetZoomFactor( const Fraction &rX, const Fraction &rY ) override; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 61895fbf3cf5..162751f513ac 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -891,7 +891,7 @@ void SmViewShell::AdjustPosSizePixel(const Point &rPos, const Size &rSize) aGraphic->SetPosSizePixel(rPos, rSize); } -void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize) +void SmViewShell::InnerResizePixel(const Point &rOfs, const Size &rSize, bool) { Size aObjSize = GetObjectShell()->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) |