diff options
| author | Oliver-Rainer Wittmann <orw@apache.org> | 2012-11-22 11:14:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-24 09:18:32 +0100 |
| commit | 679faffc68bb854af0f55d0f218698e2f372f00b (patch) | |
| tree | 5490b0b79b6e647e02b89f495a6bf542d1e6352d /sw/inc | |
| parent | 87858e043fe089a816a5787c356c94e7abbddd45 (diff) | |
Resolves: #i120879# import "Microsoft Word TOC bookmarks" as...
cross reference bookmarks and suppress the import of unreferenced ones.
Review by: zhengfan
(cherry picked from commit e3a34e95823105fda68fd29a4ded22a9d52523fb)
Conflicts:
sw/source/core/crsr/crossrefbookmark.cxx
sw/source/core/inc/crossrefbookmark.hxx
sw/source/filter/inc/fltshell.hxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par5.cxx
Change-Id: I5898cbd33c9a17b9517040e19ca8eda4355a1eac
also remove symbol-visibility problems in IDocumentMarkAccess.hxx
(cherry picked from commit de9ea83df087ba3f8e614a69e8b18403d54b9589)
Conflicts:
sw/inc/IDocumentMarkAccess.hxx
Change-Id: I2f51cc4412525c6e62d120df5c7fe1c223e35972
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/IDocumentMarkAccess.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx index 4b27357945c9..35f5ec04cd57 100644 --- a/sw/inc/IDocumentMarkAccess.hxx +++ b/sw/inc/IDocumentMarkAccess.hxx @@ -242,6 +242,9 @@ 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 OUString GetCrossRefHeadingBookmarkNamePrefix(); + static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM ); protected: virtual ~IDocumentMarkAccess() {}; }; |