From 7a586a9c6bf28088c72f163d724d1cb3259e7920 Mon Sep 17 00:00:00 2001 From: Bernhard Widl Date: Wed, 15 Nov 2017 19:30:28 +0100 Subject: tdf#101856 create bookmarks w/ new hidden/cond attrs, save as odt Committer's note: this is forward ported from 5.2+backports branch, with numerous conflicts. tdf#101856 add new checkbox/editfield for hidden/condition attrs Conflicts: sw/uiconfig/swriter/ui/insertbookmark.ui Author: Bernhard Widl (cherry picked from commit c347e00821791377731ab32acd103ea006f3cc1b) tdf#101856 Fix crash in Insert Bookmark dialog Author: Serge Krot Reviewed-on: https://gerrit.libreoffice.org/50616 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens (cherry picked from commit bcc16920eec647f2a3753d60c4d969862f272942) Change-Id: Ib1df7a4c1477693aa2d0ec067635cdcbd393cebd Reviewed-on: https://gerrit.libreoffice.org/46820 Tested-by: Jenkins Reviewed-by: Michael Stahl --- sw/inc/crsrsh.hxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sw/inc/crsrsh.hxx') diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 531452561fe9..e57153609256 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -533,6 +533,11 @@ public: const vcl::KeyCode&, const OUString& rName, IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::MarkType::BOOKMARK); + ::sw::mark::IMark* SetBookmark2( + const vcl::KeyCode&, + const OUString& rName, + bool bHide, + const OUString& rCondition); bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart ); bool GoNextBookmark(); // true, if there was one -- cgit