mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
355,914 Commits 1 Branch 0 Tags
5aadf3ce06f76b07290a8ae2fedb54386c825935
Commit Graph

166 Commits

Author SHA1 Message Date
Bjoern Michaelsen
5aadf3ce06 still ugly, but lets silent the warning for now 
Change-Id: I647e969bfc9f8b4294d3e526d8d5b11df7d7bea9
 2014-06-25 16:00:32 +02:00
Bjoern Michaelsen
ba327f6b86 remove old redline save/restore 
Change-Id: I3165f84d44c74bca3a2d75ebf3cd681b9d5d120a
 2014-06-25 16:00:31 +02:00
Bjoern Michaelsen
c8ad16ca7c refactor redline save/restore 
Change-Id: I4840d694954a5c0419abfa4c0fbe67b756f8253c
 2014-06-25 16:00:31 +02:00
Bjoern Michaelsen
a26b74cc49 fix the almost fix from ... 
... 27fc435449. Thanks sberg.

Change-Id: Ibf0c7926da38ec3835fd0ab21e1383711bfa6034
 2014-06-11 22:47:45 +02:00
Stephan Bergmann
27fc435449 -Werror,-Wlogical-not-parentheses 
...lets assume that was a stray "!" (originally introduced with
fb171e3886 "add second Restore function for
CntntIdxStore"), esp. given "make check" works fine when removing it.  But let
SweetShark have a look at it in any case.

Change-Id: I4d804a5b416a39055613d3104d31cdc314940ef1
 2014-06-11 18:24:57 +02:00
Bjoern Michaelsen
aa6e78eeef BOOST_FOREACH and constness 
Change-Id: I86c86cfa245c78ce8e21d85831de5ae82f67f81e
 2014-06-11 16:17:16 +02:00
Bjoern Michaelsen
99c1de27bf BOOST_FOREACH and constness 
Change-Id: I832bc8fcdfb4997c2eaae3f0cb5d7014df20f2fd
 2014-06-11 16:17:15 +02:00
Bjoern Michaelsen
958492d4d3 simplify MarkPos conditional 
Change-Id: If109980429f2f87e06065837eaec7129b2ece336
 2014-06-11 16:17:15 +02:00
Bjoern Michaelsen
5deaac4ff9 simplify cascading conditionals 
Change-Id: I957d7c368f6b7158c74268f7274d59e8a25b83e8
 2014-06-11 16:17:15 +02:00
Bjoern Michaelsen
6c7f0e8bfa remove now redundant old implementation 
Change-Id: Ieab4fc54be0b2e5ad547f81a7a70d84284161c47
 2014-06-11 16:17:14 +02:00
Bjoern Michaelsen
fb171e3886 add second Restore function for CntntIdxStore 
Change-Id: I2d4c92d0927bce13b03a6f235e14812ed1d0bd54
 2014-06-11 16:17:14 +02:00
Bjoern Michaelsen
64c31cc7e4 code conventions, while we are at it 
Change-Id: I118aa2cb8747775d8c778cf49248c7f3ef68d6a2
 2014-06-11 16:17:14 +02:00
Bjoern Michaelsen
bd60aba197 refactor bookmark moves 
Change-Id: I13924d40ca1c31f56440b98d9a1829963cdd3e1a
 2014-06-11 16:17:14 +02:00
Michael Stahl
2da8a60702 Revert "Change sw::mark::IMark::GetOtherMarkPos return type from ref 
... to pointer"

CrossRefBookmark::GetOtherMarkPos() is apparently not supposed to be
called, so just replace the undefined null-reference with a call to
abort().

This reverts commit dcf0ac048c.

Change-Id: I55b4accb4f42031df5671e8a30897e3aff9b56f9
 2014-06-11 16:08:34 +02:00
Stephan Bergmann
dcf0ac048c Change sw::mark::IMark::GetOtherMarkPos return type from ref to pointer 
...so CrossRefBookmark::GetOtherMarkPos can legitimately return a null pointer

Change-Id: I88774cf0d139d017d67d6727ee01214997a73636
 2014-06-10 19:44:04 +02:00
Bjoern Michaelsen
c3c959ee5d some SAL_OVERRIDEs 
Change-Id: I4fe27420606aa0a9a413e08225e9f3be6ee9aca6
 2014-06-10 13:38:27 +02:00
Bjoern Michaelsen
a72ea67d52 decouple CntntStore so it can be refactored 
Change-Id: I26554a0e269d63830fd84b37a4323f40c80fc014
 2014-06-10 10:14:58 +02:00
Bjoern Michaelsen
e5fe5601a6 create factory function for encapsulation 
Change-Id: I4cf6ca2855787102f6f9edd477e0d6e4c6a43503
 2014-06-10 10:14:57 +02:00
Chris Laplante
0a3fe4c281 Remove ASCII art and useless comments from sw module 
Change-Id: I3ba4ac78fd4810e006b1034bbe7c28b1803895d2
Reviewed-on: https://gerrit.libreoffice.org/9494
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
 2014-05-27 01:46:44 -05:00
Miklos Vajna
2013d184f1 coverity#1158084 Unchecked dynamic_cast 
Change-Id: Ia800e45166b0206377fa9e138c4e444e476e3863
 2014-05-26 18:01:32 +02:00
Miklos Vajna
309a2dabab coverity#1158083 Unchecked dynamic_cast 
Change-Id: I8213e0c8e6228320c6efcba5e42e58e87e0379b9
 2014-05-25 20:28:16 +02:00
Miklos Vajna
eedae04447 coverity#1158082 Unchecked dynamic_cast 
Change-Id: Ia70d73d64af020c546a0218b996334959ca6b624
 2014-05-25 20:28:15 +02:00
Miklos Vajna
17fa344d03 coverity#1158081 Unchecked dynamic_cast 
Change-Id: Ia67656ac35d50c1f70045ff8e9084bcc54b0d9a8
 2014-05-24 22:11:05 +02:00
Caolán McNamara
a71f7409c5 coverity#989714 Unchecked dynamic_cast 
Change-Id: I0be5ad2429af7667ccea4ac491ad661eec67d398
 2014-05-24 13:03:48 +01:00
Miklos Vajna
c0765d1b5e coverity#735895 Unchecked dynamic_cast 
Change-Id: I6c2cc90668a2158a0b5bf638ce520c8af7731f4e
 2014-05-22 19:52:28 +02:00
Miklos Vajna
8ae0610085 coverity#704866 Unchecked dynamic_cast 
Change-Id: Ib1108a6641635bbbb0d88968754d7bb19a8c9e73
 2014-05-16 23:00:34 +02:00
Miklos Vajna
a14752a864 coverity#704863 Unchecked dynamic_cast 
Change-Id: I0c451cb576dc1818043816390b14c32607609748
 2014-05-14 22:37:25 +02:00
Miklos Vajna
4ab3a43b6c coverity#704862 Unchecked dynamic_cast 
Change-Id: I97ae71335fb3a2658ca1c4a48c9092cdb4ee3733
 2014-05-13 21:04:48 +02:00
Miklos Vajna
402fe9d8aa coverity#704861 Unchecked dynamic_cast 
Change-Id: I240c461efcf21d0f41ca7d7b2fb8d18cac71ab3b
 2014-05-12 21:50:03 +02:00
Miklos Vajna
b05778b9c0 coverity#704860 Unchecked dynamic_cast 
Change-Id: I4a6cf43eaf9626bdb1d486476d3e797fcab5ab13
 2014-05-11 18:46:41 +02:00
Noel Grandin
794f09f195 simplify ternary conditions "xxx ? true : yyy" 
Look for code like:
   xxx ? true : yyy;
Which can be simplified to:
   xxx || yyy

Change-Id: Ib7ca86580bfd0cf04674328a3c0cf3747de4758d
 2014-05-06 07:45:25 +02:00
Thomas Arnhold
40bb0ab22b typo: partitially -> partially 2014-04-14 12:33:11 +02:00
Thomas Arnhold
cb215c649d typo: colleting -> collecting 2014-04-14 12:33:10 +02:00
Caolán McNamara
38e4ef50d4 Related: fdo#73936 for spelling restrict formelements-as-fields.. 
to dropdowns to be on the safe side for now anyway.

Change-Id: I88a73fe37b39306c6b24226e3b02c702d992ecb0
 2014-03-28 08:57:49 +00:00
Caolán McNamara
d0c545bede Related: fdo#73936 expand FormFieldDropDowns in ModelToViewHelper 
when EXPANDFIELDS is set. i.e. for spell and grammar checking

Change-Id: I8c524f0cd584c9d6043dece5c1b736afb254b7c0
 2014-03-28 08:57:47 +00:00
Oliver-Rainer Wittmann
14f124a5ef Resolves: #i124338# assure sorted mark containers... 
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-03-04 20:31:05 +00:00
Alexander Wilms
a27462189d Remove visual noise from sw 
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-02-27 09:41:00 -06:00
Caolán McNamara
91fcdd5a8d fix debug=2 build 
Change-Id: I9b5b2efc3b8fc3164264775b608348baa72d31b1
 2014-02-07 09:03:48 +00:00
Stephan Bergmann
8bc3751ea3 bool improvements 
Change-Id: Ibeb658e73b588f90242c95d23149f2ef45a7a815
 2014-01-28 20:26:21 +01:00
Stephan Bergmann
c963d7e642 bool improvements 
Change-Id: I9324483db587be43238af79c2148d724397a4622
 2014-01-17 18:45:16 +01:00
Oliver-Rainer Wittmann
59fd33c1f0 Resolves: #i123480# assure sorting of subset mark containers... 
before the intrinsic deletion of marks

(cherry picked from commit 93ab293354bb322a7d57b7eaf21bcd2479453e87)

Conflicts:
	sw/source/core/doc/docbm.cxx

Change-Id: I24e3b935df402f42dde135c7feda3b6e664370de
 2014-01-17 10:16:01 +00:00
Oliver-Rainer Wittmann
4b6b51182a Resolves: #i124030# do not delete UNO mark which are not expanded... 
and only touch the start of the given range.

(cherry picked from commit ae295f7d009842cdceb50c4daffe948ede2b4b88)

Conflicts:
	sw/source/core/doc/docbm.cxx

Change-Id: Id7317eeb8e9c063c9d8b30bca97ed0afee3ec8c5
 2014-01-16 15:18:33 +00:00
Caolán McNamara
2e5ec4f5b6 Related: #i17171# big xub_Strlen -> sal_Int32 changes 
Change-Id: I31bce794c95062abfa1171c13cf565498688b5f3
 2014-01-15 13:26:08 +00:00
Adam Co
4a68f12691 Renamed 'SwRedline' to 'SwRangeRedline' 
This is in preparation to adding more types of 'SwRedlines'.

Change-Id: Id61217ed3c4622f7689427ea9f30e364f6bb65d1
Reviewed-on: https://gerrit.libreoffice.org/7410
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
 2014-01-13 16:40:46 +00:00
Oliver-Rainer Wittmann
6af2caab72 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
 2014-01-09 16:21:44 +00:00
Miklos Vajna
a39cc5745d sw: one more bind -> boost::bind 
Change-Id: I6f3d36f0b0775559f3f0617d273a4f4595feda76
 2014-01-08 18:37:07 +01:00
Miklos Vajna
454b302024 sw: try to fix Windows build 
Change-Id: If6423d2ee942e0e0a27c61c69b995fedee5f5f7e
 2014-01-08 18:21:56 +01:00
Oliver-Rainer Wittmann
0761f81643 123792: complete annotations on text ranges feature 
- 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
 2014-01-08 15:58:35 +01:00
Matteo Casalin
2dda972cb9 xub_StrLen to sal_Int32 
Change-Id: I8ad8cade0b2cbc29a934a983c72d25f7f00af6bc
 2013-11-24 14:46:57 +01:00
Matteo Casalin
188886a3dc Avoid temporary, just return the result 
Change-Id: I644abe042175168dab489476a41254fba6883982
 2013-11-24 14:46:57 +01:00