loongoffice

Files

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

flash.component

sb129: #i113189# change UNO components to use passive registration

2010-09-10 13:10:07 +02:00

impswfdialog.cxx

Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

2011-03-09 22:49:23 -06:00

impswfdialog.hrc

changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)

2010-02-12 15:01:35 +01:00

impswfdialog.hxx

add modelines to .hxx files as well