Bjoern Michaelsen
|
112be98c92
|
resyncing to master
|
2011-07-21 18:38:50 +02:00 |
|
Bjoern Michaelsen
|
68ef83dbd7
|
fix buildbreakers in oox, revert token changes for now
|
2011-06-20 14:45:33 +02:00 |
|
Bjoern Michaelsen
|
ae2ebf8fac
|
Merge branch 'master' into feature/gnumake4
Conflicts:
filter/source/config/cache/filtercache.cxx
filter/source/odfflatxml/makefile.mk
oox/Library_oox.mk
oox/Makefile
oox/Module_oox.mk
oox/Package_generated.mk
oox/Package_inc.mk
oox/prj/build.lst
oox/prj/d.lst
oox/prj/makefile.mk
oox/source/dump/makefile.mk
unoxml/Library_unordf.mk
unoxml/Library_unoxml.mk
writerfilter/CppunitTest_writerfilter_doctok.mk
writerfilter/Library_writerfilter.mk
writerfilter/Module_writerfilter.mk
writerfilter/Package_inc.mk
writerfilter/inc/resourcemodel/TagLogger.hxx
writerfilter/inc/resourcemodel/WW8ResourceModel.hxx
writerfilter/prj/build.lst
writerfilter/prj/makefile.mk
writerfilter/qa/complex/ooxml/makefile.mk
writerfilter/qa/cppunittests/doctok/makefile.mk
writerfilter/qa/cppunittests/doctok/testdoctok.cxx
writerfilter/qa/cppunittests/xxml/testXXML.cxx
writerfilter/source/dmapper/DomainMapper.cxx
writerfilter/source/dmapper/DomainMapperTableHandler.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/FontTable.cxx
writerfilter/source/dmapper/GraphicHelpers.cxx
writerfilter/source/dmapper/PropertyIds.cxx
writerfilter/source/dmapper/PropertyMap.cxx
writerfilter/source/dmapper/SettingsTable.cxx
writerfilter/source/dmapper/StyleSheetTable.cxx
writerfilter/source/dmapper/TablePropertiesHandler.cxx
writerfilter/source/dmapper/TblStylePrHandler.cxx
writerfilter/source/dmapper/ThemeTable.cxx
writerfilter/source/doctok/WW8DocumentImpl.cxx
writerfilter/source/doctok/resourcesimpl.xsl
writerfilter/source/filter/WriterFilter.cxx
writerfilter/source/generated.mk
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
writerfilter/source/ooxml/OOXMLFactory.cxx
writerfilter/source/ooxml/OOXMLFactory.hxx
writerfilter/source/ooxml/OOXMLStreamImpl.cxx
writerfilter/source/ooxml/RefAndPointer.hxx
writerfilter/source/resourcemodel/TagLogger.cxx
writerfilter/unocomponent/component.cxx
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
|
2011-06-19 20:09:46 +02:00 |
|
Bjoern Michaelsen
|
6e135ba19a
|
fixing rebase errors
|
2011-06-18 14:12:16 +02:00 |
|
David Tardon
|
c25e9282ad
|
remove all traces of offuh from makefiles
|
2011-06-18 11:26:56 +02:00 |
|
Michael Stahl
|
347e365c25
|
gnumake4: oox, writerfilter, CppunitTest.mk: adapt to changes in gnumake4 [hg:d0e98479a69a]
|
2011-06-17 17:28:34 +02:00 |
|
Henning Brinkmann
|
778db52529
|
writerfilter10: added missing cxxs [hg:972d0c5efbc4]
|
2011-06-17 16:43:40 +02:00 |
|
Daniel Rentz [dr]
|
4ec8d1d36a
|
[mq]: oox_gmake.patch [hg:d0beb4a8aa40]
|
2011-06-17 16:14:10 +02:00 |
|
Jan Holesovsky
|
e959581b2d
|
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
filter/source/graphicfilter/epict/epict.cxx
filter/source/svg/svgexport.cxx
filter/source/svg/svgfontexport.cxx
filter/source/svg/svgwriter.cxx
lotuswordpro/source/filter/lwpchartstreamtools.cxx
lotuswordpro/source/filter/lwpfrib.cxx
lotuswordpro/source/filter/lwpgrfobj.cxx
lotuswordpro/source/filter/lwpidxmgr.cxx
lotuswordpro/source/filter/lwpobjid.cxx
lotuswordpro/source/filter/lwpparaproperty.cxx
lotuswordpro/util/makefile.mk
oox/prj/d.lst
oox/source/drawingml/chart/chartdrawingfragment.cxx
oox/source/drawingml/makefile.mk
oox/source/drawingml/shape.cxx
oox/source/ppt/slidepersist.cxx
oox/source/token/namespaces.hxx.tail
oox/source/xls/drawingfragment.cxx
oox/source/xls/excelfilter.cxx
oox/source/xls/makefile.mk
oox/source/xls/workbookhelper.cxx
writerfilter/source/ooxml/makefile.mk
writerfilter/source/resourcemodel/makefile.mk
|
2011-05-27 20:45:30 +02:00 |
|
Tor Lillqvist
|
fe3462b4cc
|
Fix crypto stuff when building on Windows
|
2011-04-29 15:14:07 +03:00 |
|
Caolán McNamara
|
e158b941f7
|
seem to need realpath here to build
|
2011-04-18 10:20:59 +01:00 |
|
David Tardon
|
24ce05abc9
|
link against openssl correctly
|
2011-04-15 16:12:59 +02:00 |
|
David Tardon
|
ab5e806974
|
fix delivery of generated files
|
2011-04-14 16:15:22 +02:00 |
|
David Tardon
|
2fe24238e8
|
really deliver namespaces.txt
|
2011-04-14 16:15:21 +02:00 |
|
David Tardon
|
1f9ad18ca6
|
gbuildize oox
|
2011-04-14 16:15:21 +02:00 |
|