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 /sw | |
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 'sw')
-rw-r--r-- | sw/inc/view.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/pview.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/pview.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/uiview/viewport.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index d3eec4ad5783..a2321ce13531 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -351,7 +351,7 @@ protected: virtual void Activate(bool) override; virtual void Deactivate(bool) 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; const SwFrameFormat* GetLastTableFrameFormat() const {return m_pLastTableFormat;} diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 2ad2cadaaba9..80edefd8dec0 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -218,7 +218,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SfxRequest* _pReq ); protected: - 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; void SetZoom(SvxZoomType eSet, sal_uInt16 nFactor); diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 72dc3936ad2e..1e334ab5b564 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1333,7 +1333,7 @@ void SwPagePreview::CalcAndSetBorderPixel( SvBorder &rToFill, bool /*bInner*/ ) SetBorderPixel( rToFill ); } -void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize ) +void SwPagePreview::InnerResizePixel( const Point &rOfst, const Size &rSize, bool ) { SvBorder aBorder; CalcAndSetBorderPixel( aBorder, true ); diff --git a/sw/source/uibase/uiview/viewport.cxx b/sw/source/uibase/uiview/viewport.cxx index 00a773f71e98..7cfd3dd45539 100644 --- a/sw/source/uibase/uiview/viewport.cxx +++ b/sw/source/uibase/uiview/viewport.cxx @@ -952,7 +952,7 @@ void SwView::ShowAtResize() m_pHRuler->Show(); } -void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize ) +void SwView::InnerResizePixel( const Point &rOfst, const Size &rSize, bool ) { Size aObjSize = GetObjectShell()->GetVisArea().GetSize(); if ( aObjSize.Width() > 0 && aObjSize.Height() > 0 ) |