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:27:25 +0100 |
| commit | 424d17e62e0d670aa79a890f85bb98c19169f9f5 (patch) | |
| tree | 49c82966c1465065da435d6f6b6255cf3c96675c /sc/source | |
| parent | 579feb4d841ea80de699f4124378d0701034833e (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 'sc/source')
| -rw-r--r-- | sc/source/ui/inc/prevwsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwsh4.cxx | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index dab12bc523b1..967c194db501 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -65,7 +65,7 @@ protected: virtual void Deactivate(bool bMDI) 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 WriteUserData(OUString &, bool bBrowse = false) override; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 4ec942bf0f03..1b6551f1e82c 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -196,7 +196,7 @@ protected: virtual void AdjustPosSizePixel( const Point &rPos, const Size &rSize ) override; // alt - virtual void InnerResizePixel( const Point &rOfs, const Size &rSize ) override; // neu + virtual void InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) override; // neu virtual void OuterResizePixel( const Point &rOfs, const Size &rSize ) override; virtual void SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) override; diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 7311751d4bfc..f35a0f6ea5b5 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -224,7 +224,7 @@ void ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) UpdateNeededScrollBars(false); } -void ScPreviewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) +void ScPreviewShell::InnerResizePixel( const Point &rOfs, const Size &rSize, bool ) { AdjustPosSizePixel( rOfs,rSize ); } diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index edf2953668c9..df9eaba40dc4 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -339,7 +339,7 @@ void ScTabViewShell::AdjustPosSizePixel( const Point &rPos, const Size &rSize ) OuterResizePixel( rPos, rSize ); } -void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) +void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize, bool inplaceEditModeChange ) { Size aNewSize( rSize ); if ( GetViewFrame()->GetFrame().IsInPlace() ) @@ -379,7 +379,10 @@ void ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &rSize ) UpdateOleZoom(); // calculate zoom for in-place - GetViewData().GetDocShell()->SetDocumentModified(); + if (!inplaceEditModeChange) + { + GetViewData().GetDocShell()->SetDocumentModified(); + } } void ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &rSize ) |