From 6af2caab7271e11d9501fd6a597e05194d33fd10 Mon Sep 17 00:00:00 2001 From: Oliver-Rainer Wittmann Date: Wed, 8 Jan 2014 14:20:43 +0000 Subject: Resolves: #i123792# correction for comments/annotations on table cell ranges (cherry picked from commit c25523dd3a302d1bd36297a817a869afb3605d1f) Conflicts: sw/inc/IDocumentMarkAccess.hxx sw/inc/doc.hxx sw/source/core/doc/docbm.cxx sw/source/core/undo/undobj.cxx sw/source/ui/shells/textfld.cxx xmloff/source/text/txtfldi.cxx Change-Id: Ic2e12f47e7775ee16f31bedf89d5644b18734d7a --- sw/inc/IDocumentMarkAccess.hxx | 2 +- sw/inc/doc.hxx | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) (limited to 'sw/inc') diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 917a57f892d4..271266fdd1de 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -262,7 +262,7 @@ class IDocumentMarkAccess /** Returns the MarkType used to create the mark */ - static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark& rMark); + static SAL_DLLPUBLIC_EXPORT MarkType GetType(const ::sw::mark::IMark& rMark); static SAL_DLLPUBLIC_EXPORT OUString GetCrossRefHeadingBookmarkNamePrefix(); static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM ); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 48b7b80d72da..de4487cdf0fa 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1467,20 +1467,31 @@ public: // If bMoveCrsr is set move Crsr too. /// Set everything in rOldNode on rNewPos + Offset. - void CorrAbs( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, - const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = sal_False ); + void CorrAbs( + const SwNodeIndex& rOldNode, + const SwPosition& rNewPos, + const xub_StrLen nOffset = 0, + sal_Bool bMoveCrsr = sal_False ); /// Set everything in the range of [rStartNode, rEndNode] to rNewPos. - void CorrAbs( const SwNodeIndex& rStartNode, const SwNodeIndex& rEndNode, - const SwPosition& rNewPos, sal_Bool bMoveCrsr = sal_False ); + void CorrAbs( + const SwNodeIndex& rStartNode, + const SwNodeIndex& rEndNode, + const SwPosition& rNewPos, + sal_Bool bMoveCrsr = sal_False ); /// Set everything in this range from rRange to rNewPos. - void CorrAbs( const SwPaM& rRange, const SwPosition& rNewPos, - sal_Bool bMoveCrsr = sal_False ); + void CorrAbs( + const SwPaM& rRange, + const SwPosition& rNewPos, + sal_Bool bMoveCrsr = sal_False ); /// Set everything in rOldNode to relative Pos. - void CorrRel( const SwNodeIndex& rOldNode, const SwPosition& rNewPos, - const xub_StrLen nOffset = 0, sal_Bool bMoveCrsr = sal_False ); + void CorrRel( + const SwNodeIndex& rOldNode, + const SwPosition& rNewPos, + const xub_StrLen nOffset = 0, + sal_Bool bMoveCrsr = sal_False ); /// Query / set rules for Outline. inline SwNumRule* GetOutlineNumRule() const -- cgit