Commit graph

22371 commits

Author SHA1 Message Date
Jan Holesovsky
5196ba1595 Fix mismerge, properties.hxx does not exist any more. 2011-03-18 17:18:22 +01:00
Jan Holesovsky
da6e7f3f95 Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/filters
Conflicts:
	oox/source/drawingml/chart/converterbase.cxx
	oox/source/export/drawingml.cxx
2011-03-18 16:09:00 +01:00
Jan Holesovsky
62abc84216 Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
	binfilter/bf_forms/source/component/forms_Filter.cxx
	binfilter/bf_sw/source/core/inc/node2lay.hxx
	binfilter/bf_sw/source/filter/xml/sw_swxml.cxx
	binfilter/inc/bf_sw/swdbtoolsclient.hxx
	filter/source/xsltdialog/xmlfileview.cxx
	oox/source/ole/axcontrol.cxx
	oox/source/vml/vmlformatting.cxx
	oox/source/xls/autofiltercontext.cxx
	oox/source/xls/externallinkfragment.cxx
	oox/source/xls/formulaparser.cxx
	oox/source/xls/pivotcachebuffer.cxx
	oox/source/xls/pivotcachefragment.cxx
	oox/source/xls/sheetdatacontext.cxx
	writerfilter/source/dmapper/GraphicImport.cxx
	writerfilter/source/dmapper/SettingsTable.cxx
	writerfilter/source/ooxml/model.xml
