Commit Graph

730 Commits

Author SHA1 Message Date
76c549eb01 Integrate branch of IAccessible2
Conflicts:
	everything

Change-Id: I9619634ee1e60d449025c006803da29c1e9d14b3
2013-12-02 10:25:33 +00:00
95034bafda sw doc model dump: handle SvxCharRotateItem
Change-Id: I981867bcf4ec5fa6be866b19f82805ab4ff9623f
2013-11-28 17:07:28 +01:00
e06ef25aea WaE: int/sal_Int32 format confusion
Change-Id: I0dc0bd5c8a751fbda93eeffecc1a01496427da66
2013-11-26 18:29:01 +02:00
3507ffabfe SwRedlineTbl::dumpAsXml: -Werror=format
Change-Id: I703009efb476b20f2fca8d87e14a15c28632a5be
2013-11-26 16:33:17 +01:00
bbcce6e10c Added dump of 'redline' objects in 'node dump' XML
Change-Id: I531a04fd4747a4b10858f6317b7c08cceb6458eb
Reviewed-on: https://gerrit.libreoffice.org/6817
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-11-26 07:16:32 -06:00
48264d6d47 Improve formatting
Change-Id: I0cb8eb5b78ef5ca10d6b8765bff387ca09ec291c
2013-11-24 14:46:56 +01:00
0215305c13 Prefer += and -=
Change-Id: I0b1ba2e7c8287340eebec7eb9b3e1aea8945d82f
2013-11-24 14:46:56 +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
f0a9ca24fd rhbz#887420 Implement "block untrusted referer links" feature
For now, this checks for a trusted referer (if the BlockUntrustedRefererLinks
configuration prop is set) in utl::MediaDescriptor::impl_openStreamWithURL and
SvxBrushItem::GetGraphicObject.  Checking in additional places will probably be
necessary to block /all/ unwanted communication.  Also, some places marked
/*TODO?*/ currently pass in an empty referer (which is always considered
trusted) and will probably need to be adapted.

Ideally, Referer URIs would never be empty (and consistently use something like
<private:user> for cases where access is explicitly initiated by the user and
should never be blocked), but that's a very daunting task, so start small by
identifying the places that potentially need blocking and adding appropriate
Referer URIs there.  Also, Referer information should always be computed as
freshly as possible from the context in which an access attempt is made, but,
again, always carrying the information from the context all the way to the
relevant functions is a very daunting task, so for now store the information
upon object instantiation in some cases (SvxBrushItem, SdrGrafObj, ...).

The Referer URI (css.document.MediaDescriptor property; SID_REFERER) was already
used to track macro execution, and there is one place in
SfxApplication::OpenDocExec_Impl where opening of hyperlinks (explicitly clicked
by the user) is done that needs the current document's URI as Referer to check
execution of macro URIs but needs an empty (or <private:user>, see above)
Referer to not block non-macro URIs.  Special code has been added there to
handle that.

Change-Id: Iafbdc07a9fe925d9ee580d4f5778448f18f2ebd9
2013-11-14 11:13:25 +01:00
24cad6a649 Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally.

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
2013-11-14 11:13:24 +01:00
8fd81bd96b -Werror,-Wunused-member-function
Change-Id: Ic575f5bcca894639667f9893c5caf8163b124037
2013-11-14 10:15:12 +01:00
ebeff3f074 xub_StrLen to sal_Int32 in SwIndex and some related
Change-Id: I66735635a88844c30a7fa1c886d2c1df34008f4f
2013-11-14 09:23:19 +01:00
a5536d9a0e remove unnecessary use of OUString constructor in SW module
Change-Id: I015959dce567e5579ebb5c775fb57ae14e1cd3b1
2013-11-08 08:44:33 +02:00
296329a926 convert xub_StrLen to sal_Int32
convert for loops using xub_StrLen to use sal_Int32

