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
83aa6d8180
Remove some temporaries around calls to SvNumberFormatter methods
...
Change-Id: Ib03c97a52df120bac1ac9b2b9d2e52431ead1027
2014-02-24 09:08:35 +01:00
973b47a336
unotools: sal_Bool -> bool
...
Change-Id: I8051c0756e0474a5b4f748e0aa15a9922e82ea97
2014-02-19 12:47:07 +01:00
1f6449fdeb
cid#736845 Dereference before null check
...
Change-Id: Ied41eb5cad029200fd868eaaa129d8f052f3c436
2014-02-19 09:42:17 +02:00
0d3082dbf2
callcatcher: update unused code
...
Change-Id: Iaaad9302ef8edb47fa95ce8ca608b6f36449521b
2014-02-12 13:03:50 +00:00
50f0bb85b7
Resolves: #i124179# trigger update User Fields...
...
and related Input Fields when user directly edits a User Field Input Field
- assure that no recursive updates occur
(cherry picked from commit 3c2b5242e81575ec4b6c110afd88894670bd2283)
Conflicts:
sw/inc/txtfld.hxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/usrfld.cxx
Change-Id: I36af4d5e8008f16737e3ec14c1ec737a5f43d3b1
2014-02-11 20:21:46 +00:00
7c19ff431b
coverity#704934 Dereference after null check
...
Change-Id: I5242f89448431efb4a3f7ad5c84ab685b2e40f68
2014-02-11 12:11:42 +00:00
8314374293
Translated some German comments
...
Change-Id: Id8a4db32d0fe95ecf543fcfc82fd6b236d544616
Reviewed-on: https://gerrit.libreoffice.org/7948
Reviewed-by: Caolán McNamara <caolanm@redhat.com >
Tested-by: Caolán McNamara <caolanm@redhat.com >
2014-02-10 16:52:43 +00:00
a38165fdd4
coverity#708849 unused pointer value
...
Change-Id: I3d800ca26412537a69bbe0835f518558e37dead6
2014-02-07 15:33:27 +02:00
57f10ec58c
fdo#74489 replace '\n' to ' ' in fields (e.g. multiline headings)
...
Change-Id: I1ce125e459dfcf22adef85efac344ceb320812a2
2014-02-04 20:07:19 +01:00
bb665affbd
fdo#63553: sw: fix copy/paste of cross references
...
If one of aIds or aDestIds contains nSeqNo then adding an identity
mapping for it will actually re-define a previous mapping. Likely this
can only happen when clipboard document is the source.
(regression from 44f971506c0ed37928c48e55d8007f24b0c43a5f)
(also it looks like 4b0b0a5b3045902d9a6b95510ec30a3027181e29 has subtly
changed what the "else" branch does when it is erroneously taken -
results are differently wrong)
Change-Id: I34e2979e45cffeb62ebf3d7b3e5ac6d2afff0c2b
2014-01-29 22:42:36 +01:00
8676c2157a
sw: style cleanup in GetFieldIdsFromDoc
...
Change-Id: Ib7141b47d5c2a27b75e47756adb4c644aace721a
2014-01-28 20:50:26 +01:00
8bc3751ea3
bool improvements
...
Change-Id: Ibeb658e73b588f90242c95d23149f2ef45a7a815
2014-01-28 20:26:21 +01:00
c963d7e642
bool improvements
...
Change-Id: I9324483db587be43238af79c2148d724397a4622
2014-01-17 18:45:16 +01:00
2e5ec4f5b6
Related: #i17171# big xub_Strlen -> sal_Int32 changes
...
Change-Id: I31bce794c95062abfa1171c13cf565498688b5f3
2014-01-15 13:26:08 +00:00
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
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
b55259eeb5
typo fixes
...
Change-Id: Ia5f104bfd707bcf4e159c78ca2764c861fb0b6d9
2013-12-20 15:55:00 +01:00
39e9d80bed
Reduce unoprnms.hxx to a set of string literal macros
...
Change-Id: I955dcb5cedfbdf413054482d2c51d187e6f41898
2013-12-12 15:10:36 +01:00
a62c2a5fa5
Don't hold css::uno::Type instances by pointer
...
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
2013-12-12 08:26:40 +01:00
123e2c3e93
Revert "Don't hold css::uno::Type instances by pointer"
...
This reverts commit 90f91088d238469b4a2262c91de3117ba40f5bde for now:
Ach, old GCC doesn't like plain string literals to initialize members
of OUString type...
Change-Id: I50563a00406259bb5d41831e2a2796762450d097
2013-12-11 15:38:30 +01:00
90f91088d2
Don't hold css::uno::Type instances by pointer
...
...in comphelper::PropertyMapEntry and SfxItemPropertyMapEntry. And as the
arrays of such need to be initialized dynamically anyway, also change their name
members to proper OUStrings while at it. Plus some const clean-up.
Change-Id: I67d4d7b5773fb020605f369daf39528bec930606
2013-12-11 15:16:51 +01:00
20c91a72a1
xub_StrLen to sal_Int32
...
Change-Id: Ie2c18baa3ab6a3a7c6f2ac83b6d2d5bd8ecf5811
2013-12-02 23:11:41 +01:00
4420650bb0
xub_StrLen/unsigned to sal_Int32
...
Change-Id: I6d89f19ef2ee3aa83f3e74a416c41cd42dd448fa
2013-12-02 23:11:41 +01:00
485331b1cd
Remove unneeded xub_StrLen cast
...
Change-Id: Ia26f220fa7857f14dfc89b2929f60669ade3b4ea
2013-11-24 14:46:56 +01:00
d665e05824
fdo#71645 remove footnote numbers in cross-references
...
Change-Id: Ic3780e4389e450d8c7a69d2f0f2a6a7f81b8906e
2013-11-20 07:57:57 +01:00
c2b5521921
Resolves: #i33737# enable in-place editing of Input Fields
...
(cherry picked from commit c2afeb1c3f11e8f420b59f3786eb8626c99ff595)
Conflicts:
sw/inc/IDocumentContentOperations.hxx
sw/inc/crsrsh.hxx
sw/inc/doc.hxx
sw/inc/editsh.hxx
sw/inc/expfld.hxx
sw/inc/fldbas.hxx
sw/inc/fmtfld.hxx
sw/inc/hintids.hxx
sw/inc/ndtxt.hxx
sw/inc/txatbase.hxx
sw/inc/txtfld.hxx
sw/inc/txtrfmrk.hxx
sw/inc/txttxmrk.hxx
sw/inc/viscrs.hxx
sw/source/core/bastyp/init.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/crsr/crstrvl.cxx
sw/source/core/crsr/findattr.cxx
sw/source/core/crsr/findtxt.cxx
sw/source/core/crsr/swcrsr.cxx
sw/source/core/crsr/viscrs.cxx
sw/source/core/doc/dbgoutsw.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/docredln.cxx
sw/source/core/doc/docruby.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/visiturl.cxx
sw/source/core/docnode/nodes.cxx
sw/source/core/edit/edatmisc.cxx
sw/source/core/edit/edattr.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/edit/edfldexp.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/fields/reffld.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/inc/docfld.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/swfont.hxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/laycache.cxx
sw/source/core/layout/trvlfrm.cxx
sw/source/core/text/atrhndl.hxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/porfld.hxx
sw/source/core/text/txtfld.cxx
sw/source/core/tox/tox.cxx
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/ndhints.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/txtnode/txatbase.cxx
sw/source/core/txtnode/txatritr.cxx
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/rolbck.cxx
sw/source/core/undo/unsect.cxx
sw/source/core/undo/untbl.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unorefmk.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ascii/ascatr.cxx
sw/source/filter/html/htmlatr.cxx
sw/source/filter/rtf/rtffly.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1filter.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/ui/app/applab.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/envelp/envfmt.cxx
sw/source/ui/fldui/fldedt.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/lingu/hhcwrp.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textfld.cxx
sw/source/ui/shells/textidx.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/uiview/formatclipboard.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewsrch.cxx
sw/source/ui/uiview/viewstat.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/wrtsh/wrtsh1.cxx
sw/source/ui/wrtsh/wrtsh2.cxx
Change-Id: I6758d6719e1fd523797cc6ee2648ffcb47d52595
2013-11-19 15:51:27 +00:00
8820448bfe
longparas: change GetExpandTxt to sal_Int32
...
Change-Id: I34b6f91d104e5f095f0aad58869d62d0a367d2b3
2013-11-14 11:05:38 +00:00
ebeff3f074
xub_StrLen to sal_Int32 in SwIndex and some related
...
Change-Id: I66735635a88844c30a7fa1c886d2c1df34008f4f
2013-11-14 09:23:19 +01:00
b17601a4cb
longparas: these USHRT_MAX are really STRING_LEN
...
Change-Id: I5b55204c262e9fd0c14a9562351a9a1f8b080cec
2013-11-13 15:29:22 +00:00
ef90021abe
convert OUString !compareToAscii to equalsAscii
...
Convert code like
if( ! aStr.compareToAscii("XXX") )
to
if( aStr.equalsAscii("XXX") )
which is both clearer and faster.
Change-Id: I267511bccab52f5225b291acbfa4e388b5a5302b
2013-11-11 12:58:12 +02:00
a6dc113734
convert xub_StrLen to sal_Int32
...
Convert code like:
xub_StrLen nLen = aStr.getLength();
into
sal_Int32 nLen = aStr.getLength();
Change-Id: Ib0af6b747068257478918fd1cc93e4925f32ac47
2013-11-05 15:15:30 +02:00
0921642e7f
Related: #i33737# some minor refactoring in advance
...
(cherry picked from commit b27ff0a078b7c1b32e88041f25314eaad267618b)
Conflicts:
sw/source/core/bastyp/init.cxx
sw/source/core/crsr/findtxt.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/fields/authfld.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldlst.cxx
sw/source/core/fields/reffld.cxx
sw/source/core/frmedt/tblsel.cxx
sw/source/core/inc/wrong.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/itratr.cxx
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/rolbck.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoportenum.cxx
sw/source/core/unocore/unotext.cxx
sw/source/filter/rtf/rtffld.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/ui/docvw/AnnotationWin.cxx
sw/source/ui/utlui/content.cxx
Change-Id: I372cfaed881188266c359867879ae92c8d45fee1
2013-11-01 14:43:15 +00:00
ee3189489c
sw: ViewShell -> SwViewShell rename
...
It's a public class, so it should have the 'Sw' prefix.
Change-Id: I0040c1cc37ffcba7fc5f58b71c86f4a7cb0bfce4
2013-10-26 20:03:50 +02:00
a7724966ab
Bin comments that claim to say why some header is included
...
They are practically always useless, often misleading or obsolete.
Change-Id: I2d32182a31349c9fb3b982498fd22d93e84c0c0c
2013-10-22 16:56:28 +03:00
a537db8762
Bin useless swmod comments
...
Change-Id: I65df74242453a907b1a1a50f391e7b017bec5fcb
2013-10-22 15:19:17 +03:00
b37e2dd071
Resolves: fdo#38838 remove UniString
...
hammer silver nails into coffin and bury in concrete
Change-Id: I3fda2ff47738bb33793adab97faba2d439ac9a28
2013-10-22 12:50:48 +01:00
c2ccd20c0f
fdo#44689: fix for specific case of page restart-value 0
...
This bug fix is for roundtripping a DOCX that has
a specific 'start value' for the page numbers.
In most cases LO imports it ok.
However - until now - Word allowed you to start page number
from 0, while LO only allowed starting page numbers from 1.
This was because the 'start value' was stored in an 'unsigned int',
and the value '0' was used to mark 'there is no start value'.
This patch changes the way the 'start value' is stored
from 'unsigned int' to 'optional unsigned int'.
This way - if there is no value applied - the variable will hold NULL.
However - if a value is set - it can be 0 or more.
This meant also tweaking all the places that used to get this value,
so that now they handle an 'optional uint', instead of a 'uint'.
Conflicts:
sw/source/ui/inc/break.hxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/utlui/uitool.cxx
sw/source/ui/wrtsh/wrtsh1.cxx
Change-Id: I6ad9d90e03b42c58eed2271477df43c20ad6f20a
Reviewed-on: https://gerrit.libreoffice.org/5681
2013-10-22 09:53:53 +02:00
8051bb7e18
converting remaining usage of String in SW to OUString
...
Change-Id: Iaaa3812412dc880eb9d08144219ebe428007884e
2013-10-18 09:59:25 +02:00
4da4fe2d38
convert sw/source/core/fields/*.cxx from String to OUString
...
Change-Id: I1e56b2bc0499aebf4e7e57ad7c6e6c84de6a3efe
2013-10-18 09:59:20 +02:00
75a58a5196
convert sw/source/core/inc/t*.hxx from String to OUString
...
Change-Id: I539cc99bb7adb060b417dce287d81a1102d684b3
2013-10-15 12:25:31 +02:00
eb0d268cdb
CID#736192 out of bounds
...
Change-Id: I7ab1baa96e004122bd03d7b057effaf6b1ca7fe2
2013-10-14 21:09:47 +01:00
ae95703819
Related: fdo#38838 remove UniString::SetToken & UniString::SearchAscii
...
Change-Id: I5219578fbeb40a0fe363f03c64021a83f7e505fb
2013-10-09 16:59:42 +01:00
c1198cf209
remove yet another StringHash impl
...
Change-Id: I1f7894a4a08b193b48dceb40bf0a451d4a3b3d6d
2013-10-02 16:03:54 +01:00
815c675872
sw: unify PCURCRSR / FOREACHPAM_START / FOREACHPAM_END macros
...
Change-Id: I10ab2d0ba10178ba2d37db2632349215341612f4
2013-09-21 14:26:55 +02:00
fd7ef5f638
convert include/sfx2/doctempl.hxx from String to OUString
...
Change-Id: I0d4232afa37539bafd779b1cc9a323aabb1d6b0e
2013-08-29 09:30:09 +02:00
4779373d47
convert includes/sfx2/lnkbase.hxx from String to OUString
...
Change-Id: I3816ec77dd334823100421dab90d4bc8b67542e3
2013-08-29 09:30:05 +02:00
64b993e046
finish deprecation of O(U)String::valueOf()
...
Compiler plugin to replace with matching number(), boolean() or OUString ctor,
ran it, few manual tweaks, mark as really deprecated.
Change-Id: I4a79bdbcf4c460d21e73b635d2bd3725c22876b2
2013-08-21 15:10:35 +02:00
45f8271f2f
String to OUString and some optimizations
...
Change-Id: I516ca7fe8e40ec091d860fe6fc4dfebb7c24c11c
Reviewed-on: https://gerrit.libreoffice.org/5389
Reviewed-by: Michael Stahl <mstahl@redhat.com >
Tested-by: Michael Stahl <mstahl@redhat.com >
2013-08-15 09:46:48 +00:00
fa78b33a10
Use stardard prefixes for data members, and english names
...
Change-Id: Ie2c6a12787a1a3753c7b4f82a2b5d342e60fc8da
Reviewed-on: https://gerrit.libreoffice.org/5383
Reviewed-by: Matteo Casalin <matteo.casalin@yahoo.com >
Tested-by: Matteo Casalin <matteo.casalin@yahoo.com >
2013-08-13 06:26:47 +00:00