diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2022-05-12 16:31:53 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2022-05-13 13:21:28 +0200 |
commit | f3c0701fc10ac03bf6335cd5ae9ce5f90abf5d21 (patch) | |
tree | 0eede5782051e7fb8c1fc49be92184d97f77c3f9 /sw/inc/crsrsh.hxx | |
parent | 0d8be0575f5c5301c65a8de04dd9bd310fe51c1a (diff) |
sw content controls: fixes for the ending dummy char
- make sure the DOC/RTF export doesn't write the dummy char as-is
- let "enter" only insert a linebreak while inside a content control, to
ensure that the starting and ending dummy char stays inside the same
text node
- let deletion of the dummy character at the end behave the same as the
start dummy character: if trying to delete that single character, then
just move the cursor, don't delete it
- reject document insertion in the middle of a content control, similar
to input fields
(cherry picked from commit 32dab3228cd315437efe0c5b850d116235eaa797)
Conflicts:
sw/qa/core/unocore/unocore.cxx
sw/source/core/unocore/unocrsrhelper.cxx
Change-Id: I9b54ef50261e6b17f38eadadacfe1e1111199e96
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134261
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/inc/crsrsh.hxx')
-rw-r--r-- | sw/inc/crsrsh.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index a34e02d45ead..2dd27529810a 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -717,6 +717,7 @@ public: const bool bIncludeInputFieldAtStart ); SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const; bool CursorInsideInputField() const; + bool CursorInsideContentControl() const; static bool PosInsideInputField( const SwPosition& rPos ); bool DocPtInsideInputField( const Point& rDocPt ) const; static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos ); |