Change-Id: I5f635ca078966fefe938dbc7e8dea7c8d0d0b554
2013-11-06 08:51:22 +02:00
3c01203ea6 fixincludeguards.sh: sw
Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
2013-11-05 09:28:51 +01: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
df1b20d47a convert sw/source/core/docnode/*.cxx from String to OUString
Change-Id: I1c9e569b41f953510160cefee626ee7c9440c3c0
2013-10-18 09:59:22 +02:00
86989abe6e convert sw/inc/doc.hxx from String to OUString
Change-Id: I8ddf0f59de506df4e3fea77824b5bb5679bcf7b1
2013-10-15 12:25:42 +02:00
9ad56bac45 convert sw/source/core/inc/r*.hxx from String to OUString
Change-Id: Ie2523eb8f7054d145ef969e65da1361134bfbb1e
2013-10-15 12:25:31 +02:00
8c5bf396f4 sw: include paragraph attributes and style in doc model xml dump
Change-Id: Ib4dd980ffa1836f8873e05779f5d99e4c59da721
2013-10-15 11:54:53 +02:00
4e8bc69309 SwNumRule::dumpAsXml: include IsAutoRule() and GetPoolFmtId() output
Change-Id: I8f3fbe00f472d694a7b9ea31fd251101c9ad73e3
2013-10-10 15:08:42 +02:00
5c79177089 sw: include SwNumRuleTbl in the doc model dump
Change-Id: I385bce4562e4b94102b0758ca24853892b081ea1
2013-10-10 12:47:01 +02:00
49279e759c sw: include SwNumRule in doc model xml dump
Change-Id: I1f3ef757f76c88243c4be1f1a86042040eb524e8
2013-10-09 16:41:07 +02:00
c75670498b CID#1078700 keep coverity and nesting test happy
Change-Id: I313e76a480cd734d1e950e811bb02dd1280a143c
2013-10-07 13:49:30 +01:00
ad7b757a25 'ist' -> 'is' here and there.
Change-Id: I0a463c38214b95582db2c7b3979367255426c14e
2013-10-04 20:27:30 +02:00
7f71207891 sw doc model dump: also output the SfxItemSet of paragraph styles
Change-Id: Ie85b8e6669f3b0d3bef48d56934c8ec07d858b8a
2013-10-03 16:15:00 +02:00
5a1e73615e sw: include names of character and paragraph styles in doc model dump
Change-Id: Ib766fa7753e52ad81f5fe976d0e6c3e1f688a826
2013-10-03 16:15:00 +02:00
087a8cb100 SwFldTypes::dumpAsXml: handle RES_{PAGENUMBER,DATETIME}FLD
Change-Id: Iccdf53d285ed36c59c7dab4050f1c56b0e326c91
2013-10-03 16:15:00 +02:00
5050dfc73f fdo#62475 - remove visual noise and fix existing comments
Conflicts:
	sw/source/ui/index/cnttab.cxx
	sw/source/ui/misc/outline.cxx
	sw/source/ui/uiview/view2.cxx

Change-Id: Ib75355808599401f8c0a8a626ce034f1699c9104
Reviewed-on: https://gerrit.libreoffice.org/6085
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 16:03:02 +00:00
52f5b63408 fdo#39468: translate German comments
Change-Id: Iabbd152c50c40a7db839370b6d74b6a488a90c4d
Reviewed-on: https://gerrit.libreoffice.org/6084
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 15:53:29 +00:00
0dfaa5ff93 fix format for code consistency
Conflicts:
	sw/source/core/doc/docglbl.cxx
	sw/source/filter/ww8/ww8par2.cxx

Change-Id: I8deb4ecf2714f29d53e0653ecaeabac251e9f071
Reviewed-on: https://gerrit.libreoffice.org/6082
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 15:49:02 +00:00
faad24aa33 remove/add blank lines
Conflicts:
	sw/source/core/unocore/unoprnms.cxx

Change-Id: Icc044955b7b9f28d9f237e97865198cd2ded89a1
Reviewed-on: https://gerrit.libreoffice.org/6079
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-10-02 15:18:59 +00:00
23f5c0466f SwTxtNode::dumpAsXml: don't dereference these pointers unconditionally
Change-Id: I1b65cd92b6a2afa36a0181ab9851cfb2e30a11c3
2013-09-30 12:28:58 +02:00
2b8dc46ef3 delete code that was commented out
Change-Id: I86f53763305682946098ece4fd6d58bcfdc5a73f
Reviewed-on: https://gerrit.libreoffice.org/6083
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
2013-09-30 08:28:07 +00:00
8b7bc95275 String to OUString
Change-Id: I6cff1659b0bacef0bed90fb9767513018a7eeba7
2013-09-29 10:46:59 +02:00
3099c06f7b SwTxtNode::dumpAsXml: initial support for dumping the hints
Change-Id: I47c9343f1e55d9b06e8dc4b2359392090639d320
2013-09-28 18:56:22 +02:00
abb9edd863 whitespace work
Change-Id: I3581dc5e9e3b756ac8fcdf6cdb2dec896b75e467
2013-09-26 11:24:48 +02:00
e324251a1a added code hints
Change-Id: Icce7ee8e10539d43f5686275930041a8b699b1c3
2013-09-26 11:24:48 +02:00
582860942b remove commented-out code
Change-Id: I1893ee58431ccf7d5d6b375c46333b73b9f92ede
2013-09-26 11:24:48 +02:00
20259c5940 work on existing comments
Change-Id: I35bd6c4eb15316de86f7fd85c81173a0e4ffc136
2013-09-26 11:24:47 +02:00
1043e4cb3a fdo#39468: Translate German comments
Change-Id: I2cda597bd1ccfef1234ae818716016056f44eac2
2013-09-26 11:24:47 +02:00
5b83b465f7 convert sw/source/core/inc/retrieveinputstreamconsumer.hxx to OUString
Change-Id: Ia1c8f2d7a9bcad87767f3714514c40496e0c1e6b
2013-09-17 09:06:32 +02:00
3a33d89c97 work on comments in sw/source/core/docnode/
Change-Id: Ie988076dc73f80fa962daa2e9d8e05132ed7180b
Reviewed-on: https://gerrit.libreoffice.org/5869
Reviewed-by: Philipp Riemer <ruderphilipp@gmail.com>
Tested-by: Philipp Riemer <ruderphilipp@gmail.com>
2013-09-07 22:25:08 +00:00
a7c60c0e63 remove/add blank lines for consistent code layout in sw/source/core/docnode/
Change-Id: I4ccd099b8ae491c69f25fd32d12a532348d6655d
Reviewed-on: https://gerrit.libreoffice.org/5868
Reviewed-by: Philipp Riemer <ruderphilipp@gmail.com>
Tested-by: Philipp Riemer <ruderphilipp@gmail.com>
2013-09-07 22:21:40 +00:00
09f52ba7c1 fix build on higher debugging levels
Change-Id: I332f6fc653d1b9ba2d1652d0d02f1567eeab8cb0
2013-08-31 17:22:44 +01:00
4779373d47 convert includes/sfx2/lnkbase.hxx from String to OUString
Change-Id: I3816ec77dd334823100421dab90d4bc8b67542e3
2013-08-29 09:30:05 +02:00
55c51004c5 Use slightly less verbose erase-then-move-on idiom.
Change-Id: Iae3a749770b75a99c53755d0410ef9510158e94b
2013-08-27 18:02:56 +02:00