diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-09-16 21:15:28 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-09-17 18:57:09 +0200 |
| commit | d5b50e74ee822e1c8402e3044e14799e47907ff8 (patch) | |
| tree | 1a21d12415edbbb056fb11d9368881a97876b5e4 /sw/inc | |
| parent | 3fe3588d6743c27c3734b1b4993f5155c15abe98 (diff) | |
tdf#105330 sw: fix lost cursor on undoing nested table insert
This is a regression from commit
e4509eea8fc7c07ddff48edf0d4c015c2663d896 (n#751313 SwCallLink: avoid
redrawing complete rows without nested tables, 2012-04-20), though
manual testing shows that the underlying problem has been addressed in
the meantime, so this can be reverted.
Over time, some poor tests started to depend on the new behavior so
adapt them as necessary:
1) Change back test added in commit
075fc0c0a34875adf2833e5933b4982b9443a373 (testcase for fdo#38414,
2014-03-18) to its original form, that was changed to an export test in
commit 086550313260d9fa45b91dc705b21bb9b51ce0b8 (move round-tripables to
ooxmlexport, 2016-10-07), as the export of that document still results
in data loss of cell content, just happened to pass so far.
2) Explicitly calculate content of text frames in two more tests, which
just hoped that by the time they assert, the layout is ready already
(but now that the missing notification is restored, it happens that the
first pass of the layout doesn't create them; only a later pass, invoked
by Idle, which doesn't run during cppunit tests).
(cherry picked from commit c56bf1479cc71d1a2b0639f6383e90c1f7e3655b)
Conflicts:
sw/qa/extras/uiwriter/uiwriter2.cxx
Change-Id: Ie13d17266cd552f3850848ae980bcfe8776997ac
Reviewed-on: https://gerrit.libreoffice.org/79043
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/crsrsh.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/viscrs.hxx | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index fb105b00e524..70eadace19ec 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -688,6 +688,7 @@ public: // (This is needed for displaying the Drag&Drop/Copy-Cursor.) bool SetVisibleCursor( const Point &rPt ); inline void UnSetVisibleCursor(); + SwVisibleCursor* GetVisibleCursor() const; // jump to the next or previous field of the corresponding type bool MoveFieldType( diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 49a9cc9035bb..2361bed32ecc 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -25,6 +25,7 @@ #include "swcrsr.hxx" #include "swrect.hxx" #include "swregion.hxx" +#include "swdllapi.h" namespace sdr { namespace overlay { class OverlayObject; } } @@ -33,7 +34,7 @@ class SfxViewShell; // From here classes/methods for non-text cursor. -class SwVisibleCursor +class SW_DLLPUBLIC SwVisibleCursor { friend void InitCore(); friend void FinitCore(); @@ -57,6 +58,7 @@ public: bool IsVisible() const { return m_bIsVisible; } void SetDragCursor( bool bFlag = true ) { m_bIsDragCursor = bFlag; } void SetPosAndShow(SfxViewShell const * pViewShell); + const vcl::Cursor& GetTextCursor() const; }; // From here classes/methods for selections. |