Jan Holesovsky
|
5630cca203
|
Merge commit 'ooo/DEV300_m103'
Conflicts:
sw/inc/calbck.hxx
sw/inc/crsrsh.hxx
sw/inc/dcontact.hxx
sw/inc/doc.hxx
sw/inc/docufld.hxx
sw/inc/editsh.hxx
sw/inc/expfld.hxx
sw/inc/fchrfmt.hxx
sw/inc/fmtcol.hxx
sw/inc/fmthdft.hxx
sw/inc/fmtpdsc.hxx
sw/inc/format.hxx
sw/inc/frmfmt.hxx
sw/inc/ndhints.hxx
sw/inc/ndtxt.hxx
sw/inc/node.hxx
sw/inc/numrule.hxx
sw/inc/paratr.hxx
sw/inc/swtable.hxx
sw/inc/unocrsr.hxx
sw/inc/unofield.hxx
sw/inc/unoframe.hxx
sw/inc/unoport.hxx
sw/inc/unostyle.hxx
sw/inc/usrfld.hxx
sw/inc/viewopt.hxx
sw/inc/viewsh.hxx
sw/source/core/access/accframebase.cxx
sw/source/core/access/accmap.cxx
sw/source/core/access/accnotextframe.cxx
sw/source/core/access/accpara.cxx
sw/source/core/access/accpara.hxx
sw/source/core/attr/calbck.cxx
sw/source/core/crsr/callnk.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/doc/acmplwrd.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/fmtcol.cxx
sw/source/core/doc/htmltbl.cxx
sw/source/core/doc/number.cxx
sw/source/core/docnode/ndsect.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/node.cxx
sw/source/core/docnode/node2lay.cxx
sw/source/core/docnode/section.cxx
sw/source/core/docnode/swbaslnk.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dview.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.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/reffld.cxx
sw/source/core/fields/tblcalc.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/frmedt/tblsel.cxx
sw/source/core/inc/flyfrm.hxx
sw/source/core/inc/prevwpage.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/txtfrm.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/layout/findfrm.cxx
sw/source/core/layout/flowfrm.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/flylay.cxx
sw/source/core/layout/frmtool.cxx
sw/source/core/layout/hffrm.cxx
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/layout/sectfrm.cxx
sw/source/core/layout/ssfrm.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/layout/wsfrm.cxx
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
sw/source/core/table/swtable.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/porfld.cxx
sw/source/core/text/txtdrop.cxx
sw/source/core/text/txtfly.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtio.cxx
sw/source/core/text/txttab.cxx
sw/source/core/tox/tox.cxx
sw/source/core/txtnode/atrflyin.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/undo/SwUndoPageDesc.cxx
sw/source/core/undo/undraw.cxx
sw/source/core/unocore/unochart.cxx
sw/source/core/unocore/unocoll.cxx
sw/source/core/unocore/unodraw.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoftn.cxx
sw/source/core/unocore/unoidx.cxx
sw/source/core/unocore/unoobj2.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/core/unocore/unoport.cxx
sw/source/core/unocore/unoportenum.cxx
sw/source/core/unocore/unoredline.cxx
sw/source/core/unocore/unoredlines.cxx
sw/source/core/unocore/unorefmk.cxx
sw/source/core/unocore/unosect.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/core/unocore/unotbl.cxx
sw/source/core/unocore/unotext.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewpg.cxx
sw/source/core/view/viewsh.cxx
sw/source/core/view/vnew.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/filter/ww8/rtfexport.hxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtww8gr.cxx
sw/source/filter/xml/XMLRedlineImportHelper.cxx
sw/source/ui/app/apphdl.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/swmodul1.cxx
sw/source/ui/config/viewopt.cxx
sw/source/ui/fldui/fldpage.cxx
sw/source/ui/uiview/srcview.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uno/unotxdoc.cxx
sw/source/ui/vba/wordvbahelper.cxx
sw/source/ui/wrtsh/wrtsh1.cxx
|
2011-03-23 17:00:12 +01:00 |
|
Luboš Luňák
|
6270e76bf5
|
write some lnNumType attributes only when non-default
|
2011-03-21 15:45:29 +01:00 |
|
Luboš Luňák
|
65578e67f8
|
implement lnNumType (bnc#593885)
|
2011-03-21 15:45:29 +01:00 |
|
Dózsa Bálint
|
01f05e73c0
|
FIX BUG 32559
|
2011-03-21 12:07:52 +00:00 |
|
Christoph Herzog
|
dcc88f5a0e
|
Translation of German comments.
|
2011-03-21 12:00:48 +01:00 |
|
Christoph Herzog
|
fe5d4c7657
|
Translate German comments.
|
2011-03-21 10:05:43 +01:00 |
|
Tor Lillqvist
|
af130785ee
|
Sprinkle some realpath goodness here, too
(cherry picked from commit f60ac8bb5f2a22fa2826cf08589976cb4a259d74)
|
2011-03-21 10:12:42 +02:00 |
|
Thomas Arnhold
|
7a1438d585
|
WaE: silence warnings
|
2011-03-20 14:11:24 +01:00 |
|
Caolán McNamara
|
7329e5c89a
|
WaE: silence warning
|
2011-03-20 12:21:40 +00:00 |
|
Cédric Bosdonnat
|
3c5d916116
|
i#12441: added ui for footnote separator color selection
|
2011-03-19 15:38:04 +01:00 |
|
Cédric Bosdonnat
|
157c996a32
|
i#12441: Fixed line style in footnote format GUI and saved it to ODF
|
2011-03-19 15:33:13 +01:00 |
|
Cédric Bosdonnat
|
481e04cd43
|
Added column separator style in ODF
|
2011-03-19 15:33:13 +01:00 |
|
Cédric Bosdonnat
|
67697d9415
|
Fixed the NONE border line style API value
|
2011-03-19 15:33:13 +01:00 |
|
Cédric Bosdonnat
|
a0486f0243
|
Shift all table border lines in sw to avoid hacky clipping of the borders
|
2011-03-19 15:33:13 +01:00 |
|
Cédric Bosdonnat
|
3537afd0e8
|
ODT import filter fixed for the new borders
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
adb6916948
|
Docx export filter: fixed wrong embossed/engraved values
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
07106d13bd
|
Fixed HTML filters to work with new borders
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
7382abd405
|
Fixed RTF import/export of new border lines
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
2157b3563a
|
Merged borders of paragraphs were having angles
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
b56fdd4316
|
Fixes for ODT filter related to new borders
|
2011-03-19 15:33:12 +01:00 |
|
Cédric Bosdonnat
|
f2e26401ab
|
Fixes for WW8 filter related to new borders
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
eda2257c01
|
Docx export of the new borders
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
f1c1080112
|
Few fixes for RTF export and import of borders
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
f510dc5a0d
|
Embossed and engraved to fit ODF specs
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
86c31d17a6
|
ODF export of new border types
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
32612ba8e3
|
Getting total width directly using SvxBorderLine
|
2011-03-19 15:33:11 +01:00 |
|
Cédric Bosdonnat
|
9409854f7d
|
Switching the order of the SetLinesWidth arguments
|
2011-03-19 15:33:10 +01:00 |
|
Cédric Bosdonnat
|
db54a222c6
|
One LineListBox to rule them all: started improving column sep line
|
2011-03-19 15:32:56 +01:00 |
|
Cédric Bosdonnat
|
6936cd2420
|
Misc sw build breakers fixes after the borders width changes
|
2011-03-19 15:31:31 +01:00 |
|
Cédric Bosdonnat
|
cd8d9afd92
|
Adjusted CSS1 import borders widths
|
2011-03-19 15:31:30 +01:00 |
|
Cédric Bosdonnat
|
79543bc58e
|
Fixed the ODF Writer import after borders width changes
|
2011-03-19 15:31:30 +01:00 |
|
Cédric Bosdonnat
|
0f5f87f9b6
|
Reworked the html filter
|
2011-03-19 15:31:30 +01:00 |
|
Cédric Bosdonnat
|
8b2c2ca258
|
Changed SvxBorderStyle::NONE to SvxBorderStyle::NO_STYLE
|
2011-03-19 15:31:30 +01:00 |
|
Cédric Bosdonnat
|
2dbfc0e52e
|
Fixed the WW8 filters to use new borders widths
|
2011-03-19 15:31:29 +01:00 |
|
Cédric Bosdonnat
|
a9a953c068
|
Fixed the WW1 filters to use new borders widths
|
2011-03-19 15:31:25 +01:00 |
|
Cédric Bosdonnat
|
e93c59d0c1
|
Fixed the auto formatting to use new border widths
|
2011-03-19 15:29:55 +01:00 |
|
Cédric Bosdonnat
|
4b5bd335f1
|
Borders: first attempt to fix the ww8 borders import with the new types
|
2011-03-19 15:29:54 +01:00 |
|
Cédric Bosdonnat
|
0f0896c26f
|
i#8275: Nicely draw borders using drawinglayer and added 3D borders
|
2011-03-19 15:29:43 +01:00 |
|
Thomas Arnhold
|
25af48a884
|
Move OSL_ENSURE(sal_False,...) to OSL_FAIL(...)
|
2011-03-19 14:13:18 +01:00 |
|
Thomas Arnhold
|
1ade0128a0
|
Remove core/except (came in with m101)
|
2011-03-19 07:12:33 +01:00 |
|
Thorsten Behrens
|
4997d825c1
|
Made dbgutil build work again
A few member var renames, and put removed error.h macros into
cxx directly (as the only client)
|
2011-03-18 22:55:14 +01:00 |
|
Jan Holesovsky
|
59c73f0141
|
Some ULONGs got in, get rid of them.
|
2011-03-18 17:29:08 +01:00 |
|
Jan Holesovsky
|
15c98e0648
|
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/writer
Conflicts:
sw/source/ui/dbui/mmoutputpage.cxx
|
2011-03-18 16:18:20 +01:00 |
|
Jan Holesovsky
|
5a267de99f
|
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
|
2011-03-18 15:59:29 +01:00 |
|
Caolán McNamara
|
2d5b4b02d6
|
Related: fdo#32553/fdo#31792 ensure correct pdf export filter
|
2011-03-18 13:51:34 +00:00 |
|
Caolán McNamara
|
d26364710b
|
Related: fdo#32553/fdo#31792 ensure correct mimetype
The flat xml filter also accepts .odt as an extension, so
looking up mimetype by extension could pick that up.
|
2011-03-18 13:13:54 +00:00 |
|
Caolán McNamara
|
38ecac03e1
|
Resolves: fdo#32553 freeze/hang on mailmerge to attached pdf
|
2011-03-18 12:29:41 +00:00 |
|
Bjoern Michaelsen
|
99ebfb7335
|
killing off stl in gbuild
|
2011-03-17 13:38:39 +01:00 |
|
Arnaud Versini
|
3bb681a344
|
Add non blank characters to metafile.
|
2011-03-17 11:31:28 +01:00 |
|
Bjoern Michaelsen
|
056c886e82
|
better not use introduce global variables for the libxml include path
|
2011-03-16 15:12:07 +01:00 |
|