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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/viewfrm.hxx | 3 | ||||
| -rw-r--r-- | include/sfx2/viewsh.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx index d692f5ae3626..d25095483772 100644 --- a/include/sfx2/viewfrm.hxx +++ b/include/sfx2/viewfrm.hxx @@ -124,7 +124,8 @@ public: void UnlockAdjustPosSizePixel() { m_nAdjustPosPixelLock--; } void DoAdjustPosSizePixel( SfxViewShell * pSh, - const Point &rPos, const Size &rSize ); + const Point &rPos, const Size &rSize, + bool inplaceEditModeChange ); void Show(); bool IsVisible() const; void ToTop(); diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index f7a672fd96f9..14466922f461 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -160,7 +160,7 @@ protected: virtual void Activate(bool IsMDIActivate) override; virtual void Deactivate(bool IsMDIActivate) override; - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ); + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ); virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ); virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ); |