%MODULE%/vcl/res/spinner-16-01.png %MODULE%/vcl/res/spinner-16-02.png %MODULE%/vcl/res/spinner-16-03.png %MODULE%/vcl/res/spinner-16-04.png %MODULE%/vcl/res/spinner-16-05.png %MODULE%/vcl/res/spinner-16-06.png %MODULE%/vcl/res/spinner-32-01.png %MODULE%/vcl/res/spinner-32-02.png %MODULE%/vcl/res/spinner-32-03.png %MODULE%/vcl/res/spinner-32-04.png %MODULE%/vcl/res/spinner-32-05.png %MODULE%/vcl/res/spinner-32-06.png %MODULE%/vcl/res/spinner-32-07.png %MODULE%/vcl/res/spinner-32-08.png %MODULE%/vcl/res/spinner-32-09.png %MODULE%/vcl/res/spinner-32-10.png %MODULE%/vcl/res/spinner-32-11.png %MODULE%/vcl/res/spinner-32-12.png %MODULE%/vcl/res/spinner-64-01.png %MODULE%/vcl/res/spinner-64-02.png %MODULE%/vcl/res/spinner-64-03.png %MODULE%/vcl/res/spinner-64-04.png %MODULE%/vcl/res/spinner-64-05.png %MODULE%/vcl/res/spinner-64-06.png %MODULE%/vcl/res/spinner-64-07.png %MODULE%/vcl/res/spinner-64-08.png %MODULE%/vcl/res/spinner-64-09.png %MODULE%/vcl/res/spinner-64-10.png %MODULE%/vcl/res/spinner-64-11.png %MODULE%/vcl/res/spinner-64-12.png value='distro/allotropia/zeta-24-2'>distro/allotropia/zeta-24-2 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/sw/inc/IDocumentMarkAccess.hxx
AgeCommit message (Collapse)Author
2017-09-27tdf#112679 sw: fix copying of fieldmarksMichael Stahl
Aha, now we know that the reason for the defensive programming in lcl_AssureFieldMarksSet() was that there are actually 2 different use-cases for it: usually a new mark is inserted, so there are no dummy characters and they must be inserted. However when copying text, the dummy characters are copied too, so they must not be inserted, or we get duplicate fieldmarks. This also reverts commit d4036d3a89b65a4912f62e3930eb1a31cd90a16b which fixed the problem only for CHECKBOX_FIELDMARK in a different way. (regression from bb069fe7b8b6a24f9ff4df4c7052961e17ea3a8c) Change-Id: I3c99b8c6d720951655198e682018794337859373
2016-06-16Remove the :: prefix in ::std for swMark Page
This patch was created using a script Variable name textual alignment is preserved to the same level Change-Id: I6b4858f8059b8cf71fc253e87d6df634362d62e9 Reviewed-on: https://gerrit.libreoffice.org/26306 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-01-08tdf#96480: ODF import: eliminate duplicate cross reference heading bookmarksMichael Stahl
7c3c3006deaaaf1bb3f2f4eeeaf11da3bcebe53c is apparently worse than it appeared at first glance since there are numerous assumptions about bookmarks, such as that if they were inserted successfully they may be copied successfully, which isn't the case for duplicate cross reference bookmarks. So fix this differently, by eliminating the duplicates and mapping all reference fields to refer to the surviving bookmark. It was not possible to do this in SwXBookmark by checking the makeMark() return as that would raise interesting problems such as it's currently guaranteed to have 1:1 SwXBoomarks to core Marks so we can't just connect 2 SwXBookmarks to the same core Mark, and we also can't leave the SwXBookmark unconnected after attach. Another alternative would be to temporarily allow inserting the duplicate bookmarks and then eliminate them after the import, but what is implemented now is to check from xmloff for duplicates, which is reasonably simple. Change-Id: I7ee4854d1c9d8bf74201089cbb7287b1bd8ee3b9
2015-10-13tdf#94804 sw: allow duplicate heading cross reference bookmarksMichael Stahl
... in ODF import, so that reference fields do not break that reference numbering cross reference bookmarks that were corrupted by commit 679faffc68bb854af0f55d0f218698e2f372f00b. This used to work by accident before commit 9d0c51daea67104349cac26de9839afa8baeb099 fixed it to actually check for duplicates properly. Change-Id: I5ed58eda7f3f2ce470a778852f6dda7a14356860
2015-09-17boost->stdCaolán McNamara
Change-Id: Idfbcfa1e5ba7bff92e98693c33c4b33a6beda08f
2015-05-20bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-pointChristian Lohmaier
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
2015-03-11convert MarkType to enum classNoel Grandin
Change-Id: I73c23d327104b377834013a0a6bd2de18de2900b
2015-03-05V801: Decreased performanceCaolán McNamara
Change-Id: I5e7b5327b542f610efb0960b8bcfad10e04025b5
2015-01-22::rtl::OUString->OUStringCaolán McNamara
Change-Id: I68654a5fa4cbb7403c00b103e2be5929ccb516a2
2014-09-19SwCursor::SelectWordWT: include comment anchor character of a commented wordMiklos Vajna
In case the user double-clicks on a word and exactly that word is commented, then we used to select only the word, but not its comment anchor character. So when the user deleted the selection, the comment left there. It is still possible to manually select only the word, but on double-click let's just select the comment anchor as well, so a simple double-click on the commented word will remove the comment as well. Change-Id: I7322af61c31e8aba108eef5596849d17d55fc7eb
2014-08-23fdo#82577: Handle KeyCodeTor Lillqvist
Put the VCL KeyCode class in the vcl namespace. Avoids clash with the X11 KeyCode typedef. Change-Id: I624c9d937f7c5f5986d313b6c5f060bd8bb7e028
2014-07-09Related: #i125215# MarkManager: remove unnecessary mark containerOliver-Rainer Wittmann
(cherry picked from commit f73412f09ca8a34bb7ec73370dae3e6033c0c581) Conflicts: sw/inc/IDocumentMarkAccess.hxx sw/source/core/doc/docbm.cxx sw/source/core/doc/docdde.cxx sw/source/core/inc/MarkManager.hxx Change-Id: I8aa3a0a3362de63fec9cd640ffde89d5f7f57417
2014-06-08these symbols belong to libswloDavid Tardon
Change-Id: I04b970a58b5d138b89f4eb331b3f53ebcb55236a
2014-03-28Related: fdo#73936 for spelling restrict formelements-as-fields..Caolán McNamara
to dropdowns to be on the safe side for now anyway. Change-Id: I88a73fe37b39306c6b24226e3b02c702d992ecb0
2014-03-28Related: fdo#73936 expand FormFieldDropDowns in ModelToViewHelperCaolán McNamara
when EXPANDFIELDS is set. i.e. for spell and grammar checking Change-Id: I8c524f0cd584c9d6043dece5c1b736afb254b7c0
2014-03-04Resolves: #i124338# assure sorted mark containers...Oliver-Rainer Wittmann
when updating <SwIndex> instances due to inserted characters (cherry picked from commit 770c0e6b910129710b4be5cb9e9bae39bfa6bd5a) Conflicts: sw/source/core/bastyp/index.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/doc/docbm.cxx sw/source/core/inc/bookmrk.hxx sw/source/core/inc/crossrefbookmark.hxx Change-Id: Ie4531c3b33aff0a7f3d139ee81a21c3823474f84
2014-02-27Remove visual noise from swAlexander Wilms
Conflicts: sw/inc/unodraw.hxx sw/inc/unoframe.hxx sw/sdi/swriter.sdi sw/source/core/unocore/unoframe.cxx sw/source/core/unocore/unoparagraph.cxx sw/source/filter/ww8/rtfexportfilter.cxx sw/source/ui/inc/unotxvw.hxx sw/source/ui/lingu/hyp.cxx sw/source/ui/lingu/sdrhhcwrap.cxx sw/source/ui/uno/swdetect.hxx Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908 Reviewed-on: https://gerrit.libreoffice.org/8322 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-01-15Related: #i17171# big xub_Strlen -> sal_Int32 changesCaolán McNamara
Change-Id: I31bce794c95062abfa1171c13cf565498688b5f3
2014-01-09Resolves: #i123792# correction for comments/annotations on table cell rangesOliver-Rainer Wittmann
(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
2014-01-08123792: complete annotations on text ranges featureOliver-Rainer Wittmann
- rely annotations on text ranges on new annotation marks - support arbitrary text ranges for annotations - fix undo/redo regarding annotations an text ranges - support annotations on overlapping text ranges - fix *.docx import for annotations on overlapping text ranges - fix ODF import of annotations on text ranges cherry-picked from branch ooxml-osba (cherry picked from commit ebd2922ebd3cf2d3899fb80780d38f367197aadf) Conflicts: sw/Library_sw.mk sw/inc/IDocumentMarkAccess.hxx sw/inc/SidebarWin.hxx sw/inc/doc.hxx sw/inc/docufld.hxx sw/inc/hintids.hxx sw/inc/ndhints.hxx sw/inc/txatbase.hxx sw/inc/unobookmark.hxx sw/inc/unofield.hxx sw/inc/unoport.hxx sw/source/core/access/accpara.cxx sw/source/core/bastyp/init.cxx sw/source/core/crsr/bookmrk.cxx sw/source/core/crsr/findtxt.cxx sw/source/core/doc/dbgoutsw.cxx sw/source/core/doc/docbm.cxx sw/source/core/doc/doccorr.cxx sw/source/core/doc/docdde.cxx sw/source/core/doc/docedt.cxx sw/source/core/doc/docfld.cxx sw/source/core/doc/doclay.cxx sw/source/core/doc/tblrwcl.cxx sw/source/core/docnode/ndcopy.cxx sw/source/core/docnode/nodes.cxx sw/source/core/docnode/section.cxx sw/source/core/edit/edfld.cxx sw/source/core/fields/docufld.cxx sw/source/core/fields/postithelper.cxx sw/source/core/fields/reffld.cxx sw/source/core/inc/MarkManager.hxx sw/source/core/inc/crossrefbookmark.hxx sw/source/core/text/inftxt.cxx sw/source/core/text/itratr.cxx sw/source/core/text/txtfrm.cxx sw/source/core/txtnode/atrfld.cxx sw/source/core/txtnode/ndtxt.cxx sw/source/core/txtnode/thints.cxx sw/source/core/undo/undel.cxx sw/source/core/undo/undobj.cxx sw/source/core/unocore/unofield.cxx sw/source/core/unocore/unoport.cxx sw/source/core/unocore/unoportenum.cxx sw/source/filter/html/htmlatr.cxx sw/source/filter/html/htmlgrin.cxx sw/source/filter/html/wrthtml.cxx sw/source/filter/writer/writer.cxx sw/source/filter/ww1/fltshell.cxx sw/source/filter/ww8/wrtw8nds.cxx sw/source/filter/ww8/ww8par.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/dochdl/swdtflvr.cxx sw/source/ui/docvw/PostItMgr.cxx sw/source/ui/docvw/SidebarWin.cxx sw/source/ui/fldui/fldmgr.cxx sw/source/ui/fldui/fldref.cxx sw/source/ui/inc/fldmgr.hxx sw/source/ui/inc/wrtsh.hxx sw/source/ui/shells/textfld.cxx sw/source/ui/uiview/view2.cxx sw/source/ui/utlui/navipi.cxx sw/source/ui/wrtsh/wrtsh2.cxx writerfilter/source/dmapper/DomainMapper_Impl.cxx writerfilter/source/dmapper/DomainMapper_Impl.hxx writerfilter/source/dmapper/PropertyMap.cxx xmloff/inc/txtfldi.hxx xmloff/source/text/txtfldi.cxx xmloff/source/text/txtparae.cxx Change-Id: Ie4cc467dbb837054c73742262ee20f35c151ff3f
2013-11-05fixincludeguards.sh: swThomas Arnhold
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-10-24Resolves: #i120879# import "Microsoft Word TOC bookmarks" as...Oliver-Rainer Wittmann
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
2013-09-19remove dead definitionsNoel Grandin
Change-Id: I69d2df6cb0a7f994339972a23a913938307e5791