diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
| commit | b5b4805f60f2a86adc1d76cc7d176830f1303c8e (patch) | |
| tree | 6f39e5701622202c97895bfb081fd4846259c7cc /sw/inc | |
| parent | a8770e97294b4011e6986eba6d308373c06c19bb (diff) | |
| parent | 14eccc62b53e202cd9ed63442481922a320fc02e (diff) | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/IDocumentSettingAccess.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/undobj.hxx | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 56ff3ab04234..f182027ded95 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -103,6 +103,7 @@ enum class DocumentSettingId EMBED_SYSTEM_FONTS, APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING, CONTINUOUS_ENDNOTES, + HEADER_SPACING_BELOW_LAST_PARA, }; /** Provides access to settings of a document diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index 89013a7dd2f5..c76a1dfbec0e 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -135,12 +135,13 @@ enum class DelContentType : sal_uInt16 Fly = 0x02, Bkm = 0x08, AllMask = 0x0b, + Replace = 0x10, WriterfilterHack = 0x20, ExcludeFlyAtStartEnd = 0x40, CheckNoCntnt = 0x80, }; namespace o3tl { - template<> struct typed_flags<DelContentType> : is_typed_flags<DelContentType, 0xeb> {}; + template<> struct typed_flags<DelContentType> : is_typed_flags<DelContentType, 0xfb> {}; } /// will DelContentIndex destroy a frame anchored at character at rAnchorPos? @@ -151,6 +152,9 @@ bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos, bool IsSelectFrameAnchoredAtPara(SwPosition const & rAnchorPos, SwPosition const & rStart, SwPosition const & rEnd, DelContentType const nDelContentType = DelContentType::AllMask); +/// check at-char and at-para flys in rDoc +bool IsFlySelectedByCursor(SwDoc const & rDoc, + SwPosition const & rStart, SwPosition const & rEnd); // This class has to be inherited into an Undo-object if it saves content // for Redo/Undo... |