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 /sfx2 | |
| 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 'sfx2')
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 3586a9ac3559..551cb94ae14a 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1096,7 +1096,8 @@ void SfxViewFrame::InvalidateBorderImpl( const SfxViewShell* pSh ) } DoAdjustPosSizePixel( GetViewShell(), Point(), - GetWindow().GetOutputSizePixel() ); + GetWindow().GetOutputSizePixel(), + false ); } } } @@ -1512,7 +1513,8 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... ( SfxViewShell* pSh, const Point& rPos, - const Size& rSize + const Size& rSize, + bool inplaceEditModeChange ) { @@ -1521,7 +1523,7 @@ void SfxViewFrame::DoAdjustPosSizePixel //! divide on Inner.../Outer... { m_nAdjustPosPixelLock++; if ( m_pImpl->bResizeInToOut ) - pSh->InnerResizePixel( rPos, rSize ); + pSh->InnerResizePixel( rPos, rSize, inplaceEditModeChange ); else pSh->OuterResizePixel( rPos, rSize ); m_nAdjustPosPixelLock--; @@ -2002,7 +2004,7 @@ bool SfxViewFrame::SwitchToViewShell_Impl UnlockAdjustPosSizePixel(); if ( GetWindow().IsReallyVisible() ) - DoAdjustPosSizePixel( pNewSh, Point(), GetWindow().GetOutputSizePixel() ); + DoAdjustPosSizePixel( pNewSh, Point(), GetWindow().GetOutputSizePixel(), false ); GetBindings().LEAVEREGISTRATIONS(); delete pOldSh; @@ -2314,11 +2316,11 @@ void SfxViewFrame::Resize( bool bForce ) if ( GetFrame().IsInPlace() ) { Point aPoint = GetWindow().GetPosPixel(); - DoAdjustPosSizePixel( pShell, aPoint, aSize ); + DoAdjustPosSizePixel( pShell, aPoint, aSize, true ); } else { - DoAdjustPosSizePixel( pShell, Point(), aSize ); + DoAdjustPosSizePixel( pShell, Point(), aSize, false ); } } } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index ad6d6cc5d0ce..4d55babc23ee 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -967,7 +967,8 @@ void SfxViewShell::OuterResizePixel void SfxViewShell::InnerResizePixel ( const Point& /*rToolOffset*/,// Upper left corner Tools in Frame-Window - const Size& /*rSize*/ // All available sizes. + const Size& /*rSize*/, // All available sizes. + bool ) /* [Description] |