2011-03-18 15:38:26 +01:00
Takeshi Abe
005b11645a Use SAL_PRIdINT32/SAL_PRIxUINT32 instead of %d/%x 2011-03-18 12:50:55 +09:00
Takeshi Abe
866364d7cb Removed dead code 2011-03-18 12:42:03 +09:00
Takeshi Abe
f17c5376f3 Removed an unchanged variable 2011-03-18 12:37:38 +09:00
Michael Lefevre
5a5efd42d9 Remove duplicated constant F_PI and friends
Easy hack, constants already defined in libs-gui/basegfx/inc/basegfx/numeric/ftools.hxx
2011-03-17 16:11:43 +01:00
Caolán McNamara
af9cd95a24 WaE: throw out some more warnings 2011-03-16 11:31:59 +00:00
Caolán McNamara
d50356c18a throw out some warnings 2011-03-16 11:31:59 +00:00
Luboš Luňák
e1ac729f05 there's no CT_AlignH/V either, only ST_ 2011-03-16 12:18:48 +01:00
Luboš Luňák
6e0982b824 there's no CT_PositionOffset, only ST_PositionOffset 2011-03-16 12:18:34 +01:00
Miklos Vajna
e8d08844e0 Introduce a single .gitattributes file in bootstrap 2011-03-16 11:11:46 +01:00
Norbert Thiebaud
c08aba6a41 amazingly writerfilter actually use libxml... 2011-03-15 22:23:00 -05:00
Thorsten Behrens
a41a8c504c Fix the build 2011-03-15 11:08:36 +01:00
Thomas Arnhold
7d48e6036e Remove empty comment fields 2011-03-14 21:41:46 +01:00
Thomas Arnhold
9a5c32ff8c Remove dates from comments 2011-03-14 21:39:05 +01:00
Thomas Arnhold
57dba81ada Remove empty comment fields 2011-03-14 21:36:18 +01:00
Thomas Arnhold
c066d8daab Remove dates from comments 2011-03-14 21:34:11 +01:00
Thomas Arnhold
99302f7071 Remove empty comment fields 2011-03-14 21:29:01 +01:00
Thomas Arnhold
d51b73ab6f Remove dates from comments 2011-03-14 21:23:14 +01:00
Thomas Arnhold
6b523eee51 Remove empty comment fields 2011-03-14 21:11:38 +01:00
Thomas Arnhold
4090a97017 Remove dates from comments 2011-03-14 21:03:13 +01:00
Michael Meeks
de64ae3b93 make writerfilter compile cleanly 2011-03-14 15:09:33 +00:00
Caolán McNamara
ac2d86ce6d WaE: mark this dir as warnings free 2011-03-14 12:57:51 +00:00
Norbert Thiebaud
423ad850a9 no more writeInfo 2011-03-13 20:27:01 -05:00
Norbert Thiebaud
3306bc364e no more writeInfo 2011-03-13 19:55:20 -05:00
Norbert Thiebaud
b02391add7 fix minor macro mis-merge 2011-03-13 19:55:13 -05:00
Bjoern Michaelsen
6241230a11 fixing tools types in source/graphicfilter/ipict/shape.cxx 2011-03-13 18:42:13 +01:00
Norbert Thiebaud
8021c2f312 convert tools type in lotuswordpro 2011-03-13 06:49:58 -05:00
Norbert Thiebaud
84660a5428 fix mis-merge in oox 2011-03-13 05:36:33 -05:00
Norbert Thiebaud
cef1ab56b2 fix mis-merge (mostly tools type remnants) 2011-03-13 01:33:54 -06:00
Thomas Arnhold
2063ca7141 Fix non-debug build 2011-03-12 20:40:18 +01:00
Thomas Arnhold
5e015371fc Fix non-debug build 2011-03-12 20:00:39 +01:00
Thomas Arnhold
8ab4cfaf14 OSL_TRACE: Use format string for GetBuffer() 2011-03-12 14:12:37 +01:00
Thomas Arnhold
3647031a27 Use getStr() on OString 2011-03-12 14:12:37 +01:00
Thomas Arnhold
4e7b12c7c2 Move OSL_ENSURE(0,...) to OSL_FAIL(...) 2011-03-12 14:12:37 +01:00
Thomas Arnhold
7d669e4cdc Move OSL_ENSURE(false,...) to OSL_FAIL(...) 2011-03-12 14:12:37 +01:00
Thomas Arnhold
d4ebec5c79 Move DBG_TRACE to OSL_TRACE for a macro 2011-03-11 12:29:40 +01:00
Thomas Arnhold
b3e6aa4020 Move DBG_TRACE to OSL_TRACE for strings GetBuffer() 2011-03-11 12:29:40 +01:00
Thomas Arnhold
a628091b5e Use GetBuffer() for String 2011-03-11 12:29:40 +01:00
Thomas Arnhold
ad6c44467a Move DBG_TRACE to OSL_TRACE 2011-03-11 12:29:40 +01:00
Thomas Arnhold
1fe1263f90 Move DBG_TRACE* to OSL_TRACE for some macros 2011-03-11 12:29:40 +01:00
Thomas Arnhold
3fc21391bd Move DBG_TRACE5 to OSL_TRACE 2011-03-11 12:29:40 +01:00
Thomas Arnhold
079f8714b9 Move DBG_TRACE4 to OSL_TRACE 2011-03-11 12:29:40 +01:00
Thomas Arnhold
783228a75e Move DBG_TRACE1 to OSL_TRACE 2011-03-11 12:29:39 +01:00
Thomas Arnhold
500bd4bbb5 Move #ifdef DBG_UTIL to #if OSL_DEBUG_LEVEL > 1 for OSL_TRACE 2011-03-11 12:29:39 +01:00
Thomas Arnhold
9e0e5ab669 Move DBG_ERROR2 to OSL_TRACE 2011-03-11 12:29:39 +01:00
Thomas Arnhold
1707a350af Move DBG_ERROR1 to OSL_TRACE 2011-03-11 12:29:39 +01:00
Thomas Arnhold
606ce7e9bb Move DBG_ERROR to OSL_FAIL for preprocessor string literals 2011-03-11 12:29:39 +01:00
Thomas Arnhold
3f03db2817 Move DBG_ERROR to OSL_FAIL (multiline) 2011-03-11 12:29:39 +01:00