summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-11-30 15:22:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-11-30 15:27:25 +0100
commit424d17e62e0d670aa79a890f85bb98c19169f9f5 (patch)
tree49c82966c1465065da435d6f6b6255cf3c96675c /include
parent579feb4d841ea80de699f4124378d0701034833e (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
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/viewfrm.hxx3
-rw-r--r--include/sfx2/viewsh.hxx2
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 );