diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 05:03:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 05:03:24 +0000 |
| commit | e3cf16e6fbf8d39cad8762f002b6db1d4f61ed36 (patch) | |
| tree | 3c1753125149dcf36ba42a57f1574369e8524225 /sw/inc | |
| parent | Adding debian version 4:24.2.2-3. (diff) | |
| download | libreoffice-e3cf16e6fbf8d39cad8762f002b6db1d4f61ed36.tar.xz libreoffice-e3cf16e6fbf8d39cad8762f002b6db1d4f61ed36.zip | |
Merging upstream version 4:24.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/doc.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/editsh.hxx | 4 | ||||
| -rw-r--r-- | sw/inc/usrfld.hxx | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index ea95cef856..99cb33c758 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -838,6 +838,7 @@ public: std::vector<SwFrameFormat const*> GetFlyFrameFormats( FlyCntType eType, bool bIgnoreTextBoxes); + SwFrameFormat* GetFlyFrameFormatByName( const OUString& sFrameFormatName ); // Copy formats in own arrays and return them. SwFrameFormat *CopyFrameFormat ( const SwFrameFormat& ); diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index 1fb9ff3a5b..2b75353015 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -152,7 +152,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCursorShell that will be used by GetGraphic() and GetGraphicSize(). */ SAL_DLLPRIVATE SwGrfNode *GetGrfNode_() const ; - SAL_DLLPRIVATE void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool* pUndo = nullptr); + SAL_DLLPRIVATE void DeleteSel(SwPaM& rPam, bool isArtificialSelection, bool goLeft = false, bool* pUndo = nullptr); SAL_DLLPRIVATE void SetSectionAttr_( SwSectionFormat& rSectFormat, const SfxItemSet& rSet ); @@ -178,7 +178,7 @@ public: /** Delete content of all ranges. If whole nodes are selected, these nodes get deleted. */ - bool Delete(bool isArtificialSelection = false); + bool Delete(bool isArtificialSelection = false, bool goLeft = false); /// Remove a complete paragraph. bool DelFullPara(); diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 28d582c4c5..f7371ef52c 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -102,7 +102,7 @@ inline void SwUserFieldType::SetType(sal_uInt16 nSub) * Tracks the number format and the language, conversion between the float and * string representation is independent from the system locale. */ -class SwUserField final : public SwValueField +class SW_DLLPUBLIC SwUserField final : public SwValueField { sal_uInt16 m_nSubType; |